github-linguist 7.1.3 → 7.2.0

data/grammars/hint.message.haskell.json

@@ -282,6 +282,9 @@
             {
               "include": "#deriving"
             },
+            {
+              "include": "#via"
+            },
             {
               "include": "#assignment_op"
             },
@@ -380,7 +383,7 @@
         {
           "name": "meta.declaration.instance.deriving.haskell",
           "contentName": "meta.type-signature.haskell",
-          "begin": "^([ \\t]*)(deriving\\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+(instance)(?:(?\u003c=[\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}'])(?![\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']))",
           "end": "^(?!\\1[ \\t]|[ \\t]*$)",
           "patterns": [
             {
@@ -388,11 +391,24 @@
             },
             {
               "include": "#type_signature"
+            },
+            {
+              "include": "#deriving_via"
             }
           ],
           "beginCaptures": {
             "2": {
               "name": "keyword.other.haskell"
+            },
+            "3": {
+              "patterns": [
+                {
+                  "include": "#deriving_strategies"
+                }
+              ]
+            },
+            "4": {
+              "name": "keyword.other.haskell"
             }
           }
         }
@@ -402,10 +418,17 @@
       "patterns": [
         {
           "name": "meta.deriving.haskell",
-          "match": "(?:(?=[\\p{Ll}_\\p{Lu}\\p{Lt}])(?\u003c![\\p{Ll}_\\p{Lu}\\p{Lt}']))(deriving)(?:(?\u003c=[\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}'])(?![\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']))",
+          "match": "(?:(?=[\\p{Ll}_\\p{Lu}\\p{Lt}])(?\u003c![\\p{Ll}_\\p{Lu}\\p{Lt}']))(?:(deriving)(?:\\s+([\\p{Ll}_][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*))?)(?:(?\u003c=[\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}'])(?![\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']))",
           "captures": {
             "1": {
               "name": "keyword.other.haskell"
+            },
+            "2": {
+              "patterns": [
+                {
+                  "include": "#deriving_strategies"
+                }
+              ]
             }
           }
         }
@@ -415,7 +438,7 @@
       "patterns": [
         {
           "name": "meta.deriving.haskell",
-          "begin": "(?:(?=[\\p{Ll}_\\p{Lu}\\p{Lt}])(?\u003c![\\p{Ll}_\\p{Lu}\\p{Lt}']))(deriving)\\s*\\(",
+          "begin": "(?:(?=[\\p{Ll}_\\p{Lu}\\p{Lt}])(?\u003c![\\p{Ll}_\\p{Lu}\\p{Lt}']))(?:(deriving)(?:\\s+([\\p{Ll}_][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*))?)\\s*\\(",
           "end": "\\)",
           "patterns": [
             {
@@ -430,6 +453,13 @@
           "beginCaptures": {
             "1": {
               "name": "keyword.other.haskell"
+            },
+            "2": {
+              "patterns": [
+                {
+                  "include": "#deriving_strategies"
+                }
+              ]
             }
           }
         }
@@ -439,18 +469,38 @@
       "patterns": [
         {
           "name": "meta.deriving.haskell",
-          "match": "(?:(?=[\\p{Ll}_\\p{Lu}\\p{Lt}])(?\u003c![\\p{Ll}_\\p{Lu}\\p{Lt}']))(deriving)\\s*([\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*(?:\\.[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*)*)(?:(?\u003c=[\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}'])(?![\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']))",
+          "match": "(?:(?=[\\p{Ll}_\\p{Lu}\\p{Lt}])(?\u003c![\\p{Ll}_\\p{Lu}\\p{Lt}']))(?:(deriving)(?:\\s+([\\p{Ll}_][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*))?)\\s*([\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*(?:\\.[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*)*)(?:(?\u003c=[\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}'])(?![\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']))",
           "captures": {
             "1": {
               "name": "keyword.other.haskell"
             },
             "2": {
+              "patterns": [
+                {
+                  "include": "#deriving_strategies"
+                }
+              ]
+            },
+            "3": {
               "name": "entity.other.inherited-class.haskell"
             }
           }
         }
       ]
     },
+    "deriving_strategies": {
+      "patterns": [
+        {
+          "name": "meta.deriving.strategy.haskell",
+          "match": "(?:(?=[\\p{Ll}_\\p{Lu}\\p{Lt}])(?\u003c![\\p{Ll}_\\p{Lu}\\p{Lt}']))(stock|newtype|anyclass)(?:(?\u003c=[\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}'])(?![\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']))",
+          "captures": {
+            "1": {
+              "name": "keyword.other.haskell"
+            }
+          }
+        }
+      ]
+    },
     "double_colon_operator": {
       "patterns": [
         {
@@ -1503,6 +1553,71 @@
         }
       ]
     },
+    "via": {
+      "patterns": [
+        {
+          "include": "#via_list"
+        },
+        {
+          "include": "#via_simple"
+        },
+        {
+          "include": "#via_keyword"
+        }
+      ]
+    },
+    "via_keyword": {
+      "patterns": [
+        {
+          "name": "meta.via.haskell",
+          "match": "(?:(?=[\\p{Ll}_\\p{Lu}\\p{Lt}])(?\u003c![\\p{Ll}_\\p{Lu}\\p{Lt}']))(via)(?:(?\u003c=[\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}'])(?![\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']))",
+          "captures": {
+            "1": {
+              "name": "keyword.other.haskell"
+            }
+          }
+        }
+      ]
+    },
+    "via_list": {
+      "patterns": [
+        {
+          "name": "meta.via.haskell",
+          "begin": "(?:(?=[\\p{Ll}_\\p{Lu}\\p{Lt}])(?\u003c![\\p{Ll}_\\p{Lu}\\p{Lt}']))(via)\\s*\\(",
+          "end": "\\)",
+          "patterns": [
+            {
+              "include": "#type_signature"
+            }
+          ],
+          "beginCaptures": {
+            "1": {
+              "name": "keyword.other.haskell"
+            }
+          }
+        }
+      ]
+    },
+    "via_simple": {
+      "patterns": [
+        {
+          "name": "meta.via.haskell",
+          "match": "(?:(?=[\\p{Ll}_\\p{Lu}\\p{Lt}])(?\u003c![\\p{Ll}_\\p{Lu}\\p{Lt}']))(via)\\s*([\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*(?:\\.[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*)*)(?:(?\u003c=[\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}'])(?![\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']))",
+          "captures": {
+            "1": {
+              "name": "keyword.other.haskell"
+            },
+            "2": {
+              "patterns": [
+                {
+                  "include": "#type_signature"
+                }
+              ]
+            }
+          }
+        }
+      ]
+    },
     "where": {
       "patterns": [
         {

data/grammars/hint.type.haskell.json

@@ -255,6 +255,9 @@
             {
               "include": "#deriving"
             },
+            {
+              "include": "#via"
+            },
             {
               "include": "#assignment_op"
             },
@@ -353,7 +356,7 @@
         {
           "name": "meta.declaration.instance.deriving.haskell",
           "contentName": "meta.type-signature.haskell",
-          "begin": "^([ \\t]*)(deriving\\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+(instance)(?:(?\u003c=[\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}'])(?![\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']))",
           "end": "^(?!\\1[ \\t]|[ \\t]*$)",
           "patterns": [
             {
@@ -361,11 +364,24 @@
             },
             {
               "include": "#type_signature"
+            },
+            {
+              "include": "#deriving_via"
             }
           ],
           "beginCaptures": {
             "2": {
               "name": "keyword.other.haskell"
+            },
+            "3": {
+              "patterns": [
+                {
+                  "include": "#deriving_strategies"
+                }
+              ]
+            },
+            "4": {
+              "name": "keyword.other.haskell"
             }
           }
         }
@@ -375,10 +391,17 @@
       "patterns": [
         {
           "name": "meta.deriving.haskell",
-          "match": "(?:(?=[\\p{Ll}_\\p{Lu}\\p{Lt}])(?\u003c![\\p{Ll}_\\p{Lu}\\p{Lt}']))(deriving)(?:(?\u003c=[\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}'])(?![\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']))",
+          "match": "(?:(?=[\\p{Ll}_\\p{Lu}\\p{Lt}])(?\u003c![\\p{Ll}_\\p{Lu}\\p{Lt}']))(?:(deriving)(?:\\s+([\\p{Ll}_][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*))?)(?:(?\u003c=[\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}'])(?![\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']))",
           "captures": {
             "1": {
               "name": "keyword.other.haskell"
+            },
+            "2": {
+              "patterns": [
+                {
+                  "include": "#deriving_strategies"
+                }
+              ]
             }
           }
         }
@@ -388,7 +411,7 @@
       "patterns": [
         {
           "name": "meta.deriving.haskell",
-          "begin": "(?:(?=[\\p{Ll}_\\p{Lu}\\p{Lt}])(?\u003c![\\p{Ll}_\\p{Lu}\\p{Lt}']))(deriving)\\s*\\(",
+          "begin": "(?:(?=[\\p{Ll}_\\p{Lu}\\p{Lt}])(?\u003c![\\p{Ll}_\\p{Lu}\\p{Lt}']))(?:(deriving)(?:\\s+([\\p{Ll}_][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*))?)\\s*\\(",
           "end": "\\)",
           "patterns": [
             {
@@ -403,6 +426,13 @@
           "beginCaptures": {
             "1": {
               "name": "keyword.other.haskell"
+            },
+            "2": {
+              "patterns": [
+                {
+                  "include": "#deriving_strategies"
+                }
+              ]
             }
           }
         }
@@ -412,18 +442,38 @@
       "patterns": [
         {
           "name": "meta.deriving.haskell",
-          "match": "(?:(?=[\\p{Ll}_\\p{Lu}\\p{Lt}])(?\u003c![\\p{Ll}_\\p{Lu}\\p{Lt}']))(deriving)\\s*([\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*(?:\\.[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*)*)(?:(?\u003c=[\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}'])(?![\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']))",
+          "match": "(?:(?=[\\p{Ll}_\\p{Lu}\\p{Lt}])(?\u003c![\\p{Ll}_\\p{Lu}\\p{Lt}']))(?:(deriving)(?:\\s+([\\p{Ll}_][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*))?)\\s*([\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*(?:\\.[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*)*)(?:(?\u003c=[\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}'])(?![\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']))",
           "captures": {
             "1": {
               "name": "keyword.other.haskell"
             },
             "2": {
+              "patterns": [
+                {
+                  "include": "#deriving_strategies"
+                }
+              ]
+            },
+            "3": {
               "name": "entity.other.inherited-class.haskell"
             }
           }
         }
       ]
     },
+    "deriving_strategies": {
+      "patterns": [
+        {
+          "name": "meta.deriving.strategy.haskell",
+          "match": "(?:(?=[\\p{Ll}_\\p{Lu}\\p{Lt}])(?\u003c![\\p{Ll}_\\p{Lu}\\p{Lt}']))(stock|newtype|anyclass)(?:(?\u003c=[\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}'])(?![\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']))",
+          "captures": {
+            "1": {
+              "name": "keyword.other.haskell"
+            }
+          }
+        }
+      ]
+    },
     "double_colon_operator": {
       "patterns": [
         {
@@ -1476,6 +1526,71 @@
         }
       ]
     },
+    "via": {
+      "patterns": [
+        {
+          "include": "#via_list"
+        },
+        {
+          "include": "#via_simple"
+        },
+        {
+          "include": "#via_keyword"
+        }
+      ]
+    },
+    "via_keyword": {
+      "patterns": [
+        {
+          "name": "meta.via.haskell",
+          "match": "(?:(?=[\\p{Ll}_\\p{Lu}\\p{Lt}])(?\u003c![\\p{Ll}_\\p{Lu}\\p{Lt}']))(via)(?:(?\u003c=[\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}'])(?![\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']))",
+          "captures": {
+            "1": {
+              "name": "keyword.other.haskell"
+            }
+          }
+        }
+      ]
+    },
+    "via_list": {
+      "patterns": [
+        {
+          "name": "meta.via.haskell",
+          "begin": "(?:(?=[\\p{Ll}_\\p{Lu}\\p{Lt}])(?\u003c![\\p{Ll}_\\p{Lu}\\p{Lt}']))(via)\\s*\\(",
+          "end": "\\)",
+          "patterns": [
+            {
+              "include": "#type_signature"
+            }
+          ],
+          "beginCaptures": {
+            "1": {
+              "name": "keyword.other.haskell"
+            }
+          }
+        }
+      ]
+    },
+    "via_simple": {
+      "patterns": [
+        {
+          "name": "meta.via.haskell",
+          "match": "(?:(?=[\\p{Ll}_\\p{Lu}\\p{Lt}])(?\u003c![\\p{Ll}_\\p{Lu}\\p{Lt}']))(via)\\s*([\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*(?:\\.[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*)*)(?:(?\u003c=[\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}'])(?![\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']))",
+          "captures": {
+            "1": {
+              "name": "keyword.other.haskell"
+            },
+            "2": {
+              "patterns": [
+                {
+                  "include": "#type_signature"
+                }
+              ]
+            }
+          }
+        }
+      ]
+    },
     "where": {
       "patterns": [
         {

data/grammars/injections.etc.json

@@ -0,0 +1,21 @@
+{
+  "scopeName": "injections.etc",
+  "patterns": [
+    {
+      "name": "meta.embedded.source.diff",
+      "begin": "(?\u003c=__END__)(?=\\s|$)",
+      "end": "(?=^(?!diff ))",
+      "patterns": [
+        {
+          "begin": "^(?=diff )",
+          "end": "(?=A)B",
+          "patterns": [
+            {
+              "include": "source.diff"
+            }
+          ]
+        }
+      ]
+    }
+  ]
+}

data/grammars/source.abap.json

@@ -81,7 +81,7 @@
     },
     {
       "name": "meta.block.begin.implementation.abap",
-      "begin": "(?i)^\\s*(class|method|form)\\s([a-z_][a-z_0-9]*)",
+      "begin": "(?i)^\\s*(class|method|form)\\s([a-z_/][a-z_0-9/]*)",
       "end": "\\s*\\.\\s*\\n?",
       "patterns": [
         {
@@ -179,7 +179,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|authority-check|\n\t        back|begin|binary|bound|break-point|by|byte|\n\t        call|cast|changing|check|class-data|class-method|class-methods|clear|close|cnt|collect|commit|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|endinterface|endmodule|end-of-definition|end-of-page|end-of-selection|end-test-injection|end-test-seam|\n\t        endprovide|endselect|endtry|endwhile|enum|event|events|exec|exit|export|\n\t        exporting|extract|exception|exceptions|\n\t        field-symbols|field-groups|first|fetch|fields|format|free|from|function|find|for|function-pool|\n\t        generate|get|\n\t        handle|hide|\n\t        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|length|left|leading|lower|\n\t        method|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-sign|no-zero|non-unique|number|\n\t        occurrence|object|obligatory|of|overlay|optional|others|occurrences|occurs|offset|\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|return|returning|right-justified|rollback|read|read-only|rp-provide-from-last|\n\t        scan|screen|scroll|search|select|select-options|selection-screen|\n\t        separated|set|shift|single|skip|sort|sorted|split|standard|starting|start-of-selection|sum|subtract-corresponding|statics|step|stop|structure|submatches|submit|subtract|summary|supplied|suppress|section|syntax-check|syntax-trace|system-call|\n\t        tables|table|testing|test-seam|test-injection|then|times|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\t\t )(?=\\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|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|endinterface|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        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-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|\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\t\t\t\txml\n\t\t\t )(?=\\s|\\.|:|,)"
     },
     "math_operators": {
       "name": "keyword.operator.math.abap",

data/grammars/source.ats.json

@@ -2,6 +2,12 @@
   "name": "ATS",
   "scopeName": "source.ats",
   "patterns": [
+    {
+      "include": "#quantifier_curly"
+    },
+    {
+      "include": "#quantifier_square"
+    },
     {
       "include": "#block"
     },
@@ -12,7 +18,10 @@
       "include": "#comment_line"
     },
     {
-      "include": "#comment_block"
+      "include": "#comment_block_c"
+    },
+    {
+      "include": "#comment_block_sml"
     },
     {
       "include": "#embed"
@@ -21,13 +30,13 @@
       "include": "#operators"
     },
     {
-      "include": "#quantifier_curly"
+      "include": "#quantifier_arrow"
     },
     {
-      "include": "#quantifier_square"
+      "include": "#definition_function"
     },
     {
-      "include": "#quantifier_arrow"
+      "include": "#definition_type"
     },
     {
       "include": "#keywords"
@@ -35,6 +44,9 @@
     {
       "include": "#keywords_types"
     },
+    {
+      "include": "#false_true"
+    },
     {
       "include": "#string"
     },
@@ -49,12 +61,16 @@
     },
     {
       "include": "#number"
+    },
+    {
+      "include": "#identifier"
     }
   ],
   "repository": {
     "block": {
-      "begin": "(?\u003c=where|=|^|then|else|\\$rec|\\$rec_t|\\$rec_vt)(?:\\s*){",
-      "end": "}",
+      "name": "meta.block",
+      "begin": "(?\u003c=where|=|^|then|else|\\$rec|\\$rec_t|\\$rec_vt)(?:\\s*)\\{",
+      "end": "\\}",
       "patterns": [
         {
           "include": "$self"
@@ -66,13 +82,19 @@
       "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": {
+    "comment_block_c": {
+      "name": "comment.block",
+      "begin": "/\\*",
+      "end": "\\*/",
+      "applyEndPatternLast": true
+    },
+    "comment_block_sml": {
       "name": "comment.block",
       "begin": "\\(\\*",
       "end": "\\*\\)",
       "patterns": [
         {
-          "include": "#comment_block"
+          "include": "#comment_block_sml"
         }
       ],
       "applyEndPatternLast": true
@@ -82,7 +104,7 @@
       "match": "//.*$"
     },
     "comment_rest": {
-      "name": "comment",
+      "name": "comment.block",
       "begin": "////",
       "end": ".\\z",
       "patterns": [
@@ -92,18 +114,66 @@
       ],
       "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|sif|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|scase|sif|stacst|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",
@@ -119,14 +189,14 @@
       "end": "\u003e"
     },
     "quantifier_curly": {
-      "name": "support.type",
-      "begin": "({)",
-      "end": "(})"
+      "name": "support.type.quantifier.universal",
+      "begin": "\\{(?=[\\S])",
+      "end": "\\}"
     },
     "quantifier_square": {
-      "name": "support.type",
-      "begin": "(\\[)",
-      "end": "(\\])"
+      "name": "support.type.quantifier.existential",
+      "begin": "\\[(?=[\\S])",
+      "end": "\\]"
     },
     "records": {
       "begin": "('|@)({)",