github-linguist 4.8.8 → 4.8.9

data/grammars/source.tla.json

@@ -30,31 +30,43 @@
       "name": "keyword.operator.definition.tla"
     },
     {
-      "match": "\\b=\\b",
-      "name": "keyword.operator.assignment.tla"
+      "match": "(\\/\\\\|\\\\\\/|\\=>|<\\=>|\\|\\=|\\=\\||\\|\\-|\\-\\||~)",
+      "name": "keyword.operator.logic.tla"
     },
     {
       "match": "<\\=|>\\=|\\=|<|>|\\/\\=|\\#",
       "name": "keyword.operator.comparison.tla"
     },
     {
-      "match": "(\\/\\\\|\\\\\\/|\\=>|<\\=>|~)",
-      "name": "keyword.operator.logic.tla"
+      "match": "\\b=\\b",
+      "name": "keyword.operator.assignment.tla"
+    },
+    {
+      "match": "(\\\\EE|\\\\AA)",
+      "name": "keyword.operator.temporal.quantification.tla"
     },
     {
       "match": "(\\\\E|\\\\A)",
       "name": "keyword.operator.quantification.tla"
     },
     {
-      "match": "(\\\\in|\\\\notin|:)",
+      "match": "(\\\\notin|:)",
       "name": "keyword.operator.sets.tla"
     },
+    {
+      "match": "(\\|\\->|\\->)",
+      "name": "keyword.operator.functions.tla"
+    },
+    {
+      "match": "\\\\(approx|asymp|bigcirc|bullet|cap|cdot|circ|cong|cup|div|doteq|equiv|geq|gg|in|intersect|land|leq|ll|lor|o|odot|ominus|oplus|oslash|otimes|prec|preceq|propto|sim|simeq|sqcap|sqcup|sqsubset|sqsubseteq|sqsupset|sqsupseteq|star|subset|subseteq|succ|succeq|supset|supseteq|union|uplus|wr)\\b",
+      "name": "keyword.operator.latex.tla"
+    },
     {
       "match": "\\b(\\+|\\-|\\*|\\/){1}\\b",
       "name": "keyword.operator.arithmetic.tla"
     },
     {
-      "match": "(\\[\\]|\\<\\>)",
+      "match": "(\\[\\]|\\<\\>|\\-\\+\\->)",
       "name": "keyword.operator.temporal.tla"
     },
     {

data/grammars/source.toc.json

@@ -23,7 +23,7 @@
         },
         {
           "match": "\\S[^:]+",
-          "name": "invalid.name.tag.toc"
+          "name": "invalid.tag.toc"
         }
       ],
       "end": "(:|\\Z)"
@@ -46,6 +46,10 @@
     {
       "match": "(?<!^## )#.*$",
       "name": "comment.toc"
+    },
+    {
+      "match": "^(?!#)[^ ].+\\.xml",
+      "name": "meta.require.xml.toc"
     }
   ],
   "scopeName": "source.toc"

data/grammars/source.ts.json

@@ -38,7 +38,7 @@
       ]
     },
     "assignment-operator": {
-      "match": "<<=|>>=|>>>=|\\*=|(?<!\\()/=|%=|\\+=|\\-=|&=|\\^=",
+      "match": "<<=|>>>=|>>=|\\*=|(?<!\\()/=|%=|\\+=|\\-=|&=|\\^=",
       "name": "keyword.operator.assignment.ts"
     },
     "await-modifier": {
@@ -136,7 +136,7 @@
       "name": "comment.line.ts"
     },
     "control-statement": {
-      "match": "(?<!\\.)\\b(break|catch|continue|debugger|declare|do|else|finally|for|if|return|switch|throw|try|while|with|super|case|default)\\b",
+      "match": "(?<!\\.)\\b(break|catch|continue|debugger|declare|do|else|finally|for|if|return|switch|throw|try|while|with|super|case|default|yield)\\b",
       "name": "keyword.control.ts"
     },
     "decl-block": {
@@ -233,9 +233,15 @@
         {
           "include": "#block"
         },
+        {
+          "include": "#import-operator"
+        },
         {
           "include": "#expression-operator"
         },
+        {
+          "include": "#imply-operator"
+        },
         {
           "include": "#relational-operator"
         },
@@ -251,6 +257,9 @@
         {
           "include": "#storage-keyword"
         },
+        {
+          "include": "#type-primitive"
+        },
         {
           "include": "#function-call"
         },
@@ -263,8 +272,8 @@
       ]
     },
     "expression-operator": {
-      "match": "=>|\\b(delete|export|import|from|in|instanceof|new|typeof|void|as)\\b",
-      "name": "keyword.operator.ts"
+      "match": "\\b(delete|in|instanceof|new|typeof|as|is|of)\\b",
+      "name": "keyword.others.ts"
     },
     "field-declaration": {
       "begin": "(?<!\\()\\s*((?:\\b[a-zA-Z_$][\\w$]*)|(?:\\'[^']*\\')|(?:\\\"[^\"]*\\\"))\\s*(\\?\\s*)?(?=(=|:))",
@@ -273,7 +282,7 @@
           "name": "variable.ts"
         },
         "2": {
-          "name": "keyword.operator.ts"
+          "name": "keyword.others.ts"
         }
       },
       "end": "(?=\\}|;|,|$)|(?<=\\})",
@@ -290,7 +299,7 @@
           "name": "storage.type.ts"
         },
         "3": {
-          "name": "keyword.operator.ts"
+          "name": "keyword.others.ts"
         }
       },
       "match": "(?<=\\()\\s*\\b(var|let|const)\\s+([a-zA-Z_$][\\w$]*)\\s+(in|of)\\b",
@@ -314,7 +323,7 @@
       "begin": "\\b(?:(export)\\s+)?(?:(async)\\s+)?(function\\b)(?:\\s+([a-zA-Z_$][\\w$]*))?\\s*",
       "beginCaptures": {
         "1": {
-          "name": "storage.modifier.ts"
+          "name": "storage.type.ts"
         },
         "2": {
           "name": "storage.modifier.ts"
@@ -352,7 +361,7 @@
     "function-overload-declaration": {
       "captures": {
         "1": {
-          "name": "storage.modifier.ts"
+          "name": "storage.type.ts"
         },
         "2": {
           "name": "storage.type.function.ts"
@@ -393,6 +402,14 @@
         }
       ]
     },
+    "imply-operator": {
+      "match": "=>",
+      "name": "keyword.operator.ts"
+    },
+    "import-operator": {
+      "match": "\\b(import|from)\\b",
+      "name": "keyword.control.import.include.ts"
+    },
     "indexer-declaration": {
       "begin": "\\[",
       "beginCaptures": {
@@ -406,7 +423,7 @@
           "name": "meta.brace.square.ts"
         },
         "2": {
-          "name": "keyword.operator.ts"
+          "name": "keyword.others.ts"
         }
       },
       "name": "meta.indexer.declaration.ts",
@@ -455,11 +472,11 @@
       ]
     },
     "logic-operator": {
-      "match": "\\!|&|~|\\^|\\||&&|\\|\\|",
+      "match": "\\!|&&|&|~|\\^|\\|\\||\\|",
       "name": "keyword.operator.arithmetic.ts"
     },
     "method-declaration": {
-      "begin": "\\b(?:(abstract)\\s+)?\\b(?:(public|private|protected)\\s+)?\\b(?:(async)\\s+)?(?:(get|set)\\s+)?(?:(new)|(?:([a-zA-Z_$][\\.\\w$]*)\\s*(\\??)))?\\s*(?=\\(|\\<)",
+      "begin": "\\b(?:(abstract)\\s+)?\\b(?:(public|private|protected)\\s+)?\\b(?:(async)\\s+)?(?:(get|set)\\s+)?(?:(new)|(?:\\b(constructor)\\b)|(?:([a-zA-Z_$][\\.\\w$]*)\\s*(\\??)))?\\s*(?=\\(|\\<)",
       "beginCaptures": {
         "1": {
           "name": "storage.modifier.ts"
@@ -477,9 +494,12 @@
           "name": "keyword.operator.ts"
         },
         "6": {
-          "name": "entity.name.function.ts"
+          "name": "storage.type.ts"
         },
         "7": {
+          "name": "entity.name.function.ts"
+        },
+        "8": {
           "name": "keyword.operator.ts"
         }
       },
@@ -524,20 +544,23 @@
           "name": "keyword.operator.ts"
         },
         "6": {
-          "name": "entity.name.function.ts"
+          "name": "storage.type.ts"
         },
         "7": {
+          "name": "entity.name.function.ts"
+        },
+        "8": {
           "name": "keyword.operator.ts"
         }
       },
-      "match": "\\b(?:(abstract)\\s+)?\\b(?:(public|private|protected)\\s+)?\\b(?:(async)\\s+)?(?:(get|set)\\s+)?(?:(new)|(?:([a-zA-Z_$][\\.\\w$]*)\\s*(\\??)))?\\s*(?=\\(|\\<)",
+      "match": "\\b(?:(abstract)\\s+)?\\b(?:(public|private|protected)\\s+)?\\b(?:(async)\\s+)?(?:(get|set)\\s+)?(?:(new)|(?:\\b(constructor)\\b)|(?:([a-zA-Z_$][\\.\\w$]*)\\s*(\\??)))?\\s*(?=\\(|\\<)",
       "name": "meta.method.overload.declaration.ts"
     },
     "new-expr": {
       "begin": "\\b(new)\\b",
       "beginCaptures": {
         "1": {
-          "name": "keyword.operator.ts"
+          "name": "keyword.others.ts"
         }
       },
       "end": "(?=[(;]|$)",
@@ -556,7 +579,7 @@
       "name": "constant.language.null.ts"
     },
     "numeric-literal": {
-      "match": "\\b(?<=[^$])((0(x|X)[0-9a-fA-F]+)|([0-9]+(\\.[0-9]+)?))\\b",
+      "match": "\\b(?<=[^$])((0(x|X)[0-9a-fA-F]+)|(0(o|O)[0-7]+)|(0(b|B)(0|1)+)|(([0-9]+(\\.[0-9]+)?))([eE]([+-]?)[0-9]+(\\.[0-9]+)?)?)\\b",
       "name": "constant.numeric.ts"
     },
     "object-body": {
@@ -610,7 +633,7 @@
       "begin": "\\b(?:(export)\\s+)?\\b(?:(abstract)\\s+)?\\b(?<!\\.)(class|interface)\\b",
       "beginCaptures": {
         "1": {
-          "name": "storage.modifier.ts"
+          "name": "storage.type.ts"
         },
         "2": {
           "name": "storage.modifier.ts"
@@ -676,10 +699,10 @@
     "object-heritage-type": {
       "captures": {
         "1": {
-          "name": "storage.type.ts"
+          "name": "support.type.ts"
         }
       },
-      "match": "(?:\\s*([a-zA-Z_$][\\w$]*)\\b)",
+      "match": "(?:\\b([a-zA-Z_$][\\w$]*)\\b)",
       "name": "meta.object.heritage.parent.ts"
     },
     "object-member": {
@@ -707,13 +730,13 @@
           "name": "storage.modifier.ts"
         },
         "2": {
-          "name": "keyword.operator.ts"
+          "name": "keyword.others.ts"
         },
         "3": {
           "name": "variable.parameter.ts"
         },
         "4": {
-          "name": "keyword.operator.ts"
+          "name": "keyword.others.ts"
         }
       },
       "match": "(?:\\s*\\b(public|private|protected)\\b\\s+)?(\\.\\.\\.)?\\s*([a-zA-Z_$][\\w$]*)\\s*(\\??)",
@@ -778,7 +801,7 @@
       ]
     },
     "relational-operator": {
-      "match": "===|==|=|!=|!==|<=|>=|<>|<|>",
+      "match": "===|!==|==|!=|<=|>=|<>|=|<|>",
       "name": "keyword.operator.comparison.ts"
     },
     "return-type": {
@@ -796,7 +819,7 @@
       "name": "keyword.other.ts"
     },
     "storage-keyword": {
-      "match": "\\b(number|boolean|string|any|var|let|function|const|module|namespace)\\b",
+      "match": "\\b(var|let|function|const|module|namespace|void|export)\\b",
       "name": "storage.type.ts"
     },
     "string": {
@@ -828,7 +851,7 @@
       "begin": "\\b(switch)\\b\\s*\\(",
       "beginCaptures": {
         "1": {
-          "name": "keyword.operator.ts"
+          "name": "keyword.control.ts"
         }
       },
       "end": "\\)",
@@ -889,13 +912,13 @@
       "begin": "\\$\\{",
       "beginCaptures": {
         "0": {
-          "name": "keyword.operator.ts"
+          "name": "keyword.others.ts"
         }
       },
       "end": "\\}",
       "endCaptures": {
         "0": {
-          "name": "keyword.operator.ts"
+          "name": "keyword.others.ts"
         }
       },
       "name": "template.element.ts",
@@ -905,6 +928,80 @@
         }
       ]
     },
+    "ternary-expression": {
+      "begin": "(?=\\?)",
+      "end": "(?=$|[;,])",
+      "patterns": [
+        {
+          "include": "#ternary-operator"
+        },
+        {
+          "include": "#ternary-expression-type"
+        }
+      ]
+    },
+    "ternary-expression-type": {
+      "name": "meta.expression.ts",
+      "patterns": [
+        {
+          "include": "#string"
+        },
+        {
+          "include": "#regex"
+        },
+        {
+          "include": "#template"
+        },
+        {
+          "include": "#comment"
+        },
+        {
+          "include": "#literal"
+        },
+        {
+          "include": "#paren-expression"
+        },
+        {
+          "include": "#ternary-expression"
+        },
+        {
+          "include": "#import-operator"
+        },
+        {
+          "include": "#expression-operator"
+        },
+        {
+          "include": "#imply-operator"
+        },
+        {
+          "include": "#relational-operator"
+        },
+        {
+          "include": "#arithmetic-operator"
+        },
+        {
+          "include": "#logic-operator"
+        },
+        {
+          "include": "#assignment-operator"
+        },
+        {
+          "include": "#type-primitive"
+        },
+        {
+          "include": "#function-call"
+        }
+      ]
+    },
+    "ternary-operator": {
+      "begin": "(\\?)",
+      "end": "(:)",
+      "patterns": [
+        {
+          "include": "#ternary-expression-type"
+        }
+      ]
+    },
     "this-literal": {
       "match": "\\b(this)\\b",
       "name": "constant.language.this.ts"
@@ -943,6 +1040,9 @@
       "end": "(?=$|[,);\\}\\]]|//)|(?==[^>])|(?<=[\\}>\\]\\)]|[a-zA-Z_$])\\s*(?=\\{)",
       "name": "meta.type.annotation.ts",
       "patterns": [
+        {
+          "include": "#expression-operator"
+        },
         {
           "include": "#type"
         },
@@ -961,7 +1061,7 @@
           "name": "keyword.other.ts"
         },
         "2": {
-          "name": "storage.type.ts"
+          "name": "entity.name.class.ts"
         }
       },
       "end": "(?=$|[,);>]|var|type|function|class|interface)",
@@ -975,7 +1075,7 @@
         },
         {
           "match": "=\\s*",
-          "name": "keyword.operator.ts"
+          "name": "keyword.operator.comparison.ts"
         }
       ]
     },
@@ -1093,7 +1193,7 @@
     "type-primitive": {
       "captures": {
         "1": {
-          "name": "storage.type.ts"
+          "name": "support.type.ts"
         }
       },
       "match": "\\b(string|number|boolean|symbol|any|void)\\b",
@@ -1127,7 +1227,7 @@
       "name": "constant.language.ts"
     },
     "var-expr": {
-      "begin": "(?<!\\()\\s*\\b(var|let|const(?!\\s+enum)\\b)",
+      "begin": "(?<!\\()\\s*\\b(var|let|const(?!\\s+enum))\\b",
       "beginCaptures": {
         "1": {
           "name": "storage.type.ts"
@@ -1154,6 +1254,9 @@
       "end": "(?=$|[;,])",
       "name": "meta.var-single-variable.expr.ts",
       "patterns": [
+        {
+          "include": "#ternary-expression"
+        },
         {
           "include": "#type-annotation"
         },
@@ -1172,7 +1275,7 @@
       "begin": "(=)",
       "beginCaptures": {
         "1": {
-          "name": "keyword.operator.ts"
+          "name": "keyword.operator.comparison.ts"
         }
       },
       "end": "(?=$|[,);=])",