github-linguist 5.3.3 → 6.0.0

data/grammars/source.opa.json

@@ -1,11 +1,6 @@
 {
-  "fileTypes": [
-    "opa"
-  ],
-  "foldingStartMarker": "/\\*\\*\\s*$",
-  "foldingStopMarker": "\\*/",
-  "keyEquivalent": "^~O",
   "name": "Opa",
+  "scopeName": "source.opa",
   "patterns": [
     {
       "include": "#code"
@@ -40,13 +35,13 @@
     "comments": {
       "patterns": [
         {
+          "name": "comment.block.opa",
           "begin": "/\\*(\\*)?",
           "end": "\\*/",
-          "name": "comment.block.opa",
           "patterns": [
             {
-              "match": "@\\w*",
-              "name": "keyword.annotation.opa"
+              "name": "keyword.annotation.opa",
+              "match": "@\\w*"
             },
             {
               "include": "#comments"
@@ -54,34 +49,35 @@
           ]
         },
         {
-          "match": "\\/\\/.*$",
-          "name": "comment.single.opa"
+          "name": "comment.single.opa",
+          "match": "\\/\\/.*$"
         }
       ]
     },
     "constants": {
       "patterns": [
         {
-          "match": "\\b(void|false|true)\\b",
-          "name": "constant.language"
+          "name": "constant.language",
+          "match": "\\b(void|false|true)\\b"
         },
         {
-          "match": "\\b((0(x|X)[0-9a-fA-F]*)|(([0-9]+\\.?[0-9]*)|(\\.[0-9]+))((e|E)(\\+|-)?[0-9]+)?)([LlFfUuDd]|UL|ul)?\\b",
-          "name": "constant.numeric.opa"
+          "name": "constant.numeric.opa",
+          "match": "\\b((0(x|X)[0-9a-fA-F]*)|(([0-9]+\\.?[0-9]*)|(\\.[0-9]+))((e|E)(\\+|-)?[0-9]+)?)([LlFfUuDd]|UL|ul)?\\b"
         }
       ]
     },
     "declarations": {
       "patterns": [
         {
+          "match": "([\\w_]*)\\s*=\\s*{{",
           "captures": {
             "1": {
               "name": "entity.name.module"
             }
-          },
-          "match": "([\\w_]*)\\s*=\\s*{{"
+          }
         },
         {
+          "match": "\\b(type)\\b\\s*([a-zA-Z_][a-zA-Z0-9_]*|`[^`\\n\\r]`)",
           "captures": {
             "1": {
               "name": "keyword.opa"
@@ -89,11 +85,11 @@
             "2": {
               "name": "entity.name.type"
             }
-          },
-          "match": "\\b(type)\\b\\s*([a-zA-Z_][a-zA-Z0-9_]*|`[^`\\n\\r]`)"
+          }
         },
         {
           "begin": "^\\s*(@[\\w_]*)?\\s*([\\w_]*)\\((?=.*\\)\\s*(:\\s(\\w*))?\\s*=)",
+          "end": "\\)\\s*(:\\s(\\w*))?\\s*=",
           "beginCaptures": {
             "1": {
               "name": "keyword.directive.opa"
@@ -101,32 +97,28 @@
             "2": {
               "name": "entity.name.function"
             }
-          },
-          "end": "\\)\\s*(:\\s(\\w*))?\\s*=",
-          "patterns": [
-
-          ]
+          }
         },
         {
+          "match": "(\\w*)(:.*)?\\s*=[^=]",
           "captures": {
             "1": {
               "name": "variable.other.opa"
             }
-          },
-          "match": "(\\w*)(:.*)?\\s*=[^=]"
+          }
         }
       ]
     },
     "directive": {
-      "match": "@[\\w_]*",
-      "name": "keyword.directive.opa"
+      "name": "keyword.directive.opa",
+      "match": "@[\\w_]*"
     },
     "embedded-source": {
       "patterns": [
         {
+          "name": "source.opa.embeded.block",
           "begin": "{",
           "end": "}",
-          "name": "source.opa.embeded.block",
           "patterns": [
             {
               "include": "#code"
@@ -139,19 +131,19 @@
       ]
     },
     "keywords": {
-      "match": "\\b(_|as|do|else|if|match|then|type|with|and|begin|css|db|end|external|forall|import|package|parser|rec|server|val|xml_parser)\\b",
-      "name": "keyword.opa"
+      "name": "keyword.opa",
+      "match": "\\b(_|as|do|else|if|match|then|type|with|and|begin|css|db|end|external|forall|import|package|parser|rec|server|val|xml_parser)\\b"
     },
     "strings": {
       "patterns": [
         {
-          "begin": "(?<!\\\\)\"",
-          "end": "\"",
           "name": "string.quoted.double.scala",
+          "begin": "(?\u003c!\\\\)\"",
+          "end": "\"",
           "patterns": [
             {
-              "match": "\\\\.",
-              "name": "constant.character.escape.scala"
+              "name": "constant.character.escape.scala",
+              "match": "\\\\."
             }
           ]
         }
@@ -160,6 +152,7 @@
     "xml-attribute": {
       "patterns": [
         {
+          "match": "(\\w+)=((\"[^\"]*\")|(#\\w*))",
           "captures": {
             "1": {
               "name": "entity.other.attribute-name"
@@ -170,22 +163,16 @@
             "4": {
               "name": "variable.other.opa"
             }
-          },
-          "match": "(\\w+)=((\"[^\"]*\")|(#\\w*))"
+          }
         }
       ]
     },
     "xml-literal": {
       "patterns": [
         {
-          "begin": "</?([a-zA-Z0-9]+)",
-          "beginCaptures": {
-            "1": {
-              "name": "entity.name.tag"
-            }
-          },
-          "end": "/?>",
           "name": "text.xml",
+          "begin": "\u003c/?([a-zA-Z0-9]+)",
+          "end": "/?\u003e",
           "patterns": [
             {
               "include": "#xml-literal"
@@ -196,11 +183,14 @@
             {
               "include": "#embedded-source"
             }
-          ]
+          ],
+          "beginCaptures": {
+            "1": {
+              "name": "entity.name.tag"
+            }
+          }
         }
       ]
     }
-  },
-  "scopeName": "source.opa",
-  "uuid": "6EFC7D81-7319-47DD-A191-735B5DE53E02"
-}
+  }
+}

data/grammars/source.opal.json

@@ -1,11 +1,6 @@
 {
   "name": "Opal",
   "scopeName": "source.opal",
-  "fileTypes": [
-    "impl",
-    "sign"
-  ],
-  "uuid": "3da0f3f0-8b32-41c9-857c-ce9be39b99d4",
   "patterns": [
     {
       "name": "comment.line.double-dash.opal",
@@ -48,6 +43,16 @@
       "name": "meta.signature-implementation.opal",
       "begin": "^\\s*(SIGNATURE|IMPLEMENTATION)\\s+([^A-Z])?(\\w+)\\s*(\\[)",
       "end": "(\\])",
+      "patterns": [
+        {
+          "name": "punctuation.separator.inheritance.opal",
+          "match": "\\,"
+        },
+        {
+          "name": "entity.other.inherited-class.opal",
+          "match": "(?:[^\\,\\]]+)"
+        }
+      ],
       "beginCaptures": {
         "1": {
           "name": "keyword.meta.signature-implementation.opal"
@@ -66,17 +71,7 @@
         "1": {
           "name": "punctuation.definition.inheritance.end.opal"
         }
-      },
-      "patterns": [
-        {
-          "name": "punctuation.separator.inheritance.opal",
-          "match": "\\,"
-        },
-        {
-          "name": "entity.other.inherited-class.opal",
-          "match": "(?:[^\\,\\]]+)"
-        }
-      ]
+      }
     },
     {
       "name": "keyword.control.import.opal",
@@ -84,9 +79,19 @@
     },
     {
       "name": "meta.function.opal",
+      "contentName": "meta.function.parameters.opal",
       "begin": "^\\s*(FUN)\\s+([^\\\"():]+)\\s*(\\:)",
       "end": "($)|(?=\\-\\-)|(?=/\\*)",
-      "contentName": "meta.function.parameters.opal",
+      "patterns": [
+        {
+          "name": "punctuation.seperator.parameters.opal",
+          "match": "\\*\\*|\\-\u003e"
+        },
+        {
+          "name": "storage.type.opal",
+          "match": "\\b(\\w+)\\b"
+        }
+      ],
       "beginCaptures": {
         "1": {
           "name": "storage.type.function.opal"
@@ -97,17 +102,7 @@
         "3": {
           "name": "punctuation.definition.parameters.begin.opal"
         }
-      },
-      "patterns": [
-        {
-          "name": "punctuation.seperator.parameters.opal",
-          "match": "\\*\\*|\\->"
-        },
-        {
-          "name": "storage.type.opal",
-          "match": "\\b(\\w+)\\b"
-        }
-      ]
+      }
     },
     {
       "name": "meta.function.opal",
@@ -134,6 +129,16 @@
       "name": "meta.function.opal",
       "begin": "^\\s*(DEF)\\s+([^\\s():]+)\\s*(?:(\\())?",
       "end": "(?:(\\)))?\\s*(==)",
+      "patterns": [
+        {
+          "name": "punctuation.seperator.parameters.opal",
+          "match": "\\,"
+        },
+        {
+          "name": "variable.parameter.opal",
+          "match": "\\w*"
+        }
+      ],
       "beginCaptures": {
         "1": {
           "name": "storage.type.function.opal"
@@ -152,33 +157,23 @@
         "2": {
           "name": "punctuation.section.function.begin.opal"
         }
-      },
-      "patterns": [
-        {
-          "name": "punctuation.seperator.parameters.opal",
-          "match": "\\,"
-        },
-        {
-          "name": "variable.parameter.opal",
-          "match": "\\w*"
-        }
-      ]
+      }
     },
     {
       "name": "meta.type.sort.opal",
       "begin": "^\\s*(SORT)",
       "end": "$",
-      "beginCaptures": {
-        "1": {
-          "name": "storage.type.sort.opal"
-        }
-      },
       "patterns": [
         {
           "name": "entity.name.function.type.sort.opal",
           "match": "\\b[^\\s():]+\\b"
         }
-      ]
+      ],
+      "beginCaptures": {
+        "1": {
+          "name": "storage.type.sort.opal"
+        }
+      }
     },
     {
       "name": "meta.type.data.opal",
@@ -202,20 +197,6 @@
       "name": "meta.type.constructors.opal",
       "begin": "(\\w+)\\s*\\(\\s*(\\w+)\\s*(:)\\s*(\\w+)",
       "end": "\\)",
-      "beginCaptures": {
-        "1": {
-          "name": "entity.name.function.constructor.opal"
-        },
-        "2": {
-          "name": "variable.parameter.opal"
-        },
-        "3": {
-          "name": "punctuation.seperator.type.opal"
-        },
-        "4": {
-          "name": "storage.type.opal"
-        }
-      },
       "patterns": [
         {
           "name": "punctuation.seperator.parameters.opal",
@@ -243,7 +224,21 @@
             }
           }
         }
-      ]
+      ],
+      "beginCaptures": {
+        "1": {
+          "name": "entity.name.function.constructor.opal"
+        },
+        "2": {
+          "name": "variable.parameter.opal"
+        },
+        "3": {
+          "name": "punctuation.seperator.type.opal"
+        },
+        "4": {
+          "name": "storage.type.opal"
+        }
+      }
     },
     {
       "include": "#evaluable"
@@ -258,19 +253,9 @@
       "patterns": [
         {
           "name": "meta.function.anonymous.opal",
+          "contentName": "meta.definition.parameters.opal",
           "begin": "(\\\\\\\\)",
           "end": "(\\.)",
-          "contentName": "meta.definition.parameters.opal",
-          "beginCaptures": {
-            "1": {
-              "name": "storage.type.function.opal"
-            }
-          },
-          "endCaptures": {
-            "1": {
-              "name": "punctuation.section.function.begin.opal"
-            }
-          },
           "patterns": [
             {
               "name": "punctuation.seperator.parameters.opal",
@@ -295,7 +280,17 @@
               "name": "variable.parameter.opal",
               "match": "\\w+"
             }
-          ]
+          ],
+          "beginCaptures": {
+            "1": {
+              "name": "storage.type.function.opal"
+            }
+          },
+          "endCaptures": {
+            "1": {
+              "name": "punctuation.section.function.begin.opal"
+            }
+          }
         },
         {
           "name": "constant.numeric.integer.opal",
@@ -317,19 +312,6 @@
           "name": "string.quoted.double.opal",
           "begin": "(\\\")",
           "end": "(\\n)|(\\\")",
-          "beginCaptures": {
-            "1": {
-              "name": "punctuation.definition.string.begin.opal"
-            }
-          },
-          "endCaptures": {
-            "1": {
-              "name": "invalid.illegal.unclosed-string.opal"
-            },
-            "2": {
-              "name": "punctuation.definition.string.end.opal"
-            }
-          },
           "patterns": [
             {
               "name": "constant.character.escape.backslash.opal",
@@ -375,7 +357,20 @@
               "name": "invalid.illegal.unknown-escape.opal",
               "match": "\\\\."
             }
-          ]
+          ],
+          "beginCaptures": {
+            "1": {
+              "name": "punctuation.definition.string.begin.opal"
+            }
+          },
+          "endCaptures": {
+            "1": {
+              "name": "invalid.illegal.unclosed-string.opal"
+            },
+            "2": {
+              "name": "punctuation.definition.string.end.opal"
+            }
+          }
         },
         {
           "name": "support.function.builtin.opal",
@@ -383,7 +378,7 @@
         },
         {
           "name": "support.function.builtin.opal",
-          "match": "<>\\?|<>(?!\\?)"
+          "match": "\u003c\u003e\\?|\u003c\u003e(?!\\?)"
         },
         {
           "name": "keyword.control.opal",
@@ -395,7 +390,7 @@
         },
         {
           "name": "keyword.operator.comparison.opal",
-          "match": "(<=|>=|<|>|\\|=|(?<!=)=(?!=))"
+          "match": "(\u003c=|\u003e=|\u003c|\u003e|\\|=|(?\u003c!=)=(?!=))"
         },
         {
           "name": "keyword.operator.arithmetic.opal",
@@ -412,4 +407,4 @@
       ]
     }
   }
-}
+}