github-linguist 5.3.3 → 6.0.0

data/grammars/source.tl.json

@@ -1,6 +1,6 @@
 {
-  "$schema": "https://raw.githubusercontent.com/martinring/tmlanguage/master/tmlanguage.json",
   "name": "Type Language",
+  "scopeName": "source.tl",
   "patterns": [
     {
       "include": "#comments"
@@ -13,26 +13,16 @@
     }
   ],
   "repository": {
-    "keywords": {
+    "combinator-args": {
       "patterns": [
         {
-          "match": "\\#",
-          "name": "keyword.other.hash.tl"
-        },
-        {
-          "match": "\\?",
-          "name": "keyword.other.questionmark.tl"
-        },
-        {
-          "match": "\\%",
-          "name": "keyword.other.percent.tl"
+          "include": "#combinator-args-member"
         }
       ]
     },
     "combinator-args-member": {
       "name": "meta.combinator.arg.tl",
       "begin": "([_$[:alpha:]][_$[:alnum:]]*)(\\:)(([_$[:alpha:]][_$[:alnum:]]*)|(#))",
-      "end": "",
       "beginCaptures": {
         "1": {
           "name": "meta.definition.combinator.arg.tl variable.other.tl"
@@ -46,56 +36,7 @@
         "5": {
           "name": "keyword.other.hash.tl"
         }
-      },
-      "patterns": [
-
-      ]
-    },
-    "combinator-opt-args": {
-      "name": "meta.object.type.tl",
-      "begin": "\\{",
-      "beginCaptures": {
-        "0": {
-          "name": "punctuation.definition.block.tl"
-        }
-      },
-      "end": "\\}",
-      "endCaptures": {
-        "0": {
-          "name": "punctuation.definition.block.tl"
-        }
-      },
-      "patterns": [
-        {
-          "include": "#combinator-args-member"
-        }
-      ]
-    },
-    "combinator-args": {
-      "patterns": [
-        {
-          "include": "#combinator-args-member"
-        }
-      ]
-    },
-    "combinator-result-type": {
-      "patterns": [
-        {
-          "match": "([_$[:alpha:]][_$[:alnum:]]*)\\s*(\\.)",
-          "captures": {
-            "1": {
-              "name": "entity.name.type.module.tl"
-            },
-            "2": {
-              "name": "punctuation.accessor.tl"
-            }
-          }
-        },
-        {
-          "name": "entity.name.type.tl",
-          "match": "[_$[:alpha:]][_$[:alnum:]]*"
-        }
-      ]
+      }
     },
     "combinator-declaration": {
       "patterns": [
@@ -107,22 +48,14 @@
         }
       ]
     },
-    "combinator-declaration-without-hash": {
+    "combinator-declaration-with-hash": {
       "name": "meta.combinator.declaration.tl",
-      "begin": "(([_$\\w]+)(\b\\.))?([_$\\w]*)(?= )",
-      "beginCaptures": {
-        "2": {
-          "name": "meta.definition.combinator.tl variable.other.tl"
-        },
-        "4": {
-          "name": "meta.definition.combinator.tl variable.other.tl"
-        }
-      },
+      "begin": "(([_$\\w]+)(\\b\\.))?([_$\\w]*)(\\b#)([[:alpha:][:alnum:]]*)\\s*",
       "end": "\\;\\s*",
       "patterns": [
         {
-          "match": "\\.",
-          "name": "punctuation.namespace.tl"
+          "name": "punctuation.namespace.tl",
+          "match": "\\."
         },
         {
           "include": "#keywords"
@@ -147,11 +80,7 @@
             }
           }
         }
-      ]
-    },
-    "combinator-declaration-with-hash": {
-      "name": "meta.combinator.declaration.tl",
-      "begin": "(([_$\\w]+)(\\b\\.))?([_$\\w]*)(\\b#)([[:alpha:][:alnum:]]*)\\s*",
+      ],
       "beginCaptures": {
         "2": {
           "name": "meta.definition.combinator.tl variable.other.tl"
@@ -165,12 +94,16 @@
         "6": {
           "name": "storage.type.tl"
         }
-      },
+      }
+    },
+    "combinator-declaration-without-hash": {
+      "name": "meta.combinator.declaration.tl",
+      "begin": "(([_$\\w]+)(\u0008\\.))?([_$\\w]*)(?= )",
       "end": "\\;\\s*",
       "patterns": [
         {
-          "match": "\\.",
-          "name": "punctuation.namespace.tl"
+          "name": "punctuation.namespace.tl",
+          "match": "\\."
         },
         {
           "include": "#keywords"
@@ -195,70 +128,132 @@
             }
           }
         }
-      ]
+      ],
+      "beginCaptures": {
+        "2": {
+          "name": "meta.definition.combinator.tl variable.other.tl"
+        },
+        "4": {
+          "name": "meta.definition.combinator.tl variable.other.tl"
+        }
+      }
     },
-    "triple-statement": {
+    "combinator-opt-args": {
+      "name": "meta.object.type.tl",
+      "begin": "\\{",
+      "end": "\\}",
       "patterns": [
         {
-          "name": "keyword.control.triple.tl",
-          "begin": "\\-\\-\\-",
-          "beginCaptures": {
-            "0": {
-              "name": "punctuation.triple.open.tl"
-            }
-          },
-          "end": "\\-\\-\\-",
-          "endCaptures": {
-            "0": {
-              "name": "punctuation.triple.close.tl"
-            }
-          },
-          "patterns": [
-            {
-              "match": "\\b(types|functions)\\b",
-              "name": "keyword.control.triple.name.tl"
+          "include": "#combinator-args-member"
+        }
+      ],
+      "beginCaptures": {
+        "0": {
+          "name": "punctuation.definition.block.tl"
+        }
+      },
+      "endCaptures": {
+        "0": {
+          "name": "punctuation.definition.block.tl"
+        }
+      }
+    },
+    "combinator-result-type": {
+      "patterns": [
+        {
+          "match": "([_$[:alpha:]][_$[:alnum:]]*)\\s*(\\.)",
+          "captures": {
+            "1": {
+              "name": "entity.name.type.module.tl"
             },
-            {
-              "match": "\\b(.*)\\b",
-              "name": "invalid.illegal"
+            "2": {
+              "name": "punctuation.accessor.tl"
             }
-          ]
+          }
+        },
+        {
+          "name": "entity.name.type.tl",
+          "match": "[_$[:alpha:]][_$[:alnum:]]*"
         }
       ]
     },
     "comments": {
       "patterns": [
         {
+          "name": "comment.block.documentation.tl",
           "begin": "/\\*\\*",
+          "end": "\\*/",
           "captures": {
             "0": {
               "name": "punctuation.definition.comment.tl"
             }
-          },
-          "end": "\\*/",
-          "name": "comment.block.documentation.tl"
+          }
         },
         {
+          "name": "comment.block.tl",
           "begin": "/\\*",
+          "end": "\\*/",
           "captures": {
             "0": {
               "name": "punctuation.definition.comment.tl"
             }
-          },
-          "end": "\\*/",
-          "name": "comment.block.tl"
+          }
         },
         {
+          "name": "comment.line.double-slash.tl",
+          "match": "(//).*$\\n?",
           "captures": {
             "1": {
               "name": "punctuation.definition.comment.tl"
             }
+          }
+        }
+      ]
+    },
+    "keywords": {
+      "patterns": [
+        {
+          "name": "keyword.other.hash.tl",
+          "match": "\\#"
+        },
+        {
+          "name": "keyword.other.questionmark.tl",
+          "match": "\\?"
+        },
+        {
+          "name": "keyword.other.percent.tl",
+          "match": "\\%"
+        }
+      ]
+    },
+    "triple-statement": {
+      "patterns": [
+        {
+          "name": "keyword.control.triple.tl",
+          "begin": "\\-\\-\\-",
+          "end": "\\-\\-\\-",
+          "patterns": [
+            {
+              "name": "keyword.control.triple.name.tl",
+              "match": "\\b(types|functions)\\b"
+            },
+            {
+              "name": "invalid.illegal",
+              "match": "\\b(.*)\\b"
+            }
+          ],
+          "beginCaptures": {
+            "0": {
+              "name": "punctuation.triple.open.tl"
+            }
           },
-          "match": "(//).*$\\n?",
-          "name": "comment.line.double-slash.tl"
+          "endCaptures": {
+            "0": {
+              "name": "punctuation.triple.close.tl"
+            }
+          }
         }
       ]
     }
-  },
-  "scopeName": "source.tl"
-}
+  }
+}

data/grammars/source.tla.json

@@ -1,123 +1,123 @@
 {
-  "fileTypes": [
-    "tla"
-  ],
   "name": "TLA",
+  "scopeName": "source.tla",
   "patterns": [
     {
-      "match": "\\\\\\*.*$",
-      "name": "comment.line.slash-star"
+      "name": "comment.line.slash-star",
+      "match": "\\\\\\*.*$"
     },
     {
+      "name": "comment.block",
       "begin": "\\(\\*",
-      "end": "\\*\\)",
-      "name": "comment.block"
+      "end": "\\*\\)"
     },
     {
-      "match": "\\={4,}",
-      "name": "markup.other.startbreak"
+      "name": "markup.other.startbreak",
+      "match": "\\={4,}"
     },
     {
-      "match": "={4,}",
-      "name": "markup.other.endbreak"
+      "name": "markup.other.endbreak",
+      "match": "={4,}"
     },
     {
-      "match": "\\b(\\\\h[0-9a-fA-F]+|\\\\o[0-9]+|\\\\b[01]+|\\d+\\.\\d+|\\d+)\\b",
-      "name": "constant.numeric"
+      "name": "constant.numeric",
+      "match": "\\b(\\\\h[0-9a-fA-F]+|\\\\o[0-9]+|\\\\b[01]+|\\d+\\.\\d+|\\d+)\\b"
     },
     {
-      "match": "\\b(BOOLEAN|FALSE|STRING|TRUE)\\b",
-      "name": "constant.language.tla"
+      "name": "constant.language.tla",
+      "match": "\\b(BOOLEAN|FALSE|STRING|TRUE)\\b"
     },
     {
-      "match": "\\b==\\b",
-      "name": "keyword.operator.definition.tla"
+      "name": "keyword.operator.definition.tla",
+      "match": "\\b==\\b"
     },
     {
-      "match": "(\\/\\\\|\\\\\\/|\\=>|<\\=>|\\|\\=|\\=\\||\\|\\-|\\-\\||~)",
-      "name": "keyword.operator.logic.tla"
+      "name": "keyword.operator.logic.tla",
+      "match": "(\\/\\\\|\\\\\\/|\\=\u003e|\u003c\\=\u003e|\\|\\=|\\=\\||\\|\\-|\\-\\||~)"
     },
     {
-      "match": "<\\=|>\\=|\\=|<|>|\\/\\=|\\#",
-      "name": "keyword.operator.comparison.tla"
+      "name": "keyword.operator.comparison.tla",
+      "match": "\u003c\\=|\u003e\\=|\\=|\u003c|\u003e|\\/\\=|\\#"
     },
     {
-      "match": "\\b=\\b",
-      "name": "keyword.operator.assignment.tla"
+      "name": "keyword.operator.assignment.tla",
+      "match": "\\b=\\b"
     },
     {
-      "match": "(\\\\EE|\\\\AA)",
-      "name": "keyword.operator.temporal.quantification.tla"
+      "name": "keyword.operator.temporal.quantification.tla",
+      "match": "(\\\\EE|\\\\AA)"
     },
     {
-      "match": "(\\\\E|\\\\A)",
-      "name": "keyword.operator.quantification.tla"
+      "name": "keyword.operator.quantification.tla",
+      "match": "(\\\\E|\\\\A)"
     },
     {
-      "match": "(\\\\notin|:)",
-      "name": "keyword.operator.sets.tla"
+      "name": "keyword.operator.sets.tla",
+      "match": "(\\\\notin|:)"
     },
     {
-      "match": "(\\|\\->|\\->)",
-      "name": "keyword.operator.functions.tla"
+      "name": "keyword.operator.functions.tla",
+      "match": "(\\|\\-\u003e|\\-\u003e)"
     },
     {
-      "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"
+      "name": "keyword.operator.latex.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"
     },
     {
-      "match": "\\b(\\+|\\-|\\*|\\/){1}\\b",
-      "name": "keyword.operator.arithmetic.tla"
+      "name": "keyword.operator.arithmetic.tla",
+      "match": "\\b(\\+|\\-|\\*|\\/){1}\\b"
     },
     {
-      "match": "(\\[\\]|\\<\\>|\\-\\+\\->)",
-      "name": "keyword.operator.temporal.tla"
+      "name": "keyword.operator.temporal.tla",
+      "match": "(\\[\\]|\\\u003c\\\u003e|\\-\\+\\-\u003e)"
     },
     {
       "include": "#reserved-words"
     },
     {
+      "name": "string.quoted.double.tla",
       "begin": "\"",
-      "end": "\"",
-      "name": "string.quoted.double.tla"
+      "end": "\""
     },
     {
-      "begin": "';\n\t\t\tend = '",
-      "name": "string.quoted.single.tla"
+      "name": "string.quoted.single.tla",
+      "begin": "';\n\t\t\tend = '"
     },
     {
+      "name": "meta.structure.list.tla",
       "begin": "(\\[)",
-      "beginCaptures": {
-        "1": {
-          "name": "punctuation.definition.list.begin.tla"
-        }
-      },
       "end": "(\\])",
-      "endCaptures": {
-        "1": {
-          "name": "punctuation.definition.list.end.tla"
-        }
-      },
-      "name": "meta.structure.list.tla",
       "patterns": [
         {
-          "begin": "(?<=\\[|\\,)\\s*(?![\\],])",
           "contentName": "meta.structure.list.item.tla",
+          "begin": "(?\u003c=\\[|\\,)\\s*(?![\\],])",
           "end": "\\s*(?:(,)|(?=\\]))",
-          "endCaptures": {
-            "1": {
-              "name": "punctuation.separator.list.tla"
-            }
-          },
           "patterns": [
             {
               "include": "$self"
             }
-          ]
+          ],
+          "endCaptures": {
+            "1": {
+              "name": "punctuation.separator.list.tla"
+            }
+          }
+        }
+      ],
+      "beginCaptures": {
+        "1": {
+          "name": "punctuation.definition.list.begin.tla"
+        }
+      },
+      "endCaptures": {
+        "1": {
+          "name": "punctuation.definition.list.end.tla"
         }
-      ]
+      }
     },
     {
+      "name": "meta.structure.tuple.tla",
+      "match": "(\u003c\u003c)(\\s*(\u003e\u003e))",
       "captures": {
         "1": {
           "name": "punctuation.definition.tuple.begin.tla"
@@ -128,17 +128,13 @@
         "3": {
           "name": "punctuation.definition.tuple.end.tla"
         }
-      },
-      "match": "(<<)(\\s*(>>))",
-      "name": "meta.structure.tuple.tla"
+      }
     }
   ],
   "repository": {
     "reserved-words": {
-      "match": "\\b(ACTION|ASSUME|ASSUMPTION|AXIOM|BY|CASE|CHOOSE|CONSTANT|CONSTANTS|COROLLARY|DEF|DEFINE|DEFS|DOMAIN|ELSE|ENABLED|EXCEPT|EXTENDS|HAVE|HIDE|IF|IN|INSTANCE|LAMBDA|LEMMA|LET|LOCAL|MODULE|NEW|OBVIOUS|OMITTED|ONLY|OTHER|PICK|PROOF|PROPOSITION|PROVE|QED|RECURSIVE|SF_|STATE|SUBSET|SUFFICES|TAKE|TEMPORAL|THEN|THEOREM|UNCHANGED|UNION|USE|VARIABLE|VARIABLES|WF_|WITH|WITNESS)\\b",
-      "name": "keyword.control.tla"
+      "name": "keyword.control.tla",
+      "match": "\\b(ACTION|ASSUME|ASSUMPTION|AXIOM|BY|CASE|CHOOSE|CONSTANT|CONSTANTS|COROLLARY|DEF|DEFINE|DEFS|DOMAIN|ELSE|ENABLED|EXCEPT|EXTENDS|HAVE|HIDE|IF|IN|INSTANCE|LAMBDA|LEMMA|LET|LOCAL|MODULE|NEW|OBVIOUS|OMITTED|ONLY|OTHER|PICK|PROOF|PROPOSITION|PROVE|QED|RECURSIVE|SF_|STATE|SUBSET|SUFFICES|TAKE|TEMPORAL|THEN|THEOREM|UNCHANGED|UNION|USE|VARIABLE|VARIABLES|WF_|WITH|WITNESS)\\b"
     }
-  },
-  "scopeName": "source.tla",
-  "uuid": "A29E70ED-6D0F-4997-84E9-528B8EC412A1"
-}
+  }
+}