diff options
| author | Neil <nyamatongwe@gmail.com> | 2015-03-27 09:36:22 +1100 |
|---|---|---|
| committer | Neil <nyamatongwe@gmail.com> | 2015-03-27 09:36:22 +1100 |
| commit | 4f621b4bec66bd442966bbcf8d3b02a655c33555 (patch) | |
| tree | d766c43f72ad9ac1187bcad3542aff271d7ab420 | |
| parent | 7c87c9ff57fd657af90aeaedfcaaf607a866ee4b (diff) | |
| download | scintilla-mirror-4f621b4bec66bd442966bbcf8d3b02a655c33555.tar.gz | |
Bug [#1642] Reverting change set 5455 which caused problems with highlighting of
braces within strings.
| -rw-r--r-- | doc/ScintillaHistory.html | 4 | ||||
| -rw-r--r-- | lexers/LexTCL.cxx | 7 |
2 files changed, 6 insertions, 5 deletions
diff --git a/doc/ScintillaHistory.html b/doc/ScintillaHistory.html index b9be4596e..e96ac73f4 100644 --- a/doc/ScintillaHistory.html +++ b/doc/ScintillaHistory.html @@ -492,6 +492,10 @@ and SCI_GETKEYSUNICODE always returns true. These APIs are deprecated and should not be called. </li> <li> + TCL lexer reverts change to string handling. + <a href="http://sourceforge.net/p/scintilla/bugs/1642/">Bug #1642</a>. + </li> + <li> Verilog lexer fixes bugs with macro styling. Verilog folder fixes bugs with `end completing an `if* instead of `endif and fold.at.else, and implements folding at preprocessor `else. diff --git a/lexers/LexTCL.cxx b/lexers/LexTCL.cxx index 17414e7df..dfcab54ea 100644 --- a/lexers/LexTCL.cxx +++ b/lexers/LexTCL.cxx @@ -257,7 +257,7 @@ next: sc.ForwardSetState(SCE_TCL_DEFAULT); visibleChars = true; // necessary if a " is the first and only character on a line goto next; - } else if (sc.ch == '[' || sc.ch == ']' || sc.ch == '$' || sc.ch == '(') { + } else if (sc.ch == '[' || sc.ch == ']' || sc.ch == '$') { sc.SetState(SCE_TCL_OPERATOR); expected = sc.ch == '['; sc.ForwardSetState(SCE_TCL_IN_QUOTE); @@ -324,10 +324,7 @@ next: break; case '$': subParen = 0; - if (sc.chNext == '(') { - //$("") jquery selector?! - sc.SetState(SCE_TCL_OPERATOR); - } else if (sc.chNext != '{') { + if (sc.chNext != '{') { sc.SetState(SCE_TCL_SUBSTITUTION); } else { sc.SetState(SCE_TCL_OPERATOR); // $ |