[TCL] Fix implementation of curly brace quoting

sublimehq · Apr 23, 2016 · f893296 · f893296
1 parent b0fdac1
commit f893296
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 0 deletions.
diff --git a/TCL/Tcl.sublime-syntax b/TCL/Tcl.sublime-syntax
@@ -49,6 +49,7 @@ contexts:
         - include: regexp
     - include: escape
     - include: variable
+    - include: braces
     - match: '"'
       scope: punctuation.definition.string.begin.tcl
       push:
@@ -73,6 +74,7 @@ contexts:
     - match: '(?:^|(?<=\s))\{'
       comment: matches a single brace-enclosed word
       push:
+        - meta_scope: string.quoted.curly.tcl
         - match: '\}([^\s\]]*)'
           captures:
             1: invalid.illegal.tcl

diff --git a/TCL/syntax_test_tcl.tcl b/TCL/syntax_test_tcl.tcl
@@ -20,8 +20,23 @@ puts "Not Highlighting"
 # Issue 131: https://github.com/SublimeTextIssues/DefaultPackages/issues/131
 # -------------------------------------------------------------------------- #
 set ok1 {["]"]}
+#       ^^^^^^^ string.quoted.curly
 set ok2 {["][]"]}
+#       ^^^^^^^^^ string.quoted.curly
 set not_ok {["]["]}
+#          ^^^^^^^^ string.quoted.curly
 puts $ok1            ;# ["]"]
+# ^ keyword.other
+#    ^^^^ variable.other
+#    ^ punctuation.definition.variable
+#                     ^ comment.line
 puts $ok2            ;# ["][]"]
+# ^ keyword.other
+#    ^^^^ variable.other
+#    ^ punctuation.definition.variable
+#                     ^ comment.line
 puts $not_ok         ;# ["]["]
+# ^ keyword.other
+#    ^^^^^^^ variable.other
+#    ^ punctuation.definition.variable
+#                     ^ comment.line