Merge pull request github-linguist#1405 from seancoyne/coldfusion-lex…

…er-update distinguish between ColdFusion HTML and ColdFusion CFCs
AsherBond · Aug 14, 2014 · 0ec85f9 · 0ec85f9
2 parents e27bf16 + abdd6bf
commit 0ec85f9
Show file tree

Hide file tree

Showing 5 changed files with 551 additions and 3 deletions.
diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml
@@ -413,14 +413,27 @@ CoffeeScript:
 
 ColdFusion:
   type: programming
+  group: ColdFusion
   lexer: Coldfusion HTML
   ace_mode: coldfusion
   color: "#ed2cd6"
   search_term: cfm
   aliases:
   - cfm
+  - cfml
   extensions:
   - .cfm
+
+ColdFusion CFC:
+  type: programming
+  group: ColdFusion
+  lexer: Coldfusion CFC
+  ace_mode: coldfusion
+  color: "#ed2cd6"
+  search_term: cfc
+  aliases:
+  - cfc
+  extensions:
   - .cfc
 
 Common Lisp:

diff --git a/lib/linguist/samples.json b/lib/linguist/samples.json
@@ -101,6 +101,12 @@
     "CoffeeScript": [
       ".coffee"
     ],
+    "ColdFusion": [
+      ".cfm"
+    ],
+    "ColdFusion CFC": [
+      ".cfc"
+    ],
     "Common Lisp": [
       ".cl",
       ".lisp"
@@ -823,8 +829,8 @@
       "exception.zep.php"
     ]
   },
-  "tokens_total": 650933,
-  "languages_total": 889,
+  "tokens_total": 651675,
+  "languages_total": 892,
   "tokens": {
     "ABAP": {
       "*/**": 1,
@@ -17000,6 +17006,224 @@
       "xFF": 1,
       "ip.join": 1
     },
+    "ColdFusion": {
+      "-": 12,
+      "<html>": 1,
+      "<head>": 1,
+      "<title>": 1,
+      "Date": 1,
+      "Functions": 1,
+      "</title>": 1,
+      "</head>": 1,
+      "<body>": 1,
+      "<cfset>": 15,
+      "RightNow": 7,
+      "Now": 1,
+      "<cfoutput>": 3,
+      "#RightNow#": 1,
+      "<br>": 8,
+      "#DateFormat": 2,
+      "(": 8,
+      ")": 8,
+      "#": 8,
+      "#TimeFormat": 2,
+      "#IsDate": 3,
+      "#DaysInMonth": 1,
+      "</cfoutput>": 3,
+      "x=": 1,
+      "y=": 1,
+      "z=": 1,
+      "group=": 1,
+      "#x#": 1,
+      "#y#": 1,
+      "#z#": 1,
+      "</body>": 1,
+      "</html>": 1,
+      "person": 2,
+      "Paul": 1,
+      "greeting": 2,
+      "Hello": 2,
+      "world": 1,
+      "a": 7,
+      "5": 1,
+      "b": 7,
+      "10": 1,
+      "c": 6,
+      "MOD": 1,
+      "comment": 1
+    },
+    "ColdFusion CFC": {
+      "component": 1,
+      "extends": 1,
+      "singleton": 1,
+      "{": 22,
+      "//": 16,
+      "DI": 1,
+      "property": 10,
+      "name": 10,
+      "inject": 10,
+      ";": 55,
+      "ContentService": 1,
+      "function": 12,
+      "init": 2,
+      "(": 58,
+      "entityName": 2,
+      ")": 58,
+      "it": 1,
+      "super.init": 1,
+      "arguments.entityName": 1,
+      "useQueryCaching": 1,
+      "true": 12,
+      "Test": 1,
+      "scope": 1,
+      "coloring": 1,
+      "in": 1,
+      "pygments": 1,
+      "this.colorTestVar": 1,
+      "cookie.colorTestVar": 1,
+      "client.colorTestVar": 1,
+      "session.colorTestVar": 1,
+      "application.colorTestVar": 1,
+      "return": 11,
+      "this": 10,
+      "}": 22,
+      "clearAllCaches": 1,
+      "boolean": 6,
+      "async": 7,
+      "false": 7,
+      "var": 15,
+      "settings": 6,
+      "settingService.getAllSettings": 6,
+      "asStruct": 6,
+      "Get": 6,
+      "appropriate": 6,
+      "cache": 12,
+      "provider": 6,
+      "cacheBox.getCache": 6,
+      "settings.cb_content_cacheName": 6,
+      "cache.clearByKeySnippet": 3,
+      "keySnippet": 3,
+      "arguments.async": 3,
+      "clearAllPageWrapperCaches": 1,
+      "clearPageWrapperCaches": 1,
+      "required": 5,
+      "any": 5,
+      "slug": 2,
+      "clearPageWrapper": 1,
+      "cache.clear": 3,
+      "searchContent": 1,
+      "searchTerm": 1,
+      "numeric": 2,
+      "max": 2,
+      "offset": 2,
+      "asQuery": 2,
+      "sortOrder": 2,
+      "isPublished": 1,
+      "searchActiveContent": 1,
+      "results": 2,
+      "c": 1,
+      "newCriteria": 1,
+      "only": 1,
+      "published": 1,
+      "content": 2,
+      "if": 4,
+      "isBoolean": 1,
+      "arguments.isPublished": 3,
+      "Published": 2,
+      "bit": 1,
+      "c.isEq": 1,
+      "javaCast": 1,
+      "eq": 1,
+      "evaluate": 1,
+      "other": 1,
+      "params": 1,
+      "c.isLt": 1,
+      "now": 2,
+      ".": 1,
+      "or": 3,
+      "c.restrictions.isNull": 1,
+      "c.restrictions.isGT": 1,
+      ".isEq": 1,
+      "Search": 1,
+      "Criteria": 1,
+      "len": 1,
+      "arguments.searchTerm": 1,
+      "like": 1,
+      "disjunctions": 1,
+      "c.createAlias": 1,
+      "Do": 1,
+      "we": 1,
+      "search": 1,
+      "title": 2,
+      "and": 2,
+      "active": 1,
+      "just": 1,
+      "arguments.searchActiveContent": 1,
+      "c.": 1,
+      "c.restrictions.like": 2,
+      "else": 1,
+      "c.like": 1,
+      "run": 1,
+      "criteria": 1,
+      "query": 1,
+      "projections": 1,
+      "count": 1,
+      "results.count": 1,
+      "c.count": 1,
+      "results.content": 1,
+      "c.resultTransformer": 1,
+      "c.DISTINCT_ROOT_ENTITY": 1,
+      ".list": 1,
+      "arguments.offset": 1,
+      "arguments.max": 1,
+      "arguments.sortOrder": 1,
+      "arguments.asQuery": 1,
+      "private": 4,
+      "syncUpdateHits": 1,
+      "contentID": 1,
+      "q": 1,
+      "new": 1,
+      "Query": 1,
+      "sql": 1,
+      ".execute": 1,
+      "closureTest": 1,
+      "methodCall": 1,
+      "param1": 2,
+      "arg1": 4,
+      "arg2": 2,
+      "StructliteralTest": 1,
+      "foo": 3,
+      "bar": 1,
+      "brad": 3,
+      "func": 1,
+      "array": 1,
+      "[": 2,
+      "wood": 2,
+      "null": 2,
+      "]": 2,
+      "last": 1,
+      "arrayliteralTest": 1,
+      "<cfcomponent>": 1,
+      "<cffunction>": 2,
+      "name=": 4,
+      "access=": 2,
+      "returntype=": 2,
+      "<cfargument>": 2,
+      "type=": 2,
+      "required=": 2,
+      "<cfset>": 2,
+      "myVariable": 1,
+      "arguments": 2,
+      "<cfreturn>": 1,
+      "</cffunction>": 2,
+      "<cfif>": 1,
+      "structKeyExists": 1,
+      "writeoutput": 1,
+      "Argument": 1,
+      "exists": 1,
+      "</cfif>": 1,
+      "</cfcomponent>": 1
+    },
     "Common Lisp": {
       ";": 152,
       "@file": 1,
@@ -71905,6 +72129,8 @@
     "Cirru": 244,
     "Clojure": 1899,
     "CoffeeScript": 2951,
+    "ColdFusion": 131,
+    "ColdFusion CFC": 611,
     "Common Lisp": 2186,
     "Component Pascal": 825,
     "Coq": 18259,
@@ -72111,6 +72337,8 @@
     "Cirru": 9,
     "Clojure": 8,
     "CoffeeScript": 9,
+    "ColdFusion": 1,
+    "ColdFusion CFC": 2,
     "Common Lisp": 3,
     "Component Pascal": 2,
     "Coq": 12,
@@ -72289,5 +72517,5 @@
     "fish": 3,
     "wisp": 1
   },
-  "md5": "3b349c5b6b0d9369054035bf0a734463"
+  "md5": "6ad93b92805b6680a539a188d7c820fa"
 }