diff options
| author | Kein-Hong Man <devnull@localhost> | 2015-12-21 18:03:27 +1100 |
|---|---|---|
| committer | Kein-Hong Man <devnull@localhost> | 2015-12-21 18:03:27 +1100 |
| commit | a25aed5764217e2b2834ad776413b4db3778ffa4 (patch) | |
| tree | 5d9ce4f60b2eabfed5dc05e6849a1f9d711288dd | |
| parent | 63a33763ccd8e772ecb4b1714748ab2a8deeb9d5 (diff) | |
| download | scintilla-mirror-a25aed5764217e2b2834ad776413b4db3778ffa4.tar.gz | |
Bug [#1794]. Update previous change for '#' to get priority correct.
| -rw-r--r-- | lexers/LexBash.cxx | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/lexers/LexBash.cxx b/lexers/LexBash.cxx index 09dd29650..21a756120 100644 --- a/lexers/LexBash.cxx +++ b/lexers/LexBash.cxx @@ -650,14 +650,13 @@ static void ColouriseBashDoc(Sci_PositionU startPos, Sci_Position length, int in if (sc.chNext == '#') { sc.Forward(); } - } else if (sc.chNext == '#' && !IsASpace(sc.GetRelative(2))) { // ##a - sc.SetState(SCE_SH_IDENTIFIER); - sc.Forward(2); } else if (sc.Match("##^") && IsUpperCase(sc.GetRelative(3))) { // ##^A sc.SetState(SCE_SH_IDENTIFIER); sc.Forward(3); - continue; - } else if (setWordStart.Contains(sc.chNext)) { + } else if (sc.chNext == '#' && !IsASpace(sc.GetRelative(2))) { // ##a + sc.SetState(SCE_SH_IDENTIFIER); + sc.Forward(2); + } else if (setWordStart.Contains(sc.chNext)) { // #name sc.SetState(SCE_SH_IDENTIFIER); } } |