Syntax highlighting fixes

Author: jcberquist

syntaxes/cfml.sublime-syntax

@@ -520,7 +520,7 @@ contexts:
       scope: punctuation.definition.template-expression.begin.cfml
       push:
         - match: '#'
-          scope: punctuation.definition.template-expression.begin.cfml
+          scope: punctuation.definition.template-expression.end.cfml
           pop: true
         - match: (?=.|\n)
           push:
@@ -533,7 +533,7 @@ contexts:
       scope: punctuation.definition.template-expression.begin.cfml
       push:
         - match: '#'
-          scope: punctuation.definition.template-expression.begin.cfml
+          scope: punctuation.definition.template-expression.end.cfml
           pop: true
         - match: (?=.|\n)
           push:
@@ -551,7 +551,7 @@ contexts:
       scope: punctuation.definition.template-expression.begin.cfml
       push:
         - match: '#'
-          scope: punctuation.definition.template-expression.begin.cfml
+          scope: punctuation.definition.template-expression.end.cfml
           pop: true
         - match: (?=.|\n)
           push:

syntaxes/cfscript-in-tags.sublime-syntax

@@ -1138,7 +1138,7 @@ contexts:
 
   tag-in-script-cf:
     - match: |-
-        (?x)(?i)(cf(?:ajaximport|ajaxproxy|applet|application|argument|associate|break|cache|calendar|chart
+        (?x)(?i)cf(?:ajaximport|ajaxproxy|applet|application|argument|associate|break|cache|calendar|chart
         |chartdata|chartseries|client|clientsettings|col|collection|content|cookie|dbinfo
         |directory|div|document|documentitem|documentsection|dump|error|exchangecalendar
         |exchangeconnection|exchangecontact|exchangefilter|exchangemail|exchangetask|execute
@@ -1152,14 +1152,20 @@ contexts:
         |queryparam|registry|report|reportparam|savecontent|schedule|search|select|setting
         |sharepoint|silent|slider|spreadsheet|sprydataset|storedproc|table|textarea|textinput
         |thread|throw|timer|tooltip|trace|transaction|tree|treeitem|update|wddx|websocket
-        |window|xml|zip|zipparam))\(
-      captures:
-        1: entity.name.tag.script.cfml
+        |window|xml|zip|zipparam)(?=\()
+      scope: entity.name.tag.script.cfml
       push:
-        - meta_scope: meta.tag.script.cf.cfml
-        - match: \)
-          pop: true
-        - include: tag-generic-attribute-cf-script
+        -   - meta_scope: meta.tag.script.cf.cfml
+            - include: immediately-pop
+        -   - match: \(
+              scope: punctuation.section.group.begin.cfml
+              set:
+                - meta_scope: meta.tag.script.cf.attributes.cfml
+                - match: \)
+                  scope: punctuation.section.group.end.cfml
+                  pop: true
+                - include: tag-generic-attribute-cf-script
+            - include: else-pop
 
   tag-generic-attribute-cf-script:
     - match: ','
@@ -1372,3 +1378,4 @@ contexts:
   angle-bracket-pop:
     - match: (?=/?>)
       pop: true
+

syntaxes/cfscript.sublime-syntax

@@ -1142,7 +1142,7 @@ contexts:
 
   tag-in-script-cf:
     - match: |-
-        (?x)(?i)(cf(?:ajaximport|ajaxproxy|applet|application|argument|associate|break|cache|calendar|chart
+        (?x)(?i)cf(?:ajaximport|ajaxproxy|applet|application|argument|associate|break|cache|calendar|chart
         |chartdata|chartseries|client|clientsettings|col|collection|content|cookie|dbinfo
         |directory|div|document|documentitem|documentsection|dump|error|exchangecalendar
         |exchangeconnection|exchangecontact|exchangefilter|exchangemail|exchangetask|execute
@@ -1156,14 +1156,20 @@ contexts:
         |queryparam|registry|report|reportparam|savecontent|schedule|search|select|setting
         |sharepoint|silent|slider|spreadsheet|sprydataset|storedproc|table|textarea|textinput
         |thread|throw|timer|tooltip|trace|transaction|tree|treeitem|update|wddx|websocket
-        |window|xml|zip|zipparam))\(
-      captures:
-        1: entity.name.tag.script.cfml
+        |window|xml|zip|zipparam)(?=\()
+      scope: entity.name.tag.script.cfml
       push:
-        - meta_scope: meta.tag.script.cf.cfml
-        - match: \)
-          pop: true
-        - include: tag-generic-attribute-cf-script
+        -   - meta_scope: meta.tag.script.cf.cfml
+            - include: immediately-pop
+        -   - match: \(
+              scope: punctuation.section.group.begin.cfml
+              set:
+                - meta_scope: meta.tag.script.cf.attributes.cfml
+                - match: \)
+                  scope: punctuation.section.group.end.cfml
+                  pop: true
+                - include: tag-generic-attribute-cf-script
+            - include: else-pop
 
   tag-generic-attribute-cf-script:
     - match: ','

syntaxes/macros/cfml_macros.py

@@ -163,7 +163,7 @@ def template_expression(meta_content_scope, clear_scopes=None, html_entities=Fal
             'push': [
                 {
                     'match': '#',
-                    'scope': 'punctuation.definition.template-expression.begin.cfml',
+                    'scope': 'punctuation.definition.template-expression.end.cfml',
                     'pop': True,
                 },
                 {'match': r'(?=.|\n)', 'push': push_context},

syntaxes/src/cfscript.sublime-syntax.yaml-macros

@@ -981,14 +981,19 @@ contexts:
 
   tag-in-script-cf:
     - match: !tags |-
-        (?x)(?i)(cf(?:{tags}))\(
-      captures:
-        1: entity.name.tag.script.cfml
+        (?x)(?i)cf(?:{tags})(?=\()
+      scope: entity.name.tag.script.cfml
       push:
-        - meta_scope: meta.tag.script.cf.cfml
-        - match: \)
-          pop: true
-        - include: tag-generic-attribute-cf-script
+        - !meta meta.tag.script.cf.cfml
+        - - match: '\('
+            scope: punctuation.section.group.begin.cfml
+            set:
+              - meta_scope: meta.tag.script.cf.attributes.cfml
+              - match: '\)'
+                scope: punctuation.section.group.end.cfml
+                pop: true
+              - include: tag-generic-attribute-cf-script
+          - include: else-pop
 
   tag-generic-attribute-cf-script:
     - match: ','

syntaxes/tests/syntax_test_cfc.cfc

@@ -253,12 +253,19 @@ private numeric function $fixNumber(required any value) {}
   this.test();
 //    ^ punctuation.accessor.cfml
 cflock(name:"name-of-lock") {}
+//    ^ meta.tag.script.cf.cfml  meta.tag.script.cf.attributes.cfml punctuation.section.group.begin.cfml
 //         ^ meta.tag.script.cf.cfml punctuation.separator.key-value.cfml
 //          ^ meta.string.quoted.double.cfml string.quoted.double.cfml punctuation.definition.string.begin.cfml
 //           ^^^^^^^^^^^^ meta.string.quoted.double.cfml string.quoted.double.cfml
+//                        ^ meta.tag.script.cf.cfml  meta.tag.script.cf.attributes.cfml punctuation.section.group.end.cfml
+//                          ^ meta.block.cfml punctuation.section.block.begin.cfml
   test(name:"arg");
 //     ^^^^ entity.other.function-parameter.cfml
 //         ^ punctuation.separator.key-value.cfml
 }
 // <- embedding.cfml source.cfml.script meta.class.body.cfml punctuation.section.block.end.cfml
  // <- embedding.cfml source.cfml.script -meta
+
+a = 'a #test# string';
+//     ^ punctuation.definition.template-expression.begin.cfml
+//          ^ punctuation.definition.template-expression.end.cfml