github-linguist 5.3.3 → 6.0.0

data/grammars/source.cfscript.cfc.json

@@ -1,36 +1,16 @@
 {
-  "fileTypes": [
-    "cfc"
-  ],
-  "firstLineMatch": "",
-  "foldingStartMarker": "",
-  "foldingStopMarker": "",
-  "keyEquivalent": "",
   "name": "ColdFusion Component",
+  "scopeName": "source.cfscript.cfc",
   "patterns": [
     {
-      "begin": "(?:^\\s+)?(<)((?i:cfcomponent))(?![^>]*/>)",
-      "captures": {
-        "0": {
-          "name": "meta.tag.block.cf.component.cfml"
-        },
-        "1": {
-          "name": "punctuation.definition.tag.cf.begin.cfml"
-        },
-        "2": {
-          "name": "entity.name.tag.cf.component.cfml"
-        },
-        "3": {
-          "name": "punctuation.definition.tag.cf.end.cfml"
-        }
-      },
-      "end": "(</)((?i:cfcomponent))(>)(?:\\s*\\n)?",
       "contentName": "text.html.cfm.embedded.cfml",
+      "begin": "(?:^\\s+)?(\u003c)((?i:cfcomponent))(?![^\u003e]*/\u003e)",
+      "end": "(\u003c/)((?i:cfcomponent))(\u003e)(?:\\s*\\n)?",
       "patterns": [
         {
-          "begin": "(?<=cfcomponent)\\s",
-          "end": "(?=>)",
           "name": "meta.tag.block.cf.component.cfml",
+          "begin": "(?\u003c=cfcomponent)\\s",
+          "end": "(?=\u003e)",
           "patterns": [
             {
               "include": "#tag-stuff"
@@ -38,7 +18,13 @@
           ]
         },
         {
-          "begin": "(>)",
+          "begin": "(\u003e)",
+          "end": "(?=\u003c/(?i:cfcomponent))",
+          "patterns": [
+            {
+              "include": "text.html.cfm"
+            }
+          ],
           "beginCaptures": {
             "0": {
               "name": "meta.tag.block.cf.component.cfml"
@@ -46,15 +32,23 @@
             "1": {
               "name": "punctuation.definition.tag.cf.end.cfml"
             }
-          },
-          "end": "(?=</(?i:cfcomponent))",
-          "patterns": [
-            {
-              "include": "text.html.cfm"
-            }
-          ]
+          }
         }
-      ]
+      ],
+      "captures": {
+        "0": {
+          "name": "meta.tag.block.cf.component.cfml"
+        },
+        "1": {
+          "name": "punctuation.definition.tag.cf.begin.cfml"
+        },
+        "2": {
+          "name": "entity.name.tag.cf.component.cfml"
+        },
+        "3": {
+          "name": "punctuation.definition.tag.cf.end.cfml"
+        }
+      }
     },
     {
       "include": "#cfcomments"
@@ -67,104 +61,102 @@
     "cfcomments": {
       "patterns": [
         {
-          "match": "<!---.*--->",
-          "name": "comment.line.cfml"
+          "name": "comment.line.cfml",
+          "match": "\u003c!---.*---\u003e"
         },
         {
-          "begin": "<!---",
-          "captures": {
-            "0": {
-              "name": "punctuation.definition.comment.cfml"
-            }
-          },
-          "end": "--->",
           "name": "comment.block.cfml",
+          "begin": "\u003c!---",
+          "end": "---\u003e",
           "patterns": [
             {
               "include": "#cfcomments"
             }
-          ]
+          ],
+          "captures": {
+            "0": {
+              "name": "punctuation.definition.comment.cfml"
+            }
+          }
         }
       ]
     },
-    "tag-stuff": {
+    "entities": {
       "patterns": [
         {
-          "include": "#tag-generic-attribute"
-        },
-        {
-          "include": "#string-double-quoted"
+          "name": "constant.character.entity.html",
+          "match": "(\u0026)([a-zA-Z0-9]+|#[0-9]+|#x[0-9a-fA-F]+)(;)",
+          "captures": {
+            "1": {
+              "name": "punctuation.definition.entity.html"
+            },
+            "3": {
+              "name": "punctuation.definition.entity.html"
+            }
+          }
         },
         {
-          "include": "#string-single-quoted"
+          "name": "invalid.illegal.bad-ampersand.html",
+          "match": "\u0026"
         }
       ]
     },
-    "tag-generic-attribute": {
-      "match": "\\b([a-zA-Z\\-:]+)",
-      "name": "entity.other.attribute-name.html"
-    },
     "string-double-quoted": {
+      "name": "string.quoted.double.html",
       "begin": "\"",
+      "end": "\"",
+      "patterns": [
+        {
+          "include": "#entities"
+        }
+      ],
       "beginCaptures": {
         "0": {
           "name": "punctuation.definition.string.begin.html"
         }
       },
-      "end": "\"",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.string.end.html"
         }
-      },
-      "name": "string.quoted.double.html",
+      }
+    },
+    "string-single-quoted": {
+      "name": "string.quoted.single.html",
+      "begin": "'",
+      "end": "'",
       "patterns": [
         {
           "include": "#entities"
         }
-      ]
-    },
-    "string-single-quoted": {
-      "begin": "'",
+      ],
       "beginCaptures": {
         "0": {
           "name": "punctuation.definition.string.begin.html"
         }
       },
-      "end": "'",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.string.end.html"
         }
-      },
-      "name": "string.quoted.single.html",
-      "patterns": [
-        {
-          "include": "#entities"
-        }
-      ]
+      }
     },
-    "entities": {
+    "tag-generic-attribute": {
+      "name": "entity.other.attribute-name.html",
+      "match": "\\b([a-zA-Z\\-:]+)"
+    },
+    "tag-stuff": {
       "patterns": [
         {
-          "captures": {
-            "1": {
-              "name": "punctuation.definition.entity.html"
-            },
-            "3": {
-              "name": "punctuation.definition.entity.html"
-            }
-          },
-          "match": "(&)([a-zA-Z0-9]+|#[0-9]+|#x[0-9a-fA-F]+)(;)",
-          "name": "constant.character.entity.html"
+          "include": "#tag-generic-attribute"
+        },
+        {
+          "include": "#string-double-quoted"
         },
         {
-          "match": "&",
-          "name": "invalid.illegal.bad-ampersand.html"
+          "include": "#string-single-quoted"
         }
       ]
     }
-  },
-  "scopeName": "source.cfscript.cfc",
-  "uuid": "B7AC5320-4226-11E1-B86C-0800200C9A66"
-}
+  }
+}

data/grammars/source.cfscript.json

@@ -1,11 +1,6 @@
 {
-  "comment": "This tmLanguage file is used internally by ColdFusion and Component tmLanguage files",
-  "fileTypes": [
-
-  ],
-  "foldingStartMarker": "^.*\\bfunction\\s*([\\w\\$]+\\s*)?\\([^\\)]*\\)(\\s*\\{[^\\}]*)?\\s*$",
-  "foldingStopMarker": "^\\s*\\}",
   "name": "CFScript (do not use)",
+  "scopeName": "source.cfscript",
   "patterns": [
     {
       "include": "#comments"
@@ -27,6 +22,70 @@
     }
   ],
   "repository": {
+    "braces": {
+      "patterns": [
+        {
+          "name": "meta.brace.curly.cfscript",
+          "match": "{|}"
+        },
+        {
+          "name": "meta.brace.round.cfscript",
+          "match": "\\(|\\)"
+        },
+        {
+          "begin": "([\\w]+)?\\s*(\\[)",
+          "end": "\\]",
+          "patterns": [
+            {
+              "include": "#strings"
+            },
+            {
+              "name": "punctuation.definition.set.seperator.cfscript",
+              "match": ","
+            },
+            {
+              "include": "$self"
+            }
+          ],
+          "beginCaptures": {
+            "1": {
+              "name": "variable.other.set.cfscript"
+            },
+            "2": {
+              "name": "punctuation.definition.set.begin.cfscript"
+            }
+          },
+          "endCaptures": {
+            "0": {
+              "name": "punctuation.definition.set.end.cfscript"
+            }
+          }
+        }
+      ]
+    },
+    "cfcomments": {
+      "patterns": [
+        {
+          "name": "comment.line.cfml",
+          "match": "\u003c!---.*---\u003e"
+        },
+        {
+          "name": "comment.block.cfml",
+          "begin": "\u003c!---",
+          "end": "---\u003e",
+          "patterns": [
+            {
+              "include": "#cfcomments"
+            }
+          ],
+          "captures": {
+            "0": {
+              "name": "punctuation.definition.comment.cfml"
+            }
+          }
+        }
+      ]
+    },
     "cfscript-code": {
       "patterns": [
         {
@@ -56,621 +115,610 @@
       ]
     },
     "closures": {
+      "name": "meta.closure.cfscript",
       "begin": "(?i:\\b(function))\\b",
-      "beginCaptures": {
-        "1": {
-          "name": "storage.closure.cfscript"
-        }
-      },
       "end": "(?={)",
-      "name": "meta.closure.cfscript",
       "patterns": [
         {
           "include": "#parameters"
         }
-      ]
-    },
-    "functions": {
-      "begin": "(?x)^\\s*\n                    (?:\n                        (?: # optional access-control modifier and return-type\n                            (?i:\\b(private|package|public|remote)\\s+)? # access-control.modifier\n                            (?i:\\b\n                                (void)\n                                |\n                                (any|array|binary|boolean|component|date|guid|numeric|query|string|struct|xml|uuid) # return-type.primitive\n                                |\n                                ([A-Za-z0-9_\\.$]+) #return-type component/object (may need additional tokens)\n                            )?\n                        )\n                    )\n                    \\s*\n                    (?i:(function)) # storage.function\n                    \\s+\n                    (?:\n                        (init) # entity.name.function.contructor\n                        |\n                        ([\\w\\$]+) # entity.name.function\n                    )\\b\n                ",
+      ],
       "beginCaptures": {
         "1": {
-          "name": "storage.modifier.access-control.cfscript"
-        },
-        "2": {
-          "name": "storage.type.return-type.void.cfscript"
-        },
-        "3": {
-          "name": "storage.type.return-type.primitive.cfscript"
-        },
-        "4": {
-          "name": "storage.type.return-type.object.cfscript"
-        },
-        "5": {
-          "name": "storage.type.function.cfscript"
-        },
-        "6": {
-          "name": "entity.name.function.constructor.cfscript"
-        },
-        "7": {
-          "name": "entity.name.function.cfscript"
+          "name": "storage.closure.cfscript"
         }
-      },
-      "end": "(?={)",
-      "name": "meta.function.cfscript",
+      }
+    },
+    "comment-block": {
+      "name": "comment.block.cfscript",
+      "begin": "/\\*",
+      "end": "\\*/",
+      "captures": {
+        "0": {
+          "name": "punctuation.definition.comment.cfscript"
+        }
+      }
+    },
+    "comments": {
       "patterns": [
         {
-          "include": "#parameters"
+          "name": "comment.block.empty.cfscript",
+          "match": "/\\*\\*/",
+          "captures": {
+            "0": {
+              "name": "punctuation.definition.comment.cfscript"
+            }
+          }
         },
         {
-          "include": "#comments"
+          "include": "text.html.javadoc"
         },
         {
-          "include": "#function-properties"
+          "include": "#comment-block"
         },
         {
-          "include": "#cfscript-code"
+          "match": "((//).*?[^\\s])\\s*$\\n?",
+          "captures": {
+            "1": {
+              "name": "comment.line.double-slash.cfscript"
+            },
+            "2": {
+              "name": "punctuation.definition.comment.cfscript"
+            }
+          }
         }
       ]
     },
-    "parameters": {
+    "component-extends-attribute": {
+      "name": "meta.component.attribute-with-value.extends.cfml",
+      "begin": "\\b(extends)\\b\\s*(=)\\s*(?=\")",
+      "end": "(?=[\\s{])",
       "patterns": [
         {
-          "begin": "(\\()",
+          "name": "string.quoted.double.cfml",
+          "contentName": "meta.component-operator.extends.value.cfscript",
+          "begin": "\"",
+          "end": "\"",
           "beginCaptures": {
-            "1": {
-              "name": "punctuation.definition.parameters.begin.cfscript"
+            "0": {
+              "name": "punctuation.definition.string.begin.cfscript"
             }
           },
-          "end": "(\\))",
           "endCaptures": {
-            "1": {
-              "name": "punctuation.definition.parameters.end.cfscript"
+            "0": {
+              "name": "punctuation.definition.string.end.cfscript"
+            }
+          }
+        },
+        {
+          "name": "string.quoted.single.cfscript",
+          "contentName": "meta.component-operator.extends.value.cfscript",
+          "begin": "'",
+          "end": "'",
+          "beginCaptures": {
+            "0": {
+              "name": "punctuation.definition.string.begin.cfscript"
             }
           },
-          "name": "meta.function.parameters.cfscript",
+          "endCaptures": {
+            "0": {
+              "name": "punctuation.definition.string.end.cfscript"
+            }
+          }
+        }
+      ],
+      "captures": {
+        "1": {
+          "name": "entity.name.tag.operator-attribute.extends.cfml"
+        },
+        "2": {
+          "name": "keyword.operator.assignment.cfscript"
+        }
+      }
+    },
+    "component-operators": {
+      "patterns": [
+        {
+          "name": "meta.operator.cfscript meta.class.component.cfscript",
+          "begin": "(?x)\n                        \\b\n                        (?i:\n                        (component)\n                        )\n                        \\b\n                        \\s+\n                        (?![\\.\\/\u003e=,#\\)])\n                    ",
+          "end": "(?=[;{\\(])",
           "patterns": [
             {
-              "match": "(?i:required)",
-              "name": "keyword.other.required.argument.cfscript"
-            },
-            {
-              "include": "#storage-types"
-            },
-            {
-              "match": "(=)",
-              "name": "keyword.operator.argument-assignment.cfscript"
-            },
-            {
-              "match": "(?i:false|true|no|yes)",
-              "name": "constant.language.boolean.argument.cfscript"
-            },
-            {
-              "match": "(?i:\\w)",
-              "name": "variable.parameter.cfscript"
+              "include": "#component-extends-attribute"
             },
             {
-              "match": ",",
-              "name": "punctuation.definition.seperator.parameter.cfscript"
+              "name": "entity.other.attribute-name.cfscript",
+              "match": "(?i:(\\w+)\\s*(?=\\=))"
             },
             {
-              "include": "#strings"
+              "include": "#cfscript-code"
+            }
+          ],
+          "beginCaptures": {
+            "1": {
+              "name": "entity.name.tag.operator.component.cfscript"
             }
-          ]
+          }
         }
       ]
     },
-    "function-properties": {
+    "constants": {
       "patterns": [
         {
-          "match": "\\b(?i:output)",
-          "name": "entity.other.attribute-name.output.cfscript"
+          "name": "constant.numeric.cfscript",
+          "match": "(?x)(\n                            (\\b[0-9]+)\n                            |\n                            (\\.[0-9]+[0-9\\.]*) # decimals\n                            |\n                            (0(x|X)[0-9a-fA-F]+) # hex\n                            # matches really large double/floats\n                            |(\\.[0-9]+)((e|E)(\\+|-)?[0-9]+)?([LlFfUuDd]|UL|ul)?\n                            )\\b\n                        "
+        },
+        {
+          "name": "constant.language.cfscript",
+          "match": "\\b(?i:(true|false|null))\\b"
         },
         {
-          "match": "\\b([\\w]+)",
-          "name": "entity.other.attribute-name.any.cfscript"
+          "name": "constant.other.cfscript",
+          "match": "\\b_?([A-Z][A-Z0-9_]+)\\b"
         }
       ]
     },
-    "braces": {
+    "function-call": {
+      "name": "meta.function-call.cfscript",
+      "begin": "(?x)\n                (?i:\n                    (abs|acos|addsoaprequestheader|addsoapresponseheader|ajaxlink|ajaxonload|applicationstop\n                    |arrayappend|arrayavg|arrayclear|arraycontains|arraydelete|arraydeleteat\n                    |arrayfind|arrayfindnocase|arrayinsertat|arrayisdefined|arrayisempty|arraylen\n                    |arraymax|arraymin|arraynew|arrayprepend|arrayresize|arrayset|arraysort|arraysum\n                    |arrayswap|arraytolist|asc|asin|atn|authenticatedcontext|authenticateduser|binarydecode\n                    |binaryencode|bitand|bitmaskclear|bitmaskread|bitmaskset|bitnot|bitor|bitshln|bitshrn\n                    |bitxor|cacheget|cachegetallids|cachegetmetadata|cachegetproperties|cachegetsession\n                    |cacheput|cacheremove|cachesetproperties|ceiling|charsetdecode|charsetencode|chr\n                    |cjustify|compare|comparenocase|cos|createdate|createdatetime|createobject|createodbcdate\n                    |createodbcdatetime|createodbctime|createtime|createtimespan|createuuid|dateadd|datecompare\n                    |dateconvert|datediff|dateformat|datepart|day|dayofweek|dayofweekasstring|dayofyear\n                    |daysinmonth|daysinyear|decimalformat|decrementvalue|decrypt|decryptbinary\n                    |deleteclientvariable|deserializejson|de|directorycreate|directorydelete|directoryexists\n                    |directorylist|directoryrename|dollarformat|dotnettocftype|duplicate|encrypt|encryptbinary\n                    |entitydelete|entityload|entityloadbyexample|entityloadbypk|entitymerge|entitynew\n                    |entityreload|entitysave|entitytoquery|evaluate|exp|expandpath|fileclose|filecopy\n                    |filedelete|fileexists|fileiseof|filemove|fileopen|fileread|filereadbinary|filereadline\n                    |fileseek|filesetaccessmode|filesetattribute|filesetlastmodified|fileskipbytes|fileupload\n                    |fileuploadall|filewrite|filewriteline|find|findnocase|findoneof|firstdayofmonth|fix\n                    |formatbasen|generatesecretkey|getauthuser|getbasetagdata|getbasetaglist|getbasetemplatepath\n                    |getclientvariableslist|getcomponentmetadata|getcontextroot|getcurrenttemplatepath\n                    |getdirectoryfrompath|getencoding|getexception|getfilefrompath|getfileinfo\n                    |getfunctioncalledname|getfunctionlist|getgatewayhelper|gethttprequestdata|gethttptimestring\n                    |getk2serverdoccount|getk2serverdoccountlimit|getlocale|getlocaledisplayname|getlocalhostip\n                    |getmetadata|getmetricdata|getpagecontext|getrequest|getrequesturi|getprinterinfo|getprinterlist|getprofilesections\n                    |getprofilestring|getreadableimageformats|getsoaprequest|getsoaprequestheader|getsoapresponse\n                    |getsoapresponseheader|gettempdirectory|gettempfile|gettemplatepath|gettickcount\n                    |gettimezoneinfo|gettoken|getuserroles|getvfsmetadata|getwriteableimageformats|hash|hour\n                    |htmlcodeformat|htmleditformat|iif|imageaddborder|imageblur|imageclearrect|imagecopy\n                    |imagecrop|imagedrawarc|imagedrawbeveledrect|imagedrawcubiccurve|imagedrawline|imagedrawlines\n                    |imagedrawoval|imagedrawpoint|imagedrawquadraticcurve|imagedrawrect|imagedrawroundrect\n                    |imagedrawtext|imageflip|imagegetblob|imagegetbufferedimage|imagegetexifmetadata|imagegetexiftag\n                    |imagegetheight|imagegetiptcmetadata|imagegetiptctag|imagegetwidth|imagegrayscale|imageinfo\n                    |imagenegative|imagenew|imageoverlay|imagepaste|imageread|imagereadbase64|imageresize\n                    |imagerotate|imagerotatedrawingaxis|imagescaletofit|imagesetantialiasing|imagesetbackgroundcolor\n                    |imagesetdrawingcolor|imagesetdrawingstroke|imagesetdrawingtransparency|imagesharpen|imageshear\n                    |imagesheardrawingaxis|imagetranslate|imagetranslatedrawingaxis|imagewrite|imagewritebase64\n                    |imagexordrawingmode|incrementvalue|inputbasen|insert|int|isarray|isauthenticated|isauthorized\n                    |isbinary|isboolean|iscustomfunction|isdate|isddx|isdebugmode|isdefined|isimage|isimagefile\n                    |isinstanceof|isipv6|isjson|isk2serverabroker|isk2serverdoccountexceeded|isk2serveronline|isleapyear\n                    |islocalhost|isnull|isnumeric|isnumericdate|isobject|ispdffile|ispdfobject|isprotected|isquery\n                    |issimplevalue|issoaprequest|isspreadsheetfile|isspreadsheetobject|isstruct|isuserinanyrole\n                    |isuserinrole|isuserloggedin|isvalid|iswddx|isxml|isxmlattribute|isxmldoc|isxmlelem|isxmlnode\n                    |isxmlroot|javacast|jsstringformat|lcase|left|len|listappend|listchangedelims|listcontains\n                    |listcontainsnocase|listdeleteat|listfind|listfindnocase|listfirst|listgetat|listinsertat\n                    |listlast|listlen|listprepend|listqualify|listrest|listsetat|listsort|listtoarray|listvaluecount\n                    |listvaluecountnocase|ljustify|location|log|log10|lscurrencyformat|lsdateformat|lseurocurrencyformat\n                    |lsiscurrency|lsisdate|lsisnumeric|lsnumberformat|lsparsecurrency|lsparsedatetime|lsparseeurocurrency\n                    |lsparsenumber|lstimeformat|ltrim|max|mid|min|minute|month|monthasstring|now|numberformat|objectequals\n                    |objectload|objectsave|ormclearsession|ormclosesession|ormcloseallsessions|ormevictcollection\n                    |ormevictentity|ormevictqueries|ormexecutequery|ormflush|ormflushall|ormgetsession|ormgetsessionfactory\n                    |ormreload|paragraphformat|parameterexists|parsedatetime|pi|precisionevaluate|preservesinglequotes\n                    |quarter|queryaddcolumn|queryaddrow|queryconvertforgrid|querynew|querysetcell|quotedvaluelist\n                    |rand|randomize|randrange|refind|refindnocase|rematch|rematchnocase|releasecomobject|removechars\n                    |repeatstring|replace|replacelist|replacenocase|rereplace|rereplacenocase|reverse|right|rjustify\n                    |round|rtrim|second|sendgatewaymessage|serializejson|setencoding|setlocale|setprofilestring\n                    |setvariable|sgn|sin|sleep|spanexcluding|spanincluding|spreadsheetaddcolumn|spreadsheetaddimage\n                    |spreadsheetaddfreezepane|spreadsheetaddinfo|spreadsheetaddrow|spreadsheetaddrows|spreadsheetaddsplitpane\n                    |spreadsheetcreatesheet|spreadsheetdeletecolumn|spreadsheetdeletecolumns|spreadsheetdeleterow\n                    |spreadsheetdeleterows|spreadsheetformatcell|spreadsheetformatcolumn|spreadsheetformatcellrange\n                    |spreadsheetformatcolumns|spreadsheetformatrow|spreadsheetformatrows|spreadsheetgetcellcomment\n                    |spreadsheetgetcellformula|spreadsheetgetcellvalue|spreadsheetinfo|spreadsheetmergecells\n                    |spreadsheetnew|spreadsheetread|spreadsheetreadbinary|spreadsheetremovesheet|spreadsheetsetactivesheet\n                    |spreadsheetsetactivesheetnumber|spreadsheetsetcellcomment|spreadsheetsetcellformula|spreadsheetsetcellvalue\n                    |spreadsheetsetcolumnwidth|spreadsheetsetfooter|spreadsheetsetheader|spreadsheetsetrowheight\n                    |spreadsheetshiftcolumnsspreadsheetshiftrows|spreadsheetwrite|sqr|stripcr|structappend|structclear\n                    |structcopy|structcount|structdelete|structfind|structfindkey|structfindvalue|structget|structinsert\n                    |structisempty|structkeyarray|structkeyexists|structkeylist|structnew|structsort|structupdate|tan\n                    |threadjoin|threadterminate|throw|timeformat|tobase64|tobinary|toscript|tostring|trace|transactioncommit\n                    |transactionrollback|transactionsetsavepoint|trim|ucase|urldecode|urlencodedformat|urlsessionformat\n                    |val|valuelist|verifyclient|week|wrap|writedump|writelog|writeoutput|xmlchildpos|xmlelemnew\n                    |xmlformat|xmlgetnodetype|xmlnew|xmlparse|xmlsearch|xmltransform|xmlvalidate|year|yesnoformat)\n                    |\n                    (\\w+)\n                )\n                \\s*\n                (\\()\n            ",
+      "end": "(\\))",
       "patterns": [
         {
-          "name": "meta.brace.curly.cfscript",
-          "match": "{|}"
+          "name": "punctuation.definition.seperator.arguments.cfscript",
+          "match": ","
         },
         {
-          "name": "meta.brace.round.cfscript",
-          "match": "\\(|\\)"
+          "name": "entity.other.method-parameter.cfscript",
+          "match": "(?i:(\\w+)\\s*(?=\\=))"
         },
         {
-          "begin": "([\\w]+)?\\s*(\\[)",
-          "beginCaptures": {
-            "1": {
-              "name": "variable.other.set.cfscript"
-            },
-            "2": {
-              "name": "punctuation.definition.set.begin.cfscript"
-            }
-          },
-          "end": "\\]",
-          "endCaptures": {
-            "0": {
-              "name": "punctuation.definition.set.end.cfscript"
-            }
-          },
-          "patterns": [
-            {
-              "include": "#strings"
-            },
-            {
-              "match": ",",
-              "name": "punctuation.definition.set.seperator.cfscript"
-            },
-            {
-              "include": "$self"
-            }
-          ]
+          "include": "#cfcomments"
+        },
+        {
+          "include": "#comments"
+        },
+        {
+          "include": "#tag-operators"
+        },
+        {
+          "include": "#cfscript-code"
         }
-      ]
+      ],
+      "beginCaptures": {
+        "1": {
+          "name": "support.function.cfscript"
+        },
+        "2": {
+          "name": "entity.name.function-call.cfscript"
+        },
+        "3": {
+          "name": "punctuation.definition.arguments.begin.cfscript"
+        }
+      },
+      "endCaptures": {
+        "1": {
+          "name": "punctuation.definition.arguments.end.cfscript"
+        }
+      }
     },
-    "tag-operators": {
+    "function-properties": {
       "patterns": [
         {
-          "match": "\\b(else\\s+if|else|if)\\b",
-          "name": "keyword.control.operator.conditional.cfscript"
+          "name": "entity.other.attribute-name.output.cfscript",
+          "match": "\\b(?i:output)"
         },
         {
-          "match": "\\b(switch|case|default)\\b",
-          "name": "keyword.control.operator.switch.cfscript"
-        },
-        {
-          "begin": "(?x)^[\\s}]*\n                        (?i:\n                        (lock)|(transaction)|(thread)|(abort)\n                        |(exit)|(include)|(param)|(thread)|(import)\n                        |(rethrow|throw)|(property)|(interface)|(location)\n                        |(break)|(pageencoding)|(schedule)|(return)|(try|catch|finally)\n                        |(for|in|do|while|break|continue)\n                        |(trace)|(savecontent)|(http|httpparam)\n                        )\n                        \\b\n                        \\s*\n                        (?![^\\w|\"|'|\\(|{|;])\n                    ",
-          "beginCaptures": {
+          "name": "entity.other.attribute-name.any.cfscript",
+          "match": "\\b([\\w]+)"
+        }
+      ]
+    },
+    "functions": {
+      "name": "meta.function.cfscript",
+      "begin": "(?x)^\\s*\n                    (?:\n                        (?: # optional access-control modifier and return-type\n                            (?i:\\b(private|package|public|remote)\\s+)? # access-control.modifier\n                            (?i:\\b\n                                (void)\n                                |\n                                (any|array|binary|boolean|component|date|guid|numeric|query|string|struct|xml|uuid) # return-type.primitive\n                                |\n                                ([A-Za-z0-9_\\.$]+) #return-type component/object (may need additional tokens)\n                            )?\n                        )\n                    )\n                    \\s*\n                    (?i:(function)) # storage.function\n                    \\s+\n                    (?:\n                        (init) # entity.name.function.contructor\n                        |\n                        ([\\w\\$]+) # entity.name.function\n                    )\\b\n                ",
+      "end": "(?={)",
+      "patterns": [
+        {
+          "include": "#parameters"
+        },
+        {
+          "include": "#comments"
+        },
+        {
+          "include": "#function-properties"
+        },
+        {
+          "include": "#cfscript-code"
+        }
+      ],
+      "beginCaptures": {
+        "1": {
+          "name": "storage.modifier.access-control.cfscript"
+        },
+        "2": {
+          "name": "storage.type.return-type.void.cfscript"
+        },
+        "3": {
+          "name": "storage.type.return-type.primitive.cfscript"
+        },
+        "4": {
+          "name": "storage.type.return-type.object.cfscript"
+        },
+        "5": {
+          "name": "storage.type.function.cfscript"
+        },
+        "6": {
+          "name": "entity.name.function.constructor.cfscript"
+        },
+        "7": {
+          "name": "entity.name.function.cfscript"
+        }
+      }
+    },
+    "keywords": {
+      "patterns": [
+        {
+          "name": "keyword.other.new.cfscript",
+          "match": "\\b(?i:new)\\b"
+        },
+        {
+          "name": "keyword.operator.comparison.cfscript",
+          "match": "(===?|!|!=|\u003c=|\u003e=|\u003c|\u003e)"
+        },
+        {
+          "name": "keyword.operator.decision.cfscript",
+          "match": "\\b(?i:(GREATER|LESS|THAN|EQUAL\\s+TO|DOES|CONTAINS|EQUAL|EQ|NEQ|LT|LTE|LE|GT|GTE|GE|AND|IS))\\b"
+        },
+        {
+          "name": "keyword.operator.increment-decrement.cfscript",
+          "match": "(\\-\\-|\\+\\+)"
+        },
+        {
+          "name": "keyword.operator.arithmetic.cfscript",
+          "match": "(?i:(\\^|\\-|\\+|\\*|\\/|\\\\|%|\\-=|\\+=|\\*=|\\/=|%=|\\bMOD\\b))"
+        },
+        {
+          "name": "keyword.operator.concat.cfscript",
+          "match": "(\u0026|\u0026=)"
+        },
+        {
+          "name": "keyword.operator.assignment.cfscript",
+          "match": "(=)"
+        },
+        {
+          "name": "keyword.operator.logical.cfscript",
+          "match": "\\b(?i:(NOT|!|AND|\u0026\u0026|OR|\\|\\||XOR|EQV|IMP))\\b"
+        },
+        {
+          "name": "keyword.operator.ternary.cfscript",
+          "match": "(\\?|:)"
+        },
+        {
+          "name": "punctuation.terminator.cfscript",
+          "match": ";"
+        }
+      ]
+    },
+    "nest_hash": {
+      "patterns": [
+        {
+          "name": "string.escaped.hash.cfscript",
+          "match": "##"
+        },
+        {
+          "name": "meta.inline.hash.cfscript",
+          "contentName": "source.cfscript.embedded.cfscript",
+          "begin": "(#)(?=.*#)",
+          "end": "(#)",
+          "patterns": [
+            {
+              "include": "#cfscript-code"
+            }
+          ],
+          "beginCaptures": {
             "1": {
-              "name": "entity.name.tag.operator.lock.cfscript"
-            },
-            "2": {
-              "name": "entity.name.tag.operator.transaction.cfscript"
-            },
-            "3": {
-              "name": "entity.name.tag.operator.thread.cfscript"
-            },
-            "4": {
-              "name": "keyword.control.operator.abort.cfscript"
-            },
-            "5": {
-              "name": "keyword.control.operator.exit.cfscript"
-            },
-            "6": {
-              "name": "entity.name.tag.operator.include.cfscript"
-            },
-            "7": {
-              "name": "entity.name.tag.operator.param.cfscript"
-            },
-            "8": {
-              "name": "entity.name.tag.operator.thread.cfscript"
-            },
-            "9": {
-              "name": "entity.name.tag.operator.import.cfscript"
-            },
-            "10": {
-              "name": "keyword.control.operator.catch-exception.cfscript"
-            },
-            "11": {
-              "name": "entity.name.tag.operator.property.cfscript"
-            },
-            "12": {
-              "name": "entity.name.tag.operator.interface.cfscript"
-            },
-            "13": {
-              "name": "entity.name.tag.operator.location.cfscript"
-            },
-            "14": {
-              "name": "keyword.control.operator.break.cfscript"
-            },
-            "15": {
-              "name": "entity.name.tag.operator.pageencoding.cfscript"
-            },
-            "16": {
-              "name": "entity.name.tag.operator.schedule.cfscript"
-            },
-            "17": {
-              "name": "keyword.control.operator.return.cfscript"
-            },
-            "18": {
-              "name": "keyword.control.operator.catch-exception.cfscript"
-            },
-            "19": {
-              "name": "keyword.control.operator.loop.cfscript"
-            },
-            "20": {
-              "name": "entity.name.tag.operator.trace.cfscript"
-            },
-            "21": {
-              "name": "entity.name.tag.operator.savecontent.cfscript"
-            },
-            "22": {
-              "name": "entity.name.tag.operator.http.cfscript"
+              "name": "punctuation.definition.hash.begin.cfscript"
             }
           },
-          "end": "(;)|({)",
           "endCaptures": {
             "1": {
-              "name": "punctuation.terminator.cfscript"
-            },
-            "3": {
-              "name": "meta.brace.curly.cfscript"
+              "name": "punctuation.definition.hash.end.cfscript"
             }
-          },
-          "name": "meta.operator.cfscript",
+          }
+        }
+      ]
+    },
+    "parameters": {
+      "patterns": [
+        {
+          "name": "meta.function.parameters.cfscript",
+          "begin": "(\\()",
+          "end": "(\\))",
           "patterns": [
             {
-              "begin": "\\(",
-              "beginCaptures": {
-                "0": {
-                  "name": "meta.brace.curly.cfscript"
-                }
-              },
-              "end": "\\)",
-              "endCaptures": {
-                "0": {
-                  "name": "meta.brace.curly.cfscript"
-                }
-              },
-              "patterns": [
-                {
-                  "match": ",",
-                  "name": "punctuation.definition.seperator.arguments.cfscript"
-                },
-                {
-                  "match": "(?i:(\\w+)\\s*(?=\\=))",
-                  "name": "entity.other.operator-parameter.cfscript"
-                },
-                {
-                  "include": "#cfscript-code"
-                }
-              ]
+              "name": "keyword.other.required.argument.cfscript",
+              "match": "(?i:required)"
             },
             {
-              "match": "(?i:(\\w+)\\s*(?=\\=))",
-              "name": "entity.other.attribute-name.cfscript"
+              "include": "#storage-types"
             },
             {
-              "include": "#cfcomments"
+              "name": "keyword.operator.argument-assignment.cfscript",
+              "match": "(=)"
             },
             {
-              "include": "#comments"
+              "name": "constant.language.boolean.argument.cfscript",
+              "match": "(?i:false|true|no|yes)"
             },
             {
-              "include": "#cfscript-code"
-            }
-          ]
-        }
-      ]
-    },
-    "component-operators": {
-      "patterns": [
-        {
-          "begin": "(?x)\n                        \\b\n                        (?i:\n                        (component)\n                        )\n                        \\b\n                        \\s+\n                        (?![\\.\\/>=,#\\)])\n                    ",
-          "beginCaptures": {
-            "1": {
-              "name": "entity.name.tag.operator.component.cfscript"
-            }
-          },
-          "name": "meta.operator.cfscript meta.class.component.cfscript",
-          "end": "(?=[;{\\(])",
-          "patterns": [
-            {
-              "include": "#component-extends-attribute"
+              "name": "variable.parameter.cfscript",
+              "match": "(?i:\\w)"
             },
             {
-              "match": "(?i:(\\w+)\\s*(?=\\=))",
-              "name": "entity.other.attribute-name.cfscript"
+              "name": "punctuation.definition.seperator.parameter.cfscript",
+              "match": ","
             },
             {
-              "include": "#cfscript-code"
+              "include": "#strings"
             }
-          ]
-        }
-      ]
-    },
-    "component-extends-attribute": {
-      "begin": "\\b(extends)\\b\\s*(=)\\s*(?=\")",
-      "captures": {
-        "1": {
-          "name": "entity.name.tag.operator-attribute.extends.cfml"
-        },
-        "2": {
-          "name": "keyword.operator.assignment.cfscript"
-        }
-      },
-      "end": "(?=[\\s{])",
-      "name": "meta.component.attribute-with-value.extends.cfml",
-      "patterns": [
-        {
-          "begin": "\"",
+          ],
           "beginCaptures": {
-            "0": {
-              "name": "punctuation.definition.string.begin.cfscript"
-            }
-          },
-          "contentName": "meta.component-operator.extends.value.cfscript",
-          "end": "\"",
-          "endCaptures": {
-            "0": {
-              "name": "punctuation.definition.string.end.cfscript"
-            }
-          },
-          "name": "string.quoted.double.cfml"
-        },
-        {
-          "begin": "'",
-          "beginCaptures": {
-            "0": {
-              "name": "punctuation.definition.string.begin.cfscript"
+            "1": {
+              "name": "punctuation.definition.parameters.begin.cfscript"
             }
           },
-          "contentName": "meta.component-operator.extends.value.cfscript",
-          "end": "'",
           "endCaptures": {
-            "0": {
-              "name": "punctuation.definition.string.end.cfscript"
+            "1": {
+              "name": "punctuation.definition.parameters.end.cfscript"
             }
-          },
-          "name": "string.quoted.single.cfscript"
-        }
-      ]
-    },
-    "storage-types": {
-      "patterns": [
-        {
-          "match": "\\b(?i:(function|string|date|struct|array|void|binary|numeric|boolean|query|xml|uuid|any))\\b",
-          "name": "storage.type.primitive.cfscript"
-        }
-      ]
-    },
-    "constants": {
-      "patterns": [
-        {
-          "match": "(?x)(\n                            (\\b[0-9]+)\n                            |\n                            (\\.[0-9]+[0-9\\.]*) # decimals\n                            |\n                            (0(x|X)[0-9a-fA-F]+) # hex\n                            # matches really large double/floats\n                            |(\\.[0-9]+)((e|E)(\\+|-)?[0-9]+)?([LlFfUuDd]|UL|ul)?\n                            )\\b\n                        ",
-          "name": "constant.numeric.cfscript"
-        },
-        {
-          "match": "\\b(?i:(true|false|null))\\b",
-          "name": "constant.language.cfscript"
-        },
-        {
-          "match": "\\b_?([A-Z][A-Z0-9_]+)\\b",
-          "name": "constant.other.cfscript"
+          }
         }
       ]
     },
-    "comments": {
+    "sql-code": {
       "patterns": [
         {
-          "captures": {
-            "0": {
-              "name": "punctuation.definition.comment.cfscript"
-            }
-          },
-          "match": "/\\*\\*/",
-          "name": "comment.block.empty.cfscript"
-        },
-        {
-          "include": "text.html.javadoc"
-        },
-        {
-          "include": "#comment-block"
-        },
-        {
-          "captures": {
-            "2": {
-              "name": "punctuation.definition.comment.cfscript"
+          "name": "source.sql.embedded.cfscript",
+          "begin": "([\\w+\\.]+)\\.((?i:setsql))\\(\\s*[\"|']",
+          "end": "([\"|']\\s*\\))",
+          "patterns": [
+            {
+              "include": "#nest_hash"
             },
+            {
+              "include": "source.sql"
+            }
+          ],
+          "beginCaptures": {
             "1": {
-              "name": "comment.line.double-slash.cfscript"
+              "name": "entity.name.function.query.cfscript, meta.toc-list.query.cfscript"
+            },
+            "2": {
+              "name": "support.function.cfscript"
             }
           },
-          "match": "((//).*?[^\\s])\\s*$\\n?"
+          "endCaptures": {
+            "1": {
+              "name": "punctuation.parenthesis.end.cfscript"
+            }
+          }
         }
       ]
     },
-    "comment-block": {
-      "begin": "/\\*",
-      "captures": {
-        "0": {
-          "name": "punctuation.definition.comment.cfscript"
-        }
-      },
-      "end": "\\*/",
-      "name": "comment.block.cfscript"
-    },
-    "strings": {
+    "storage-types": {
       "patterns": [
         {
-          "include": "#string-quoted-double"
-        },
-        {
-          "include": "#string-quoted-single"
+          "name": "storage.type.primitive.cfscript",
+          "match": "\\b(?i:(function|string|date|struct|array|void|binary|numeric|boolean|query|xml|uuid|any))\\b"
         }
       ]
     },
     "string-quoted-double": {
+      "name": "string.quoted.double.cfscript",
       "begin": "\"",
-      "beginCaptures": {
-        "0": {
-          "name": "punctuation.definition.string.begin.cfscript"
-        }
-      },
       "end": "\"(?!\")",
-      "endCaptures": {
-        "0": {
-          "name": "punctuation.definition.string.end.cfscript"
-        }
-      },
-      "name": "string.quoted.double.cfscript",
       "patterns": [
         {
-          "match": "(\"\")",
-          "name": "constant.character.escape.quoted.double.cfscript"
+          "name": "constant.character.escape.quoted.double.cfscript",
+          "match": "(\"\")"
         },
         {
           "include": "#nest_hash"
         }
-      ]
-    },
-    "string-quoted-single": {
-      "begin": "'",
+      ],
       "beginCaptures": {
         "0": {
           "name": "punctuation.definition.string.begin.cfscript"
         }
       },
-      "end": "'(?!')",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.string.end.cfscript"
         }
-      },
+      }
+    },
+    "string-quoted-single": {
       "name": "string.quoted.single.cfscript",
+      "begin": "'",
+      "end": "'(?!')",
       "patterns": [
         {
-          "match": "('')",
-          "name": "constant.character.escape.quoted.single.cfscript"
+          "name": "constant.character.escape.quoted.single.cfscript",
+          "match": "('')"
         },
         {
           "include": "#nest_hash"
         }
-      ]
-    },
-    "keywords": {
-      "patterns": [
-        {
-          "match": "\\b(?i:new)\\b",
-          "name": "keyword.other.new.cfscript"
-        },
-        {
-          "match": "(===?|!|!=|<=|>=|<|>)",
-          "name": "keyword.operator.comparison.cfscript"
-        },
-        {
-          "match": "\\b(?i:(GREATER|LESS|THAN|EQUAL\\s+TO|DOES|CONTAINS|EQUAL|EQ|NEQ|LT|LTE|LE|GT|GTE|GE|AND|IS))\\b",
-          "name": "keyword.operator.decision.cfscript"
-        },
-        {
-          "match": "(\\-\\-|\\+\\+)",
-          "name": "keyword.operator.increment-decrement.cfscript"
-        },
-        {
-          "match": "(?i:(\\^|\\-|\\+|\\*|\\/|\\\\|%|\\-=|\\+=|\\*=|\\/=|%=|\\bMOD\\b))",
-          "name": "keyword.operator.arithmetic.cfscript"
-        },
-        {
-          "match": "(&|&=)",
-          "name": "keyword.operator.concat.cfscript"
-        },
-        {
-          "match": "(=)",
-          "name": "keyword.operator.assignment.cfscript"
-        },
-        {
-          "match": "\\b(?i:(NOT|!|AND|&&|OR|\\|\\||XOR|EQV|IMP))\\b",
-          "name": "keyword.operator.logical.cfscript"
-        },
-        {
-          "match": "(\\?|:)",
-          "name": "keyword.operator.ternary.cfscript"
-        },
-        {
-          "match": ";",
-          "name": "punctuation.terminator.cfscript"
-        }
-      ]
-    },
-    "function-call": {
-      "begin": "(?x)\n                (?i:\n                    (abs|acos|addsoaprequestheader|addsoapresponseheader|ajaxlink|ajaxonload|applicationstop\n                    |arrayappend|arrayavg|arrayclear|arraycontains|arraydelete|arraydeleteat\n                    |arrayfind|arrayfindnocase|arrayinsertat|arrayisdefined|arrayisempty|arraylen\n                    |arraymax|arraymin|arraynew|arrayprepend|arrayresize|arrayset|arraysort|arraysum\n                    |arrayswap|arraytolist|asc|asin|atn|authenticatedcontext|authenticateduser|binarydecode\n                    |binaryencode|bitand|bitmaskclear|bitmaskread|bitmaskset|bitnot|bitor|bitshln|bitshrn\n                    |bitxor|cacheget|cachegetallids|cachegetmetadata|cachegetproperties|cachegetsession\n                    |cacheput|cacheremove|cachesetproperties|ceiling|charsetdecode|charsetencode|chr\n                    |cjustify|compare|comparenocase|cos|createdate|createdatetime|createobject|createodbcdate\n                    |createodbcdatetime|createodbctime|createtime|createtimespan|createuuid|dateadd|datecompare\n                    |dateconvert|datediff|dateformat|datepart|day|dayofweek|dayofweekasstring|dayofyear\n                    |daysinmonth|daysinyear|decimalformat|decrementvalue|decrypt|decryptbinary\n                    |deleteclientvariable|deserializejson|de|directorycreate|directorydelete|directoryexists\n                    |directorylist|directoryrename|dollarformat|dotnettocftype|duplicate|encrypt|encryptbinary\n                    |entitydelete|entityload|entityloadbyexample|entityloadbypk|entitymerge|entitynew\n                    |entityreload|entitysave|entitytoquery|evaluate|exp|expandpath|fileclose|filecopy\n                    |filedelete|fileexists|fileiseof|filemove|fileopen|fileread|filereadbinary|filereadline\n                    |fileseek|filesetaccessmode|filesetattribute|filesetlastmodified|fileskipbytes|fileupload\n                    |fileuploadall|filewrite|filewriteline|find|findnocase|findoneof|firstdayofmonth|fix\n                    |formatbasen|generatesecretkey|getauthuser|getbasetagdata|getbasetaglist|getbasetemplatepath\n                    |getclientvariableslist|getcomponentmetadata|getcontextroot|getcurrenttemplatepath\n                    |getdirectoryfrompath|getencoding|getexception|getfilefrompath|getfileinfo\n                    |getfunctioncalledname|getfunctionlist|getgatewayhelper|gethttprequestdata|gethttptimestring\n                    |getk2serverdoccount|getk2serverdoccountlimit|getlocale|getlocaledisplayname|getlocalhostip\n                    |getmetadata|getmetricdata|getpagecontext|getrequest|getrequesturi|getprinterinfo|getprinterlist|getprofilesections\n                    |getprofilestring|getreadableimageformats|getsoaprequest|getsoaprequestheader|getsoapresponse\n                    |getsoapresponseheader|gettempdirectory|gettempfile|gettemplatepath|gettickcount\n                    |gettimezoneinfo|gettoken|getuserroles|getvfsmetadata|getwriteableimageformats|hash|hour\n                    |htmlcodeformat|htmleditformat|iif|imageaddborder|imageblur|imageclearrect|imagecopy\n                    |imagecrop|imagedrawarc|imagedrawbeveledrect|imagedrawcubiccurve|imagedrawline|imagedrawlines\n                    |imagedrawoval|imagedrawpoint|imagedrawquadraticcurve|imagedrawrect|imagedrawroundrect\n                    |imagedrawtext|imageflip|imagegetblob|imagegetbufferedimage|imagegetexifmetadata|imagegetexiftag\n                    |imagegetheight|imagegetiptcmetadata|imagegetiptctag|imagegetwidth|imagegrayscale|imageinfo\n                    |imagenegative|imagenew|imageoverlay|imagepaste|imageread|imagereadbase64|imageresize\n                    |imagerotate|imagerotatedrawingaxis|imagescaletofit|imagesetantialiasing|imagesetbackgroundcolor\n                    |imagesetdrawingcolor|imagesetdrawingstroke|imagesetdrawingtransparency|imagesharpen|imageshear\n                    |imagesheardrawingaxis|imagetranslate|imagetranslatedrawingaxis|imagewrite|imagewritebase64\n                    |imagexordrawingmode|incrementvalue|inputbasen|insert|int|isarray|isauthenticated|isauthorized\n                    |isbinary|isboolean|iscustomfunction|isdate|isddx|isdebugmode|isdefined|isimage|isimagefile\n                    |isinstanceof|isipv6|isjson|isk2serverabroker|isk2serverdoccountexceeded|isk2serveronline|isleapyear\n                    |islocalhost|isnull|isnumeric|isnumericdate|isobject|ispdffile|ispdfobject|isprotected|isquery\n                    |issimplevalue|issoaprequest|isspreadsheetfile|isspreadsheetobject|isstruct|isuserinanyrole\n                    |isuserinrole|isuserloggedin|isvalid|iswddx|isxml|isxmlattribute|isxmldoc|isxmlelem|isxmlnode\n                    |isxmlroot|javacast|jsstringformat|lcase|left|len|listappend|listchangedelims|listcontains\n                    |listcontainsnocase|listdeleteat|listfind|listfindnocase|listfirst|listgetat|listinsertat\n                    |listlast|listlen|listprepend|listqualify|listrest|listsetat|listsort|listtoarray|listvaluecount\n                    |listvaluecountnocase|ljustify|location|log|log10|lscurrencyformat|lsdateformat|lseurocurrencyformat\n                    |lsiscurrency|lsisdate|lsisnumeric|lsnumberformat|lsparsecurrency|lsparsedatetime|lsparseeurocurrency\n                    |lsparsenumber|lstimeformat|ltrim|max|mid|min|minute|month|monthasstring|now|numberformat|objectequals\n                    |objectload|objectsave|ormclearsession|ormclosesession|ormcloseallsessions|ormevictcollection\n                    |ormevictentity|ormevictqueries|ormexecutequery|ormflush|ormflushall|ormgetsession|ormgetsessionfactory\n                    |ormreload|paragraphformat|parameterexists|parsedatetime|pi|precisionevaluate|preservesinglequotes\n                    |quarter|queryaddcolumn|queryaddrow|queryconvertforgrid|querynew|querysetcell|quotedvaluelist\n                    |rand|randomize|randrange|refind|refindnocase|rematch|rematchnocase|releasecomobject|removechars\n                    |repeatstring|replace|replacelist|replacenocase|rereplace|rereplacenocase|reverse|right|rjustify\n                    |round|rtrim|second|sendgatewaymessage|serializejson|setencoding|setlocale|setprofilestring\n                    |setvariable|sgn|sin|sleep|spanexcluding|spanincluding|spreadsheetaddcolumn|spreadsheetaddimage\n                    |spreadsheetaddfreezepane|spreadsheetaddinfo|spreadsheetaddrow|spreadsheetaddrows|spreadsheetaddsplitpane\n                    |spreadsheetcreatesheet|spreadsheetdeletecolumn|spreadsheetdeletecolumns|spreadsheetdeleterow\n                    |spreadsheetdeleterows|spreadsheetformatcell|spreadsheetformatcolumn|spreadsheetformatcellrange\n                    |spreadsheetformatcolumns|spreadsheetformatrow|spreadsheetformatrows|spreadsheetgetcellcomment\n                    |spreadsheetgetcellformula|spreadsheetgetcellvalue|spreadsheetinfo|spreadsheetmergecells\n                    |spreadsheetnew|spreadsheetread|spreadsheetreadbinary|spreadsheetremovesheet|spreadsheetsetactivesheet\n                    |spreadsheetsetactivesheetnumber|spreadsheetsetcellcomment|spreadsheetsetcellformula|spreadsheetsetcellvalue\n                    |spreadsheetsetcolumnwidth|spreadsheetsetfooter|spreadsheetsetheader|spreadsheetsetrowheight\n                    |spreadsheetshiftcolumnsspreadsheetshiftrows|spreadsheetwrite|sqr|stripcr|structappend|structclear\n                    |structcopy|structcount|structdelete|structfind|structfindkey|structfindvalue|structget|structinsert\n                    |structisempty|structkeyarray|structkeyexists|structkeylist|structnew|structsort|structupdate|tan\n                    |threadjoin|threadterminate|throw|timeformat|tobase64|tobinary|toscript|tostring|trace|transactioncommit\n                    |transactionrollback|transactionsetsavepoint|trim|ucase|urldecode|urlencodedformat|urlsessionformat\n                    |val|valuelist|verifyclient|week|wrap|writedump|writelog|writeoutput|xmlchildpos|xmlelemnew\n                    |xmlformat|xmlgetnodetype|xmlnew|xmlparse|xmlsearch|xmltransform|xmlvalidate|year|yesnoformat)\n                    |\n                    (\\w+)\n                )\n                \\s*\n                (\\()\n            ",
+      ],
       "beginCaptures": {
-        "1": {
-          "name": "support.function.cfscript"
-        },
-        "2": {
-          "name": "entity.name.function-call.cfscript"
-        },
-        "3": {
-          "name": "punctuation.definition.arguments.begin.cfscript"
+        "0": {
+          "name": "punctuation.definition.string.begin.cfscript"
         }
       },
-      "end": "(\\))",
       "endCaptures": {
-        "1": {
-          "name": "punctuation.definition.arguments.end.cfscript"
+        "0": {
+          "name": "punctuation.definition.string.end.cfscript"
         }
-      },
-      "name": "meta.function-call.cfscript",
+      }
+    },
+    "strings": {
       "patterns": [
         {
-          "match": ",",
-          "name": "punctuation.definition.seperator.arguments.cfscript"
-        },
-        {
-          "match": "(?i:(\\w+)\\s*(?=\\=))",
-          "name": "entity.other.method-parameter.cfscript"
-        },
-        {
-          "include": "#cfcomments"
-        },
-        {
-          "include": "#comments"
-        },
-        {
-          "include": "#tag-operators"
+          "include": "#string-quoted-double"
         },
         {
-          "include": "#cfscript-code"
+          "include": "#string-quoted-single"
         }
       ]
     },
-    "nest_hash": {
+    "tag-operators": {
       "patterns": [
         {
-          "match": "##",
-          "name": "string.escaped.hash.cfscript"
+          "name": "keyword.control.operator.conditional.cfscript",
+          "match": "\\b(else\\s+if|else|if)\\b"
         },
         {
-          "begin": "(#)(?=.*#)",
+          "name": "keyword.control.operator.switch.cfscript",
+          "match": "\\b(switch|case|default)\\b"
+        },
+        {
+          "name": "meta.operator.cfscript",
+          "begin": "(?x)^[\\s}]*\n                        (?i:\n                        (lock)|(transaction)|(thread)|(abort)\n                        |(exit)|(include)|(param)|(thread)|(import)\n                        |(rethrow|throw)|(property)|(interface)|(location)\n                        |(break)|(pageencoding)|(schedule)|(return)|(try|catch|finally)\n                        |(for|in|do|while|break|continue)\n                        |(trace)|(savecontent)|(http|httpparam)\n                        )\n                        \\b\n                        \\s*\n                        (?![^\\w|\"|'|\\(|{|;])\n                    ",
+          "end": "(;)|({)",
+          "patterns": [
+            {
+              "begin": "\\(",
+              "end": "\\)",
+              "patterns": [
+                {
+                  "name": "punctuation.definition.seperator.arguments.cfscript",
+                  "match": ","
+                },
+                {
+                  "name": "entity.other.operator-parameter.cfscript",
+                  "match": "(?i:(\\w+)\\s*(?=\\=))"
+                },
+                {
+                  "include": "#cfscript-code"
+                }
+              ],
+              "beginCaptures": {
+                "0": {
+                  "name": "meta.brace.curly.cfscript"
+                }
+              },
+              "endCaptures": {
+                "0": {
+                  "name": "meta.brace.curly.cfscript"
+                }
+              }
+            },
+            {
+              "name": "entity.other.attribute-name.cfscript",
+              "match": "(?i:(\\w+)\\s*(?=\\=))"
+            },
+            {
+              "include": "#cfcomments"
+            },
+            {
+              "include": "#comments"
+            },
+            {
+              "include": "#cfscript-code"
+            }
+          ],
           "beginCaptures": {
             "1": {
-              "name": "punctuation.definition.hash.begin.cfscript"
+              "name": "entity.name.tag.operator.lock.cfscript"
+            },
+            "10": {
+              "name": "keyword.control.operator.catch-exception.cfscript"
+            },
+            "11": {
+              "name": "entity.name.tag.operator.property.cfscript"
+            },
+            "12": {
+              "name": "entity.name.tag.operator.interface.cfscript"
+            },
+            "13": {
+              "name": "entity.name.tag.operator.location.cfscript"
+            },
+            "14": {
+              "name": "keyword.control.operator.break.cfscript"
+            },
+            "15": {
+              "name": "entity.name.tag.operator.pageencoding.cfscript"
+            },
+            "16": {
+              "name": "entity.name.tag.operator.schedule.cfscript"
+            },
+            "17": {
+              "name": "keyword.control.operator.return.cfscript"
+            },
+            "18": {
+              "name": "keyword.control.operator.catch-exception.cfscript"
+            },
+            "19": {
+              "name": "keyword.control.operator.loop.cfscript"
+            },
+            "2": {
+              "name": "entity.name.tag.operator.transaction.cfscript"
+            },
+            "20": {
+              "name": "entity.name.tag.operator.trace.cfscript"
+            },
+            "21": {
+              "name": "entity.name.tag.operator.savecontent.cfscript"
+            },
+            "22": {
+              "name": "entity.name.tag.operator.http.cfscript"
+            },
+            "3": {
+              "name": "entity.name.tag.operator.thread.cfscript"
+            },
+            "4": {
+              "name": "keyword.control.operator.abort.cfscript"
+            },
+            "5": {
+              "name": "keyword.control.operator.exit.cfscript"
+            },
+            "6": {
+              "name": "entity.name.tag.operator.include.cfscript"
+            },
+            "7": {
+              "name": "entity.name.tag.operator.param.cfscript"
+            },
+            "8": {
+              "name": "entity.name.tag.operator.thread.cfscript"
+            },
+            "9": {
+              "name": "entity.name.tag.operator.import.cfscript"
             }
           },
-          "end": "(#)",
           "endCaptures": {
             "1": {
-              "name": "punctuation.definition.hash.end.cfscript"
-            }
-          },
-          "name": "meta.inline.hash.cfscript",
-          "contentName": "source.cfscript.embedded.cfscript",
-          "patterns": [
-            {
-              "include": "#cfscript-code"
+              "name": "punctuation.terminator.cfscript"
+            },
+            "3": {
+              "name": "meta.brace.curly.cfscript"
             }
-          ]
+          }
         }
       ]
     },
     "variables": {
       "patterns": [
         {
-          "match": "\\b(?i:var)\\b",
-          "name": "storage.modifier.var.cfscript"
+          "name": "storage.modifier.var.cfscript",
+          "match": "\\b(?i:var)\\b"
         },
         {
-          "match": "\\b(?i:(this|key))(?!\\.)",
-          "name": "variable.language.cfscript"
+          "name": "variable.language.cfscript",
+          "match": "\\b(?i:(this|key))(?!\\.)"
         },
         {
-          "match": "(\\.)",
-          "name": "punctuation.definition.seperator.variable.cfscript"
+          "name": "punctuation.definition.seperator.variable.cfscript",
+          "match": "(\\.)"
         },
         {
           "match": "(?x)\n                    (?i:\n                        \\b\n                        (application|arguments|attributes|caller|cgi|client|\n                            cookie|flash|form|local|request|server|session|\n                            this|thistag|thread|thread local|url|variables|\n                            super|self|argumentcollection)\n                        \\b\n                        |\n                        (\\w+)\n                    )",
@@ -684,61 +732,6 @@
           }
         }
       ]
-    },
-    "sql-code": {
-      "patterns": [
-        {
-          "begin": "([\\w+\\.]+)\\.((?i:setsql))\\(\\s*[\"|']",
-          "beginCaptures": {
-            "1": {
-              "name": "entity.name.function.query.cfscript, meta.toc-list.query.cfscript"
-            },
-            "2": {
-              "name": "support.function.cfscript"
-            }
-          },
-          "end": "([\"|']\\s*\\))",
-          "endCaptures": {
-            "1": {
-              "name": "punctuation.parenthesis.end.cfscript"
-            }
-          },
-          "name": "source.sql.embedded.cfscript",
-          "patterns": [
-            {
-              "include": "#nest_hash"
-            },
-            {
-              "include": "source.sql"
-            }
-          ]
-        }
-      ]
-    },
-    "cfcomments": {
-      "patterns": [
-        {
-          "match": "<!---.*--->",
-          "name": "comment.line.cfml"
-        },
-        {
-          "begin": "<!---",
-          "captures": {
-            "0": {
-              "name": "punctuation.definition.comment.cfml"
-            }
-          },
-          "end": "--->",
-          "name": "comment.block.cfml",
-          "patterns": [
-            {
-              "include": "#cfcomments"
-            }
-          ]
-        }
-      ]
     }
-  },
-  "scopeName": "source.cfscript",
-  "uuid": "D5324EE0-4226-11E1-B86C-0800200C9A66"
-}
+  }
+}