github-linguist 5.3.1 → 5.3.2

data/grammars/source.coffee.json

@@ -11,22 +11,22 @@
   "firstLineMatch": "(?x)\n# Hashbang\n^\\#!.*(?:\\s|\\/)\n  coffee\n(?:$|\\s)\n|\n# Modeline\n(?i:\n  # Emacs\n  -\\*-(?:\\s*(?=[^:;\\s]+\\s*-\\*-)|(?:.*?[;\\s]|(?<=-\\*-))mode\\s*:\\s*)\n    coffee\n  (?=[\\s;]|(?<![-*])-\\*-).*?-\\*-\n  |\n  # Vim\n  (?:(?:\\s|^)vi(?:m[<=>]?\\d+|m)?|\\sex)(?=:(?=\\s*set?\\s[^\\n:]+:)|:(?!\\s*set?\\s))(?:(?:\\s|\\s*:\\s*)\\w*(?:\\s*=(?:[^\\n\\\\\\s]|\\\\.)*)?)*[\\s:](?:filetype|ft|syntax)\\s*=\n    coffee\n  (?=\\s|:|$)\n)",
   "patterns": [
     {
+      "match": "(new)\\s+(?:(?:(class)\\s+(\\w+(?:\\.\\w*)*)?)|(\\w+(?:\\.\\w*)*))",
+      "name": "meta.class.instance.constructor.coffee",
       "captures": {
         "1": {
           "name": "keyword.operator.new.coffee"
         },
-        "4": {
+        "2": {
           "name": "storage.type.class.coffee"
         },
-        "6": {
+        "3": {
           "name": "entity.name.type.instance.coffee"
         },
-        "7": {
+        "4": {
           "name": "entity.name.type.instance.coffee"
         }
-      },
-      "match": "(new)\\s+(((class)(\\s+(\\w+(?:\\.\\w*)*))?)|(\\w+(?:\\.\\w*)*))",
-      "name": "meta.class.instance.constructor"
+      }
     },
     {
       "begin": "'''",
@@ -41,7 +41,7 @@
           "name": "punctuation.definition.string.end.coffee"
         }
       },
-      "name": "string.quoted.heredoc.coffee",
+      "name": "string.quoted.single.heredoc.coffee",
       "patterns": [
         {
           "captures": {
@@ -137,7 +137,7 @@
     {
       "begin": "///",
       "end": "(///)[gimuy]*",
-      "name": "string.regexp.coffee",
+      "name": "string.regexp.multiline.coffee",
       "beginCaptures": {
         "0": {
           "name": "punctuation.definition.string.begin.coffee"
@@ -529,13 +529,13 @@
     "arguments": {
       "patterns": [
         {
-          "begin": "(?=(@|@?[\\w$]+|[=-]>|\\-\\d|\\[|{|\"|'))|\\(",
+          "begin": "\\(",
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.arguments.begin.bracket.round.coffee"
             }
           },
-          "end": "\\)|(?=\\s*(?<![\\w$])(of|in|then|is|isnt|and|or|for|else|when|if|unless|by|instanceof)(?![\\w$]))|(?=\\s*(}|#|$))",
+          "end": "\\)",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.arguments.end.bracket.round.coffee"
@@ -547,6 +547,16 @@
               "include": "$self"
             }
           ]
+        },
+        {
+          "begin": "(?=(@|@?[\\w$]+|[=-]>|\\-\\d|\\[|{|\"|'))",
+          "end": "(?=\\s*(?<![\\w$])(of|in|then|is|isnt|and|or|for|else|when|if|unless|by|instanceof)(?![\\w$]))|(?=\\s*(}|\\]|\\)|#|$))",
+          "name": "meta.arguments.coffee",
+          "patterns": [
+            {
+              "include": "$self"
+            }
+          ]
         }
       ]
     },
@@ -586,7 +596,7 @@
     "function_calls": {
       "patterns": [
         {
-          "begin": "(?x)\n(@)?([\\w$]+)\n\\s*\n(?=\\s+(?!(?<![\\w$])(of|in|then|is|isnt|and|or|for|else|when|if|unless|by|instanceof)(?![\\w$]))(?=(@?[\\w$]+|[=-]>|\\-\\d|\\[|\\{|\"|'))|(?=\\())",
+          "begin": "(@)?([\\w$]+)(?=\\()",
           "beginCaptures": {
             "1": {
               "name": "variable.other.readwrite.instance.coffee"
@@ -594,21 +604,34 @@
             "2": {
               "patterns": [
                 {
-                  "match": "(?x)\n\\b(isNaN|isFinite|eval|uneval|parseInt|parseFloat|decodeURI|\ndecodeURIComponent|encodeURI|encodeURIComponent|escape|unescape|\nrequire|set(Interval|Timeout)|clear(Interval|Timeout))\\b",
-                  "name": "support.function.coffee"
-                },
-                {
-                  "match": "[a-zA-Z_$][\\w$]*",
-                  "name": "entity.name.function.coffee"
-                },
+                  "include": "#function_names"
+                }
+              ]
+            }
+          },
+          "end": "(?<=\\))",
+          "name": "meta.function-call.coffee",
+          "patterns": [
+            {
+              "include": "#arguments"
+            }
+          ]
+        },
+        {
+          "begin": "(?x)\n(@)?([\\w$]+)\n\\s*\n(?=\\s+(?!(?<![\\w$])(of|in|then|is|isnt|and|or|for|else|when|if|unless|by|instanceof)(?![\\w$]))(?=(@?[\\w$]+|[=-]>|\\-\\d|\\[|{|\"|')))",
+          "beginCaptures": {
+            "1": {
+              "name": "variable.other.readwrite.instance.coffee"
+            },
+            "2": {
+              "patterns": [
                 {
-                  "match": "\\d[\\w$]*",
-                  "name": "invalid.illegal.identifier.coffee"
+                  "include": "#function_names"
                 }
               ]
             }
           },
-          "end": "(?<=\\))|(?=\\s*(?<![\\w$])(of|in|then|is|isnt|and|or|for|else|when|if|unless|by|instanceof)(?![\\w$]))|(?=\\s*(}|#|$))",
+          "end": "(?=\\s*(?<![\\w$])(of|in|then|is|isnt|and|or|for|else|when|if|unless|by|instanceof)(?![\\w$]))|(?=\\s*(}|\\]|\\)|#|$))",
           "name": "meta.function-call.coffee",
           "patterns": [
             {
@@ -618,6 +641,22 @@
         }
       ]
     },
+    "function_names": {
+      "patterns": [
+        {
+          "match": "(?x)\n\\b(isNaN|isFinite|eval|uneval|parseInt|parseFloat|decodeURI|\ndecodeURIComponent|encodeURI|encodeURIComponent|escape|unescape|\nrequire|set(Interval|Timeout)|clear(Interval|Timeout))\\b",
+          "name": "support.function.coffee"
+        },
+        {
+          "match": "[a-zA-Z_$][\\w$]*",
+          "name": "entity.name.function.coffee"
+        },
+        {
+          "match": "\\d[\\w$]*",
+          "name": "invalid.illegal.identifier.coffee"
+        }
+      ]
+    },
     "function_params": {
       "patterns": [
         {
@@ -707,7 +746,7 @@
     "method_calls": {
       "patterns": [
         {
-          "begin": "(?:(\\.)|(::))\\s*([\\w$]+)\\s*(?=\\s+(?!(?<![\\w$])(of|in|then|is|isnt|and|or|for|else|when|if|unless|by|instanceof)(?![\\w$]))(?=(@|@?[\\w$]+|[=-]>|\\-\\d|\\[|\\{|\"|'))|(?=\\())",
+          "begin": "(?:(\\.)|(::))\\s*([\\w$]+)\\s*(?=\\()",
           "beginCaptures": {
             "1": {
               "name": "punctuation.separator.method.period.coffee"
@@ -718,29 +757,37 @@
             "3": {
               "patterns": [
                 {
-                  "match": "(?x)\n\\bon(Rowsinserted|Rowsdelete|Rowenter|Rowexit|Resize|Resizestart|Resizeend|Reset|\nReadystatechange|Mouseout|Mouseover|Mousedown|Mouseup|Mousemove|\nBefore(cut|deactivate|unload|update|paste|print|editfocus|activate)|\nBlur|Scrolltop|Submit|Select|Selectstart|Selectionchange|Hover|Help|\nChange|Contextmenu|Controlselect|Cut|Cellchange|Clock|Close|Deactivate|\nDatasetchanged|Datasetcomplete|Dataavailable|Drop|Drag|Dragstart|Dragover|\nDragdrop|Dragenter|Dragend|Dragleave|Dblclick|Unload|Paste|Propertychange|Error|\nErrorupdate|Keydown|Keyup|Keypress|Focus|Load|Activate|Afterupdate|Afterprint|Abort)\\b",
-                  "name": "support.function.event-handler.coffee"
-                },
-                {
-                  "match": "(?x)\n\\b(shift|showModelessDialog|showModalDialog|showHelp|scroll|scrollX|scrollByPages|\nscrollByLines|scrollY|scrollTo|stop|strike|sizeToContent|sidebar|signText|sort|\nsup|sub|substr|substring|splice|split|send|set(Milliseconds|Seconds|Minutes|Hours|\nMonth|Year|FullYear|Date|UTC(Milliseconds|Seconds|Minutes|Hours|Month|FullYear|Date)|\nTime|Hotkeys|Cursor|ZOptions|Active|Resizable|RequestHeader)|search|slice|\nsavePreferences|small|home|handleEvent|navigate|char|charCodeAt|charAt|concat|\ncontextual|confirm|compile|clear|captureEvents|call|createStyleSheet|createPopup|\ncreateEventObject|to(GMTString|UTCString|String|Source|UpperCase|LowerCase|LocaleString)|\ntest|taint|taintEnabled|indexOf|italics|disableExternalCapture|dump|detachEvent|unshift|\nuntaint|unwatch|updateCommands|join|javaEnabled|pop|push|plugins.refresh|paddings|parse|\nprint|prompt|preference|enableExternalCapture|exec|execScript|valueOf|UTC|find|file|\nfileModifiedDate|fileSize|fileCreatedDate|fileUpdatedDate|fixed|fontsize|fontcolor|\nforward|fromCharCode|watch|link|load|lastIndexOf|anchor|attachEvent|atob|apply|alert|\nabort|routeEvents|resize|resizeBy|resizeTo|recalc|returnValue|replace|reverse|reload|\nreleaseCapture|releaseEvents|go|get(Milliseconds|Seconds|Minutes|Hours|Month|Day|Year|FullYear|\nTime|Date|TimezoneOffset|UTC(Milliseconds|Seconds|Minutes|Hours|Day|Month|FullYear|Date)|\nAttention|Selection|ResponseHeader|AllResponseHeaders)|moveBy|moveBelow|moveTo|\nmoveToAbsolute|moveAbove|mergeAttributes|match|margins|btoa|big|bold|borderWidths|blink|back)\\b",
-                  "name": "support.function.coffee"
-                },
-                {
-                  "match": "(?x)\n\\b(acceptNode|add|addEventListener|addTextTrack|adoptNode|after|animate|append|\nappendChild|appendData|before|blur|canPlayType|captureStream|\ncaretPositionFromPoint|caretRangeFromPoint|checkValidity|clear|click|\ncloneContents|cloneNode|cloneRange|close|closest|collapse|\ncompareBoundaryPoints|compareDocumentPosition|comparePoint|contains|\nconvertPointFromNode|convertQuadFromNode|convertRectFromNode|createAttribute|\ncreateAttributeNS|createCaption|createCDATASection|createComment|\ncreateContextualFragment|createDocument|createDocumentFragment|\ncreateDocumentType|createElement|createElementNS|createEntityReference|\ncreateEvent|createExpression|createHTMLDocument|createNodeIterator|\ncreateNSResolver|createProcessingInstruction|createRange|createShadowRoot|\ncreateTBody|createTextNode|createTFoot|createTHead|createTreeWalker|delete|\ndeleteCaption|deleteCell|deleteContents|deleteData|deleteRow|deleteTFoot|\ndeleteTHead|detach|disconnect|dispatchEvent|elementFromPoint|elementsFromPoint|\nenableStyleSheetsForSet|entries|evaluate|execCommand|exitFullscreen|\nexitPointerLock|expand|extractContents|fastSeek|firstChild|focus|forEach|get|\ngetAll|getAnimations|getAttribute|getAttributeNames|getAttributeNode|\ngetAttributeNodeNS|getAttributeNS|getBoundingClientRect|getBoxQuads|\ngetClientRects|getContext|getDestinationInsertionPoints|getElementById|\ngetElementsByClassName|getElementsByName|getElementsByTagName|\ngetElementsByTagNameNS|getItem|getNamedItem|getSelection|getStartDate|\ngetVideoPlaybackQuality|has|hasAttribute|hasAttributeNS|hasAttributes|\nhasChildNodes|hasFeature|hasFocus|importNode|initEvent|insertAdjacentElement|\ninsertAdjacentHTML|insertAdjacentText|insertBefore|insertCell|insertData|\ninsertNode|insertRow|intersectsNode|isDefaultNamespace|isEqualNode|\nisPointInRange|isSameNode|item|key|keys|lastChild|load|lookupNamespaceURI|\nlookupPrefix|matches|move|moveAttribute|moveAttributeNode|moveChild|\nmoveNamedItem|namedItem|nextNode|nextSibling|normalize|observe|open|\nparentNode|pause|play|postMessage|prepend|preventDefault|previousNode|\npreviousSibling|probablySupportsContext|queryCommandEnabled|\nqueryCommandIndeterm|queryCommandState|queryCommandSupported|queryCommandValue|\nquerySelector|querySelectorAll|registerContentHandler|registerElement|\nregisterProtocolHandler|releaseCapture|releaseEvents|remove|removeAttribute|\nremoveAttributeNode|removeAttributeNS|removeChild|removeEventListener|\nremoveItem|replace|replaceChild|replaceData|replaceWith|reportValidity|\nrequestFullscreen|requestPointerLock|reset|scroll|scrollBy|scrollIntoView|\nscrollTo|seekToNextFrame|select|selectNode|selectNodeContents|set|setAttribute|\nsetAttributeNode|setAttributeNodeNS|setAttributeNS|setCapture|\nsetCustomValidity|setEnd|setEndAfter|setEndBefore|setItem|setNamedItem|\nsetRangeText|setSelectionRange|setSinkId|setStart|setStartAfter|setStartBefore|\nslice|splitText|stepDown|stepUp|stopImmediatePropagation|stopPropagation|\nsubmit|substringData|supports|surroundContents|takeRecords|terminate|toBlob|\ntoDataURL|toggle|toString|values|write|writeln)\\b",
-                  "name": "support.function.dom.coffee"
-                },
-                {
-                  "match": "[a-zA-Z_$][\\w$]*",
-                  "name": "entity.name.function.coffee"
-                },
+                  "include": "#method_names"
+                }
+              ]
+            }
+          },
+          "end": "(?<=\\))",
+          "name": "meta.method-call.coffee",
+          "patterns": [
+            {
+              "include": "#arguments"
+            }
+          ]
+        },
+        {
+          "begin": "(?:(\\.)|(::))\\s*([\\w$]+)\\s*(?=\\s+(?!(?<![\\w$])(of|in|then|is|isnt|and|or|for|else|when|if|unless|by|instanceof)(?![\\w$]))(?=(@|@?[\\w$]+|[=-]>|\\-\\d|\\[|{|\"|')))",
+          "beginCaptures": {
+            "1": {
+              "name": "punctuation.separator.method.period.coffee"
+            },
+            "2": {
+              "name": "keyword.operator.prototype.coffee"
+            },
+            "3": {
+              "patterns": [
                 {
-                  "match": "\\d[\\w$]*",
-                  "name": "invalid.illegal.identifier.coffee"
+                  "include": "#method_names"
                 }
               ]
             }
           },
-          "end": "(?<=\\))|(?=\\s*(?<![\\w$])(of|in|then|is|isnt|and|or|for|else|when|if|unless|by|instanceof)(?![\\w$]))|(?=\\s*(}|#|$))",
+          "end": "(?=\\s*(?<![\\w$])(of|in|then|is|isnt|and|or|for|else|when|if|unless|by|instanceof)(?![\\w$]))|(?=\\s*(}|\\]|\\)|#|$))",
           "name": "meta.method-call.coffee",
           "patterns": [
             {
@@ -750,6 +797,30 @@
         }
       ]
     },
+    "method_names": {
+      "patterns": [
+        {
+          "match": "(?x)\n\\bon(Rowsinserted|Rowsdelete|Rowenter|Rowexit|Resize|Resizestart|Resizeend|Reset|\nReadystatechange|Mouseout|Mouseover|Mousedown|Mouseup|Mousemove|\nBefore(cut|deactivate|unload|update|paste|print|editfocus|activate)|\nBlur|Scrolltop|Submit|Select|Selectstart|Selectionchange|Hover|Help|\nChange|Contextmenu|Controlselect|Cut|Cellchange|Clock|Close|Deactivate|\nDatasetchanged|Datasetcomplete|Dataavailable|Drop|Drag|Dragstart|Dragover|\nDragdrop|Dragenter|Dragend|Dragleave|Dblclick|Unload|Paste|Propertychange|Error|\nErrorupdate|Keydown|Keyup|Keypress|Focus|Load|Activate|Afterupdate|Afterprint|Abort)\\b",
+          "name": "support.function.event-handler.coffee"
+        },
+        {
+          "match": "(?x)\n\\b(shift|showModelessDialog|showModalDialog|showHelp|scroll|scrollX|scrollByPages|\nscrollByLines|scrollY|scrollTo|stop|strike|sizeToContent|sidebar|signText|sort|\nsup|sub|substr|substring|splice|split|send|set(Milliseconds|Seconds|Minutes|Hours|\nMonth|Year|FullYear|Date|UTC(Milliseconds|Seconds|Minutes|Hours|Month|FullYear|Date)|\nTime|Hotkeys|Cursor|ZOptions|Active|Resizable|RequestHeader)|search|slice|\nsavePreferences|small|home|handleEvent|navigate|char|charCodeAt|charAt|concat|\ncontextual|confirm|compile|clear|captureEvents|call|createStyleSheet|createPopup|\ncreateEventObject|to(GMTString|UTCString|String|Source|UpperCase|LowerCase|LocaleString)|\ntest|taint|taintEnabled|indexOf|italics|disableExternalCapture|dump|detachEvent|unshift|\nuntaint|unwatch|updateCommands|join|javaEnabled|pop|push|plugins.refresh|paddings|parse|\nprint|prompt|preference|enableExternalCapture|exec|execScript|valueOf|UTC|find|file|\nfileModifiedDate|fileSize|fileCreatedDate|fileUpdatedDate|fixed|fontsize|fontcolor|\nforward|fromCharCode|watch|link|load|lastIndexOf|anchor|attachEvent|atob|apply|alert|\nabort|routeEvents|resize|resizeBy|resizeTo|recalc|returnValue|replace|reverse|reload|\nreleaseCapture|releaseEvents|go|get(Milliseconds|Seconds|Minutes|Hours|Month|Day|Year|FullYear|\nTime|Date|TimezoneOffset|UTC(Milliseconds|Seconds|Minutes|Hours|Day|Month|FullYear|Date)|\nAttention|Selection|ResponseHeader|AllResponseHeaders)|moveBy|moveBelow|moveTo|\nmoveToAbsolute|moveAbove|mergeAttributes|match|margins|btoa|big|bold|borderWidths|blink|back)\\b",
+          "name": "support.function.coffee"
+        },
+        {
+          "match": "(?x)\n\\b(acceptNode|add|addEventListener|addTextTrack|adoptNode|after|animate|append|\nappendChild|appendData|before|blur|canPlayType|captureStream|\ncaretPositionFromPoint|caretRangeFromPoint|checkValidity|clear|click|\ncloneContents|cloneNode|cloneRange|close|closest|collapse|\ncompareBoundaryPoints|compareDocumentPosition|comparePoint|contains|\nconvertPointFromNode|convertQuadFromNode|convertRectFromNode|createAttribute|\ncreateAttributeNS|createCaption|createCDATASection|createComment|\ncreateContextualFragment|createDocument|createDocumentFragment|\ncreateDocumentType|createElement|createElementNS|createEntityReference|\ncreateEvent|createExpression|createHTMLDocument|createNodeIterator|\ncreateNSResolver|createProcessingInstruction|createRange|createShadowRoot|\ncreateTBody|createTextNode|createTFoot|createTHead|createTreeWalker|delete|\ndeleteCaption|deleteCell|deleteContents|deleteData|deleteRow|deleteTFoot|\ndeleteTHead|detach|disconnect|dispatchEvent|elementFromPoint|elementsFromPoint|\nenableStyleSheetsForSet|entries|evaluate|execCommand|exitFullscreen|\nexitPointerLock|expand|extractContents|fastSeek|firstChild|focus|forEach|get|\ngetAll|getAnimations|getAttribute|getAttributeNames|getAttributeNode|\ngetAttributeNodeNS|getAttributeNS|getBoundingClientRect|getBoxQuads|\ngetClientRects|getContext|getDestinationInsertionPoints|getElementById|\ngetElementsByClassName|getElementsByName|getElementsByTagName|\ngetElementsByTagNameNS|getItem|getNamedItem|getSelection|getStartDate|\ngetVideoPlaybackQuality|has|hasAttribute|hasAttributeNS|hasAttributes|\nhasChildNodes|hasFeature|hasFocus|importNode|initEvent|insertAdjacentElement|\ninsertAdjacentHTML|insertAdjacentText|insertBefore|insertCell|insertData|\ninsertNode|insertRow|intersectsNode|isDefaultNamespace|isEqualNode|\nisPointInRange|isSameNode|item|key|keys|lastChild|load|lookupNamespaceURI|\nlookupPrefix|matches|move|moveAttribute|moveAttributeNode|moveChild|\nmoveNamedItem|namedItem|nextNode|nextSibling|normalize|observe|open|\nparentNode|pause|play|postMessage|prepend|preventDefault|previousNode|\npreviousSibling|probablySupportsContext|queryCommandEnabled|\nqueryCommandIndeterm|queryCommandState|queryCommandSupported|queryCommandValue|\nquerySelector|querySelectorAll|registerContentHandler|registerElement|\nregisterProtocolHandler|releaseCapture|releaseEvents|remove|removeAttribute|\nremoveAttributeNode|removeAttributeNS|removeChild|removeEventListener|\nremoveItem|replace|replaceChild|replaceData|replaceWith|reportValidity|\nrequestFullscreen|requestPointerLock|reset|scroll|scrollBy|scrollIntoView|\nscrollTo|seekToNextFrame|select|selectNode|selectNodeContents|set|setAttribute|\nsetAttributeNode|setAttributeNodeNS|setAttributeNS|setCapture|\nsetCustomValidity|setEnd|setEndAfter|setEndBefore|setItem|setNamedItem|\nsetRangeText|setSelectionRange|setSinkId|setStart|setStartAfter|setStartBefore|\nslice|splitText|stepDown|stepUp|stopImmediatePropagation|stopPropagation|\nsubmit|substringData|supports|surroundContents|takeRecords|terminate|toBlob|\ntoDataURL|toggle|toString|values|write|writeln)\\b",
+          "name": "support.function.dom.coffee"
+        },
+        {
+          "match": "[a-zA-Z_$][\\w$]*",
+          "name": "entity.name.function.coffee"
+        },
+        {
+          "match": "\\d[\\w$]*",
+          "name": "invalid.illegal.identifier.coffee"
+        }
+      ]
+    },
     "numbers": {
       "patterns": [
         {
@@ -807,7 +878,18 @@
     "operators": {
       "patterns": [
         {
-          "match": "([a-zA-Z$_][\\w$]*)?\\s*(%=|\\+=|-=|\\*=|and=|or=|&&=|\\|\\|=|\\?=|(?<!\\()/=)",
+          "match": "(?:([a-zA-Z$_][\\w$]*)?\\s+|(?<![\\w$]))(and=|or=)",
+          "captures": {
+            "1": {
+              "name": "variable.assignment.coffee"
+            },
+            "2": {
+              "name": "keyword.operator.assignment.compound.coffee"
+            }
+          }
+        },
+        {
+          "match": "([a-zA-Z$_][\\w$]*)?\\s*(%=|\\+=|-=|\\*=|&&=|\\|\\|=|\\?=|(?<!\\()/=)",
           "captures": {
             "1": {
               "name": "variable.assignment.coffee"

data/grammars/source.crystal.json

@@ -34,7 +34,7 @@
           "name": "entity.other.inherited-class.crystal"
         }
       },
-      "match": "^\\s*(?:(abstract)\\s+)?(class|struct)\\s+([.\\w\\d_:]+)(?:(\\()([.\\w\\d_:]+)(\\)))?(?:\\s+(<)\\s+([.\\w\\d_:]+))?",
+      "match": "^\\s*(?:(abstract)\\s+)?(class|struct|def)\\s+([.\\w\\d_:]+)(?:(\\()([.\\w\\d_:]+)(\\)))?(?:\\s+(<)\\s+([.\\w\\d_:]+))?",
       "name": "meta.class.crystal"
     },
     {
@@ -113,7 +113,7 @@
     },
     {
       "comment": "everything being a reserved word, not a value and needing a 'end' is a..",
-      "match": "(?<!\\.)\\b(BEGIN|begin|case|class|else|elsif|END|end|ensure|for|if|ifdef|in|module|rescue|struct|then|unless|until|when|while)\\b(?![?!])",
+      "match": "(?<!\\.)\\b(BEGIN|begin|case|class|else|elsif|END|end|ensure|forall|for|if|ifdef|in|module|rescue|struct|then|unless|until|when|while)\\b(?![?!])",
       "name": "keyword.control.crystal"
     },
     {

data/grammars/source.css.less.json

@@ -14,12 +14,7 @@
       "include": "#strings"
     },
     {
-      "captures": {
-        "1": {
-          "name": "entity.other.attribute-name.class.mixin.css"
-        }
-      },
-      "match": "(\\.[_a-zA-Z][a-zA-Z0-9_-]*(?=\\())"
+      "include": "#mixins"
     },
     {
       "captures": {
@@ -276,13 +271,7 @@
       ]
     },
     {
-      "match": "(@|\\-\\-)[\\w-]+(?=\\s*)",
-      "name": "variable.other.less",
-      "captures": {
-        "1": {
-          "name": "punctuation.definition.variable.less"
-        }
-      }
+      "include": "#variables"
     },
     {
       "include": "#variable_interpolation"
@@ -333,12 +322,10 @@
       "name": "keyword.other.important.css"
     },
     {
-      "match": "\\*|\\/|\\-|\\+|~|=|<=|>=|<|>",
-      "name": "keyword.operator.less"
+      "include": "#operators"
     },
     {
-      "match": "\\b(not|and|when)\\b",
-      "name": "keyword.control.logical.operator.less"
+      "include": "#logical_operators"
     },
     {
       "include": "source.css#tag-names"
@@ -385,20 +372,13 @@
       "name": "punctuation.separator.key-value.css"
     },
     {
-      "match": "\\btrue\\b",
-      "name": "constant.language.boolean.less"
-    },
-    {
-      "match": "\\bdefault\\b",
-      "name": "support.function.default.less"
+      "include": "#booleans"
     },
     {
-      "match": "\\b(isurl|isstring|isnumber|iskeyword|iscolor)\\b",
-      "name": "support.function.type-checking.less"
+      "include": "#function_type_checking"
     },
     {
-      "match": "\\b(isunit|ispixel|ispercentage|isem)\\b",
-      "name": "support.function.unit-checking.less"
+      "include": "#function_unit_checking"
     },
     {
       "include": "source.css#property-keywords"
@@ -417,6 +397,19 @@
     }
   ],
   "repository": {
+    "booleans": {
+      "match": "\\btrue\\b",
+      "name": "constant.language.boolean.less"
+    },
+    "variables": {
+      "match": "(@|\\-\\-)[\\w-]+",
+      "name": "variable.other.less",
+      "captures": {
+        "1": {
+          "name": "punctuation.definition.variable.less"
+        }
+      }
+    },
     "variable_interpolation": {
       "match": "@{[a-zA-Z0-9_-]+}",
       "name": "variable.other.interpolation.less"
@@ -477,6 +470,14 @@
       "match": "\\(|\\)",
       "name": "meta.brace.round.css"
     },
+    "operators": {
+      "match": "\\*|\\/|\\-|\\+|~|=|<=|>=|<|>",
+      "name": "keyword.operator.less"
+    },
+    "logical_operators": {
+      "match": "\\b(not|and|when)\\b",
+      "name": "keyword.control.logical.operator.less"
+    },
     "property_values": {
       "begin": "(?<!&)(:)\\s*(?!(\\s*{))(?!.*(?<!@){)",
       "beginCaptures": {
@@ -539,6 +540,297 @@
     "less_builtin_functions": {
       "match": "\\b(abs|acos|alpha|argb|asin|atan|average|blue|calc|ceil|color|contrast|convert|convert|cos|darken|data-uri|desaturate|difference|e|escape|exclusion|extract|fade|fadein|fadeout|floor|format|green|greyscale|hardlight|hsl|hsla|hsv|hsva|hsvhue|hsvsaturation|hsvvalue|hue|length|lighten|lightness|luma|max|min|mix|mod|multiply|negation|overlay|percentage|pi|pow|red|replace|round|saturate|saturation|screen|sin|softlight|spin|sqrt|tan|unit)\\b",
       "name": "support.function.any-method.builtin.less"
+    },
+    "function_type_checking": {
+      "begin": "\\b(isurl|isstring|isnumber|iskeyword|iscolor)(\\()",
+      "beginCaptures": {
+        "1": {
+          "name": "support.function.type-checking.less"
+        },
+        "2": {
+          "name": "meta.brace.round.css"
+        }
+      },
+      "end": "\\)",
+      "endCaptures": {
+        "0": {
+          "name": "meta.brace.round.css"
+        }
+      },
+      "patterns": [
+        {
+          "include": "#property_values"
+        },
+        {
+          "include": "#variables"
+        }
+      ]
+    },
+    "function_default": {
+      "match": "\\b(default)(\\()(\\))",
+      "captures": {
+        "1": {
+          "name": "support.function.default.less"
+        },
+        "2": {
+          "name": "meta.brace.round.css"
+        },
+        "3": {
+          "name": "meta.brace.round.css"
+        }
+      }
+    },
+    "function_unit_checking": {
+      "begin": "\\b(isunit|ispixel|ispercentage|isem)(\\()",
+      "beginCaptures": {
+        "1": {
+          "name": "support.function.unit-checking.less"
+        },
+        "2": {
+          "name": "meta.brace.round.css"
+        }
+      },
+      "end": "\\)",
+      "endCaptures": {
+        "0": {
+          "name": "meta.brace.round.css"
+        }
+      },
+      "patterns": [
+        {
+          "include": "#property_values"
+        },
+        {
+          "include": "#variables"
+        }
+      ]
+    },
+    "mixins": {
+      "name": "meta.mixin.less",
+      "begin": "((\\.)[_a-zA-Z][a-zA-Z0-9_-]*)(?=\\s*\\()",
+      "beginCaptures": {
+        "0": {
+          "name": "meta.definition.mixin.less"
+        },
+        "1": {
+          "name": "entity.name.mixin.less"
+        },
+        "2": {
+          "name": "punctuation.definition.mixin.less"
+        }
+      },
+      "end": "(?<=})",
+      "patterns": [
+        {
+          "include": "#mixin_parameters"
+        },
+        {
+          "include": "#mixin_guards"
+        },
+        {
+          "include": "$self"
+        }
+      ]
+    },
+    "mixin_parameters": {
+      "name": "meta.parameters.less",
+      "begin": "\\((?=\\s*@|\\))",
+      "beginCaptures": {
+        "0": {
+          "name": "punctuation.definition.parameters.begin.bracket.round.less"
+        }
+      },
+      "end": "\\)",
+      "endCaptures": {
+        "0": {
+          "name": "punctuation.definition.parameters.end.bracket.round.less"
+        }
+      },
+      "patterns": [
+        {
+          "include": "#mixin_parameter_semicolon"
+        },
+        {
+          "include": "#mixin_parameter_comma"
+        },
+        {
+          "include": "#mixin_parameter"
+        }
+      ]
+    },
+    "mixin_parameter_semicolon": {
+      "begin": "(@)[a-zA-Z][a-zA-Z0-9-]*(?=.*?;)",
+      "beginCaptures": {
+        "0": {
+          "name": "variable.parameter.less"
+        },
+        "1": {
+          "name": "punctuation.definition.variable.less"
+        }
+      },
+      "end": ";",
+      "endCaptures": {
+        "0": {
+          "name": "punctuation.separator.parameter.less"
+        }
+      },
+      "patterns": [
+        {
+          "match": ":",
+          "name": "punctuation.separator.key-value.less"
+        },
+        {
+          "include": "source.css#numeric-values"
+        },
+        {
+          "include": "source.css#color-keywords"
+        },
+        {
+          "include": "source.css#functions"
+        },
+        {
+          "include": "#less_builtin_functions"
+        },
+        {
+          "include": "source.css#property-keywords"
+        },
+        {
+          "include": "#strings"
+        },
+        {
+          "include": "source.css#commas"
+        }
+      ]
+    },
+    "mixin_parameter_comma": {
+      "begin": "(@)[a-zA-Z][a-zA-Z0-9-]*(?=.*?,\\s*@)",
+      "beginCaptures": {
+        "0": {
+          "name": "variable.parameter.less"
+        },
+        "1": {
+          "name": "punctuation.definition.variable.less"
+        }
+      },
+      "end": ",(?=\\s*@)",
+      "endCaptures": {
+        "0": {
+          "name": "punctuation.separator.parameter.less"
+        }
+      },
+      "patterns": [
+        {
+          "match": ":",
+          "name": "punctuation.separator.key-value.less"
+        },
+        {
+          "include": "source.css#numeric-values"
+        },
+        {
+          "include": "source.css#color-keywords"
+        },
+        {
+          "include": "source.css#functions"
+        },
+        {
+          "include": "#less_builtin_functions"
+        },
+        {
+          "include": "source.css#property-keywords"
+        },
+        {
+          "include": "#strings"
+        }
+      ]
+    },
+    "mixin_parameter": {
+      "begin": "(@)[a-zA-Z][a-zA-Z0-9-]*",
+      "beginCaptures": {
+        "0": {
+          "name": "variable.parameter.less"
+        },
+        "1": {
+          "name": "punctuation.definition.variable.less"
+        }
+      },
+      "end": "(?=\\))",
+      "patterns": [
+        {
+          "match": ":",
+          "name": "punctuation.separator.key-value.less"
+        },
+        {
+          "include": "source.css#numeric-values"
+        },
+        {
+          "include": "source.css#color-keywords"
+        },
+        {
+          "include": "source.css#functions"
+        },
+        {
+          "include": "#less_builtin_functions"
+        },
+        {
+          "include": "source.css#property-keywords"
+        },
+        {
+          "include": "#strings"
+        },
+        {
+          "include": "source.css#commas"
+        }
+      ]
+    },
+    "mixin_guards": {
+      "name": "meta.guard.less",
+      "begin": "(?:(when|and|when\\s+not|and\\s+not)\\s*|(,)\\s*)+(\\()",
+      "beginCaptures": {
+        "1": {
+          "name": "keyword.control.logical.operator.less"
+        },
+        "2": {
+          "name": "punctuation.separator.list.comma.css"
+        },
+        "3": {
+          "name": "meta.brace.round.css"
+        }
+      },
+      "end": "\\)",
+      "endCaptures": {
+        "0": {
+          "name": "meta.brace.round.css"
+        }
+      },
+      "patterns": [
+        {
+          "include": "#function_type_checking"
+        },
+        {
+          "include": "#function_default"
+        },
+        {
+          "include": "#function_unit_checking"
+        },
+        {
+          "include": "#property_values"
+        },
+        {
+          "include": "#variables"
+        },
+        {
+          "include": "source.css#numeric-values"
+        },
+        {
+          "include": "#booleans"
+        },
+        {
+          "include": "#strings"
+        },
+        {
+          "include": "#operators"
+        }
+      ]
     }
   }
 }