github-linguist 7.4.0 → 7.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: fd3201b062e25699ef1953bb75bb31455120b7d6c2c7689564a98d96a933b3da
-  data.tar.gz: e200f00dbc2d5b4328e1e5220e643689d815bf6f9bcc5937bd93959293b10f7a
+SHA1:
+  metadata.gz: b4bd8cbabd12cf542c9a8bc799551db93e999282
+  data.tar.gz: 1b78e284c91ab90733cff84352ef094db30bd7d6
 SHA512:
-  metadata.gz: 495e7265faf020f90d0fb18b03d71710f29ef76fd41c55089299063919cad982610995a033e4e4589b90a9646f9181b6e02789cdf31fb2a6cf35b61c8b8504b4
-  data.tar.gz: 9c524474881806301b778388aae07180b708228f4b59c308b52cece0c5ae55eb70a6039ecbed4dbf7242e31578e8858cec00916a00d987bbf2e36038a0836198
+  metadata.gz: ccecdad32127c65eb97c90b4b528156e6a9ce920793565b911aefdef7f800afa7dc981b129013f89da814ba292453ca3d4e926a54df31fe7b20a36a2153789e1
+  data.tar.gz: 41058eaf75540117bb28b5a9634b98189aa0578050fc7ddbd0cc20963edbaa0a893f3458f19e7b1f76b390133060a1ae3df0851e1d2ebea4ee01143723d93a83

data/grammars/annotation.liquidhaskell.haskell.json

@@ -377,7 +377,7 @@
         {
           "name": "meta.declaration.instance.deriving.haskell",
           "contentName": "meta.type-signature.haskell",
-          "begin": "(?:\\G(?:\\s*\\w+\\s)?|^)([ \\t]*)(?:(deriving)(?:\\s+([\\p{Ll}_][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*))?)\\s+(instance)(?:(?\u003c=[\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}'])(?![\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']))",
+          "begin": "(?:\\G(?:\\s*\\w+\\s)?|^)([ \\t]*)(?:(?:(deriving)(?:\\s+([\\p{Ll}_][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*))?)\\s+|(deriving)\\s+(via)\\s+(.*)\\s+)?(instance)(?:(?\u003c=[\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}'])(?![\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']))",
           "end": "(?:^(?!\\1[ \\t]|[ \\t]*$)|(?=@-}))",
           "patterns": [
             {
@@ -385,9 +385,6 @@
             },
             {
               "include": "#type_signature"
-            },
-            {
-              "include": "#deriving_via"
             }
           ],
           "beginCaptures": {
@@ -403,6 +400,20 @@
             },
             "4": {
               "name": "keyword.other.haskell"
+            },
+            "5": {
+              "name": "keyword.other.haskell"
+            },
+            "6": {
+              "name": "meta.type-signature.haskell",
+              "patterns": [
+                {
+                  "include": "#type_signature"
+                }
+              ]
+            },
+            "7": {
+              "name": "keyword.other.haskell"
             }
           }
         }

data/grammars/hint.haskell.json

@@ -359,7 +359,7 @@
         {
           "name": "meta.declaration.instance.deriving.haskell",
           "contentName": "meta.type-signature.haskell",
-          "begin": "^([ \\t]*)(?:(deriving)(?:\\s+([\\p{Ll}_][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*))?)\\s+(instance)(?:(?\u003c=[\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}'])(?![\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']))",
+          "begin": "^([ \\t]*)(?:(?:(deriving)(?:\\s+([\\p{Ll}_][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*))?)\\s+|(deriving)\\s+(via)\\s+(.*)\\s+)?(instance)(?:(?\u003c=[\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}'])(?![\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']))",
           "end": "^(?!\\1[ \\t]|[ \\t]*$)",
           "patterns": [
             {
@@ -367,9 +367,6 @@
             },
             {
               "include": "#type_signature"
-            },
-            {
-              "include": "#deriving_via"
             }
           ],
           "beginCaptures": {
@@ -385,6 +382,20 @@
             },
             "4": {
               "name": "keyword.other.haskell"
+            },
+            "5": {
+              "name": "keyword.other.haskell"
+            },
+            "6": {
+              "name": "meta.type-signature.haskell",
+              "patterns": [
+                {
+                  "include": "#type_signature"
+                }
+              ]
+            },
+            "7": {
+              "name": "keyword.other.haskell"
             }
           }
         }

data/grammars/hint.message.haskell.json

@@ -383,7 +383,7 @@
         {
           "name": "meta.declaration.instance.deriving.haskell",
           "contentName": "meta.type-signature.haskell",
-          "begin": "^([ \\t]*)(?:(deriving)(?:\\s+([\\p{Ll}_][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*))?)\\s+(instance)(?:(?\u003c=[\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}'])(?![\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']))",
+          "begin": "^([ \\t]*)(?:(?:(deriving)(?:\\s+([\\p{Ll}_][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*))?)\\s+|(deriving)\\s+(via)\\s+(.*)\\s+)?(instance)(?:(?\u003c=[\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}'])(?![\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']))",
           "end": "^(?!\\1[ \\t]|[ \\t]*$)",
           "patterns": [
             {
@@ -391,9 +391,6 @@
             },
             {
               "include": "#type_signature"
-            },
-            {
-              "include": "#deriving_via"
             }
           ],
           "beginCaptures": {
@@ -409,6 +406,20 @@
             },
             "4": {
               "name": "keyword.other.haskell"
+            },
+            "5": {
+              "name": "keyword.other.haskell"
+            },
+            "6": {
+              "name": "meta.type-signature.haskell",
+              "patterns": [
+                {
+                  "include": "#type_signature"
+                }
+              ]
+            },
+            "7": {
+              "name": "keyword.other.haskell"
             }
           }
         }

data/grammars/hint.type.haskell.json

@@ -356,7 +356,7 @@
         {
           "name": "meta.declaration.instance.deriving.haskell",
           "contentName": "meta.type-signature.haskell",
-          "begin": "^([ \\t]*)(?:(deriving)(?:\\s+([\\p{Ll}_][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*))?)\\s+(instance)(?:(?\u003c=[\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}'])(?![\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']))",
+          "begin": "^([ \\t]*)(?:(?:(deriving)(?:\\s+([\\p{Ll}_][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*))?)\\s+|(deriving)\\s+(via)\\s+(.*)\\s+)?(instance)(?:(?\u003c=[\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}'])(?![\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']))",
           "end": "^(?!\\1[ \\t]|[ \\t]*$)",
           "patterns": [
             {
@@ -364,9 +364,6 @@
             },
             {
               "include": "#type_signature"
-            },
-            {
-              "include": "#deriving_via"
             }
           ],
           "beginCaptures": {
@@ -382,6 +379,20 @@
             },
             "4": {
               "name": "keyword.other.haskell"
+            },
+            "5": {
+              "name": "keyword.other.haskell"
+            },
+            "6": {
+              "name": "meta.type-signature.haskell",
+              "patterns": [
+                {
+                  "include": "#type_signature"
+                }
+              ]
+            },
+            "7": {
+              "name": "keyword.other.haskell"
             }
           }
         }

data/grammars/source.abap.json

@@ -24,6 +24,10 @@
       "name": "comment.line.pragma.abap",
       "match": "(?\u003c![^\\s])##.*?(?=([\\.:,\\s]))"
     },
+    {
+      "name": "variable.other.abap",
+      "match": "(?i)(?\u003c=\\s)([a-z_/][a-z_0-9/]*)(?=\\s+=\\s+)"
+    },
     {
       "name": "constant.numeric.abap",
       "match": "\\b[0-9]+(\\b|\\.|,)"
@@ -281,8 +285,15 @@
       ]
     },
     "keywords_followed_by_braces": {
-      "name": "keyword.control.simple.abap",
-      "match": "(?ix)\\b(data|value|field-symbol)(?=\\()"
+      "match": "(?ix)\\b(data|value|field-symbol)\\((\u003c?[a-z_\\/][a-z_0-9\\/]*\u003e?)\\)",
+      "captures": {
+        "1": {
+          "name": "keyword.control.simple.abap"
+        },
+        "2": {
+          "name": "variable.other.abap"
+        }
+      }
     },
     "logical_operator": {
       "name": "keyword.operator.arithmetic.abap",
@@ -290,7 +301,7 @@
     },
     "main_keywords": {
       "name": "keyword.control.simple.abap",
-      "match": "(?ix)(?\u003c=^|\\s)(\n\t        abstract|add|add-corresponding|adjacent|alias|aliases|all|append|appending|ascending|as|assert|assign|assigned|assigning|association|authority-check|\n\t        back|begin|binary|block|bound|break-point|by|byte|\n\t        call|cast|changing|check|class-data|class-method|class-methods|clear|close|cnt|collect|commit|cond|character|\n\t        corresponding|communication|component|compute|concatenate|condense|constants|conv|count|\n\t        controls|convert|create|currency|\n\t        data|descending|default|define|deferred|delete|describe|detail|display|divide|divide-corresponding|display-mode|duplicates|\n\t        deleting|\n\t        editor-call|end|endexec|endfunction|ending|endmodule|end-of-definition|end-of-page|end-of-selection|end-test-injection|end-test-seam|exit-command|\n\t        endprovide|endselect|endtry|endwhile|enum|event|events|exec|exit|export|\n\t        exporting|extract|exception|exceptions|\n\t        field-symbols|field-groups|field|first|fetch|fields|format|frame|free|from|function|find|for|function-pool|\n\t        generate|get|\n\t        handle|hide|hashed|\n\t        include|import|importing|index|infotypes|initial|initialization|\n\t        id|is|in|interface|interfaces|input|insert|into|\n\t\t\tkey|\n\t        left-justified|leave|like|line|line-count|line-size|load|local|log-point|length|left|leading|lower|\n\t        matchcode|method|mesh|message|message-id|methods|modify|module|move|move-corresponding|multiply|multiply-corresponding|match|\n\t\t\tnew|new-line|new-page|new-section|no|no-gap|no-gaps|no-sign|no-zero|non-unique|number|\n\t        occurrence|object|obligatory|of|overlay|optional|others|occurrences|occurs|offset|options|\n\t        pack|parameters|perform|places|position|print-control|private|program|protected|provide|public|put|\n\t        radiobutton|raising|ranges|receive|receiving|redefinition|reference|refresh|regex|reject|results|requested|\n\t        ref|replace|report|reserve|restore|result|return|returning|right-justified|rollback|read|read-only|rp-provide-from-last|run|\n\t        scan|screen|scroll|search|select|select-options|selection-screen|stamp|source|subkey|\n\t        separated|set|shift|single|skip|sort|sorted|split|standard|stamp|starting|start-of-selection|sum|subtract-corresponding|statics|step|stop|structure|submatches|submit|subtract|summary|supplied|suppress|section|syntax-check|syntax-trace|system-call|switch|\n\t        tables|table|task|testing|test-seam|test-injection|then|time|times|title|titlebar|to|top-of-page|trailing|transfer|transformation|translate|transporting|types|type|type-pool|type-pools|\n\t        unassign|unique|uline|unpack|update|upper|using|\n\t        value|\n\t        when|while|window|write|where|with|work|\n\t\txml)(?=\\s|\\.|:|,)"
+      "match": "(?ix)(?\u003c=^|\\s)(\n\t        abstract|add|add-corresponding|adjacent|alias|aliases|all|append|appending|ascending|as|assert|assign|assigned|assigning|association|authority-check|\n\t        back|begin|binary|block|bound|break-point|by|byte|\n\t        call|cast|changing|check|class-data|class-method|class-methods|clear|close|cnt|collect|commit|cond|character|\n\t        corresponding|communication|component|compute|concatenate|condense|constants|conv|count|\n\t        controls|convert|create|currency|\n\t        data|descending|default|define|deferred|delete|describe|detail|display|divide|divide-corresponding|display-mode|duplicates|\n\t        deleting|\n\t        editor-call|end|endexec|endfunction|ending|endmodule|end-of-definition|end-of-page|end-of-selection|end-test-injection|end-test-seam|exit-command|\n\t        endprovide|endselect|endtry|endwhile|enum|event|events|exec|exit|export|\n\t        exporting|extract|exception|exceptions|\n\t        field-symbols|field-groups|field|first|fetch|fields|format|frame|free|from|function|find|for|found|function-pool|\n\t        generate|get|\n\t        handle|hide|hashed|\n\t        include|import|importing|index|infotypes|initial|initialization|\n\t        id|is|in|interface|interfaces|input|insert|instance|into|\n\t\t\tkey|\n\t        left-justified|leave|like|line|line-count|line-size|load|local|log-point|length|left|leading|lower|\n\t        matchcode|method|mesh|message|message-id|methods|modify|module|move|move-corresponding|multiply|multiply-corresponding|match|\n\t\t\tnew|new-line|new-page|new-section|no|no-gap|no-gaps|no-sign|no-zero|non-unique|number|\n\t        occurrence|object|obligatory|of|output|overlay|optional|others|occurrences|occurs|offset|options|\n\t        pack|parameters|perform|places|position|print-control|private|program|protected|provide|public|put|\n\t        radiobutton|raising|ranges|receive|receiving|redefinition|reference|refresh|regex|reject|results|requested|\n\t        ref|replace|report|reserve|restore|result|return|returning|right-justified|rollback|read|read-only|rp-provide-from-last|run|\n\t        scan|screen|scroll|search|select|select-options|selection-screen|stamp|source|subkey|\n\t        separated|set|shift|single|skip|sort|sorted|split|standard|stamp|starting|start-of-selection|sum|subtract-corresponding|statics|step|stop|structure|submatches|submit|subtract|summary|supplied|suppress|section|syntax-check|syntax-trace|system-call|switch|\n\t        tables|table|task|testing|test-seam|test-injection|then|time|times|title|titlebar|to|top-of-page|trailing|transfer|transformation|translate|transporting|types|type|type-pool|type-pools|\n\t        unassign|unique|uline|unpack|update|upper|using|\n\t        value|\n\t        when|while|window|write|where|with|work|\n\t\txml)(?=\\s|\\.|:|,)"
     },
     "operators": {
       "patterns": [

data/grammars/source.apl.json

@@ -306,9 +306,26 @@
       "patterns": [
         {
           "name": "meta.function.apl",
-          "begin": "(?x) ^\\s*? (?# 1: keyword.operator.nabla.apl) (∇) (?: \\s* (?: (?# 2: entity.function.return-value.apl) ( [A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ] [A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ¯0-9]* ) | \\s* (?# 3: entity.function.return-value.shy.apl) ( (\\{)             (?# 4: punctuation.definition.return-value.begin.apl) (?: \\s* [A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ] [A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ¯0-9]* \\s* )* (\\})             (?# 5: punctuation.definition.return-value.end.apl) | (\\()             (?# 6: punctuation.definition.return-value.begin.apl) (?: \\s* [A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ] [A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ¯0-9]* \\s* )* (\\))             (?# 7: punctuation.definition.return-value.end.apl) | (\\(\\s*\\{)      (?# 8: punctuation.definition.return-value.begin.apl) (?: \\s* [A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ] [A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ¯0-9]* \\s* )* (\\}\\s*\\))      (?# 9: punctuation.definition.return-value.end.apl) | (\\{\\s*\\()      (?# 10: punctuation.definition.return-value.begin.apl) (?: \\s* [A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ] [A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ¯0-9]* \\s* )* (\\)\\s*\\})      (?# 11: punctuation.definition.return-value.end.apl) ) \\s* ) \\s* (?# 12: keyword.operator.assignment.apl) (←) )? \\s* (?: (?# MONADIC) (?: (?# 13: entity.function.name.apl) ( [A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ] [A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ¯0-9]* ) \\s* (?# 14: entity.function.axis.apl) ( (?# 15: punctuation.definition.axis.begin.apl) (\\[) \\s* (?: \\s* [A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ] [A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ¯0-9]* \\s* (?# 16: invalid.illegal.extra-characters.apl) (.*?) | (?# 17: invalid.illegal.apl) ([^\\]]*) ) \\s* (?# 18: punctuation.definition.axis.end.apl) (\\]) )? \\s*? (?# 19: entity.function.arguments.right.apl) ( (?\u003c=\\s|\\]) [A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ] [A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ¯0-9]* | (\\()   (?# 20: punctuation.definition.arguments.begin.apl) (?: \\s* [A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ] [A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ¯0-9]* \\s* )* (\\))   (?# 21: punctuation.definition.arguments.end.apl) ) \\s* (?=;|$) ) | (?# DYADIC/AMBIVALENT) (?#==================) (?: (?# 22: entity.function.arguments.left.apl) ( [A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ] [A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ¯0-9]* \\s+ ) | (?# 23: entity.function.arguments.left.optional.apl) ( (\\{)          (?# 24: punctuation.definition.arguments.begin.apl) (?: \\s* [A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ] [A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ¯0-9]* \\s* )* (\\})          (?# 25: punctuation.definition.arguments.end.apl) | (\\(\\s*\\{)   (?# 26: punctuation.definition.arguments.begin.apl) (?: \\s* [A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ] [A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ¯0-9]* \\s* )* (\\}\\s*\\))   (?# 27: punctuation.definition.arguments.end.apl) | (\\{\\s*\\()   (?# 28: punctuation.definition.arguments.begin.apl) (?: \\s* [A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ] [A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ¯0-9]* \\s* )* (\\)\\s*\\})   (?# 29: punctuation.definition.arguments.end.apl) ) )? \\s* (?: (?# 30: entity.function.name.apl) ( [A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ] [A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ¯0-9]* ) \\s* (?# 31: entity.function.axis.apl) ( (?# 32: punctuation.definition.axis.begin.apl) (\\[) \\s* (?: \\s* [A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ] [A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ¯0-9]* \\s* (?# 33: invalid.illegal.extra-characters.apl) (.*?) | (?# 34: invalid.illegal.apl) ([^\\]]*) ) \\s* (?# 35: punctuation.definition.axis.end.apl) (\\]) )? | (?# 36: entity.function.operands.apl) ( (?# 37: punctuation.definition.operands.begin.apl) (\\() (?# 38: entity.function.operands.left.apl) ( \\s* [A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ] [A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ¯0-9]* )? \\s* (?# 39: entity.function.name.apl) ( [A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ] [A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ¯0-9]* ) \\s*? (?# 40: entity.function.axis.apl) ( (?# 41: punctuation.definition.axis.begin.apl) (\\[) \\s* (?: \\s* [A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ] [A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ¯0-9]* \\s* (?# 42: invalid.illegal.extra-characters.apl) (.*?) | (?# 43: invalid.illegal.apl) ([^\\]]*) ) \\s* (?# 44: punctuation.definition.axis.end.apl) (\\]) )? \\s* (?# 45: entity.function.operands.right.apl) ( [A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ] [A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ¯0-9]* \\s* )? (?# 46: punctuation.definition.operands.end.apl) (\\)) ) ) \\s* (?# 47: entity.function.arguments.right.apl) ( (?\u003c=\\s|\\]) [A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ] [A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ¯0-9]* | \\s* (\\()   (?# 48: punctuation.definition.arguments.begin.apl) (?: \\s* [A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ] [A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ¯0-9]* \\s* )* (\\))   (?# 49: punctuation.definition.arguments.end.apl) )? (?#==================) ) \\s* (?# 50: invalid.illegal.arguments.right.apl) ([^;]+)? (?# 51: entity.function.local-variables.apl) ( (?# 52: Include “;”) ( (?: \\s* ; (?: \\s* [⎕A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ] [A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ¯0-9]* \\s* )+ )+ ) | (?# 53: invalid.illegal.local-variables.apl) ([^⍝]+) )? \\s* (?# 54: comment.line.apl) (⍝.*)? $",
+          "begin": "(?x) ^\\s*? (?# 1: keyword.operator.nabla.apl) (∇) (?: \\s* (?: (?# 2: entity.function.return-value.apl) ( [A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ] [A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ¯0-9]* ) | \\s* (?# 3: entity.function.return-value.shy.apl) ( (\\{)             (?# 4: punctuation.definition.return-value.begin.apl) (?: \\s* [A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ] [A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ¯0-9]* \\s* )* (\\})             (?# 5: punctuation.definition.return-value.end.apl) | (\\()             (?# 6: punctuation.definition.return-value.begin.apl) (?: \\s* [A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ] [A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ¯0-9]* \\s* )* (\\))             (?# 7: punctuation.definition.return-value.end.apl) | (\\(\\s*\\{)      (?# 8: punctuation.definition.return-value.begin.apl) (?: \\s* [A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ] [A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ¯0-9]* \\s* )* (\\}\\s*\\))      (?# 9: punctuation.definition.return-value.end.apl) | (\\{\\s*\\()      (?# 10: punctuation.definition.return-value.begin.apl) (?: \\s* [A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ] [A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ¯0-9]* \\s* )* (\\)\\s*\\})      (?# 11: punctuation.definition.return-value.end.apl) ) \\s* ) \\s* (?# 12: keyword.operator.assignment.apl) (←) )? \\s* (?: (?# MONADIC) (?: (?# 13: entity.function.name.apl) ( [A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ] [A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ¯0-9]* ) \\s* (?# 14: entity.function.axis.apl) ( (?# 15: punctuation.definition.axis.begin.apl) (\\[) \\s* (?: \\s* [A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ] [A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ¯0-9]* \\s* (?# 16: invalid.illegal.extra-characters.apl) (.*?) | (?# 17: invalid.illegal.apl) ([^\\]]*) ) \\s* (?# 18: punctuation.definition.axis.end.apl) (\\]) )? \\s*? (?# 19: entity.function.arguments.right.apl) ( (?\u003c=\\s|\\]) [A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ] [A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ¯0-9]* | (\\()   (?# 20: punctuation.definition.arguments.begin.apl) (?: \\s* [A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ] [A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ¯0-9]* \\s* )* (\\))   (?# 21: punctuation.definition.arguments.end.apl) ) \\s* (?=;|$) ) | (?# DYADIC/AMBIVALENT) (?#==================) (?: (?# 22: entity.function.arguments.left.apl) ( [A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ] [A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ¯0-9]* \\s+ ) | (?# 23: entity.function.arguments.left.optional.apl) ( (\\{)          (?# 24: punctuation.definition.arguments.begin.apl) (?: \\s* [A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ] [A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ¯0-9]* \\s* )* (\\})          (?# 25: punctuation.definition.arguments.end.apl) | (\\(\\s*\\{)   (?# 26: punctuation.definition.arguments.begin.apl) (?: \\s* [A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ] [A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ¯0-9]* \\s* )* (\\}\\s*\\))   (?# 27: punctuation.definition.arguments.end.apl) | (\\{\\s*\\()   (?# 28: punctuation.definition.arguments.begin.apl) (?: \\s* [A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ] [A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ¯0-9]* \\s* )* (\\)\\s*\\})   (?# 29: punctuation.definition.arguments.end.apl) ) )? \\s* (?: (?# 30: entity.function.name.apl) ( [A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ] [A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ¯0-9]* ) \\s* (?# 31: entity.function.axis.apl) ( (?# 32: punctuation.definition.axis.begin.apl) (\\[) \\s* (?: \\s* [A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ] [A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ¯0-9]* \\s* (?# 33: invalid.illegal.extra-characters.apl) (.*?) | (?# 34: invalid.illegal.apl) ([^\\]]*) ) \\s* (?# 35: punctuation.definition.axis.end.apl) (\\]) )? | (?# 36: entity.function.operands.apl) ( (?# 37: punctuation.definition.operands.begin.apl) (\\() (?# 38: entity.function.operands.left.apl) ( \\s* [A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ] [A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ¯0-9]* )? \\s* (?# 39: entity.function.name.apl) ( [A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ] [A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ¯0-9]* ) \\s*? (?# 40: entity.function.axis.apl) ( (?# 41: punctuation.definition.axis.begin.apl) (\\[) \\s* (?: \\s* [A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ] [A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ¯0-9]* \\s* (?# 42: invalid.illegal.extra-characters.apl) (.*?) | (?# 43: invalid.illegal.apl) ([^\\]]*) ) \\s* (?# 44: punctuation.definition.axis.end.apl) (\\]) )? \\s* (?# 45: entity.function.operands.right.apl) ( [A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ] [A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ¯0-9]* \\s* )? (?# 46: punctuation.definition.operands.end.apl) (\\)) ) ) \\s* (?# 47: entity.function.arguments.right.apl) ( (?\u003c=\\s|\\]) [A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ] [A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ¯0-9]* | \\s* (\\()   (?# 48: punctuation.definition.arguments.begin.apl) (?: \\s* [A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ] [A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ¯0-9]* \\s* )* (\\))   (?# 49: punctuation.definition.arguments.end.apl) )? (?#==================) ) \\s* (?# 50: invalid.illegal.arguments.right.apl) ([^;]+)? (?# 51: entity.function.local-variables.apl) ( (?# 52: Include “;”) ( (?\u003e \\s* ; (?: \\s* [⎕A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ] [A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ¯0-9]* \\s* )+ )+ ) | (?# 53: invalid.illegal.local-variables.apl) ([^⍝]+) )? \\s* (?# 54: comment.line.apl) (⍝.*)? $",
           "end": "^\\s*?(?:(∇)|(⍫))\\s*?(⍝.*?)?$",
           "patterns": [
+            {
+              "name": "entity.function.definition.apl",
+              "match": "(?x)\n^\\s*\n(\n\t(?\u003e\n\t\t;\n\t\t(?:\n\t\t\t\\s*\n\t\t\t[⎕A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ]\n\t\t\t[A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ¯0-9]*\n\t\t\t\\s*\n\t\t)+\n\t)+\n)",
+              "captures": {
+                "0": {
+                  "name": "entity.function.local-variables.apl"
+                },
+                "1": {
+                  "patterns": [
+                    {
+                      "name": "punctuation.separator.apl",
+                      "match": ";"
+                    }
+                  ]
+                }
+              }
+            },
             {
               "include": "$self"
             }
@@ -853,7 +870,7 @@
     },
     "number": {
       "name": "constant.numeric.apl",
-      "match": "(?:[¯0-9]|\\.[0-9])[¯0-9A-Za-z]*"
+      "match": "¯?[0-9][¯0-9A-Za-z]*(?:\\.[¯0-9Ee][¯0-9A-Za-z]*)*|¯?\\.[0-9Ee][¯0-9A-Za-z]*"
     },
     "sck": {
       "patterns": [

data/grammars/source.ats.json

@@ -2,12 +2,6 @@
   "name": "ATS",
   "scopeName": "source.ats",
   "patterns": [
-    {
-      "include": "#quantifier_curly"
-    },
-    {
-      "include": "#quantifier_square"
-    },
     {
       "include": "#block"
     },
@@ -18,10 +12,7 @@
       "include": "#comment_line"
     },
     {
-      "include": "#comment_block_c"
-    },
-    {
-      "include": "#comment_block_sml"
+      "include": "#comment_block"
     },
     {
       "include": "#embed"
@@ -30,13 +21,13 @@
       "include": "#operators"
     },
     {
-      "include": "#quantifier_arrow"
+      "include": "#quantifier_curly"
     },
     {
-      "include": "#definition_function"
+      "include": "#quantifier_square"
     },
     {
-      "include": "#definition_type"
+      "include": "#quantifier_arrow"
     },
     {
       "include": "#keywords"
@@ -44,9 +35,6 @@
     {
       "include": "#keywords_types"
     },
-    {
-      "include": "#false_true"
-    },
     {
       "include": "#string"
     },
@@ -61,16 +49,12 @@
     },
     {
       "include": "#number"
-    },
-    {
-      "include": "#identifier"
     }
   ],
   "repository": {
     "block": {
-      "name": "meta.block",
-      "begin": "(?\u003c=where|=|^|then|else|\\$rec|\\$rec_t|\\$rec_vt)(?:\\s*)\\{",
-      "end": "\\}",
+      "begin": "(?\u003c=where|=|^|then|else|\\$rec|\\$rec_t|\\$rec_vt)(?:\\s*){",
+      "end": "}",
       "patterns": [
         {
           "include": "$self"
@@ -82,19 +66,13 @@
       "name": "string.quoted.double",
       "match": "(')([^\\\\]{0,1}|\\\\(\\\\|[abefpnrtv'\"?]|[0-3]\\d{0,2}|[4-7]\\d?|x[a-fA-F0-9]{0,2}|u[a-fA-F0-9]{0,4}|U[a-fA-F0-9]{0,8}))(')"
     },
-    "comment_block_c": {
-      "name": "comment.block",
-      "begin": "/\\*",
-      "end": "\\*/",
-      "applyEndPatternLast": true
-    },
-    "comment_block_sml": {
+    "comment_block": {
       "name": "comment.block",
       "begin": "\\(\\*",
       "end": "\\*\\)",
       "patterns": [
         {
-          "include": "#comment_block_sml"
+          "include": "#comment_block"
         }
       ],
       "applyEndPatternLast": true
@@ -104,7 +82,7 @@
       "match": "//.*$"
     },
     "comment_rest": {
-      "name": "comment.block",
+      "name": "comment",
       "begin": "////",
       "end": ".\\z",
       "patterns": [
@@ -114,66 +92,18 @@
       ],
       "applyEndPatternLast": true
     },
-    "definition_function": {
-      "name": "meta.function-definition",
-      "begin": "\\b(?:castfn|fn|fun|implement|implmnt|infixl|infixr|infix|overload|postfix|praxi|prfn|prfun|primplement|primplmnt|var)\\b",
-      "end": "\\b[a-zA-Z][a-zA-Z0-9_']*\\b",
-      "patterns": [
-        {
-          "include": "$self"
-        }
-      ],
-      "beginCaptures": {
-        "0": {
-          "name": "keyword"
-        }
-      },
-      "endCaptures": {
-        "0": {
-          "name": "entity.name.function"
-        }
-      }
-    },
-    "definition_type": {
-      "name": "meta.type-definition",
-      "begin": "\\b(abstype|abst@ype|abst0pe|absvtype|absvt@ype|absvt0pe|absviewtype|absviewt@ype|absviewt0pe|absview|absprop|datatype|datavtype|dataviewtype|dataview|dataprop|datasort|sortdef|propdef|viewdef|viewtypedef|vtypedef|stadef|stacst|typedef)\\b",
-      "end": "\\b[a-zA-Z][a-zA-Z0-9_']*\\b",
-      "patterns": [
-        {
-          "include": "$self"
-        }
-      ],
-      "beginCaptures": {
-        "0": {
-          "name": "keyword"
-        }
-      },
-      "endCaptures": {
-        "0": {
-          "name": "entity.name.type storage.type"
-        }
-      }
-    },
     "embed": {
       "name": "meta",
       "begin": "(%{)",
       "end": "(%})"
     },
-    "false_true": {
-      "name": "constant.language.boolean",
-      "match": "\\b(?:false|true)\\b"
-    },
-    "identifier": {
-      "name": "identifier",
-      "match": "\\b[a-zA-Z][a-zA-Z0-9_']*\\b"
-    },
     "keywords": {
       "name": "keyword",
-      "match": "(\\#|\\$)(\\w+)|\\b(castfn|and|andalso|assume|as|begin|break|case(\\+|-)?|class|continue|dynload|dyn|else|end|exception|extern|fix|fn|for|fun|if|implement|implmnt|primplement|primplmnt|infixl|infixr|infix|in|lam|let|llam|local|macdef|macrodef|method|modprop|modtype|module|nonfix|object|of|op|or|orelse|overload|par|postfix|praxi|prefix|prfn|prfun|prval|rec|scase|sif|stacst|staif|staload|stavar|sta|struct|symelim|symintr|then|try|union|val(\\+|-)?|var|when|where|while|withprop|withtype|withviewtype|withview|with)\\b"
+      "match": "(\\#|\\$)(\\w+)|\\b(castfn|and|andalso|assume|as|begin|break|case(\\+|-)?|class|continue|dynload|dyn|else|end|exception|extern|fix|fn|for|fun|if|implement|implmnt|primplement|primplmnt|infixl|infixr|infix|in|lam|let|llam|local|macdef|macrodef|method|modprop|modtype|module|nonfix|object|of|op|or|orelse|overload|par|postfix|praxi|prefix|prfn|prfun|prval|rec|sif|staif|staload|stavar|sta|struct|symelim|symintr|then|try|union|val(\\+|-)?|var|when|where|while|withprop|withtype|withviewtype|withview|with)\\b"
     },
     "keywords_types": {
       "name": "keyword",
-      "match": "(\\#|\\$)(\\w+)|\\b(abstype|abst@ype|abst0pe|absvtype|absvt@ype|absvt0pe|absviewtype|absviewt@ype|absviewt0pe|absview|absprop|datatype|datavtype|dataviewtype|dataview|dataprop|datasort|sortdef|propdef|viewdef|viewtypedef|vtypedef|stadef|typedef)\\b"
+      "match": "(\\#|\\$)(\\w+)|\\b(abstype|abst@ype|abst0pe|absvtype|absvt@ype|absvt0pe|absviewtype|absviewt@ype|absviewt0pe|absview|absprop|datatype|datavtype|dataviewtype|dataview|dataprop|datasort|sortdef|propdef|viewdef|viewtypedef|vtypedef|stadef|typedef|)\\b"
     },
     "number": {
       "name": "constant.numeric",
@@ -189,14 +119,14 @@
       "end": "\u003e"
     },
     "quantifier_curly": {
-      "name": "support.type.quantifier.universal",
-      "begin": "\\{(?=[\\S])",
-      "end": "\\}"
+      "name": "support.type",
+      "begin": "({)",
+      "end": "(})"
     },
     "quantifier_square": {
-      "name": "support.type.quantifier.existential",
-      "begin": "\\[(?=[\\S])",
-      "end": "\\]"
+      "name": "support.type",
+      "begin": "(\\[)",
+      "end": "(\\])"
     },
     "records": {
       "begin": "('|@)({)",

data/grammars/source.ballerina.json

@@ -57,18 +57,22 @@
       ]
     },
     "annotationDefinition": {
-      "begin": "\\bannotation\\b",
-      "end": ";",
       "patterns": [
         {
-          "include": "#typeDescription"
-        }
-      ],
-      "beginCaptures": {
-        "0": {
-          "name": "keyword.ballerina"
+          "begin": "\\bannotation\\b",
+          "end": ";",
+          "patterns": [
+            {
+              "include": "#typeDescription"
+            }
+          ],
+          "beginCaptures": {
+            "0": {
+              "name": "keyword.ballerina"
+            }
+          }
         }
-      }
+      ]
     },
     "booleans": {
       "patterns": [
@@ -245,9 +249,6 @@
             {
               "include": "#comment"
             },
-            {
-              "include": "#continuedType"
-            },
             {
               "include": "#constrainType"
             },
@@ -937,7 +938,7 @@
       "patterns": [
         {
           "begin": "\\(",
-          "end": "(?=\\,)|(?=\\|)|(?=\\:)|(?==\u003e)",
+          "end": "(?=\\,)|(?=\\|)|(?=\\:)|(?==\u003e)|(?=\\))",
           "patterns": [
             {
               "include": "#record"
@@ -1275,9 +1276,6 @@
             {
               "include": "#comment"
             },
-            {
-              "include": "#continuedType"
-            },
             {
               "include": "#constrainType"
             },
@@ -1376,9 +1374,6 @@
             {
               "include": "#tupleType"
             },
-            {
-              "include": "#continuedType"
-            },
             {
               "include": "#constrainType"
             },