github-linguist 5.2.0 → 5.3.0

data/grammars/source.rust.json

@@ -167,7 +167,7 @@
       "comment": "Type parameters",
       "name": "meta.type_params.rust",
       "begin": "<(?![=<])",
-      "end": ">",
+      "end": "(?<![-])>",
       "patterns": [
         {
           "include": "#block_comment"

data/grammars/source.sbt.json

@@ -10,23 +10,33 @@
     {
       "captures": {
         "1": {
-          "name": "entity.name.setting.sbt"
+          "name": "constant.other.setting.sbt"
         }
       },
       "match": "(\\w*)\\s+(?=.*=)"
     },
     {
       "match": "\\b(at)\\b",
-      "name": "keyword.sbt"
+      "name": "keyword.control.directive.sbt"
     },
     {
       "begin": "\"",
+      "beginCaptures": {
+        "1": {
+          "name": "punctuation.definition.string.begin.sbt"
+        }
+      },
       "end": "\"",
+      "endCaptures": {
+        "1": {
+          "name": "punctuation.definition.string.end.sbt"
+        }
+      },
       "name": "string.quoted.double.sbt",
       "patterns": [
         {
           "match": "\\\\.",
-          "name": "constant.character.escape.untitled"
+          "name": "constant.character.escape.sbt"
         }
       ]
     }

data/grammars/source.scala.json

@@ -15,14 +15,21 @@
   "repository": {
     "block-comments": {
       "begin": "/\\*",
+      "beginCaptures": {
+        "1": {
+          "name": "punctuation.definition.comment.begin.scala"
+        }
+      },
       "end": "\\*/",
+      "endCaptures": {
+        "1": {
+          "name": "punctuation.definition.comment.end.scala"
+        }
+      },
       "name": "comment.block.scala",
       "patterns": [
         {
           "include": "#block-comments"
-        },
-        {
-          "match": "(?x)\n\t\t\t(?! /\\*)\n\t\t\t(?! \\*/)\n\t\t  "
         }
       ]
     },
@@ -76,9 +83,6 @@
         {
           "include": "#comments"
         },
-        {
-          "include": "#block-comments"
-        },
         {
           "include": "#strings"
         },
@@ -101,7 +105,7 @@
           "include": "#char-literal"
         },
         {
-          "include": "#empty-parentheses"
+          "include": "#empty-blocks"
         },
         {
           "include": "#parameter-list"
@@ -163,7 +167,7 @@
                   "name": "keyword.other.documentation.scaladoc.scala"
                 },
                 "2": {
-                  "name": "entity.name.class"
+                  "name": "entity.name.type.class.scala"
                 }
               },
               "match": "(@(?:tparam|throws))\\s+(\\S+)"
@@ -178,7 +182,7 @@
                   "name": "punctuation.definition.documentation.link.scala"
                 },
                 "2": {
-                  "name": "entity.other.documentation.link.scala"
+                  "name": "entity.name.type.class.documentation.link.scala"
                 },
                 "3": {
                   "name": "punctuation.definition.documentation.link.scala"
@@ -189,14 +193,7 @@
           ]
         },
         {
-          "begin": "/\\*",
-          "captures": {
-            "0": {
-              "name": "punctuation.definition.comment.scala"
-            }
-          },
-          "end": "\\*/",
-          "name": "comment.block.scala"
+          "include": "#block-comments"
         },
         {
           "captures": {
@@ -207,7 +204,7 @@
               "name": "punctuation.definition.comment.scala"
             }
           },
-          "match": "\\s*((//).*$)"
+          "match": "\\s*((//).*$\\n?)"
         }
       ]
     },
@@ -240,10 +237,10 @@
         {
           "captures": {
             "1": {
-              "name": "keyword.declaration.scala"
+              "name": "keyword.control.def.scala"
             },
             "2": {
-              "name": "entity.name.function.declaration"
+              "name": "entity.name.function.declaration.scala"
             }
           },
           "match": "(?x)\n\t\t\t\t\t\t\\b(def)\\s+\n\t\t\t\t\t\t(`[^`]+`|[_$a-zA-Z][_$a-zA-Z0-9]*(?:_[^\\s])(?=[(\\t ])|[_$a-zA-Z][_$a-zA-Z0-9]*|[-?~><^+*%:!#|/@\\\\]+)"
@@ -251,24 +248,24 @@
         {
           "captures": {
             "1": {
-              "name": "keyword.declaration.scala"
+              "name": "storage.modifier.case.scala"
             },
             "2": {
-              "name": "keyword.declaration.scala"
+              "name": "storage.type.$1.scala"
             },
             "3": {
-              "name": "entity.name.class.declaration"
+              "name": "entity.name.type.class.declaration.scala"
             }
           },
-          "match": "(case)?\\b(class|trait|object)\\s+([^\\s\\{\\(\\[]+)"
+          "match": "(?:(case) +)?\\b(class|trait|object)\\s+([^\\s\\{\\(\\[]+)"
         },
         {
           "captures": {
             "1": {
-              "name": "keyword.declaration.scala"
+              "name": "keyword.control.type.scala"
             },
             "2": {
-              "name": "entity.name.type.declaration"
+              "name": "entity.name.type.type.declaration.scala"
             }
           },
           "match": "\\b(type)\\s+(`[^`]+`|[_$a-zA-Z][_$a-zA-Z0-9]*(?:_[^\\s])(?=[\\t ])|[_$a-zA-Z][_$a-zA-Z0-9]*|[-?~><^+*%:!#|/@\\\\]+)"
@@ -276,13 +273,13 @@
         {
           "captures": {
             "1": {
-              "name": "keyword.declaration.stable.scala"
+              "name": "storage.type.stable.scala"
             },
             "2": {
-              "name": "keyword.declaration.volatile.scala"
+              "name": "storage.type.volatile.scala"
             },
             "3": {
-              "name": "entity.name.val.declaration"
+              "name": "entity.name.type.val.declaration.scala"
             }
           },
           "match": "\\b(?:(val)|(var))\\s+(?:(`[^`]+`|[_$a-zA-Z][_$a-zA-Z0-9]*(?:_[^\\s])(?=[\\t ])|[_$a-zA-Z][_$a-zA-Z0-9]*|[-?~><^+*%:!#|/@\\\\]+)|(?=\\())"
@@ -290,21 +287,24 @@
         {
           "captures": {
             "1": {
-              "name": "keyword.declaration.scala"
+              "name": "storage.type.package.scala"
             },
             "2": {
-              "name": "entity.name.class.declaration"
+              "name": "storage.type.package.object.scala"
+            },
+            "3": {
+              "name": "entity.name.type.class.declaration.scala"
             }
           },
-          "match": "\\b(package object)\\s+([^\\s\\{\\(\\[]+)"
+          "match": "\\b(package) (object)\\s+([^\\s\\{\\(\\[]+)"
         },
         {
           "captures": {
             "1": {
-              "name": "keyword.other.scoping.scala"
+              "name": "storage.type.package.scala"
             },
             "2": {
-              "name": "entity.name.package.scala"
+              "name": "entity.name.type.package.scala"
             }
           },
           "match": "\\b(package)\\s+([\\w\\.]+)",
@@ -312,20 +312,39 @@
         }
       ]
     },
-    "empty-parentheses": {
-      "captures": {
-        "1": {
-          "name": "meta.bracket.scala"
+    "empty-blocks": {
+      "patterns": [
+        {
+          "captures": {
+            "1": {
+              "name": "punctuation.definition.parentheses.begin.scala"
+            },
+            "2": {
+              "name": "punctuation.definition.parentheses.end.scala"
+            }
+          },
+          "match": "(\\()(\\))",
+          "name": "meta.parentheses.scala"
+        },
+        {
+          "captures": {
+            "1": {
+              "name": "punctuation.definition.parentheses.begin.scala"
+            },
+            "2": {
+              "name": "punctuation.definition.parentheses.end.scala"
+            }
+          },
+          "match": "(\\{)(\\})",
+          "name": "meta.braces.scala"
         }
-      },
-      "match": "(\\(\\))",
-      "name": "meta.parentheses.scala"
+      ]
     },
     "imports": {
       "begin": "\\b(import)\\s+",
       "beginCaptures": {
         "1": {
-          "name": "keyword.other.import.scala"
+          "name": "keyword.control.import.scala"
         }
       },
       "end": "(?<=[\\n;])",
@@ -336,11 +355,11 @@
         },
         {
           "match": "([^\\s{;.]+)\\s*\\.\\s*",
-          "name": "variable.package.scala"
+          "name": "variable.other.package.scala"
         },
         {
           "match": "([^\\s{;.]+)\\s*",
-          "name": "variable.import.scala"
+          "name": "variable.other.import.scala"
         },
         {
           "begin": "{",
@@ -360,20 +379,20 @@
             {
               "captures": {
                 "1": {
-                  "name": "variable.import.renamed-from.scala"
+                  "name": "variable.other.import.renamed-from.scala"
                 },
                 "2": {
-                  "name": "keyword.other.arrow.scala"
+                  "name": "keyword.operator.scala"
                 },
                 "3": {
-                  "name": "variable.import.renamed-to.scala"
+                  "name": "variable.other.import.renamed-to.scala"
                 }
               },
               "match": "(?x) \\s*\n\t\t\t\t([^\\s.,}]+) \\s*\n\t\t\t\t(=>) \\s*\n\t\t\t\t([^\\s.,}]+) \\s*\n\t\t\t  "
             },
             {
               "match": "([^\\s.,}]+)",
-              "name": "variable.import.scala"
+              "name": "variable.other.import.scala"
             }
           ]
         }
@@ -384,7 +403,7 @@
         {
           "captures": {
             "1": {
-              "name": "keyword.declaration.scala"
+              "name": "storage.modifier.extends.scala"
             },
             "2": {
               "name": "entity.other.inherited-class.scala"
@@ -397,10 +416,10 @@
     "initialization": {
       "captures": {
         "1": {
-          "name": "keyword.declaration.scala"
+          "name": "keyword.control.directive.scala"
         },
         "2": {
-          "name": "entity.name.class"
+          "name": "entity.name.type.class.scala"
         }
       },
       "match": "\\b(new)\\s+([^\\s\\{\\(\\[]+)"
@@ -483,24 +502,24 @@
     "qualifiedClassName": {
       "captures": {
         "1": {
-          "name": "entity.name.class"
+          "name": "entity.name.type.class.scala"
         }
       },
       "match": "(\\b([A-Z][\\w]*))"
     },
     "scala-symbol": {
       "match": "'\\w+(?=[^'\\w])",
-      "name": "entity.name.symbol"
+      "name": "entity.name.type.symbol.scala"
     },
     "storage-modifiers": {
       "patterns": [
         {
           "match": "\\b(private\\[\\S+\\]|protected\\[\\S+\\]|private|protected)\\b",
-          "name": "storage.modifier.access"
+          "name": "storage.modifier.access.scala"
         },
         {
           "match": "\\b(synchronized|@volatile|abstract|final|lazy|sealed|implicit|override|@transient|@native)\\b",
-          "name": "storage.modifier.other"
+          "name": "storage.modifier.other.scala"
         }
       ]
     },

data/grammars/source.shaderlab.json

@@ -145,7 +145,7 @@
         },
         {
           "name": "support.variable.transformations.shaderlab",
-          "match": "\\b(UNITY_MATRIX_MVP|UNITY_MATRIX_MV|UNITY_MATRIX_V|UNITY_MATRIX_P|UNITY_MATRIX_VP|UNITY_MATRIX_T_MV|UNITY_MATRIX_IT_MV|_Object2World|_World2Object)\\b"
+          "match": "\\b(UNITY_MATRIX_MVP|UNITY_MATRIX_MV|UNITY_MATRIX_M|UNITY_MATRIX_V|UNITY_MATRIX_P|UNITY_MATRIX_VP|UNITY_MATRIX_T_MV|UNITY_MATRIX_I_V|UNITY_MATRIX_IT_MV|_Object2World|_World2Object|unity_ObjectToWorld|unity_WorldToObject)\\b"
         },
         {
           "name": "support.variable.camera.shaderlab",

data/grammars/source.shell.json

@@ -44,10 +44,10 @@
       "include": "#loop"
     },
     {
-      "include": "#function-definition"
+      "include": "#string"
     },
     {
-      "include": "#string"
+      "include": "#function-definition"
     },
     {
       "include": "#variable"
@@ -308,7 +308,7 @@
     "heredoc": {
       "patterns": [
         {
-          "begin": "(<<)-(\"|'|)(RUBY)\\2",
+          "begin": "(<<)-(\"|'|)\\s*(RUBY)(?=\\s|;|&|<|\"|')\\2",
           "beginCaptures": {
             "1": {
               "name": "keyword.operator.heredoc.shell"
@@ -332,7 +332,7 @@
           ]
         },
         {
-          "begin": "(<<)(\"|'|)(RUBY)\\2",
+          "begin": "(<<)(\"|'|)\\s*(RUBY)(?=\\s|;|&|<|\"|')\\2",
           "beginCaptures": {
             "1": {
               "name": "keyword.operator.heredoc.shell"
@@ -356,7 +356,7 @@
           ]
         },
         {
-          "begin": "(<<)-(\"|'|)(PYTHON)\\2",
+          "begin": "(<<)-(\"|'|)\\s*(PYTHON)(?=\\s|;|&|<|\"|')\\2",
           "beginCaptures": {
             "1": {
               "name": "keyword.operator.heredoc.shell"
@@ -380,7 +380,7 @@
           ]
         },
         {
-          "begin": "(<<)(\"|'|)(PYTHON)\\2",
+          "begin": "(<<)(\"|'|)\\s*(PYTHON)(?=\\s|;|&|<|\"|')\\2",
           "beginCaptures": {
             "1": {
               "name": "keyword.operator.heredoc.shell"
@@ -404,7 +404,7 @@
           ]
         },
         {
-          "begin": "(<<)-(\"|'|)(APPLESCRIPT)\\2",
+          "begin": "(<<)-(\"|'|)\\s*(APPLESCRIPT)(?=\\s|;|&|<|\"|')\\2",
           "beginCaptures": {
             "1": {
               "name": "keyword.operator.heredoc.shell"
@@ -428,7 +428,7 @@
           ]
         },
         {
-          "begin": "(<<)(\"|'|)(APPLESCRIPT)\\2",
+          "begin": "(<<)(\"|'|)\\s*(APPLESCRIPT)(?=\\s|;|&|<|\"|')\\2",
           "beginCaptures": {
             "1": {
               "name": "keyword.operator.heredoc.shell"
@@ -452,7 +452,7 @@
           ]
         },
         {
-          "begin": "(<<)-(\"|'|)(HTML)\\2",
+          "begin": "(<<)-(\"|'|)\\s*(HTML)(?=\\s|;|&|<|\"|')\\2",
           "beginCaptures": {
             "1": {
               "name": "keyword.operator.heredoc.shell"
@@ -476,7 +476,7 @@
           ]
         },
         {
-          "begin": "(<<)(\"|'|)(HTML)\\2",
+          "begin": "(<<)(\"|'|)\\s*(HTML)(?=\\s|;|&|<|\"|')\\2",
           "beginCaptures": {
             "1": {
               "name": "keyword.operator.heredoc.shell"
@@ -500,7 +500,7 @@
           ]
         },
         {
-          "begin": "(<<)-(\"|'|)(MARKDOWN)\\2",
+          "begin": "(<<)-(\"|'|)\\s*(MARKDOWN)(?=\\s|;|&|<|\"|')\\2",
           "beginCaptures": {
             "1": {
               "name": "keyword.operator.heredoc.shell"
@@ -524,7 +524,7 @@
           ]
         },
         {
-          "begin": "(<<)(\"|'|)(MARKDOWN)\\2",
+          "begin": "(<<)(\"|'|)\\s*(MARKDOWN)(?=\\s|;|&|<|\"|')\\2",
           "beginCaptures": {
             "1": {
               "name": "keyword.operator.heredoc.shell"
@@ -548,7 +548,7 @@
           ]
         },
         {
-          "begin": "(<<)-(\"|'|)(TEXTILE)\\2",
+          "begin": "(<<)-(\"|'|)\\s*(TEXTILE)(?=\\s|;|&|<|\"|')\\2",
           "beginCaptures": {
             "1": {
               "name": "keyword.operator.heredoc.shell"
@@ -572,7 +572,7 @@
           ]
         },
         {
-          "begin": "(<<)(\"|'|)(TEXTILE)\\2",
+          "begin": "(<<)(\"|'|)\\s*(TEXTILE)(?=\\s|;|&|<|\"|')\\2",
           "beginCaptures": {
             "1": {
               "name": "keyword.operator.heredoc.shell"
@@ -596,7 +596,7 @@
           ]
         },
         {
-          "begin": "(<<)-(\"|'|)(SHELL)\\2",
+          "begin": "(<<)-(\"|'|)\\s*(SHELL)(?=\\s|;|&|<|\"|')\\2",
           "beginCaptures": {
             "1": {
               "name": "keyword.operator.heredoc.shell"
@@ -620,7 +620,7 @@
           ]
         },
         {
-          "begin": "(<<)(\"|'|)(SHELL)\\2",
+          "begin": "(<<)(\"|'|)\\s*(SHELL)(?=\\s|;|&|<|\"|')\\2",
           "beginCaptures": {
             "1": {
               "name": "keyword.operator.heredoc.shell"
@@ -644,7 +644,7 @@
           ]
         },
         {
-          "begin": "(<<)-(\"|'|)\\\\?(\\w+)\\2",
+          "begin": "(<<)-(\"|'|)\\s*\\\\?([^;&<\\s]+)\\2",
           "beginCaptures": {
             "1": {
               "name": "keyword.operator.heredoc.shell"
@@ -662,7 +662,7 @@
           "name": "string.unquoted.heredoc.no-indent.shell"
         },
         {
-          "begin": "(<<)(\"|'|)\\\\?(\\w+)\\2",
+          "begin": "(<<)(\"|'|)\\s*\\\\?([^;&<\\s]+)\\2",
           "beginCaptures": {
             "1": {
               "name": "keyword.operator.heredoc.shell"
@@ -739,10 +739,15 @@
               "name": "keyword.operator.herestring.shell"
             },
             "2": {
-              "name": "string.unquoted.herestring.shell"
+              "name": "string.unquoted.herestring.shell",
+              "patterns": [
+                {
+                  "include": "$self"
+                }
+              ]
             }
           },
-          "match": "(<<<)(([^\\s\\\\]|\\\\.)+)",
+          "match": "(<<<)\\s*(([^\\s\\\\]|\\\\.)+)",
           "name": "meta.herestring.shell"
         }
       ]
@@ -1125,7 +1130,7 @@
           ]
         },
         {
-          "match": "&>|\\d*>&\\d*|\\d*(>>|>|<)|\\d*<&|\\d*<>",
+          "match": "(?<![<>])(&>|\\d*>&\\d*|\\d*(>>|>|<)|\\d*<&|\\d*<>)(?![<>])",
           "name": "keyword.operator.redirect.shell"
         }
       ]