github-linguist 5.3.3 → 6.0.0

data/grammars/source.jisonlex-injection.json

@@ -1,11 +1,10 @@
 {
   "name": "Jison Lex Injection",
   "scopeName": "source.jisonlex-injection",
-  "injectionSelector": "L:(meta.rule.action.jisonlex - comment)",
   "patterns": [
     {
       "name": "variable.language.jisonlex",
       "match": "\\byy(?:l(?:eng|ineno|loc)|text)\\b"
     }
   ]
-}
+}

data/grammars/source.jisonlex.json

@@ -1,37 +1,29 @@
 {
   "name": "Jison Lex",
   "scopeName": "source.jisonlex",
-  "fileTypes": [
-    "jisonlex"
-  ],
   "patterns": [
     {
       "begin": "%%",
-      "beginCaptures": {
-        "0": {
-          "name": "meta.separator.section.jisonlex"
-        }
-      },
       "patterns": [
         {
           "begin": "^%%",
-          "beginCaptures": {
-            "0": {
-              "name": "meta.separator.section.jisonlex"
-            }
-          },
           "patterns": [
             {
               "name": "meta.section.user-code.jisonlex",
-              "begin": "\\G",
               "contentName": "source.js.embedded.jison",
+              "begin": "\\G",
               "patterns": [
                 {
                   "include": "#user_code_section"
                 }
               ]
             }
-          ]
+          ],
+          "beginCaptures": {
+            "0": {
+              "name": "meta.separator.section.jisonlex"
+            }
+          }
         },
         {
           "name": "meta.section.rules.jisonlex",
@@ -43,7 +35,12 @@
             }
           ]
         }
-      ]
+      ],
+      "beginCaptures": {
+        "0": {
+          "name": "meta.separator.section.jisonlex"
+        }
+      }
     },
     {
       "name": "meta.section.definitions.jisonlex",
@@ -69,11 +66,6 @@
           "name": "meta.definition.jisonlex",
           "begin": "\\b[[:alpha:]_](?:[\\w-]*\\w)?\\b",
           "end": "$",
-          "beginCaptures": {
-            "0": {
-              "name": "entity.name.other.definition.jisonlex"
-            }
-          },
           "patterns": [
             {
               "include": "source.jison#comments"
@@ -88,17 +80,17 @@
                 }
               ]
             }
-          ]
+          ],
+          "beginCaptures": {
+            "0": {
+              "name": "entity.name.other.definition.jisonlex"
+            }
+          }
         },
         {
           "name": "meta.start-condition.jisonlex",
           "begin": "%[sx]\\b",
           "end": "$",
-          "beginCaptures": {
-            "0": {
-              "name": "keyword.other.start-condition.jisonlex"
-            }
-          },
           "patterns": [
             {
               "include": "source.jison#comments"
@@ -111,7 +103,12 @@
               "name": "invalid.illegal.jisonlex",
               "match": "\\S"
             }
-          ]
+          ],
+          "beginCaptures": {
+            "0": {
+              "name": "keyword.other.start-condition.jisonlex"
+            }
+          }
         },
         {
           "include": "source.jison#options_declarations"
@@ -125,94 +122,6 @@
         }
       ]
     },
-    "rules_section": {
-      "patterns": [
-        {
-          "include": "source.jison#comments"
-        },
-        {
-          "name": "meta.start-conditions.jisonlex",
-          "begin": "(?:^|(?<=%\\}))<(?!<EOF>>)",
-          "end": ">",
-          "beginCaptures": {
-            "0": {
-              "name": "punctuation.definition.start-conditions.begin.jisonlex"
-            }
-          },
-          "endCaptures": {
-            "0": {
-              "name": "punctuation.definition.start-conditions.end.jisonlex"
-            }
-          },
-          "patterns": [
-            {
-              "name": "keyword.other.jisonlex",
-              "match": "\\bINITIAL\\b"
-            },
-            {
-              "name": "entity.name.function.jisonlex",
-              "match": "\\b[[:alpha:]_](?:[\\w-]*\\w)?\\b"
-            },
-            {
-              "name": "punctuation.separator.start-condition.jisonlex",
-              "match": ","
-            },
-            {
-              "name": "keyword.other.any-start-condition.jisonlex",
-              "match": "(?<=<)\\*(?=>)"
-            },
-            {
-              "name": "invalid.illegal.jisonlex",
-              "match": "."
-            }
-          ]
-        },
-        {
-          "name": "meta.rule.action.jisonlex",
-          "begin": "(?=%\\{)",
-          "end": "(?<=%\\})",
-          "patterns": [
-            {
-              "include": "source.jison#user_code_blocks"
-            }
-          ]
-        },
-        {
-          "name": "string.regexp.jisonlex",
-          "begin": "(?:^|(?<=>|%\\}))(?=\\S)",
-          "end": "(?=\\s|%\\{)",
-          "patterns": [
-            {
-              "include": "#regexp"
-            }
-          ]
-        },
-        {
-          "name": "meta.rule.action.jisonlex",
-          "begin": "(?=\\S)",
-          "end": "$",
-          "contentName": "source.js.embedded.jison",
-          "patterns": [
-            {
-              "include": "source.jison#include_declarations"
-            },
-            {
-              "include": "source.js"
-            }
-          ]
-        }
-      ]
-    },
-    "user_code_section": {
-      "patterns": [
-        {
-          "include": "source.jison#user_code_include_declarations"
-        },
-        {
-          "include": "source.js"
-        }
-      ]
-    },
     "name_uses": {
       "patterns": [
         {
@@ -270,6 +179,11 @@
           "name": "meta.non-capturing.group.regexp.jisonlex",
           "begin": "\\(\\?:",
           "end": "\\)",
+          "patterns": [
+            {
+              "include": "#regexp"
+            }
+          ],
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.group.begin.regexp.jisonlex"
@@ -279,17 +193,17 @@
             "0": {
               "name": "punctuation.definition.group.end.regexp.jisonlex"
             }
-          },
-          "patterns": [
-            {
-              "include": "#regexp"
-            }
-          ]
+          }
         },
         {
           "name": "meta.lookahead.assertion.regexp.jisonlex",
           "begin": "\\(\\?=",
           "end": "\\)",
+          "patterns": [
+            {
+              "include": "#regexp"
+            }
+          ],
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.group.begin.regexp.jisonlex"
@@ -299,17 +213,17 @@
             "0": {
               "name": "punctuation.definition.group.end.regexp.jisonlex"
             }
-          },
-          "patterns": [
-            {
-              "include": "#regexp"
-            }
-          ]
+          }
         },
         {
           "name": "meta.negative.lookahead.assertion.regexp.jisonlex",
           "begin": "\\(\\?!",
           "end": "\\)",
+          "patterns": [
+            {
+              "include": "#regexp"
+            }
+          ],
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.group.begin.regexp.jisonlex"
@@ -319,17 +233,17 @@
             "0": {
               "name": "punctuation.definition.group.end.regexp.jisonlex"
             }
-          },
-          "patterns": [
-            {
-              "include": "#regexp"
-            }
-          ]
+          }
         },
         {
           "name": "meta.group.regexp.jisonlex",
           "begin": "\\(",
           "end": "\\)",
+          "patterns": [
+            {
+              "include": "#regexp"
+            }
+          ],
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.group.begin.regexp.jisonlex"
@@ -339,17 +253,20 @@
             "0": {
               "name": "punctuation.definition.group.end.regexp.jisonlex"
             }
-          },
-          "patterns": [
-            {
-              "include": "#regexp"
-            }
-          ]
+          }
         },
         {
           "name": "constant.other.character-class.set.regexp.jisonlex",
           "begin": "(\\[)(\\^)?",
           "end": "\\]",
+          "patterns": [
+            {
+              "include": "#name_uses"
+            },
+            {
+              "include": "#regexp_character_class"
+            }
+          ],
           "beginCaptures": {
             "1": {
               "name": "punctuation.definition.character-class.begin.regexp.jisonlex"
@@ -362,15 +279,7 @@
             "0": {
               "name": "punctuation.definition.character-class.end.regexp.jisonlex"
             }
-          },
-          "patterns": [
-            {
-              "include": "#name_uses"
-            },
-            {
-              "include": "#regexp_character_class"
-            }
-          ]
+          }
         },
         {
           "include": "#regexp_character_class"
@@ -383,7 +292,7 @@
         },
         {
           "name": "keyword.other.eof.regexp.jisonlex",
-          "match": "<<EOF>>"
+          "match": "\u003c\u003cEOF\u003e\u003e"
         },
         {
           "name": "keyword.operator.negative.lookahead.regexp.jisonlex",
@@ -429,6 +338,94 @@
           "include": "source.js#string_escapes"
         }
       ]
+    },
+    "rules_section": {
+      "patterns": [
+        {
+          "include": "source.jison#comments"
+        },
+        {
+          "name": "meta.start-conditions.jisonlex",
+          "begin": "(?:^|(?\u003c=%\\}))\u003c(?!\u003cEOF\u003e\u003e)",
+          "end": "\u003e",
+          "patterns": [
+            {
+              "name": "keyword.other.jisonlex",
+              "match": "\\bINITIAL\\b"
+            },
+            {
+              "name": "entity.name.function.jisonlex",
+              "match": "\\b[[:alpha:]_](?:[\\w-]*\\w)?\\b"
+            },
+            {
+              "name": "punctuation.separator.start-condition.jisonlex",
+              "match": ","
+            },
+            {
+              "name": "keyword.other.any-start-condition.jisonlex",
+              "match": "(?\u003c=\u003c)\\*(?=\u003e)"
+            },
+            {
+              "name": "invalid.illegal.jisonlex",
+              "match": "."
+            }
+          ],
+          "beginCaptures": {
+            "0": {
+              "name": "punctuation.definition.start-conditions.begin.jisonlex"
+            }
+          },
+          "endCaptures": {
+            "0": {
+              "name": "punctuation.definition.start-conditions.end.jisonlex"
+            }
+          }
+        },
+        {
+          "name": "meta.rule.action.jisonlex",
+          "begin": "(?=%\\{)",
+          "end": "(?\u003c=%\\})",
+          "patterns": [
+            {
+              "include": "source.jison#user_code_blocks"
+            }
+          ]
+        },
+        {
+          "name": "string.regexp.jisonlex",
+          "begin": "(?:^|(?\u003c=\u003e|%\\}))(?=\\S)",
+          "end": "(?=\\s|%\\{)",
+          "patterns": [
+            {
+              "include": "#regexp"
+            }
+          ]
+        },
+        {
+          "name": "meta.rule.action.jisonlex",
+          "contentName": "source.js.embedded.jison",
+          "begin": "(?=\\S)",
+          "end": "$",
+          "patterns": [
+            {
+              "include": "source.jison#include_declarations"
+            },
+            {
+              "include": "source.js"
+            }
+          ]
+        }
+      ]
+    },
+    "user_code_section": {
+      "patterns": [
+        {
+          "include": "source.jison#user_code_include_declarations"
+        },
+        {
+          "include": "source.js"
+        }
+      ]
     }
   }
-}
+}

data/grammars/source.jolie.json

@@ -1,18 +1,17 @@
 {
   "name": "Jolie",
-  "fileTypes": [
-    "ol",
-    "iol"
-  ],
   "scopeName": "source.jolie",
-  "foldingStartMarker": "\\{\\s*$",
-  "foldingStopMarker": "^\\s*\\}",
   "patterns": [
     {
       "include": "#code"
     }
   ],
   "repository": {
+    "block_comments": {
+      "name": "comment.block.jolie",
+      "begin": "/\\*",
+      "end": "\\*/"
+    },
     "code": {
       "patterns": [
         {
@@ -64,16 +63,6 @@
       "name": "constant.numeric.jolie",
       "match": "\\b\\d+\\b"
     },
-    "block_comments": {
-      "begin": "/\\*",
-      "end": "\\*/",
-      "name": "comment.block.jolie"
-    },
-    "line_comments": {
-      "begin": "//",
-      "end": "\\n",
-      "name": "comment.line.double-slash.jolie"
-    },
     "definitions": {
       "match": "\\b(inputPort|outputPort|interface|type|define|service)\\s+(\\w+)\\b",
       "captures": {
@@ -85,26 +74,6 @@
         }
       }
     },
-    "keywords_with_colon": {
-      "name": "keyword.other.with_colon.jolie",
-      "match": "\\b(Location|Protocol|Interfaces|Aggregates|Redirects|Jolie|JavaScript|Java|OneWay|RequestResponse)\\b\\s*:"
-    },
-    "keywords_other": {
-      "name": "keyword.other.jolie",
-      "match": "\\b(constants|cH|instanceof|execution|comp|concurrent|nullProcess|single|sequential|main|init|cset|is_defined|embedded|extender|courier|forward|install|undef|include|synchronized|throws|throw)\\b"
-    },
-    "keywords_control": {
-      "name": "keyword.control.jolie",
-      "match": "\\b(if|else|while|for|foreach|provide|until|throw|forward|scope)\\b"
-    },
-    "keywords_types": {
-      "name": "storage.type.jolie",
-      "match": "\\b(void|bool|int|string|long|double|any|raw)\\b"
-    },
-    "keywords_modifiers": {
-      "name": "storage.modifiers.jolie",
-      "match": "\\b(csets|global)\\b"
-    },
     "invocations": {
       "match": "\\b(\\w+)\\s*(@)\\s*(\\w+)\\b",
       "captures": {
@@ -119,20 +88,45 @@
         }
       }
     },
+    "keywords_control": {
+      "name": "keyword.control.jolie",
+      "match": "\\b(if|else|while|for|foreach|provide|until|throw|forward|scope)\\b"
+    },
+    "keywords_modifiers": {
+      "name": "storage.modifiers.jolie",
+      "match": "\\b(csets|global)\\b"
+    },
+    "keywords_other": {
+      "name": "keyword.other.jolie",
+      "match": "\\b(constants|cH|instanceof|execution|comp|concurrent|nullProcess|single|sequential|main|init|cset|is_defined|embedded|extender|courier|forward|install|undef|include|synchronized|throws|throw)\\b"
+    },
+    "keywords_types": {
+      "name": "storage.type.jolie",
+      "match": "\\b(void|bool|int|string|long|double|any|raw)\\b"
+    },
+    "keywords_with_colon": {
+      "name": "keyword.other.with_colon.jolie",
+      "match": "\\b(Location|Protocol|Interfaces|Aggregates|Redirects|Jolie|JavaScript|Java|OneWay|RequestResponse)\\b\\s*:"
+    },
+    "line_comments": {
+      "name": "comment.line.double-slash.jolie",
+      "begin": "//",
+      "end": "\\n"
+    },
+    "operators": {
+      "name": "keyword.operator.jolie",
+      "match": "\\b(\u003c\u003c|\u0026\u0026|\\|\\||\\+|\\-|/|\\*|=|==|\\+\\+|--|\\+=|-=|\\*=|/=|!|%|%=)\\b"
+    },
     "strings": {
       "name": "string.quoted.double.jolie",
       "begin": "\"",
       "end": "\"",
       "patterns": [
         {
-          "match": "\\\\.",
-          "name": "constant.character.escape.jolie"
+          "name": "constant.character.escape.jolie",
+          "match": "\\\\."
         }
       ]
-    },
-    "operators": {
-      "name": "keyword.operator.jolie",
-      "match": "\\b(<<|&&|\\|\\||\\+|\\-|/|\\*|=|==|\\+\\+|--|\\+=|-=|\\*=|/=|!|%|%=)\\b"
     }
   }
-}
+}