diff options
| author | nyamatongwe <unknown> | 2010-10-27 10:44:38 +1100 |
|---|---|---|
| committer | nyamatongwe <unknown> | 2010-10-27 10:44:38 +1100 |
| commit | 010a3916103fa45b8969888b719abc90bb722de6 (patch) | |
| tree | 7bd1a5621f10697c48dffc4c597b2e676565e323 | |
| parent | c80faa757ba819566a8a82bcbfa97b5ea703468b (diff) | |
| download | scintilla-mirror-010a3916103fa45b8969888b719abc90bb722de6.tar.gz | |
Fix for bug #3063822 for bash here docs starting with <<-
| -rw-r--r-- | doc/ScintillaHistory.html | 4 | ||||
| -rw-r--r-- | lexers/LexBash.cxx | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/doc/ScintillaHistory.html b/doc/ScintillaHistory.html index 768301c69..e1863d1a1 100644 --- a/doc/ScintillaHistory.html +++ b/doc/ScintillaHistory.html @@ -427,6 +427,10 @@ <a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3073481&group_id=2439">Bug #3073481.</a> </li> <li> + Bash lexer bug fixed for here docs starting with <<-. + <a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3063822&group_id=2439">Bug #3063822.</a> + </li> + <li> C++ lexer bug fixed for // comments that are continued onto a second line by a \. <a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3066031&group_id=2439">Bug #3066031.</a> </li> diff --git a/lexers/LexBash.cxx b/lexers/LexBash.cxx index 7c06bdebb..1c844a6fd 100644 --- a/lexers/LexBash.cxx +++ b/lexers/LexBash.cxx @@ -407,8 +407,8 @@ static void ColouriseBashDoc(unsigned int startPos, int length, int initStyle, if (s[strlen(s) - 1] == '\r') s[strlen(s) - 1] = '\0'; if (strcmp(HereDoc.Delimiter, s) == 0) { - if ((prefixws > 0 && HereDoc.Indent) || // indentation rule - (prefixws == 0 && !HereDoc.Indent)) { + if ((prefixws == 0) || // indentation rule + (prefixws > 0 && HereDoc.Indent)) { sc.SetState(SCE_SH_DEFAULT); break; } |