From 5e31f98b879e70765e2b84f396da8431f0259cfd Mon Sep 17 00:00:00 2001 From: John Berquist Date: Sun, 3 Apr 2016 22:19:04 -0400 Subject: [PATCH] 0.8.1 release - Updated tags and functions to match latest cfdocs.org data - minor syntax file updates (tag and function lists, typo fixes, tweaked a regex) --- messages.json | 5 +- messages/0.8.1.txt | 5 + src/basecompletions/json/cfml_functions.json | 21 +- src/basecompletions/json/cfml_tags.json | 25 +- syntaxes/cfml.tmLanguage | 215 ++++++++++------- syntaxes/cfscript.YAML-tmLanguage | 215 ++++++++++------- syntaxes/cfscript.plist | 215 ++++++++++------- syntaxes/cfscript.sublime-syntax | 240 ++++++++++--------- 8 files changed, 528 insertions(+), 413 deletions(-) create mode 100644 messages/0.8.1.txt diff --git a/messages.json b/messages.json index 0bbf795..b71c420 100644 --- a/messages.json +++ b/messages.json @@ -11,5 +11,6 @@ "0.5.1": "messages/0.5.1.txt", "0.6.0": "messages/0.6.0.txt", "0.7.0": "messages/0.7.0.txt", - "0.8.0": "messages/0.8.0.txt" -} \ No newline at end of file + "0.8.0": "messages/0.8.0.txt", + "0.8.1": "messages/0.8.1.txt" +} diff --git a/messages/0.8.1.txt b/messages/0.8.1.txt new file mode 100644 index 0000000..845027d --- /dev/null +++ b/messages/0.8.1.txt @@ -0,0 +1,5 @@ +CFML v0.8.1 Changelog: + +- Updated function and tag completions to use latest cfdocs.org data + +- Minor syntax file updates (tag and function lists, typo fixes, tweaked a regex) diff --git a/src/basecompletions/json/cfml_functions.json b/src/basecompletions/json/cfml_functions.json index 41bdf5c..32f2546 100644 --- a/src/basecompletions/json/cfml_functions.json +++ b/src/basecompletions/json/cfml_functions.json @@ -15,6 +15,7 @@ "arrayContainsNoCase": "(${1:array array}, ${2:any object})", "arrayDelete": "(${1:array array}, ${2:any object}${3:, ${4:string scope}})", "arrayDeleteAt": "(${1:array array}, ${2:numeric position})", + "arrayDeleteNoCase": "(${1:array array}, ${2:any object})", "arrayEach": "(${1:array array}, ${2:closure closure}${3:, ${4:boolean parallel}}${5:, ${6:boolean maxThreads}})", "arrayEvery": "(${1:array array}, ${2:closure closure}${3:, ${4:boolean parallel}}${5:, ${6:boolean maxThreads}})", "arrayFilter": "(${1:array array}, ${2:closure function}${3:, ${4:boolean parallel}}${5:, ${6:boolean maxThreads}})", @@ -35,7 +36,7 @@ "arrayMerge": "(${1:array array1}, ${2:array array2}${3:, ${4:boolean leaveIndex}})", "arrayMid": "(${1:array array}, ${2:number start}${3:, ${4:number count}})", "arrayMin": "(${1:array array})", - "arrayNew": "(${1:numeric dimension})", + "arrayNew": "(${1:numeric dimension}${2:, ${3:boolean unsynchronized}})", "arrayPrepend": "(${1:array array}, ${2:object value})", "arrayReduce": "(${1:array array}, ${2:any function}, ${3:any initialValue})", "arrayResize": "(${1:array array}, ${2:numeric size})", @@ -63,10 +64,11 @@ "bitShln": "(${1:numeric number}, ${2:numeric count})", "bitShrn": "(${1:numeric number}, ${2:numeric count})", "bitXor": "(${1:numeric number1}, ${2:numeric number2})", + "booleanFormat": "(${1:numeric number})", "cacheClear": "(${1:string filter}${2:, ${3:string cacheName}})", "cacheCount": "(${1:string cacheName})", "cacheDelete": "(${1:string id}${2:, ${3:boolean throwOnError}}${4:, ${5:string cacheName}})", - "cacheGet": "(${1:string id})", + "cacheGet": "(${1:string id}${2:, ${3:string region}})", "cacheGetAll": "(${1:string filter}${2:, ${3:string cacheName}})", "cacheGetAllIds": "()", "cacheGetDefaultCacheName": "(${1:string type})", @@ -207,7 +209,7 @@ "fileSetAttribute": "(${1:string filePath}, ${2:string attribute})", "fileSetLastModified": "(${1:string filePath}, ${2:datetime date})", "fileSkipBytes": "(${1:variablename file}, ${2:numeric bytes})", - "fileUpload": "(${1:string destination}${2:, ${3:string fileField}}${4:, ${5:string accept}}${6:, ${7:string nameConflict}})", + "fileUpload": "(${1:string destination}${2:, ${3:string fileField}}${4:, ${5:string nameConflict}}${6:, ${7:string accept}}${8:, ${9:boolean strict}})", "fileUploadAll": "(${1:string destination}${2:, ${3:string accept}}${4:, ${5:string nameConflict}})", "fileWrite": "(${1:string filePath}, ${2:string data}${3:, ${4:string charset}})", "fileWriteLine": "(${1: file}, ${2: content})", @@ -216,6 +218,7 @@ "findOneOf": "(${1:string set}, ${2:string string}${3:, ${4:numeric start}})", "firstDayOfMonth": "(${1:datetime date})", "fix": "(${1:numeric number})", + "floor": "(${1:numeric number})", "formatBaseN": "(${1:numeric number}, ${2:numeric radix})", "generatePBKDFKey": "(${1:string algorithm}, ${2:string passphrase}, ${3:string salt}, ${4:numeric iterations}, ${5:numeric keysize})", "generateSecretKey": "(${1:string algorithm})", @@ -289,7 +292,7 @@ "hmac": "(${1:string message}, ${2:string key}${3:, ${4:string algorithm}}${5:, ${6:string encoding}})", "hour": "(${1:datetime date})", "HTMLCodeFormat": "(${1:string String}${2:, ${3:numeric version}})", - "HTMLEditFormat": "(${1:string String}${2:, ${3:numeric version}})", + "HTMLEditFormat": "(${1:string string}${2:, ${3:numeric version}})", "HTMLParse": "(${1:string html}${2:, ${3:boolean caseSensitive}})", "iIf": "(${1:boolean condition}, ${2:string expression1}, ${3:string expression2})", "imageAddBorder": "(${1:string name}, ${2:string thickness}${3:, ${4:string color}}${5:, ${6:string bordertype}})", @@ -574,7 +577,7 @@ "second": "(${1:datetime date})", "sendGatewayMessage": "(${1:string gatewayID}, ${2:struct data})", "serialize": "(${1: objToBeSerialized}, ${2: type}, ${3: useCustomSerializer})", - "serializeJSON": "(${1:variablename var}${2:, ${3:boolean serializeQueryByColumns}}, ${4:boolean useCustomSerializer})", + "serializeJSON": "(${1:variablename var}${2:, ${3:boolean serializeQueryByColumns}}${4:, ${5:boolean useCustomSerializer}})", "serializeXML": "(${1: objToBeSerialized}, ${2: useCustomSerializer})", "sessionGetMetadata": "(${1: region})", "sessionInvalidate": "()", @@ -662,7 +665,7 @@ "structKeyList": "(${1:struct structure}${2:, ${3:string delimiter}})", "structKeyTranslate": "(${1:struct structure}${2:, ${3:boolean deepTranslation}}${4:, ${5:boolean leaveOriginalKey}})", "structMap": "(${1:struct struct}, ${2:any function})", - "structNew": "()", + "structNew": "(${1:string structType})", "structReduce": "(${1:struct struct}, ${2:any function}, ${3:any initialVal})", "structSome": "(${1:struct struct}, ${2:function closure}${3:, ${4:boolean parallel}}${5:, ${6:number maxThreads}})", "structSort": "(${1:struct base}, ${2:string sorttype}, ${3:string sortorder}, ${4:string pathtosubelement})", @@ -672,7 +675,7 @@ "tan": "(${1:numeric number})", "threadJoin": "(${1: Param1})", "threadTerminate": "(${1:string threadname})", - "throw": "(${1:string type}${2:, ${3:string message}}${4:, ${5:string detail}}${6:, ${7:string errorcode}}${8:, ${9:string extendedinfo}}${10:, ${11:object object}})", + "throw": "(${1:string message}${2:, ${3:string type}}${4:, ${5:string detail}}${6:, ${7:string errorcode}}${8:, ${9:string extendedinfo}}${10:, ${11:object object}})", "timeFormat": "(${1:datetime time}${2:, ${3:string mask}})", "toBase64": "(${1:object string_or_object}${2:, ${3:string encoding}})", "toBinary": "(${1:object base64_or_object})", @@ -701,7 +704,7 @@ "writeBody": "()", "writeDump": "(${1:variablename var}${2:, ${3:boolean expand}}${4:, ${5:string format}}${6:, ${7:boolean abort}}${8:, ${9:string hide}}${10:, ${11:numeric keys}}${12:, ${13:string label}}${14:, ${15:boolean metainfo}}${16:, ${17:string output}}${18:, ${19:string show}}${20:, ${21:boolean showUDfs}}${22:, ${23:numeric top}})", "writeLog": "(${1:string text}${2:, ${3:string log}}${4:, ${5:string file}}${6:, ${7:string type}}${8:, ${9:boolean application}})", - "writeOutput": "(${1:string String})", + "writeOutput": "(${1:string string}${2:, ${3:string encodeFor}})", "WSGetAllChannels": "(${1: channelName})", "WSGetSubscribers": "(${1: channel})", "WSPublish": "(${1: channel}, ${2: message}${3:, ${4: filterCriteria}})", @@ -716,5 +719,5 @@ "XMLTransform": "(${1:string xml}, ${2:string xsl}${3:, ${4:struct parameters}})", "XMLValidate": "(${1:object xmlDoc}${2:, ${3:string validator}})", "year": "(${1:datetime date})", - "yesNoFormat": "(${1:boolean value})" + "yesNoFormat": "(${1:object value})" } \ No newline at end of file diff --git a/src/basecompletions/json/cfml_tags.json b/src/basecompletions/json/cfml_tags.json index e428a71..ec7276f 100644 --- a/src/basecompletions/json/cfml_tags.json +++ b/src/basecompletions/json/cfml_tags.json @@ -59,12 +59,12 @@ "cfcalendar": { "attributes": [["name"], ["daynames", "disabled", "enabled", "endrange", "firstdayofweek", "height", "mask", "monthnames", "onblur", "onchange", "onfocus", "selecteddate", "startrange", "style", "tooltip", "visible", "width"]], "attribute_values": { - "daynames": ["S,M,T,W,Th,F,S", "Sunday,Monday,Tuesday,Wednesday,Thursday,Friday,Saturday", "Sun,Mon,Tue,Wed,Thu,Fri,Sat"], + "daynames": ["S, M, T, W, Th, F, S", "Sunday, Monday, Tuesday, Wednesday, Thursday, Friday, Saturday", "Sun, Mon, Tue, Wed, Thu, Fri, Sat"], "disabled": ["true", "false"], "enabled": ["true", "false"], "firstdayofweek": ["0", "1", "2", "3", "4", "5", "6"], "mask": ["MM/DD/YYYY", "DD/MM/YYYY", "MM/YYYY", "MM/YY", "YYYY-MM-DD", "EEE DD. MMM YYYY"], - "monthnames": ["January,February,March,April,May,June,July,August,September,October,November,December", "Jan,Feb,Mar,Apr,May,Jun,Jul,Aug,Sep,Oct,Nov,Dec"], + "monthnames": ["January, February, March, April, May, June, July, August, September, October, November, December", "Jan, Feb, Mar, Apr, May, Jun, Jul, Aug, Sep, Oct, Nov, Dec"], "style": ["haloBlue", "haloGreen", "haloOrange", "haloSilver"], "visible": ["true", "false"] } @@ -145,7 +145,7 @@ } }, "cfcomponent": { - "attributes": [[], ["accessors", "attribute", "batchsize", "bindingname", "cacheName", "cacheUse", "catalog", "discriminatorColumn", "discriminatorValue", "displayname", "dynamicinsert", "dynamicupdate", "embedded", "entityname", "extends", "hint", "implements", "initmethod", "joinColumn", "lazy", "namespace", "optimisticlock", "output", "persistent", "porttypename", "readonly", "rowid", "saveMapping", "schema", "selectbeforeupdate", "serializable", "serviceaddress", "serviceportname", "style", "table", "wsdlfile"]], + "attributes": [[], ["accessors", "attribute", "batchsize", "bindingname", "cacheName", "cacheUse", "catalog", "discriminatorColumn", "discriminatorValue", "displayname", "dynamicinsert", "dynamicupdate", "embedded", "entityname", "extends", "hint", "implements", "initmethod", "joinColumn", "lazy", "mappedSuperClass", "namespace", "optimisticlock", "output", "persistent", "porttypename", "readonly", "rowid", "saveMapping", "schema", "selectbeforeupdate", "serializable", "serviceaddress", "serviceportname", "style", "table", "wsdlfile"]], "attribute_values": { "accessors": ["true", "false"], "attribute": ["true", "false"], @@ -154,6 +154,7 @@ "dynamicupdate": ["true", "false"], "embedded": ["true", "false"], "lazy": ["true", "false"], + "mappedSuperClass": ["true", "false"], "optimisticlock": ["none", "dirty", "all", "version"], "output": ["true", "false"], "persistent": ["true", "false"], @@ -392,13 +393,14 @@ } }, "cfftp": { - "attributes": [["action"], ["actionparam", "asciiextensionlist", "attributes", "buffersize", "connection", "directory", "existing", "failifexists", "fingerprint", "item", "key", "localfile", "name", "new", "passive", "passphrase", "password", "port", "proxyserver", "remotefile", "result", "retrycount", "secure", "server", "stoponerror", "timeout", "transfermode", "username"]], + "attributes": [["action"], ["actionparam", "asciiextensionlist", "attributes", "buffersize", "connection", "directory", "existing", "failifexists", "fingerprint", "item", "key", "localfile", "name", "new", "passive", "passphrase", "password", "port", "proxyserver", "remotefile", "result", "retrycount", "secure", "server", "stoponerror", "systemtype", "timeout", "transfermode", "username"]], "attribute_values": { "action": ["open", "close", "changedir", "createdir", "listdir", "removedir", "getfile", "putfile", "rename", "remove", "getcurrentdir", "getcurrenturl", "existsdir", "existsfile", "exists", "quote", "site", "allo", "acct"], "failifexists": ["true", "false"], "passive": ["true", "false"], "secure": ["true", "false"], "stoponerror": ["true", "false"], + "systemtype": ["WINDOWS", "UNIX"], "transfermode": ["auto", "ascii", "binary"] } }, @@ -468,7 +470,7 @@ "select": ["true", "false"], "textcolor": ["black", "red", "blue", "magenta", "cyan", "orange", "darkgray", "pink", "white", "lightgray", "yellow"], "type": ["string_noCase", "Boolean", "numeric", "date", "combobox", "image"], - "valuesdelimiter": [", ", ";", "|", ":"] + "valuesdelimiter": [", ", ";", "|", ":"] } }, "cfgridrow": { @@ -510,14 +512,16 @@ } }, "cfhttp": { - "attributes": [["url"], ["charset", "clientcert", "clientcertpassword", "columns", "compression", "delimiter", "file", "firstrowasheaders", "getasbinary", "method", "multipart", "name", "password", "path", "port", "proxypassword", "proxyport", "proxyserver", "proxyuser", "redirect", "resolveurl", "result", "textqualifier", "throwonerror", "timeout", "useragent", "username"]], + "attributes": [["url"], ["authType", "charset", "clientcert", "clientcertpassword", "columns", "compression", "delimiter", "domain", "file", "firstrowasheaders", "getasbinary", "method", "multipart", "multipartType", "name", "password", "path", "port", "proxypassword", "proxyport", "proxyserver", "proxyuser", "redirect", "resolveurl", "result", "textqualifier", "throwonerror", "timeout", "useragent", "username", "workstation"]], "attribute_values": { + "authType": ["BASIC", "NTLM"], "charset": ["utf-8", "iso-8859-1", "windows-1252", "us-ascii", "shift_jis", "iso-2022-jp", "euc-jp", "euc-kr", "big5", "euc-cn", "utf-16"], "delimiter": [",", ";", "|", ":"], "firstrowasheaders": ["true", "false"], "getasbinary": ["auto", "false", "true"], - "method": ["get", "post", "put", "delete", "head", "trace", "options"], + "method": ["get", "post", "put", "delete", "head", "trace", "options", "patch"], "multipart": ["false", "true"], + "multipartType": ["form-data", "related"], "redirect": ["true", "false"], "resolveurl": ["true", "false"], "textqualifier": ["\"", "'"], @@ -697,7 +701,7 @@ "attribute_values": {} }, "cfloop": { - "attributes": [[], ["array", "characters", "collection", "condition", "delimiters", "endrow", "file", "from", "index", "item", "list", "query", "startrow", "step", "to"]], + "attributes": [[], ["array", "characters", "collection", "condition", "delimiters", "endrow", "file", "from", "group", "groupcasesensitive", "index", "item", "list", "query", "startrow", "step", "to"]], "attribute_values": { "delimiters": [",", ";", "|", ":"] } @@ -826,8 +830,9 @@ } }, "cfoutput": { - "attributes": [[], ["group", "groupcasesensitive", "maxrows", "query", "startrow"]], + "attributes": [[], ["encodefor", "group", "groupcasesensitive", "maxrows", "query", "startrow"]], "attribute_values": { + "encodefor": ["html", "htmlattribute", "javascript", "css", "xml", "xmlattribute", "url", "xpath", "ldap", "dn"], "groupcasesensitive": ["true", "false"] } }, @@ -1042,7 +1047,7 @@ "encryption": ["128-bit", "40-bit", "none"], "format": ["PDF", "FlashPaper", "Excel", "RTF", "HTML", "XML"], "overwrite": ["true", "false"], - "permissions": ["AllowPrinting,AllowCopy,AllowScreenReaders", "AllowPrinting", "AllowModifyContents", "AllowCopy", "AllowModifyAnnotations", "AllowFillIn", "AllowScreenReaders", "AllowAssembly", "AllowDegradedPrinting", "AllowPrinting,AllowModifyContents,AllowCopy,AllowModifyAnnotations,AllowFillIn,AllowScreenReaders,AllowAssembly,AllowDegradedPrinting"], + "permissions": ["AllowPrinting, AllowCopy, AllowScreenReaders", "AllowPrinting", "AllowModifyContents", "AllowCopy", "AllowModifyAnnotations", "AllowFillIn", "AllowScreenReaders", "AllowAssembly", "AllowDegradedPrinting", "AllowPrinting, AllowModifyContents, AllowCopy, AllowModifyAnnotations, AllowFillIn, AllowScreenReaders, AllowAssembly, AllowDegradedPrinting"], "type": ["standard", "netscape", "microsoft"] } }, diff --git a/syntaxes/cfml.tmLanguage b/syntaxes/cfml.tmLanguage index 80c57cc..7f9605b 100644 --- a/syntaxes/cfml.tmLanguage +++ b/syntaxes/cfml.tmLanguage @@ -4205,81 +4205,98 @@ begin (?x)\b (?i: - (abs|acos|addsoaprequestheader|addsoapresponseheader|ajaxlink|ajaxonload|applicationstarttime - |applicationstop|array|arrayappend|arrayavg|arrayclear|arraycontains|arraycontainsnocase - |arraydelete|arraydeleteat|arrayeach|arrayevery|arrayfilter|arrayfind|arrayfindall|arrayfindallnocase - |arrayfindnocase|arrayfirst|arrayindexexists|arrayinsertat|arrayisdefined|arrayisempty - |arraylast|arraylen|arraymap|arraymax|arraymedian|arraymerge|arraymid|arraymin|arraynew|arrayprepend - |arrayreduce|arrayresize|arrayreverse|arrayset|arrayslice|arraysome|arraysort|arraysum|arrayswap - |arraytolist|arraytostruct|asc|asin|atn|beat|binarydecode|binaryencode|bitand|bitmaskclear|bitmaskread - |bitmaskset|bitnot|bitor|bitshln|bitshrn|bitxor|cacheclear|cachecount|cachedelete|cacheget|cachegetall - |cachegetallids|cachegetdefaultcachename|cachegetmetadata|cachegetproperties|cacheidexists|cachekeyexists - |cacheput|cacheremove|cacheremoveall|cachesetproperties|callstackdump|callstackget|canonicalize|ceiling - |cfusion_decrypt|cfusion_encrypt|charsetdecode|charsetencode|chr|cjustify|collectioneach|collectionevery - |collectionfilter|collectionmap|collectionreduce|collectionsome|compare|comparenocase|componentcacheclear - |componentcachelist|componentinfo|compress|contractpath|cos|createdate|createdatetime|createdynamicproxy - |createguid|createobject|createodbcdate|createodbcdatetime|createodbctime|createtime|createtimespan - |createuniqueid|createuuid|csrfgeneratetoken|csrfverifytoken|ctcacheclear|ctcachelist - |datasourceflushmetacache|dateadd|datecompare|dateconvert|datediff|dateformat|datepart|datetimeformat|day - |dayofweek|dayofweekasstring|dayofweekshortasstring|dayofyear|daysinmonth|daysinyear|de|decimalformat - |decodefromurl|decrementvalue|decrypt|decryptbinary|deleteclientvariable|deserializejson|directorycopy - |directorycreate|directorydelete|directoryexists|directorylist|directoryrename|dollarformat|dump|duplicate + (array(?:append|avg|clear|contains|containsnocase|delete|deleteat|deletenocase|each + |every|filter|find|findall|findallnocase|findnocase|first|indexexists|insertat|isdefined + |isempty|last|len|map|max|median|merge|mid|min|new|prepend|reduce|resize|reverse + |set|slice|some|sort|sum|swap|tolist|tostruct)|cache(?:clear|count|delete|get|getall + |getallids|getdefaultcachename|getmetadata|getproperties|getsession|idexists|keyexists + |put|regionexists|regionnew|regionremove|remove|removeall|setproperties)|component(?:cacheclear + |cachelist|info)|create(?:date|datetime|dynamicproxy|guid|object|odbcdate|odbcdatetime + |odbctime|time|timespan|uniqueid|uuid)|date(?:add|compare|convert|diff|format|part + |timeformat)|entity(?:delete|load|loadbyexample|loadbypk|merge|namearray|namelist + |new|reload|save|toquery)|get(?:applicationmetadata|applicationsettings|authuser + |basetagdata|basetaglist|basetemplatepath|builtinfunction|canonicalpath|classpath + |clientvariableslist|componentmetadata|contextroot|cpuusage|currentcontext|currenttemplatepath + |directoryfrompath|encoding|exception|filefrompath|fileinfo|freespace|functioncalledname + |functiondata|functionkeywords|functionlist|gatewayhelper|httprequestdata|httptimestring + |k2serverdoccount|k2serverdoccountlimit|locale|localedisplayname|localhostip|luceeid + |memoryusage|metadata|metricdata|numericdate|pagecontext|printerinfo|printerlist + |profilesections|profilestring|readableimageformats|safehtml|soaprequest|soaprequestheader + |soapresponse|soapresponseheader|systemfreememory|systemtotalmemory|tagdata|taglist + |tempdirectory|tempfile|templatepath|tickcount|timezone|timezoneinfo|token|totalspace + |userroles|variable|vfsmetadata|writeableimageformats)|image(?:addborder|blur|clearrect + |copy|createcaptcha|crop|drawarc|drawbeveledrect|drawcubiccurve|drawimage|drawline + |drawlines|drawoval|drawpoint|drawquadraticcurve|drawrect|drawroundrect|drawtext + |filter|filtercolormap|filtercurves|filterkernel|filterwarpgrid|flip|fonts|formats + |getblob|getbufferedimage|getexifmetadata|getexiftag|getheight|getiptcmetadata|getiptctag + |getmetadata|getwidth|grayscale|info|makecolortransparent|maketranslucent|negative + |new|overlay|paste|read|readbase64|resize|rotate|rotatedrawingaxis|scaletofit|setantialiasing + |setbackgroundcolor|setdrawingalpha|setdrawingcolor|setdrawingstroke|setdrawingtransparency + |sharpen|shear|sheardrawingaxis|translate|translatedrawingaxis|write|writebase64 + |xordrawingmode)|is(?:array|binary|boolean|closure|customfunction|date|ddx|debugmode + |defined|empty|fileobject|image|imagefile|instanceof|ipinrange|ipv6|json|leapyear + |localhost|notmap|null|numeric|numericdate|object|pdffile|pdfobject|query|safehtml + |simplevalue|soaprequest|spreadsheetfile|spreadsheetobject|struct|userinanyrole|userinrole + |userloggedin|valid|validoauthaccesstoken|videofile|wddx|xml|xmlattribute|xmldoc + |xmlelem|xmlnode|xmlroot|zipfile)|list(?:append|avg|changedelims|compact|contains + |containsnocase|deleteat|each|every|filter|find|findnocase|first|getat|indexexists + |insertat|itemtrim|last|len|map|prepend|qualify|reduce|removeduplicates|rest|setat + |some|sort|toarray|trim|valuecount|valuecountnocase)|object(?:equals|load|save)|orm(?:clearsession + |closeallsessions|closesession|evictcollection|evictentity|evictqueries|executequery + |flush|flushall|getsession|getsessionfactory|index|indexpurge|reload|search|searchoffline) + |query(?:addcolumn|addrow|columnarray|columncount|columndata|columnexists|columnlist + |convertforgrid|currentrow|deletecolumn|deleterow|each|every|execute|filter|getcell + |getrow|map|new|recordcount|reduce|rowdata|setcell|slice|some|sort)|replace(?:list + |nocase)|spreadsheet(?:addautofilter|addcolumn|addfreezepane|addimage|addinfo|addpagebreaks + |addrow|addrows|addsplitpane|createsheet|deletecolumn|deletecolumns|deleterow|deleterows + |formatcell|formatcellrange|formatcolumn|formatcolumns|formatrow|formatrows|getcellcomment + |getcellformula|getcellvalue|info|mergecells|new|read|readbinary|removesheet|setactivesheet + |setactivesheetnumber|setcellcomment|setcellformula|setcellvalue|setcolumnwidth|setfooter + |setheader|setrowheight|shiftcolumns|shiftrows|write)|store(?:addacl|getacl|getmetadata + |setacl|setmetadata)|struct(?:append|clear|copy|count|delete|each|every|filter|find + |findkey|findvalue|get|insert|isempty|keyarray|keyexists|keylist|keytranslate|map + |new|reduce|some|sort|update)|to(?:base64|binary|numeric|script|string)|transaction(?:commit + |rollback|setsavepoint)|url(?:decode|encode|encodedformat|sessionformat)|xml(?:childpos + |elemnew|format|getnodetype|new|parse|search|transform|validate)|abs|acos|addsoaprequestheader + |addsoapresponseheader|ajaxlink|ajaxonload|applicationstarttime|applicationstop|array + |asc|asin|atn|beat|binarydecode|binaryencode|bitand|bitmaskclear|bitmaskread|bitmaskset + |bitnot|bitor|bitshln|bitshrn|bitxor|booleanformat|callstackdump|callstackget|canonicalize + |ceiling|cfusion_decrypt|cfusion_encrypt|charsetdecode|charsetencode|chr|cjustify + |collectioneach|collectionevery|collectionfilter|collectionmap|collectionreduce|collectionsome + |compare|comparenocase|compress|contractpath|cos|csrfgeneratetoken|csrfverifytoken + |ctcacheclear|ctcachelist|datasourceflushmetacache|day|dayofweek|dayofweekasstring + |dayofweekshortasstring|dayofyear|daysinmonth|daysinyear|de|decimalformat|decodeforhtml + |decodefromurl|decrementvalue|decrypt|decryptbinary|deleteclientvariable|deserialize + |deserializejson|deserializexml|directorycopy|directorycreate|directorydelete|directoryexists + |directorylist|directoryrename|directorysize|dollarformat|dotnettocftype|duplicate |each|echo|empty|encodeforcss|encodefordn|encodeforhtml|encodeforhtmlattribute|encodeforjavascript - |encodeforldap|encodeforurl|encodeforxml|encodeforxmlattribute|encodeforxpath|encrypt|encryptbinary|entitydelete - |entityload|entityloadbyexample|entityloadbypk|entitymerge|entitynamearray|entitynamelist|entitynew|entityreload - |entitysave|entitytoquery|esapidecode|esapiencode|evaluate|exp|expandpath|extract|fileappend|fileclose|filecopy - |filedelete|fileexists|filegetmimetype|fileiseof|filemove|fileopen|fileread|filereadbinary|filereadline|fileseek - |filesetaccessmode|filesetattribute|filesetlastmodified|fileskipbytes|fileupload|fileuploadall|filewrite - |filewriteline|find|findnocase|findoneof|firstdayofmonth|fix|formatbasen|generatesecretkey|getapplicationmetadata - |getapplicationsettings|getauthuser|getbasetagdata|getbasetaglist|getbasetemplatepath|getbuiltinfunction - |getcanonicalpath|getclasspath|getclientvariableslist|getcomponentmetadata|getcontextroot|getcpuusage - |getcurrentcontext|getcurrenttemplatepath|getdirectoryfrompath|getencoding|getfilefrompath|getfileinfo|getfreespace - |getfunctioncalledname|getfunctiondata|getfunctionkeywords|getfunctionlist|gethttprequestdata|gethttptimestring - |getk2serverdoccount|getk2serverdoccountlimit|getlocale|getlocaledisplayname|getlocalhostip|getluceeid - |getmemoryusage|getmetadata|getmetricdata|getnumericdate|getpagecontext|getprinterlist|getprofilesections - |getprofilestring|getreadableimageformats|getsoaprequest|getsoaprequestheader|getsoapresponse|getsoapresponseheader - |getsystemfreememory|getsystemtotalmemory|gettagdata|gettaglist|gettempdirectory|gettempfile|gettemplatepath - |gettickcount|gettimezone|gettimezoneinfo|gettoken|gettotalspace|getuserroles|getvariable|getvfsmetadata - |getwriteableimageformats|hash|hash40|hmac|hour|htmlcodeformat|htmleditformat|htmlparse|iif|imageaddborder - |imageblur|imageclearrect|imagecopy|imagecrop|imagedrawarc|imagedrawbeveledrect|imagedrawcubiccurve|imagedrawimage - |imagedrawline|imagedrawlines|imagedrawoval|imagedrawpoint|imagedrawquadraticcurve|imagedrawrect|imagedrawroundrect - |imagedrawtext|imagefilter|imagefiltercolormap|imagefiltercurves|imagefilterkernel|imagefilterwarpgrid|imageflip - |imagefonts|imageformats|imagegetblob|imagegetbufferedimage|imagegetexifmetadata|imagegetexiftag|imagegetheight - |imagegetiptctag|imagegetwidth|imagegrayscale|imageinfo|imagenegative|imagenew|imageoverlay|imagepaste|imageread - |imagereadbase64|imageresize|imagerotate|imagerotatedrawingaxis|imagescaletofit|imagesetantialiasing - |imagesetbackgroundcolor|imagesetdrawingalpha|imagesetdrawingcolor|imagesetdrawingstroke|imagesetdrawingtransparency - |imagesharpen|imageshear|imagesheardrawingaxis|imagetranslate|imagetranslatedrawingaxis|imagewrite|imagewritebase64 - |imagexordrawingmode|incrementvalue|inputbasen|insert|int|invoke|isarray|isbinary|isboolean|isclosure - |iscustomfunction|isdate|isdebugmode|isdefined|isempty|isimage|isimagefile|isinstanceof|isipinrange|isipv6 - |isjson|isleapyear|islocalhost|isnotmap|isnull|isnumeric|isnumericdate|isobject|ispdfobject|isquery|issimplevalue - |issoaprequest|isstruct|isuserinanyrole|isuserinrole|isuserloggedin|isvalid|isvideofile|iswddx|isxml|isxmlattribute - |isxmldoc|isxmlelem|isxmlnode|isxmlroot|iszipfile|javacast|jsstringformat|lcase|left|len|listappend|listavg - |listchangedelims|listcompact|listcontains|listcontainsnocase|listdeleteat|listeach|listevery|listfilter|listfind - |listfindnocase|listfirst|listgetat|listindexexists|listinsertat|listitemtrim|listlast|listlen|listmap|listprepend - |listqualify|listreduce|listremoveduplicates|listrest|listsetat|listsome|listsort|listtoarray|listtrim - |listvaluecount|listvaluecountnocase|ljustify|location|log|log10|lscurrencyformat|lsdateformat|lsdatetimeformat - |lsdayofweek|lseurocurrencyformat|lsiscurrency|lsisdate|lsisnumeric|lsnumberformat|lsparsecurrency|lsparsedatetime - |lsparseeurocurrency|lsparsenumber|lstimeformat|lsweek|ltrim|max|metaphone|mid|millisecond|min|minute|month - |monthasstring|monthshortasstring|newline|now|nowserver|nullvalue|numberformat|objectequals|objectload|objectsave - |ormclearsession|ormcloseallsessions|ormclosesession|ormevictcollection|ormevictentity|ormevictqueries - |ormexecutequery|ormflush|ormgetsession|ormgetsessionfactory|ormreload|pagepoolclear|pagepoollist|paragraphformat - |parameterexists|parsedatetime|parsenumber|pi|precisionevaluate|preservesinglequotes|quarter|query|queryaddcolumn - |queryaddrow|querycolumnarray|querycolumncount|querycolumndata|querycolumnexists|querycolumnlist|queryconvertforgrid - |querycurrentrow|querydeletecolumn|querydeleterow|queryeach|queryevery|queryexecute|queryfilter|querygetcell - |querygetrow|querymap|querynew|queryrecordcount|queryreduce|queryrowdata|querysetcell|queryslice|querysome - |querysort|quotedvaluelist|rand|randomize|randrange|refind|refindnocase|releasecomobject|rematch|rematchnocase - |removechars|repeatstring|replace|replacelist|replacenocase|rereplace|rereplacenocase|restdeleteapplication - |restinitapplication|restsetresponse|reverse|right|rjustify|round|rtrim|second|sendgatewaymessage|serialize - |serializejson|sessioninvalidate|sessionrotate|sessionstarttime|setencoding|setlocale|setprofilestring|settimezone - |setvariable|sgn|sin|sizeof|sleep|soundex|spanexcluding|spanincluding|spreadsheetnew|spreadsheetsetcellvalue - |spreadsheetwrite|sqr|sslcertificateinstall|sslcertificatelist|storeaddacl|storegetacl|storesetacl|stringlen|stripcr - |structappend|structclear|structcopy|structcount|structdelete|structeach|structevery|structfilter|structfind - |structfindkey|structfindvalue|structget|structinsert|structisempty|structkeyarray|structkeyexists|structkeylist - |structkeytranslate|structmap|structnew|structreduce|structsome|structsort|structupdate|systemcacheclear|systemoutput - |tan|threadjoin|threadterminate|throw|timeformat|tobase64|tobinary|tonumeric|toscript|tostring|trace|transactioncommit - |transactionrollback|transactionsetsavepoint|trim|truefalseformat|ucase|ucfirst|unserializejava|urldecode|urlencode - |urlencodedformat|urlsessionformat|val|valuearray|valuelist|verifyclient|week|wrap|writedump|writelog|writeoutput - |xmlchildpos|xmlelemnew|xmlformat|xmlgetnodetype|xmlnew|xmlparse|xmlsearch|xmltransform|xmlvalidate|year|yesnoformat) + |encodeforldap|encodeforurl|encodeforxml|encodeforxmlattribute|encodeforxpath|encrypt + |encryptbinary|esapidecode|esapiencode|evaluate|exp|expandpath|extract|fileappend + |fileclose|filecopy|filedelete|fileexists|filegetmimetype|fileiseof|filemove|fileopen + |fileread|filereadbinary|filereadline|fileseek|filesetaccessmode|filesetattribute + |filesetlastmodified|fileskipbytes|fileupload|fileuploadall|filewrite|filewriteline + |find|findnocase|findoneof|firstdayofmonth|fix|floor|formatbasen|generatepbkdfkey + |generatesecretkey|hash|hash40|hmac|hour|htmlcodeformat|htmleditformat|htmlparse + |iif|incrementvalue|inputbasen|insert|int|invalidateoauthaccesstoken|invoke|javacast + |jsstringformat|lcase|left|len|ljustify|location|log|log10|lscurrencyformat|lsdateformat + |lsdatetimeformat|lsdayofweek|lseurocurrencyformat|lsiscurrency|lsisdate|lsisnumeric + |lsnumberformat|lsparsecurrency|lsparsedatetime|lsparseeurocurrency|lsparsenumber + |lstimeformat|lsweek|ltrim|max|metaphone|mid|millisecond|min|minute|month|monthasstring + |monthshortasstring|newline|now|nowserver|nullvalue|numberformat|onapplicationend + |onapplicationstart|onerror|onmissingmethod|onmissingtemplate|onrequest|onrequestend + |onrequeststart|onsessionend|onsessionstart|pagepoolclear|pagepoollist|paragraphformat + |parameterexists|parsedatetime|parsenumber|pi|precisionevaluate|preservesinglequotes + |quarter|query|quotedvaluelist|rand|randomize|randrange|reescape|refind|refindnocase + |releasecomobject|rematch|rematchnocase|removecachedquery|removechars|repeatstring + |replace|rereplace|rereplacenocase|restdeleteapplication|restinitapplication|restsetresponse + |reverse|right|rjustify|round|rtrim|second|sendgatewaymessage|serialize|serializejson + |serializexml|sessiongetmetadata|sessioninvalidate|sessionrotate|sessionstarttime + |setencoding|setlocale|setprofilestring|settimezone|setvariable|sgn|sin|sizeof|sleep + |soundex|spanexcluding|spanincluding|sqr|sslcertificateinstall|sslcertificatelist + |stringlen|stripcr|systemcacheclear|systemoutput|tan|threadjoin|threadterminate|throw + |timeformat|trace|trim|truefalseformat|ucase|ucfirst|unserializejava|val|valuearray + |valuelist|verifyclient|week|wrap|writebody|writedump|writelog|writeoutput|wsgetallchannels + |wsgetsubscribers|wspublish|wssendmessage|year|yesnoformat) )(\() beginCaptures @@ -4755,16 +4772,22 @@ begin (?x)(\b) (?i: - (ajaximport|ajaxproxy|applet|application|argument|associate|authenticate|break|cache|chart|chartdata - |chartseries|col|collection|content|cookie|dbinfo|directory|div|document|documentitem - |documentsection|dump|error|execute|exit|feed|file|flush|form|forward|ftp|graph|graphdata - |header|htmlbody|htmlhead|http|httpparam|image|imap|import|include|index|input|insert|invoke|invokeargument - |layout|layoutarea|ldap|location|lock|log|login|loginuser|logout|loop|mail|mailparam|mailpart|map|mapitem|mediaplayer - |module|object|objectcache|output|pageencoding|pdf|pdfparam|pop|processingdirective|procparam|procresult - |query|queryparam|registry|rethrow|retry|savecontent|schedule|search|select|servlet|servletparam - |setting|silent|sleep|slider|stopwatch|storedproc|table|textinput|thread|throw|timer|trace|transaction - |update|video|videoplayer|videoplayerparam|wddx|window|xml|zip|zipparam) -)(?=(\s+[a-zA-Z0-9:-]+\s*[=;{]|\s*[{])) + (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|feed|file|fileupload|flush|form|formgroup|formitem|ftp|grid|gridcolumn + |gridrow|gridupdate|header|htmlhead|htmltopdf|htmltopdfitem|http|httpparam|image + |imap|imapfilter|import|include|index|input|insert|invoke|invokeargument|layout + |layoutarea|ldap|location|lock|log|login|loginuser|logout|loop|mail|mailparam|mailpart + |map|mapitem|mediaplayer|menu|menuitem|messagebox|module|ntauthenticate|oauth|object + |objectcache|output|param|pdf|pdfform|pdfformparam|pdfparam|pdfsubform|pod|pop + |presentation|presentationslide|presenter|print|processingdirective|procparam|procresult + |progressbar|property|query|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|try + |update|video|videoplayer|videoplayerparam|wddx|websocket|window|xml|zip|zipparam) +)(?=\s+[a-zA-Z0-9:-]+\s*([=;{]|$)|\s*({|$)) beginCaptures 2 @@ -4811,15 +4834,21 @@ begin (?x)(?i) (cf - (?:ajaximport|ajaxproxy|applet|application|argument|associate|authenticate|break|cache|chart|chartdata - |chartseries|col|collection|content|cookie|dbinfo|directory|div|document|documentitem - |documentsection|dump|error|execute|exit|feed|file|flush|form|forward|ftp|graph|graphdata - |header|htmlbody|htmlhead|http|httpparam|image|imap|import|include|index|input|insert|invoke|invokeargument - |layout|layoutarea|ldap|location|lock|log|login|loginuser|logout|loop|mail|mailparam|mailpart|map|mapitem|mediaplayer - |module|object|objectcache|output|pageencoding|pdf|pdfparam|pop|processingdirective|procparam|procresult - |query|queryparam|registry|rethrow|retry|savecontent|schedule|search|select|servlet|servletparam - |setting|silent|sleep|slider|stopwatch|storedproc|table|textinput|thread|throw|timer|trace|transaction - |update|video|videoplayer|videoplayerparam|wddx|window|xml|zip|zipparam) + (?: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|feed|file|fileupload|flush|form|formgroup|formitem|ftp|grid|gridcolumn + |gridrow|gridupdate|header|htmlhead|htmltopdf|htmltopdfitem|http|httpparam|image + |imap|imapfilter|import|include|index|input|insert|invoke|invokeargument|layout + |layoutarea|ldap|location|lock|log|login|loginuser|logout|loop|mail|mailparam|mailpart + |map|mapitem|mediaplayer|menu|menuitem|messagebox|module|ntauthenticate|oauth|object + |objectcache|output|param|pdf|pdfform|pdfformparam|pdfparam|pdfsubform|pod|pop + |presentation|presentationslide|presenter|print|processingdirective|procparam|procresult + |progressbar|property|query|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|try + |update|video|videoplayer|videoplayerparam|wddx|websocket|window|xml|zip|zipparam) )\( beginCaptures diff --git a/syntaxes/cfscript.YAML-tmLanguage b/syntaxes/cfscript.YAML-tmLanguage index 0a763ed..525c39d 100644 --- a/syntaxes/cfscript.YAML-tmLanguage +++ b/syntaxes/cfscript.YAML-tmLanguage @@ -935,81 +935,98 @@ repository: begin: |- (?x)\b (?i: - (abs|acos|addsoaprequestheader|addsoapresponseheader|ajaxlink|ajaxonload|applicationstarttime - |applicationstop|array|arrayappend|arrayavg|arrayclear|arraycontains|arraycontainsnocase - |arraydelete|arraydeleteat|arrayeach|arrayevery|arrayfilter|arrayfind|arrayfindall|arrayfindallnocase - |arrayfindnocase|arrayfirst|arrayindexexists|arrayinsertat|arrayisdefined|arrayisempty - |arraylast|arraylen|arraymap|arraymax|arraymedian|arraymerge|arraymid|arraymin|arraynew|arrayprepend - |arrayreduce|arrayresize|arrayreverse|arrayset|arrayslice|arraysome|arraysort|arraysum|arrayswap - |arraytolist|arraytostruct|asc|asin|atn|beat|binarydecode|binaryencode|bitand|bitmaskclear|bitmaskread - |bitmaskset|bitnot|bitor|bitshln|bitshrn|bitxor|cacheclear|cachecount|cachedelete|cacheget|cachegetall - |cachegetallids|cachegetdefaultcachename|cachegetmetadata|cachegetproperties|cacheidexists|cachekeyexists - |cacheput|cacheremove|cacheremoveall|cachesetproperties|callstackdump|callstackget|canonicalize|ceiling - |cfusion_decrypt|cfusion_encrypt|charsetdecode|charsetencode|chr|cjustify|collectioneach|collectionevery - |collectionfilter|collectionmap|collectionreduce|collectionsome|compare|comparenocase|componentcacheclear - |componentcachelist|componentinfo|compress|contractpath|cos|createdate|createdatetime|createdynamicproxy - |createguid|createobject|createodbcdate|createodbcdatetime|createodbctime|createtime|createtimespan - |createuniqueid|createuuid|csrfgeneratetoken|csrfverifytoken|ctcacheclear|ctcachelist - |datasourceflushmetacache|dateadd|datecompare|dateconvert|datediff|dateformat|datepart|datetimeformat|day - |dayofweek|dayofweekasstring|dayofweekshortasstring|dayofyear|daysinmonth|daysinyear|de|decimalformat - |decodefromurl|decrementvalue|decrypt|decryptbinary|deleteclientvariable|deserializejson|directorycopy - |directorycreate|directorydelete|directoryexists|directorylist|directoryrename|dollarformat|dump|duplicate + (array(?:append|avg|clear|contains|containsnocase|delete|deleteat|deletenocase|each + |every|filter|find|findall|findallnocase|findnocase|first|indexexists|insertat|isdefined + |isempty|last|len|map|max|median|merge|mid|min|new|prepend|reduce|resize|reverse + |set|slice|some|sort|sum|swap|tolist|tostruct)|cache(?:clear|count|delete|get|getall + |getallids|getdefaultcachename|getmetadata|getproperties|getsession|idexists|keyexists + |put|regionexists|regionnew|regionremove|remove|removeall|setproperties)|component(?:cacheclear + |cachelist|info)|create(?:date|datetime|dynamicproxy|guid|object|odbcdate|odbcdatetime + |odbctime|time|timespan|uniqueid|uuid)|date(?:add|compare|convert|diff|format|part + |timeformat)|entity(?:delete|load|loadbyexample|loadbypk|merge|namearray|namelist + |new|reload|save|toquery)|get(?:applicationmetadata|applicationsettings|authuser + |basetagdata|basetaglist|basetemplatepath|builtinfunction|canonicalpath|classpath + |clientvariableslist|componentmetadata|contextroot|cpuusage|currentcontext|currenttemplatepath + |directoryfrompath|encoding|exception|filefrompath|fileinfo|freespace|functioncalledname + |functiondata|functionkeywords|functionlist|gatewayhelper|httprequestdata|httptimestring + |k2serverdoccount|k2serverdoccountlimit|locale|localedisplayname|localhostip|luceeid + |memoryusage|metadata|metricdata|numericdate|pagecontext|printerinfo|printerlist + |profilesections|profilestring|readableimageformats|safehtml|soaprequest|soaprequestheader + |soapresponse|soapresponseheader|systemfreememory|systemtotalmemory|tagdata|taglist + |tempdirectory|tempfile|templatepath|tickcount|timezone|timezoneinfo|token|totalspace + |userroles|variable|vfsmetadata|writeableimageformats)|image(?:addborder|blur|clearrect + |copy|createcaptcha|crop|drawarc|drawbeveledrect|drawcubiccurve|drawimage|drawline + |drawlines|drawoval|drawpoint|drawquadraticcurve|drawrect|drawroundrect|drawtext + |filter|filtercolormap|filtercurves|filterkernel|filterwarpgrid|flip|fonts|formats + |getblob|getbufferedimage|getexifmetadata|getexiftag|getheight|getiptcmetadata|getiptctag + |getmetadata|getwidth|grayscale|info|makecolortransparent|maketranslucent|negative + |new|overlay|paste|read|readbase64|resize|rotate|rotatedrawingaxis|scaletofit|setantialiasing + |setbackgroundcolor|setdrawingalpha|setdrawingcolor|setdrawingstroke|setdrawingtransparency + |sharpen|shear|sheardrawingaxis|translate|translatedrawingaxis|write|writebase64 + |xordrawingmode)|is(?:array|binary|boolean|closure|customfunction|date|ddx|debugmode + |defined|empty|fileobject|image|imagefile|instanceof|ipinrange|ipv6|json|leapyear + |localhost|notmap|null|numeric|numericdate|object|pdffile|pdfobject|query|safehtml + |simplevalue|soaprequest|spreadsheetfile|spreadsheetobject|struct|userinanyrole|userinrole + |userloggedin|valid|validoauthaccesstoken|videofile|wddx|xml|xmlattribute|xmldoc + |xmlelem|xmlnode|xmlroot|zipfile)|list(?:append|avg|changedelims|compact|contains + |containsnocase|deleteat|each|every|filter|find|findnocase|first|getat|indexexists + |insertat|itemtrim|last|len|map|prepend|qualify|reduce|removeduplicates|rest|setat + |some|sort|toarray|trim|valuecount|valuecountnocase)|object(?:equals|load|save)|orm(?:clearsession + |closeallsessions|closesession|evictcollection|evictentity|evictqueries|executequery + |flush|flushall|getsession|getsessionfactory|index|indexpurge|reload|search|searchoffline) + |query(?:addcolumn|addrow|columnarray|columncount|columndata|columnexists|columnlist + |convertforgrid|currentrow|deletecolumn|deleterow|each|every|execute|filter|getcell + |getrow|map|new|recordcount|reduce|rowdata|setcell|slice|some|sort)|replace(?:list + |nocase)|spreadsheet(?:addautofilter|addcolumn|addfreezepane|addimage|addinfo|addpagebreaks + |addrow|addrows|addsplitpane|createsheet|deletecolumn|deletecolumns|deleterow|deleterows + |formatcell|formatcellrange|formatcolumn|formatcolumns|formatrow|formatrows|getcellcomment + |getcellformula|getcellvalue|info|mergecells|new|read|readbinary|removesheet|setactivesheet + |setactivesheetnumber|setcellcomment|setcellformula|setcellvalue|setcolumnwidth|setfooter + |setheader|setrowheight|shiftcolumns|shiftrows|write)|store(?:addacl|getacl|getmetadata + |setacl|setmetadata)|struct(?:append|clear|copy|count|delete|each|every|filter|find + |findkey|findvalue|get|insert|isempty|keyarray|keyexists|keylist|keytranslate|map + |new|reduce|some|sort|update)|to(?:base64|binary|numeric|script|string)|transaction(?:commit + |rollback|setsavepoint)|url(?:decode|encode|encodedformat|sessionformat)|xml(?:childpos + |elemnew|format|getnodetype|new|parse|search|transform|validate)|abs|acos|addsoaprequestheader + |addsoapresponseheader|ajaxlink|ajaxonload|applicationstarttime|applicationstop|array + |asc|asin|atn|beat|binarydecode|binaryencode|bitand|bitmaskclear|bitmaskread|bitmaskset + |bitnot|bitor|bitshln|bitshrn|bitxor|booleanformat|callstackdump|callstackget|canonicalize + |ceiling|cfusion_decrypt|cfusion_encrypt|charsetdecode|charsetencode|chr|cjustify + |collectioneach|collectionevery|collectionfilter|collectionmap|collectionreduce|collectionsome + |compare|comparenocase|compress|contractpath|cos|csrfgeneratetoken|csrfverifytoken + |ctcacheclear|ctcachelist|datasourceflushmetacache|day|dayofweek|dayofweekasstring + |dayofweekshortasstring|dayofyear|daysinmonth|daysinyear|de|decimalformat|decodeforhtml + |decodefromurl|decrementvalue|decrypt|decryptbinary|deleteclientvariable|deserialize + |deserializejson|deserializexml|directorycopy|directorycreate|directorydelete|directoryexists + |directorylist|directoryrename|directorysize|dollarformat|dotnettocftype|duplicate |each|echo|empty|encodeforcss|encodefordn|encodeforhtml|encodeforhtmlattribute|encodeforjavascript - |encodeforldap|encodeforurl|encodeforxml|encodeforxmlattribute|encodeforxpath|encrypt|encryptbinary|entitydelete - |entityload|entityloadbyexample|entityloadbypk|entitymerge|entitynamearray|entitynamelist|entitynew|entityreload - |entitysave|entitytoquery|esapidecode|esapiencode|evaluate|exp|expandpath|extract|fileappend|fileclose|filecopy - |filedelete|fileexists|filegetmimetype|fileiseof|filemove|fileopen|fileread|filereadbinary|filereadline|fileseek - |filesetaccessmode|filesetattribute|filesetlastmodified|fileskipbytes|fileupload|fileuploadall|filewrite - |filewriteline|find|findnocase|findoneof|firstdayofmonth|fix|formatbasen|generatesecretkey|getapplicationmetadata - |getapplicationsettings|getauthuser|getbasetagdata|getbasetaglist|getbasetemplatepath|getbuiltinfunction - |getcanonicalpath|getclasspath|getclientvariableslist|getcomponentmetadata|getcontextroot|getcpuusage - |getcurrentcontext|getcurrenttemplatepath|getdirectoryfrompath|getencoding|getfilefrompath|getfileinfo|getfreespace - |getfunctioncalledname|getfunctiondata|getfunctionkeywords|getfunctionlist|gethttprequestdata|gethttptimestring - |getk2serverdoccount|getk2serverdoccountlimit|getlocale|getlocaledisplayname|getlocalhostip|getluceeid - |getmemoryusage|getmetadata|getmetricdata|getnumericdate|getpagecontext|getprinterlist|getprofilesections - |getprofilestring|getreadableimageformats|getsoaprequest|getsoaprequestheader|getsoapresponse|getsoapresponseheader - |getsystemfreememory|getsystemtotalmemory|gettagdata|gettaglist|gettempdirectory|gettempfile|gettemplatepath - |gettickcount|gettimezone|gettimezoneinfo|gettoken|gettotalspace|getuserroles|getvariable|getvfsmetadata - |getwriteableimageformats|hash|hash40|hmac|hour|htmlcodeformat|htmleditformat|htmlparse|iif|imageaddborder - |imageblur|imageclearrect|imagecopy|imagecrop|imagedrawarc|imagedrawbeveledrect|imagedrawcubiccurve|imagedrawimage - |imagedrawline|imagedrawlines|imagedrawoval|imagedrawpoint|imagedrawquadraticcurve|imagedrawrect|imagedrawroundrect - |imagedrawtext|imagefilter|imagefiltercolormap|imagefiltercurves|imagefilterkernel|imagefilterwarpgrid|imageflip - |imagefonts|imageformats|imagegetblob|imagegetbufferedimage|imagegetexifmetadata|imagegetexiftag|imagegetheight - |imagegetiptctag|imagegetwidth|imagegrayscale|imageinfo|imagenegative|imagenew|imageoverlay|imagepaste|imageread - |imagereadbase64|imageresize|imagerotate|imagerotatedrawingaxis|imagescaletofit|imagesetantialiasing - |imagesetbackgroundcolor|imagesetdrawingalpha|imagesetdrawingcolor|imagesetdrawingstroke|imagesetdrawingtransparency - |imagesharpen|imageshear|imagesheardrawingaxis|imagetranslate|imagetranslatedrawingaxis|imagewrite|imagewritebase64 - |imagexordrawingmode|incrementvalue|inputbasen|insert|int|invoke|isarray|isbinary|isboolean|isclosure - |iscustomfunction|isdate|isdebugmode|isdefined|isempty|isimage|isimagefile|isinstanceof|isipinrange|isipv6 - |isjson|isleapyear|islocalhost|isnotmap|isnull|isnumeric|isnumericdate|isobject|ispdfobject|isquery|issimplevalue - |issoaprequest|isstruct|isuserinanyrole|isuserinrole|isuserloggedin|isvalid|isvideofile|iswddx|isxml|isxmlattribute - |isxmldoc|isxmlelem|isxmlnode|isxmlroot|iszipfile|javacast|jsstringformat|lcase|left|len|listappend|listavg - |listchangedelims|listcompact|listcontains|listcontainsnocase|listdeleteat|listeach|listevery|listfilter|listfind - |listfindnocase|listfirst|listgetat|listindexexists|listinsertat|listitemtrim|listlast|listlen|listmap|listprepend - |listqualify|listreduce|listremoveduplicates|listrest|listsetat|listsome|listsort|listtoarray|listtrim - |listvaluecount|listvaluecountnocase|ljustify|location|log|log10|lscurrencyformat|lsdateformat|lsdatetimeformat - |lsdayofweek|lseurocurrencyformat|lsiscurrency|lsisdate|lsisnumeric|lsnumberformat|lsparsecurrency|lsparsedatetime - |lsparseeurocurrency|lsparsenumber|lstimeformat|lsweek|ltrim|max|metaphone|mid|millisecond|min|minute|month - |monthasstring|monthshortasstring|newline|now|nowserver|nullvalue|numberformat|objectequals|objectload|objectsave - |ormclearsession|ormcloseallsessions|ormclosesession|ormevictcollection|ormevictentity|ormevictqueries - |ormexecutequery|ormflush|ormgetsession|ormgetsessionfactory|ormreload|pagepoolclear|pagepoollist|paragraphformat - |parameterexists|parsedatetime|parsenumber|pi|precisionevaluate|preservesinglequotes|quarter|query|queryaddcolumn - |queryaddrow|querycolumnarray|querycolumncount|querycolumndata|querycolumnexists|querycolumnlist|queryconvertforgrid - |querycurrentrow|querydeletecolumn|querydeleterow|queryeach|queryevery|queryexecute|queryfilter|querygetcell - |querygetrow|querymap|querynew|queryrecordcount|queryreduce|queryrowdata|querysetcell|queryslice|querysome - |querysort|quotedvaluelist|rand|randomize|randrange|refind|refindnocase|releasecomobject|rematch|rematchnocase - |removechars|repeatstring|replace|replacelist|replacenocase|rereplace|rereplacenocase|restdeleteapplication - |restinitapplication|restsetresponse|reverse|right|rjustify|round|rtrim|second|sendgatewaymessage|serialize - |serializejson|sessioninvalidate|sessionrotate|sessionstarttime|setencoding|setlocale|setprofilestring|settimezone - |setvariable|sgn|sin|sizeof|sleep|soundex|spanexcluding|spanincluding|spreadsheetnew|spreadsheetsetcellvalue - |spreadsheetwrite|sqr|sslcertificateinstall|sslcertificatelist|storeaddacl|storegetacl|storesetacl|stringlen|stripcr - |structappend|structclear|structcopy|structcount|structdelete|structeach|structevery|structfilter|structfind - |structfindkey|structfindvalue|structget|structinsert|structisempty|structkeyarray|structkeyexists|structkeylist - |structkeytranslate|structmap|structnew|structreduce|structsome|structsort|structupdate|systemcacheclear|systemoutput - |tan|threadjoin|threadterminate|throw|timeformat|tobase64|tobinary|tonumeric|toscript|tostring|trace|transactioncommit - |transactionrollback|transactionsetsavepoint|trim|truefalseformat|ucase|ucfirst|unserializejava|urldecode|urlencode - |urlencodedformat|urlsessionformat|val|valuearray|valuelist|verifyclient|week|wrap|writedump|writelog|writeoutput - |xmlchildpos|xmlelemnew|xmlformat|xmlgetnodetype|xmlnew|xmlparse|xmlsearch|xmltransform|xmlvalidate|year|yesnoformat) + |encodeforldap|encodeforurl|encodeforxml|encodeforxmlattribute|encodeforxpath|encrypt + |encryptbinary|esapidecode|esapiencode|evaluate|exp|expandpath|extract|fileappend + |fileclose|filecopy|filedelete|fileexists|filegetmimetype|fileiseof|filemove|fileopen + |fileread|filereadbinary|filereadline|fileseek|filesetaccessmode|filesetattribute + |filesetlastmodified|fileskipbytes|fileupload|fileuploadall|filewrite|filewriteline + |find|findnocase|findoneof|firstdayofmonth|fix|floor|formatbasen|generatepbkdfkey + |generatesecretkey|hash|hash40|hmac|hour|htmlcodeformat|htmleditformat|htmlparse + |iif|incrementvalue|inputbasen|insert|int|invalidateoauthaccesstoken|invoke|javacast + |jsstringformat|lcase|left|len|ljustify|location|log|log10|lscurrencyformat|lsdateformat + |lsdatetimeformat|lsdayofweek|lseurocurrencyformat|lsiscurrency|lsisdate|lsisnumeric + |lsnumberformat|lsparsecurrency|lsparsedatetime|lsparseeurocurrency|lsparsenumber + |lstimeformat|lsweek|ltrim|max|metaphone|mid|millisecond|min|minute|month|monthasstring + |monthshortasstring|newline|now|nowserver|nullvalue|numberformat|onapplicationend + |onapplicationstart|onerror|onmissingmethod|onmissingtemplate|onrequest|onrequestend + |onrequeststart|onsessionend|onsessionstart|pagepoolclear|pagepoollist|paragraphformat + |parameterexists|parsedatetime|parsenumber|pi|precisionevaluate|preservesinglequotes + |quarter|query|quotedvaluelist|rand|randomize|randrange|reescape|refind|refindnocase + |releasecomobject|rematch|rematchnocase|removecachedquery|removechars|repeatstring + |replace|rereplace|rereplacenocase|restdeleteapplication|restinitapplication|restsetresponse + |reverse|right|rjustify|round|rtrim|second|sendgatewaymessage|serialize|serializejson + |serializexml|sessiongetmetadata|sessioninvalidate|sessionrotate|sessionstarttime + |setencoding|setlocale|setprofilestring|settimezone|setvariable|sgn|sin|sizeof|sleep + |soundex|spanexcluding|spanincluding|sqr|sslcertificateinstall|sslcertificatelist + |stringlen|stripcr|systemcacheclear|systemoutput|tan|threadjoin|threadterminate|throw + |timeformat|trace|trim|truefalseformat|ucase|ucfirst|unserializejava|val|valuearray + |valuelist|verifyclient|week|wrap|writebody|writedump|writelog|writeoutput|wsgetallchannels + |wsgetsubscribers|wspublish|wssendmessage|year|yesnoformat) )(\() beginCaptures: '1': {name: support.function.cfml} @@ -1146,16 +1163,22 @@ repository: - begin: |- (?x)(\b) (?i: - (ajaximport|ajaxproxy|applet|application|argument|associate|authenticate|break|cache|chart|chartdata - |chartseries|col|collection|content|cookie|dbinfo|directory|div|document|documentitem - |documentsection|dump|error|execute|exit|feed|file|flush|form|forward|ftp|graph|graphdata - |header|htmlbody|htmlhead|http|httpparam|image|imap|import|include|index|input|insert|invoke|invokeargument - |layout|layoutarea|ldap|location|lock|log|login|loginuser|logout|loop|mail|mailparam|mailpart|map|mapitem|mediaplayer - |module|object|objectcache|output|pageencoding|pdf|pdfparam|pop|processingdirective|procparam|procresult - |query|queryparam|registry|rethrow|retry|savecontent|schedule|search|select|servlet|servletparam - |setting|silent|sleep|slider|stopwatch|storedproc|table|textinput|thread|throw|timer|trace|transaction - |update|video|videoplayer|videoplayerparam|wddx|window|xml|zip|zipparam) - )(?=(\s+[a-zA-Z0-9:-]+\s*[=;{]|\s*[{])) + (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|feed|file|fileupload|flush|form|formgroup|formitem|ftp|grid|gridcolumn + |gridrow|gridupdate|header|htmlhead|htmltopdf|htmltopdfitem|http|httpparam|image + |imap|imapfilter|import|include|index|input|insert|invoke|invokeargument|layout + |layoutarea|ldap|location|lock|log|login|loginuser|logout|loop|mail|mailparam|mailpart + |map|mapitem|mediaplayer|menu|menuitem|messagebox|module|ntauthenticate|oauth|object + |objectcache|output|param|pdf|pdfform|pdfformparam|pdfparam|pdfsubform|pod|pop + |presentation|presentationslide|presenter|print|processingdirective|procparam|procresult + |progressbar|property|query|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|try + |update|video|videoplayer|videoplayerparam|wddx|websocket|window|xml|zip|zipparam) + )(?=\s+[a-zA-Z0-9:-]+\s*([=;{]|$)|\s*({|$)) beginCaptures: '2': {name: meta.tag.script.cfml entity.name.tag.script.cfml} end: (\})|(?=;) @@ -1173,15 +1196,21 @@ repository: begin: |- (?x)(?i) (cf - (?:ajaximport|ajaxproxy|applet|application|argument|associate|authenticate|break|cache|chart|chartdata - |chartseries|col|collection|content|cookie|dbinfo|directory|div|document|documentitem - |documentsection|dump|error|execute|exit|feed|file|flush|form|forward|ftp|graph|graphdata - |header|htmlbody|htmlhead|http|httpparam|image|imap|import|include|index|input|insert|invoke|invokeargument - |layout|layoutarea|ldap|location|lock|log|login|loginuser|logout|loop|mail|mailparam|mailpart|map|mapitem|mediaplayer - |module|object|objectcache|output|pageencoding|pdf|pdfparam|pop|processingdirective|procparam|procresult - |query|queryparam|registry|rethrow|retry|savecontent|schedule|search|select|servlet|servletparam - |setting|silent|sleep|slider|stopwatch|storedproc|table|textinput|thread|throw|timer|trace|transaction - |update|video|videoplayer|videoplayerparam|wddx|window|xml|zip|zipparam) + (?: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|feed|file|fileupload|flush|form|formgroup|formitem|ftp|grid|gridcolumn + |gridrow|gridupdate|header|htmlhead|htmltopdf|htmltopdfitem|http|httpparam|image + |imap|imapfilter|import|include|index|input|insert|invoke|invokeargument|layout + |layoutarea|ldap|location|lock|log|login|loginuser|logout|loop|mail|mailparam|mailpart + |map|mapitem|mediaplayer|menu|menuitem|messagebox|module|ntauthenticate|oauth|object + |objectcache|output|param|pdf|pdfform|pdfformparam|pdfparam|pdfsubform|pod|pop + |presentation|presentationslide|presenter|print|processingdirective|procparam|procresult + |progressbar|property|query|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|try + |update|video|videoplayer|videoplayerparam|wddx|websocket|window|xml|zip|zipparam) )\( beginCaptures: '1': {name: entity.name.tag.script.cfml} diff --git a/syntaxes/cfscript.plist b/syntaxes/cfscript.plist index 38e2504..a89cc98 100644 --- a/syntaxes/cfscript.plist +++ b/syntaxes/cfscript.plist @@ -2891,81 +2891,98 @@ begin (?x)\b (?i: - (abs|acos|addsoaprequestheader|addsoapresponseheader|ajaxlink|ajaxonload|applicationstarttime - |applicationstop|array|arrayappend|arrayavg|arrayclear|arraycontains|arraycontainsnocase - |arraydelete|arraydeleteat|arrayeach|arrayevery|arrayfilter|arrayfind|arrayfindall|arrayfindallnocase - |arrayfindnocase|arrayfirst|arrayindexexists|arrayinsertat|arrayisdefined|arrayisempty - |arraylast|arraylen|arraymap|arraymax|arraymedian|arraymerge|arraymid|arraymin|arraynew|arrayprepend - |arrayreduce|arrayresize|arrayreverse|arrayset|arrayslice|arraysome|arraysort|arraysum|arrayswap - |arraytolist|arraytostruct|asc|asin|atn|beat|binarydecode|binaryencode|bitand|bitmaskclear|bitmaskread - |bitmaskset|bitnot|bitor|bitshln|bitshrn|bitxor|cacheclear|cachecount|cachedelete|cacheget|cachegetall - |cachegetallids|cachegetdefaultcachename|cachegetmetadata|cachegetproperties|cacheidexists|cachekeyexists - |cacheput|cacheremove|cacheremoveall|cachesetproperties|callstackdump|callstackget|canonicalize|ceiling - |cfusion_decrypt|cfusion_encrypt|charsetdecode|charsetencode|chr|cjustify|collectioneach|collectionevery - |collectionfilter|collectionmap|collectionreduce|collectionsome|compare|comparenocase|componentcacheclear - |componentcachelist|componentinfo|compress|contractpath|cos|createdate|createdatetime|createdynamicproxy - |createguid|createobject|createodbcdate|createodbcdatetime|createodbctime|createtime|createtimespan - |createuniqueid|createuuid|csrfgeneratetoken|csrfverifytoken|ctcacheclear|ctcachelist - |datasourceflushmetacache|dateadd|datecompare|dateconvert|datediff|dateformat|datepart|datetimeformat|day - |dayofweek|dayofweekasstring|dayofweekshortasstring|dayofyear|daysinmonth|daysinyear|de|decimalformat - |decodefromurl|decrementvalue|decrypt|decryptbinary|deleteclientvariable|deserializejson|directorycopy - |directorycreate|directorydelete|directoryexists|directorylist|directoryrename|dollarformat|dump|duplicate + (array(?:append|avg|clear|contains|containsnocase|delete|deleteat|deletenocase|each + |every|filter|find|findall|findallnocase|findnocase|first|indexexists|insertat|isdefined + |isempty|last|len|map|max|median|merge|mid|min|new|prepend|reduce|resize|reverse + |set|slice|some|sort|sum|swap|tolist|tostruct)|cache(?:clear|count|delete|get|getall + |getallids|getdefaultcachename|getmetadata|getproperties|getsession|idexists|keyexists + |put|regionexists|regionnew|regionremove|remove|removeall|setproperties)|component(?:cacheclear + |cachelist|info)|create(?:date|datetime|dynamicproxy|guid|object|odbcdate|odbcdatetime + |odbctime|time|timespan|uniqueid|uuid)|date(?:add|compare|convert|diff|format|part + |timeformat)|entity(?:delete|load|loadbyexample|loadbypk|merge|namearray|namelist + |new|reload|save|toquery)|get(?:applicationmetadata|applicationsettings|authuser + |basetagdata|basetaglist|basetemplatepath|builtinfunction|canonicalpath|classpath + |clientvariableslist|componentmetadata|contextroot|cpuusage|currentcontext|currenttemplatepath + |directoryfrompath|encoding|exception|filefrompath|fileinfo|freespace|functioncalledname + |functiondata|functionkeywords|functionlist|gatewayhelper|httprequestdata|httptimestring + |k2serverdoccount|k2serverdoccountlimit|locale|localedisplayname|localhostip|luceeid + |memoryusage|metadata|metricdata|numericdate|pagecontext|printerinfo|printerlist + |profilesections|profilestring|readableimageformats|safehtml|soaprequest|soaprequestheader + |soapresponse|soapresponseheader|systemfreememory|systemtotalmemory|tagdata|taglist + |tempdirectory|tempfile|templatepath|tickcount|timezone|timezoneinfo|token|totalspace + |userroles|variable|vfsmetadata|writeableimageformats)|image(?:addborder|blur|clearrect + |copy|createcaptcha|crop|drawarc|drawbeveledrect|drawcubiccurve|drawimage|drawline + |drawlines|drawoval|drawpoint|drawquadraticcurve|drawrect|drawroundrect|drawtext + |filter|filtercolormap|filtercurves|filterkernel|filterwarpgrid|flip|fonts|formats + |getblob|getbufferedimage|getexifmetadata|getexiftag|getheight|getiptcmetadata|getiptctag + |getmetadata|getwidth|grayscale|info|makecolortransparent|maketranslucent|negative + |new|overlay|paste|read|readbase64|resize|rotate|rotatedrawingaxis|scaletofit|setantialiasing + |setbackgroundcolor|setdrawingalpha|setdrawingcolor|setdrawingstroke|setdrawingtransparency + |sharpen|shear|sheardrawingaxis|translate|translatedrawingaxis|write|writebase64 + |xordrawingmode)|is(?:array|binary|boolean|closure|customfunction|date|ddx|debugmode + |defined|empty|fileobject|image|imagefile|instanceof|ipinrange|ipv6|json|leapyear + |localhost|notmap|null|numeric|numericdate|object|pdffile|pdfobject|query|safehtml + |simplevalue|soaprequest|spreadsheetfile|spreadsheetobject|struct|userinanyrole|userinrole + |userloggedin|valid|validoauthaccesstoken|videofile|wddx|xml|xmlattribute|xmldoc + |xmlelem|xmlnode|xmlroot|zipfile)|list(?:append|avg|changedelims|compact|contains + |containsnocase|deleteat|each|every|filter|find|findnocase|first|getat|indexexists + |insertat|itemtrim|last|len|map|prepend|qualify|reduce|removeduplicates|rest|setat + |some|sort|toarray|trim|valuecount|valuecountnocase)|object(?:equals|load|save)|orm(?:clearsession + |closeallsessions|closesession|evictcollection|evictentity|evictqueries|executequery + |flush|flushall|getsession|getsessionfactory|index|indexpurge|reload|search|searchoffline) + |query(?:addcolumn|addrow|columnarray|columncount|columndata|columnexists|columnlist + |convertforgrid|currentrow|deletecolumn|deleterow|each|every|execute|filter|getcell + |getrow|map|new|recordcount|reduce|rowdata|setcell|slice|some|sort)|replace(?:list + |nocase)|spreadsheet(?:addautofilter|addcolumn|addfreezepane|addimage|addinfo|addpagebreaks + |addrow|addrows|addsplitpane|createsheet|deletecolumn|deletecolumns|deleterow|deleterows + |formatcell|formatcellrange|formatcolumn|formatcolumns|formatrow|formatrows|getcellcomment + |getcellformula|getcellvalue|info|mergecells|new|read|readbinary|removesheet|setactivesheet + |setactivesheetnumber|setcellcomment|setcellformula|setcellvalue|setcolumnwidth|setfooter + |setheader|setrowheight|shiftcolumns|shiftrows|write)|store(?:addacl|getacl|getmetadata + |setacl|setmetadata)|struct(?:append|clear|copy|count|delete|each|every|filter|find + |findkey|findvalue|get|insert|isempty|keyarray|keyexists|keylist|keytranslate|map + |new|reduce|some|sort|update)|to(?:base64|binary|numeric|script|string)|transaction(?:commit + |rollback|setsavepoint)|url(?:decode|encode|encodedformat|sessionformat)|xml(?:childpos + |elemnew|format|getnodetype|new|parse|search|transform|validate)|abs|acos|addsoaprequestheader + |addsoapresponseheader|ajaxlink|ajaxonload|applicationstarttime|applicationstop|array + |asc|asin|atn|beat|binarydecode|binaryencode|bitand|bitmaskclear|bitmaskread|bitmaskset + |bitnot|bitor|bitshln|bitshrn|bitxor|booleanformat|callstackdump|callstackget|canonicalize + |ceiling|cfusion_decrypt|cfusion_encrypt|charsetdecode|charsetencode|chr|cjustify + |collectioneach|collectionevery|collectionfilter|collectionmap|collectionreduce|collectionsome + |compare|comparenocase|compress|contractpath|cos|csrfgeneratetoken|csrfverifytoken + |ctcacheclear|ctcachelist|datasourceflushmetacache|day|dayofweek|dayofweekasstring + |dayofweekshortasstring|dayofyear|daysinmonth|daysinyear|de|decimalformat|decodeforhtml + |decodefromurl|decrementvalue|decrypt|decryptbinary|deleteclientvariable|deserialize + |deserializejson|deserializexml|directorycopy|directorycreate|directorydelete|directoryexists + |directorylist|directoryrename|directorysize|dollarformat|dotnettocftype|duplicate |each|echo|empty|encodeforcss|encodefordn|encodeforhtml|encodeforhtmlattribute|encodeforjavascript - |encodeforldap|encodeforurl|encodeforxml|encodeforxmlattribute|encodeforxpath|encrypt|encryptbinary|entitydelete - |entityload|entityloadbyexample|entityloadbypk|entitymerge|entitynamearray|entitynamelist|entitynew|entityreload - |entitysave|entitytoquery|esapidecode|esapiencode|evaluate|exp|expandpath|extract|fileappend|fileclose|filecopy - |filedelete|fileexists|filegetmimetype|fileiseof|filemove|fileopen|fileread|filereadbinary|filereadline|fileseek - |filesetaccessmode|filesetattribute|filesetlastmodified|fileskipbytes|fileupload|fileuploadall|filewrite - |filewriteline|find|findnocase|findoneof|firstdayofmonth|fix|formatbasen|generatesecretkey|getapplicationmetadata - |getapplicationsettings|getauthuser|getbasetagdata|getbasetaglist|getbasetemplatepath|getbuiltinfunction - |getcanonicalpath|getclasspath|getclientvariableslist|getcomponentmetadata|getcontextroot|getcpuusage - |getcurrentcontext|getcurrenttemplatepath|getdirectoryfrompath|getencoding|getfilefrompath|getfileinfo|getfreespace - |getfunctioncalledname|getfunctiondata|getfunctionkeywords|getfunctionlist|gethttprequestdata|gethttptimestring - |getk2serverdoccount|getk2serverdoccountlimit|getlocale|getlocaledisplayname|getlocalhostip|getluceeid - |getmemoryusage|getmetadata|getmetricdata|getnumericdate|getpagecontext|getprinterlist|getprofilesections - |getprofilestring|getreadableimageformats|getsoaprequest|getsoaprequestheader|getsoapresponse|getsoapresponseheader - |getsystemfreememory|getsystemtotalmemory|gettagdata|gettaglist|gettempdirectory|gettempfile|gettemplatepath - |gettickcount|gettimezone|gettimezoneinfo|gettoken|gettotalspace|getuserroles|getvariable|getvfsmetadata - |getwriteableimageformats|hash|hash40|hmac|hour|htmlcodeformat|htmleditformat|htmlparse|iif|imageaddborder - |imageblur|imageclearrect|imagecopy|imagecrop|imagedrawarc|imagedrawbeveledrect|imagedrawcubiccurve|imagedrawimage - |imagedrawline|imagedrawlines|imagedrawoval|imagedrawpoint|imagedrawquadraticcurve|imagedrawrect|imagedrawroundrect - |imagedrawtext|imagefilter|imagefiltercolormap|imagefiltercurves|imagefilterkernel|imagefilterwarpgrid|imageflip - |imagefonts|imageformats|imagegetblob|imagegetbufferedimage|imagegetexifmetadata|imagegetexiftag|imagegetheight - |imagegetiptctag|imagegetwidth|imagegrayscale|imageinfo|imagenegative|imagenew|imageoverlay|imagepaste|imageread - |imagereadbase64|imageresize|imagerotate|imagerotatedrawingaxis|imagescaletofit|imagesetantialiasing - |imagesetbackgroundcolor|imagesetdrawingalpha|imagesetdrawingcolor|imagesetdrawingstroke|imagesetdrawingtransparency - |imagesharpen|imageshear|imagesheardrawingaxis|imagetranslate|imagetranslatedrawingaxis|imagewrite|imagewritebase64 - |imagexordrawingmode|incrementvalue|inputbasen|insert|int|invoke|isarray|isbinary|isboolean|isclosure - |iscustomfunction|isdate|isdebugmode|isdefined|isempty|isimage|isimagefile|isinstanceof|isipinrange|isipv6 - |isjson|isleapyear|islocalhost|isnotmap|isnull|isnumeric|isnumericdate|isobject|ispdfobject|isquery|issimplevalue - |issoaprequest|isstruct|isuserinanyrole|isuserinrole|isuserloggedin|isvalid|isvideofile|iswddx|isxml|isxmlattribute - |isxmldoc|isxmlelem|isxmlnode|isxmlroot|iszipfile|javacast|jsstringformat|lcase|left|len|listappend|listavg - |listchangedelims|listcompact|listcontains|listcontainsnocase|listdeleteat|listeach|listevery|listfilter|listfind - |listfindnocase|listfirst|listgetat|listindexexists|listinsertat|listitemtrim|listlast|listlen|listmap|listprepend - |listqualify|listreduce|listremoveduplicates|listrest|listsetat|listsome|listsort|listtoarray|listtrim - |listvaluecount|listvaluecountnocase|ljustify|location|log|log10|lscurrencyformat|lsdateformat|lsdatetimeformat - |lsdayofweek|lseurocurrencyformat|lsiscurrency|lsisdate|lsisnumeric|lsnumberformat|lsparsecurrency|lsparsedatetime - |lsparseeurocurrency|lsparsenumber|lstimeformat|lsweek|ltrim|max|metaphone|mid|millisecond|min|minute|month - |monthasstring|monthshortasstring|newline|now|nowserver|nullvalue|numberformat|objectequals|objectload|objectsave - |ormclearsession|ormcloseallsessions|ormclosesession|ormevictcollection|ormevictentity|ormevictqueries - |ormexecutequery|ormflush|ormgetsession|ormgetsessionfactory|ormreload|pagepoolclear|pagepoollist|paragraphformat - |parameterexists|parsedatetime|parsenumber|pi|precisionevaluate|preservesinglequotes|quarter|query|queryaddcolumn - |queryaddrow|querycolumnarray|querycolumncount|querycolumndata|querycolumnexists|querycolumnlist|queryconvertforgrid - |querycurrentrow|querydeletecolumn|querydeleterow|queryeach|queryevery|queryexecute|queryfilter|querygetcell - |querygetrow|querymap|querynew|queryrecordcount|queryreduce|queryrowdata|querysetcell|queryslice|querysome - |querysort|quotedvaluelist|rand|randomize|randrange|refind|refindnocase|releasecomobject|rematch|rematchnocase - |removechars|repeatstring|replace|replacelist|replacenocase|rereplace|rereplacenocase|restdeleteapplication - |restinitapplication|restsetresponse|reverse|right|rjustify|round|rtrim|second|sendgatewaymessage|serialize - |serializejson|sessioninvalidate|sessionrotate|sessionstarttime|setencoding|setlocale|setprofilestring|settimezone - |setvariable|sgn|sin|sizeof|sleep|soundex|spanexcluding|spanincluding|spreadsheetnew|spreadsheetsetcellvalue - |spreadsheetwrite|sqr|sslcertificateinstall|sslcertificatelist|storeaddacl|storegetacl|storesetacl|stringlen|stripcr - |structappend|structclear|structcopy|structcount|structdelete|structeach|structevery|structfilter|structfind - |structfindkey|structfindvalue|structget|structinsert|structisempty|structkeyarray|structkeyexists|structkeylist - |structkeytranslate|structmap|structnew|structreduce|structsome|structsort|structupdate|systemcacheclear|systemoutput - |tan|threadjoin|threadterminate|throw|timeformat|tobase64|tobinary|tonumeric|toscript|tostring|trace|transactioncommit - |transactionrollback|transactionsetsavepoint|trim|truefalseformat|ucase|ucfirst|unserializejava|urldecode|urlencode - |urlencodedformat|urlsessionformat|val|valuearray|valuelist|verifyclient|week|wrap|writedump|writelog|writeoutput - |xmlchildpos|xmlelemnew|xmlformat|xmlgetnodetype|xmlnew|xmlparse|xmlsearch|xmltransform|xmlvalidate|year|yesnoformat) + |encodeforldap|encodeforurl|encodeforxml|encodeforxmlattribute|encodeforxpath|encrypt + |encryptbinary|esapidecode|esapiencode|evaluate|exp|expandpath|extract|fileappend + |fileclose|filecopy|filedelete|fileexists|filegetmimetype|fileiseof|filemove|fileopen + |fileread|filereadbinary|filereadline|fileseek|filesetaccessmode|filesetattribute + |filesetlastmodified|fileskipbytes|fileupload|fileuploadall|filewrite|filewriteline + |find|findnocase|findoneof|firstdayofmonth|fix|floor|formatbasen|generatepbkdfkey + |generatesecretkey|hash|hash40|hmac|hour|htmlcodeformat|htmleditformat|htmlparse + |iif|incrementvalue|inputbasen|insert|int|invalidateoauthaccesstoken|invoke|javacast + |jsstringformat|lcase|left|len|ljustify|location|log|log10|lscurrencyformat|lsdateformat + |lsdatetimeformat|lsdayofweek|lseurocurrencyformat|lsiscurrency|lsisdate|lsisnumeric + |lsnumberformat|lsparsecurrency|lsparsedatetime|lsparseeurocurrency|lsparsenumber + |lstimeformat|lsweek|ltrim|max|metaphone|mid|millisecond|min|minute|month|monthasstring + |monthshortasstring|newline|now|nowserver|nullvalue|numberformat|onapplicationend + |onapplicationstart|onerror|onmissingmethod|onmissingtemplate|onrequest|onrequestend + |onrequeststart|onsessionend|onsessionstart|pagepoolclear|pagepoollist|paragraphformat + |parameterexists|parsedatetime|parsenumber|pi|precisionevaluate|preservesinglequotes + |quarter|query|quotedvaluelist|rand|randomize|randrange|reescape|refind|refindnocase + |releasecomobject|rematch|rematchnocase|removecachedquery|removechars|repeatstring + |replace|rereplace|rereplacenocase|restdeleteapplication|restinitapplication|restsetresponse + |reverse|right|rjustify|round|rtrim|second|sendgatewaymessage|serialize|serializejson + |serializexml|sessiongetmetadata|sessioninvalidate|sessionrotate|sessionstarttime + |setencoding|setlocale|setprofilestring|settimezone|setvariable|sgn|sin|sizeof|sleep + |soundex|spanexcluding|spanincluding|sqr|sslcertificateinstall|sslcertificatelist + |stringlen|stripcr|systemcacheclear|systemoutput|tan|threadjoin|threadterminate|throw + |timeformat|trace|trim|truefalseformat|ucase|ucfirst|unserializejava|val|valuearray + |valuelist|verifyclient|week|wrap|writebody|writedump|writelog|writeoutput|wsgetallchannels + |wsgetsubscribers|wspublish|wssendmessage|year|yesnoformat) )(\() beginCaptures @@ -3441,16 +3458,22 @@ begin (?x)(\b) (?i: - (ajaximport|ajaxproxy|applet|application|argument|associate|authenticate|break|cache|chart|chartdata - |chartseries|col|collection|content|cookie|dbinfo|directory|div|document|documentitem - |documentsection|dump|error|execute|exit|feed|file|flush|form|forward|ftp|graph|graphdata - |header|htmlbody|htmlhead|http|httpparam|image|imap|import|include|index|input|insert|invoke|invokeargument - |layout|layoutarea|ldap|location|lock|log|login|loginuser|logout|loop|mail|mailparam|mailpart|map|mapitem|mediaplayer - |module|object|objectcache|output|pageencoding|pdf|pdfparam|pop|processingdirective|procparam|procresult - |query|queryparam|registry|rethrow|retry|savecontent|schedule|search|select|servlet|servletparam - |setting|silent|sleep|slider|stopwatch|storedproc|table|textinput|thread|throw|timer|trace|transaction - |update|video|videoplayer|videoplayerparam|wddx|window|xml|zip|zipparam) -)(?=(\s+[a-zA-Z0-9:-]+\s*[=;{]|\s*[{])) + (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|feed|file|fileupload|flush|form|formgroup|formitem|ftp|grid|gridcolumn + |gridrow|gridupdate|header|htmlhead|htmltopdf|htmltopdfitem|http|httpparam|image + |imap|imapfilter|import|include|index|input|insert|invoke|invokeargument|layout + |layoutarea|ldap|location|lock|log|login|loginuser|logout|loop|mail|mailparam|mailpart + |map|mapitem|mediaplayer|menu|menuitem|messagebox|module|ntauthenticate|oauth|object + |objectcache|output|param|pdf|pdfform|pdfformparam|pdfparam|pdfsubform|pod|pop + |presentation|presentationslide|presenter|print|processingdirective|procparam|procresult + |progressbar|property|query|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|try + |update|video|videoplayer|videoplayerparam|wddx|websocket|window|xml|zip|zipparam) +)(?=\s+[a-zA-Z0-9:-]+\s*([=;{]|$)|\s*({|$)) beginCaptures 2 @@ -3497,15 +3520,21 @@ begin (?x)(?i) (cf - (?:ajaximport|ajaxproxy|applet|application|argument|associate|authenticate|break|cache|chart|chartdata - |chartseries|col|collection|content|cookie|dbinfo|directory|div|document|documentitem - |documentsection|dump|error|execute|exit|feed|file|flush|form|forward|ftp|graph|graphdata - |header|htmlbody|htmlhead|http|httpparam|image|imap|import|include|index|input|insert|invoke|invokeargument - |layout|layoutarea|ldap|location|lock|log|login|loginuser|logout|loop|mail|mailparam|mailpart|map|mapitem|mediaplayer - |module|object|objectcache|output|pageencoding|pdf|pdfparam|pop|processingdirective|procparam|procresult - |query|queryparam|registry|rethrow|retry|savecontent|schedule|search|select|servlet|servletparam - |setting|silent|sleep|slider|stopwatch|storedproc|table|textinput|thread|throw|timer|trace|transaction - |update|video|videoplayer|videoplayerparam|wddx|window|xml|zip|zipparam) + (?: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|feed|file|fileupload|flush|form|formgroup|formitem|ftp|grid|gridcolumn + |gridrow|gridupdate|header|htmlhead|htmltopdf|htmltopdfitem|http|httpparam|image + |imap|imapfilter|import|include|index|input|insert|invoke|invokeargument|layout + |layoutarea|ldap|location|lock|log|login|loginuser|logout|loop|mail|mailparam|mailpart + |map|mapitem|mediaplayer|menu|menuitem|messagebox|module|ntauthenticate|oauth|object + |objectcache|output|param|pdf|pdfform|pdfformparam|pdfparam|pdfsubform|pod|pop + |presentation|presentationslide|presenter|print|processingdirective|procparam|procresult + |progressbar|property|query|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|try + |update|video|videoplayer|videoplayerparam|wddx|websocket|window|xml|zip|zipparam) )\( beginCaptures diff --git a/syntaxes/cfscript.sublime-syntax b/syntaxes/cfscript.sublime-syntax index 4fa6bff..41610c1 100644 --- a/syntaxes/cfscript.sublime-syntax +++ b/syntaxes/cfscript.sublime-syntax @@ -42,11 +42,11 @@ contexts: - include: component - include: conditional - match: '\{' - scope: meta.brace.curly.js + scope: meta.brace.curly.cfml push: - - meta_scope: meta.block.js + - meta_scope: meta.block.cfml - match: '\}' - scope: meta.brace.curly.js + scope: meta.brace.curly.cfml pop: true - include: statements - include: expressions @@ -898,16 +898,22 @@ contexts: (?x) (\b) (?i: - (ajaximport|ajaxproxy|applet|application|argument|associate|authenticate|break|cache|chart|chartdata - |chartseries|col|collection|content|cookie|dbinfo|directory|div|document|documentitem - |documentsection|dump|error|execute|exit|feed|file|flush|form|forward|ftp|graph|graphdata - |header|htmlbody|htmlhead|http|httpparam|image|imap|import|include|index|input|insert|invoke|invokeargument - |layout|layoutarea|ldap|location|lock|log|login|loginuser|logout|loop|mail|mailparam|mailpart|map|mapitem|mediaplayer - |module|object|objectcache|output|pageencoding|pdf|pdfparam|pop|processingdirective|procparam|procresult - |query|queryparam|registry|rethrow|retry|savecontent|schedule|search|select|servlet|servletparam - |setting|silent|sleep|slider|stopwatch|storedproc|table|textinput|thread|throw|timer|trace|transaction - |update|video|videoplayer|videoplayerparam|wddx|window|xml|zip|zipparam) - )(?=(\s+[a-zA-Z0-9:-]+\s*[=;{]|\s*[{])) + (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|feed|file|fileupload|flush|form|formgroup|formitem|ftp|grid|gridcolumn + |gridrow|gridupdate|header|htmlhead|htmltopdf|htmltopdfitem|http|httpparam|image + |imap|imapfilter|import|include|index|input|insert|invoke|invokeargument|layout + |layoutarea|ldap|location|lock|log|login|loginuser|logout|loop|mail|mailparam|mailpart + |map|mapitem|mediaplayer|menu|menuitem|messagebox|module|ntauthenticate|oauth|object + |objectcache|output|param|pdf|pdfform|pdfformparam|pdfparam|pdfsubform|pod|pop + |presentation|presentationslide|presenter|print|processingdirective|procparam|procresult + |progressbar|property|query|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|try + |update|video|videoplayer|videoplayerparam|wddx|websocket|window|xml|zip|zipparam) + )(?=\s+[a-zA-Z0-9:-]+\s*([=;{]|$)|\s*({|$)) captures: 2: entity.name.tag.script.cfml push: tag-generic-attribute-script @@ -916,15 +922,21 @@ contexts: - match: |- (?x)(?i) (cf - (?:ajaximport|ajaxproxy|applet|application|argument|associate|authenticate|break|cache|chart|chartdata - |chartseries|col|collection|content|cookie|dbinfo|directory|div|document|documentitem - |documentsection|dump|error|execute|exit|feed|file|flush|form|forward|ftp|graph|graphdata - |header|htmlbody|htmlhead|http|httpparam|image|imap|import|include|index|input|insert|invoke|invokeargument - |layout|layoutarea|ldap|location|lock|log|login|loginuser|logout|loop|mail|mailparam|mailpart|map|mapitem|mediaplayer - |module|object|objectcache|output|pageencoding|pdf|pdfparam|pop|processingdirective|procparam|procresult - |query|queryparam|registry|rethrow|retry|savecontent|schedule|search|select|servlet|servletparam - |setting|silent|sleep|slider|stopwatch|storedproc|table|textinput|thread|throw|timer|trace|transaction - |update|video|videoplayer|videoplayerparam|wddx|window|xml|zip|zipparam) + (?: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|feed|file|fileupload|flush|form|formgroup|formitem|ftp|grid|gridcolumn + |gridrow|gridupdate|header|htmlhead|htmltopdf|htmltopdfitem|http|httpparam|image + |imap|imapfilter|import|include|index|input|insert|invoke|invokeargument|layout + |layoutarea|ldap|location|lock|log|login|loginuser|logout|loop|mail|mailparam|mailpart + |map|mapitem|mediaplayer|menu|menuitem|messagebox|module|ntauthenticate|oauth|object + |objectcache|output|param|pdf|pdfform|pdfformparam|pdfparam|pdfsubform|pod|pop + |presentation|presentationslide|presenter|print|processingdirective|procparam|procresult + |progressbar|property|query|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|try + |update|video|videoplayer|videoplayerparam|wddx|websocket|window|xml|zip|zipparam) )\( captures: 1: entity.name.tag.script.cfml @@ -960,97 +972,99 @@ contexts: - match: |- (?x)\b (?i: - (array(?:append|avg|clear|contains|containsnocase|delete|deleteat|each|every|filter - |find|findall|findallnocase|findnocase|first|indexexists|insertat|isdefined|isempty - |last|len|map|max|median|merge|mid|min|new|prepend|reduce|resize|reverse|set|slice - |some|sort|sum|swap|tolist|tostruct)|cache(?:clear|count|delete|get|getall|getallids - |getdefaultcachename|getmetadata|getproperties|getsession|idexists|keyexists|put|regionexists - |regionnew|regionremove|remove|removeall|setproperties)|component(?:cacheclear|cachelist - |info)|create(?:date|datetime|dynamicproxy|guid|object|odbcdate|odbcdatetime|odbctime - |time|timespan|uniqueid|uuid)|date(?:add|compare|convert|diff|format|part|timeformat) - |entity(?:delete|load|loadbyexample|loadbypk|merge|namearray|namelist|new|reload|save - |toquery)|get(?:applicationmetadata|applicationsettings|authuser|basetagdata|basetaglist - |basetemplatepath|builtinfunction|canonicalpath|classpath|clientvariableslist|componentmetadata - |contextroot|cpuusage|currentcontext|currenttemplatepath|directoryfrompath|encoding - |exception|filefrompath|fileinfo|freespace|functioncalledname|functiondata|functionkeywords - |functionlist|gatewayhelper|httprequestdata|httptimestring|k2serverdoccount|k2serverdoccountlimit - |locale|localedisplayname|localhostip|luceeid|memoryusage|metadata|metricdata|numericdate - |pagecontext|printerinfo|printerlist|profilesections|profilestring|readableimageformats - |safehtml|soaprequest|soaprequestheader|soapresponse|soapresponseheader|systemfreememory - |systemtotalmemory|tagdata|taglist|tempdirectory|tempfile|templatepath|tickcount|timezone - |timezoneinfo|token|totalspace|userroles|variable|vfsmetadata|writeableimageformats) - |image(?:addborder|blur|clearrect|copy|createcaptcha|crop|drawarc|drawbeveledrect - |drawcubiccurve|drawimage|drawline|drawlines|drawoval|drawpoint|drawquadraticcurve - |drawrect|drawroundrect|drawtext|filter|filtercolormap|filtercurves|filterkernel|filterwarpgrid - |flip|fonts|formats|getblob|getbufferedimage|getexifmetadata|getexiftag|getheight - |getiptcmetadata|getiptctag|getmetadata|getwidth|grayscale|info|makecolortransparent - |maketranslucent|negative|new|overlay|paste|read|readbase64|resize|rotate|rotatedrawingaxis - |scaletofit|setantialiasing|setbackgroundcolor|setdrawingalpha|setdrawingcolor|setdrawingstroke - |setdrawingtransparency|sharpen|shear|sheardrawingaxis|translate|translatedrawingaxis - |write|writebase64|xordrawingmode)|is(?:array|binary|boolean|closure|customfunction - |date|ddx|debugmode|defined|empty|fileobject|image|imagefile|instanceof|ipinrange - |ipv6|json|leapyear|localhost|notmap|null|numeric|numericdate|object|pdffile|pdfobject - |query|safehtml|simplevalue|soaprequest|spreadsheetfile|spreadsheetobject|struct|userinanyrole - |userinrole|userloggedin|valid|validoauthaccesstoken|videofile|wddx|xml|xmlattribute - |xmldoc|xmlelem|xmlnode|xmlroot|zipfile)|list(?:append|avg|changedelims|compact|contains - |containsnocase|deleteat|each|every|filter|find|findnocase|first|getat|indexexists - |insertat|itemtrim|last|len|map|prepend|qualify|reduce|removeduplicates|rest|setat - |some|sort|toarray|trim|valuecount|valuecountnocase)|object(?:equals|load|save)|orm(?:clearsession - |closeallsessions|closesession|evictcollection|evictentity|evictqueries|executequery - |flush|flushall|getsession|getsessionfactory|index|indexpurge|reload|search|searchoffline) - |query(?:addcolumn|addrow|columnarray|columncount|columndata|columnexists|columnlist - |convertforgrid|currentrow|deletecolumn|deleterow|each|every|execute|filter|getcell - |getrow|map|new|recordcount|reduce|rowdata|setcell|slice|some|sort)|replace(?:list - |nocase)|spreadsheet(?:addautofilter|addcolumn|addfreezepane|addimage|addinfo|addpagebreaks - |addrow|addrows|addsplitpane|createsheet|deletecolumn|deletecolumns|deleterow|deleterows - |formatcell|formatcellrange|formatcolumn|formatcolumns|formatrow|formatrows|getcellcomment - |getcellformula|getcellvalue|info|mergecells|new|read|readbinary|removesheet|setactivesheet - |setactivesheetnumber|setcellcomment|setcellformula|setcellvalue|setcolumnwidth|setfooter - |setheader|setrowheight|shiftcolumns|shiftrows|write)|store(?:addacl|getacl|getmetadata - |setacl|setmetadata)|struct(?:append|clear|copy|count|delete|each|every|filter|find - |findkey|findvalue|get|insert|isempty|keyarray|keyexists|keylist|keytranslate|map - |new|reduce|some|sort|update)|to(?:base64|binary|numeric|script|string)|transaction(?:commit - |rollback|setsavepoint)|url(?:decode|encode|encodedformat|sessionformat)|xml(?:childpos - |elemnew|format|getnodetype|new|parse|search|transform|validate)|abs|acos|addsoaprequestheader - |addsoapresponseheader|ajaxlink|ajaxonload|applicationstarttime|applicationstop|array - |asc|asin|atn|beat|binarydecode|binaryencode|bitand|bitmaskclear|bitmaskread|bitmaskset - |bitnot|bitor|bitshln|bitshrn|bitxor|callstackdump|callstackget|canonicalize|ceiling - |cfusion_decrypt|cfusion_encrypt|charsetdecode|charsetencode|chr|cjustify|collectioneach - |collectionevery|collectionfilter|collectionmap|collectionreduce|collectionsome|compare - |comparenocase|compress|contractpath|cos|csrfgeneratetoken|csrfverifytoken|ctcacheclear - |ctcachelist|datasourceflushmetacache|day|dayofweek|dayofweekasstring|dayofweekshortasstring - |dayofyear|daysinmonth|daysinyear|de|decimalformat|decodeforhtml|decodefromurl|decrementvalue - |decrypt|decryptbinary|deleteclientvariable|deserialize|deserializejson|deserializexml - |directorycopy|directorycreate|directorydelete|directoryexists|directorylist|directoryrename - |directorysize|dollarformat|dotnettocftype|duplicate|each|echo|empty|encodeforcss - |encodefordn|encodeforhtml|encodeforhtmlattribute|encodeforjavascript|encodeforldap - |encodeforurl|encodeforxml|encodeforxmlattribute|encodeforxpath|encrypt|encryptbinary - |esapidecode|esapiencode|evaluate|exp|expandpath|extract|fileappend|fileclose|filecopy - |filedelete|fileexists|filegetmimetype|fileiseof|filemove|fileopen|fileread|filereadbinary - |filereadline|fileseek|filesetaccessmode|filesetattribute|filesetlastmodified|fileskipbytes - |fileupload|fileuploadall|filewrite|filewriteline|find|findnocase|findoneof|firstdayofmonth - |fix|formatbasen|generatepbkdfkey|generatesecretkey|hash|hash40|hmac|hour|htmlcodeformat - |htmleditformat|htmlparse|iif|incrementvalue|inputbasen|insert|int|invalidateoauthaccesstoken - |invoke|javacast|jsstringformat|lcase|left|len|ljustify|location|log|log10|lscurrencyformat - |lsdateformat|lsdatetimeformat|lsdayofweek|lseurocurrencyformat|lsiscurrency|lsisdate - |lsisnumeric|lsnumberformat|lsparsecurrency|lsparsedatetime|lsparseeurocurrency|lsparsenumber - |lstimeformat|lsweek|ltrim|max|metaphone|mid|millisecond|min|minute|month|monthasstring - |monthshortasstring|newline|now|nowserver|nullvalue|numberformat|onapplicationend - |onapplicationstart|onerror|onmissingmethod|onmissingtemplate|onrequest|onrequestend - |onrequeststart|onsessionend|onsessionstart|pagepoolclear|pagepoollist|paragraphformat - |parameterexists|parsedatetime|parsenumber|pi|precisionevaluate|preservesinglequotes - |quarter|query|quotedvaluelist|rand|randomize|randrange|reescape|refind|refindnocase - |releasecomobject|rematch|rematchnocase|removecachedquery|removechars|repeatstring - |replace|rereplace|rereplacenocase|restdeleteapplication|restinitapplication|restsetresponse - |reverse|right|rjustify|round|rtrim|second|sendgatewaymessage|serialize|serializejson - |serializexml|sessiongetmetadata|sessioninvalidate|sessionrotate|sessionstarttime - |setencoding|setlocale|setprofilestring|settimezone|setvariable|sgn|sin|sizeof|sleep - |soundex|spanexcluding|spanincluding|sqr|sslcertificateinstall|sslcertificatelist - |stringlen|stripcr|systemcacheclear|systemoutput|tan|threadjoin|threadterminate|throw - |timeformat|trace|trim|truefalseformat|ucase|ucfirst|unserializejava|val|valuearray - |valuelist|verifyclient|week|wrap|writebody|writedump|writelog|writeoutput|wsgetallchannels - |wsgetsubscribers|wspublish|wssendmessage|year|yesnoformat) - )(?=\() + (array(?:append|avg|clear|contains|containsnocase|delete|deleteat|deletenocase|each + |every|filter|find|findall|findallnocase|findnocase|first|indexexists|insertat|isdefined + |isempty|last|len|map|max|median|merge|mid|min|new|prepend|reduce|resize|reverse + |set|slice|some|sort|sum|swap|tolist|tostruct)|cache(?:clear|count|delete|get|getall + |getallids|getdefaultcachename|getmetadata|getproperties|getsession|idexists|keyexists + |put|regionexists|regionnew|regionremove|remove|removeall|setproperties)|component(?:cacheclear + |cachelist|info)|create(?:date|datetime|dynamicproxy|guid|object|odbcdate|odbcdatetime + |odbctime|time|timespan|uniqueid|uuid)|date(?:add|compare|convert|diff|format|part + |timeformat)|entity(?:delete|load|loadbyexample|loadbypk|merge|namearray|namelist + |new|reload|save|toquery)|get(?:applicationmetadata|applicationsettings|authuser + |basetagdata|basetaglist|basetemplatepath|builtinfunction|canonicalpath|classpath + |clientvariableslist|componentmetadata|contextroot|cpuusage|currentcontext|currenttemplatepath + |directoryfrompath|encoding|exception|filefrompath|fileinfo|freespace|functioncalledname + |functiondata|functionkeywords|functionlist|gatewayhelper|httprequestdata|httptimestring + |k2serverdoccount|k2serverdoccountlimit|locale|localedisplayname|localhostip|luceeid + |memoryusage|metadata|metricdata|numericdate|pagecontext|printerinfo|printerlist + |profilesections|profilestring|readableimageformats|safehtml|soaprequest|soaprequestheader + |soapresponse|soapresponseheader|systemfreememory|systemtotalmemory|tagdata|taglist + |tempdirectory|tempfile|templatepath|tickcount|timezone|timezoneinfo|token|totalspace + |userroles|variable|vfsmetadata|writeableimageformats)|image(?:addborder|blur|clearrect + |copy|createcaptcha|crop|drawarc|drawbeveledrect|drawcubiccurve|drawimage|drawline + |drawlines|drawoval|drawpoint|drawquadraticcurve|drawrect|drawroundrect|drawtext + |filter|filtercolormap|filtercurves|filterkernel|filterwarpgrid|flip|fonts|formats + |getblob|getbufferedimage|getexifmetadata|getexiftag|getheight|getiptcmetadata|getiptctag + |getmetadata|getwidth|grayscale|info|makecolortransparent|maketranslucent|negative + |new|overlay|paste|read|readbase64|resize|rotate|rotatedrawingaxis|scaletofit|setantialiasing + |setbackgroundcolor|setdrawingalpha|setdrawingcolor|setdrawingstroke|setdrawingtransparency + |sharpen|shear|sheardrawingaxis|translate|translatedrawingaxis|write|writebase64 + |xordrawingmode)|is(?:array|binary|boolean|closure|customfunction|date|ddx|debugmode + |defined|empty|fileobject|image|imagefile|instanceof|ipinrange|ipv6|json|leapyear + |localhost|notmap|null|numeric|numericdate|object|pdffile|pdfobject|query|safehtml + |simplevalue|soaprequest|spreadsheetfile|spreadsheetobject|struct|userinanyrole|userinrole + |userloggedin|valid|validoauthaccesstoken|videofile|wddx|xml|xmlattribute|xmldoc + |xmlelem|xmlnode|xmlroot|zipfile)|list(?:append|avg|changedelims|compact|contains + |containsnocase|deleteat|each|every|filter|find|findnocase|first|getat|indexexists + |insertat|itemtrim|last|len|map|prepend|qualify|reduce|removeduplicates|rest|setat + |some|sort|toarray|trim|valuecount|valuecountnocase)|object(?:equals|load|save)|orm(?:clearsession + |closeallsessions|closesession|evictcollection|evictentity|evictqueries|executequery + |flush|flushall|getsession|getsessionfactory|index|indexpurge|reload|search|searchoffline) + |query(?:addcolumn|addrow|columnarray|columncount|columndata|columnexists|columnlist + |convertforgrid|currentrow|deletecolumn|deleterow|each|every|execute|filter|getcell + |getrow|map|new|recordcount|reduce|rowdata|setcell|slice|some|sort)|replace(?:list + |nocase)|spreadsheet(?:addautofilter|addcolumn|addfreezepane|addimage|addinfo|addpagebreaks + |addrow|addrows|addsplitpane|createsheet|deletecolumn|deletecolumns|deleterow|deleterows + |formatcell|formatcellrange|formatcolumn|formatcolumns|formatrow|formatrows|getcellcomment + |getcellformula|getcellvalue|info|mergecells|new|read|readbinary|removesheet|setactivesheet + |setactivesheetnumber|setcellcomment|setcellformula|setcellvalue|setcolumnwidth|setfooter + |setheader|setrowheight|shiftcolumns|shiftrows|write)|store(?:addacl|getacl|getmetadata + |setacl|setmetadata)|struct(?:append|clear|copy|count|delete|each|every|filter|find + |findkey|findvalue|get|insert|isempty|keyarray|keyexists|keylist|keytranslate|map + |new|reduce|some|sort|update)|to(?:base64|binary|numeric|script|string)|transaction(?:commit + |rollback|setsavepoint)|url(?:decode|encode|encodedformat|sessionformat)|xml(?:childpos + |elemnew|format|getnodetype|new|parse|search|transform|validate)|abs|acos|addsoaprequestheader + |addsoapresponseheader|ajaxlink|ajaxonload|applicationstarttime|applicationstop|array + |asc|asin|atn|beat|binarydecode|binaryencode|bitand|bitmaskclear|bitmaskread|bitmaskset + |bitnot|bitor|bitshln|bitshrn|bitxor|booleanformat|callstackdump|callstackget|canonicalize + |ceiling|cfusion_decrypt|cfusion_encrypt|charsetdecode|charsetencode|chr|cjustify + |collectioneach|collectionevery|collectionfilter|collectionmap|collectionreduce|collectionsome + |compare|comparenocase|compress|contractpath|cos|csrfgeneratetoken|csrfverifytoken + |ctcacheclear|ctcachelist|datasourceflushmetacache|day|dayofweek|dayofweekasstring + |dayofweekshortasstring|dayofyear|daysinmonth|daysinyear|de|decimalformat|decodeforhtml + |decodefromurl|decrementvalue|decrypt|decryptbinary|deleteclientvariable|deserialize + |deserializejson|deserializexml|directorycopy|directorycreate|directorydelete|directoryexists + |directorylist|directoryrename|directorysize|dollarformat|dotnettocftype|duplicate + |each|echo|empty|encodeforcss|encodefordn|encodeforhtml|encodeforhtmlattribute|encodeforjavascript + |encodeforldap|encodeforurl|encodeforxml|encodeforxmlattribute|encodeforxpath|encrypt + |encryptbinary|esapidecode|esapiencode|evaluate|exp|expandpath|extract|fileappend + |fileclose|filecopy|filedelete|fileexists|filegetmimetype|fileiseof|filemove|fileopen + |fileread|filereadbinary|filereadline|fileseek|filesetaccessmode|filesetattribute + |filesetlastmodified|fileskipbytes|fileupload|fileuploadall|filewrite|filewriteline + |find|findnocase|findoneof|firstdayofmonth|fix|floor|formatbasen|generatepbkdfkey + |generatesecretkey|hash|hash40|hmac|hour|htmlcodeformat|htmleditformat|htmlparse + |iif|incrementvalue|inputbasen|insert|int|invalidateoauthaccesstoken|invoke|javacast + |jsstringformat|lcase|left|len|ljustify|location|log|log10|lscurrencyformat|lsdateformat + |lsdatetimeformat|lsdayofweek|lseurocurrencyformat|lsiscurrency|lsisdate|lsisnumeric + |lsnumberformat|lsparsecurrency|lsparsedatetime|lsparseeurocurrency|lsparsenumber + |lstimeformat|lsweek|ltrim|max|metaphone|mid|millisecond|min|minute|month|monthasstring + |monthshortasstring|newline|now|nowserver|nullvalue|numberformat|onapplicationend + |onapplicationstart|onerror|onmissingmethod|onmissingtemplate|onrequest|onrequestend + |onrequeststart|onsessionend|onsessionstart|pagepoolclear|pagepoollist|paragraphformat + |parameterexists|parsedatetime|parsenumber|pi|precisionevaluate|preservesinglequotes + |quarter|query|quotedvaluelist|rand|randomize|randrange|reescape|refind|refindnocase + |releasecomobject|rematch|rematchnocase|removecachedquery|removechars|repeatstring + |replace|rereplace|rereplacenocase|restdeleteapplication|restinitapplication|restsetresponse + |reverse|right|rjustify|round|rtrim|second|sendgatewaymessage|serialize|serializejson + |serializexml|sessiongetmetadata|sessioninvalidate|sessionrotate|sessionstarttime + |setencoding|setlocale|setprofilestring|settimezone|setvariable|sgn|sin|sizeof|sleep + |soundex|spanexcluding|spanincluding|sqr|sslcertificateinstall|sslcertificatelist + |stringlen|stripcr|systemcacheclear|systemoutput|tan|threadjoin|threadterminate|throw + |timeformat|trace|trim|truefalseformat|ucase|ucfirst|unserializejava|val|valuearray + |valuelist|verifyclient|week|wrap|writebody|writedump|writelog|writeoutput|wsgetallchannels + |wsgetsubscribers|wspublish|wssendmessage|year|yesnoformat) + )(?=\() captures: 1: support.function.cfml set: