github-linguist 5.0.10 → 5.0.11

data/grammars/source.clojure.json

@@ -64,14 +64,11 @@
     },
     {
       "include": "#symbol"
-    },
-    {
-      "include": "#whitespace"
     }
   ],
   "repository": {
     "comment": {
-      "begin": ";",
+      "begin": "(?<!\\\\);",
       "beginCaptures": {
         "0": {
           "name": "punctuation.definition.comment.clojure"
@@ -217,18 +214,15 @@
           "name": "punctuation.section.expression.begin.clojure"
         }
       },
-      "end": "(\\))(\\n)|(\\)(?=[\\}\\]\\)\\s]*(?:;|$)))|(\\))",
+      "end": "(\\))$|(\\)(?=[\\}\\]\\)\\s]*(?:;|$)))|(\\))",
       "endCaptures": {
         "1": {
           "name": "punctuation.section.expression.end.trailing.clojure"
         },
         "2": {
-          "name": "meta.after-expression.clojure"
-        },
-        "3": {
           "name": "punctuation.section.expression.end.trailing.clojure"
         },
-        "4": {
+        "3": {
           "name": "punctuation.section.expression.end.clojure"
         }
       },
@@ -293,18 +287,15 @@
           "name": "punctuation.section.expression.begin.clojure"
         }
       },
-      "end": "(\\))(\\n)|(\\)(?=[\\}\\]\\)\\s]*(?:;|$)))|(\\))",
+      "end": "(\\))$|(\\)(?=[\\}\\]\\)\\s]*(?:;|$)))|(\\))",
       "endCaptures": {
         "1": {
           "name": "punctuation.section.expression.end.trailing.clojure"
         },
         "2": {
-          "name": "meta.after-expression.clojure"
-        },
-        "3": {
           "name": "punctuation.section.expression.end.trailing.clojure"
         },
-        "4": {
+        "3": {
           "name": "punctuation.section.expression.end.clojure"
         }
       },
@@ -448,10 +439,6 @@
           "include": "$self"
         }
       ]
-    },
-    "whitespace": {
-      "match": "\\s+$",
-      "name": "invalid.trailing-whitespace"
     }
   }
 }

data/grammars/source.crystal.json

@@ -133,7 +133,7 @@
     },
     {
       "comment": " just as above but being not a logical operation",
-      "match": "(?<!\\.)\\b(alias|alias_method|break|next|redo|retry|return|super|type|undef|yield)\\b(?![?!])|\\bdefined\\?|\\bblock_given\\?",
+      "match": "(?<!\\.)\\b(alias|alias_method|break|next|redo|retry|return|super|type|undef|yield|out|pointerof|typeof)\\b(?![?!])|\\bdefined\\?|\\bblock_given\\?",
       "name": "keyword.control.pseudo-method.crystal"
     },
     {

data/grammars/source.csound-document.json

@@ -7,31 +7,55 @@
   "firstLineMatch": "<CsoundSynthesi[sz]er>",
   "patterns": [
     {
-      "begin": "<(CsoundSynthesi[sz]er)>",
-      "end": "</(CsoundSynthesi[sz]er)>",
+      "begin": "(<)(CsoundSynthesi[sz]er)(>)",
+      "end": "(</)(CsoundSynthesi[sz]er)(>)",
       "beginCaptures": {
         "1": {
-          "name": "entity.name.tag.csound-document"
+          "name": "punctuation.definition.tag.begin.csound-document"
+        },
+        "2": {
+          "name": "entity.name.tag.begin.csound-document"
+        },
+        "3": {
+          "name": "punctuation.definition.tag.begin.csound-document"
         }
       },
       "endCaptures": {
         "1": {
-          "name": "entity.name.tag.csound-document"
+          "name": "punctuation.definition.tag.end.csound-document"
+        },
+        "2": {
+          "name": "entity.name.tag.end.csound-document"
+        },
+        "3": {
+          "name": "punctuation.definition.tag.end.csound-document"
         }
       },
       "patterns": [
         {
           "name": "meta.orchestra.csound-document",
-          "begin": "<(CsOptions)>",
-          "end": "</(CsOptions)>",
+          "begin": "(<)(CsOptions)(>)",
+          "end": "(</)(CsOptions)(>)",
           "beginCaptures": {
             "1": {
-              "name": "entity.name.tag.csound-document"
+              "name": "punctuation.definition.tag.begin.csound-document"
+            },
+            "2": {
+              "name": "entity.name.tag.begin.csound-document"
+            },
+            "3": {
+              "name": "punctuation.definition.tag.begin.csound-document"
             }
           },
           "endCaptures": {
             "1": {
-              "name": "entity.name.tag.csound-document"
+              "name": "punctuation.definition.tag.end.csound-document"
+            },
+            "2": {
+              "name": "entity.name.tag.end.csound-document"
+            },
+            "3": {
+              "name": "punctuation.definition.tag.end.csound-document"
             }
           },
           "patterns": [
@@ -42,16 +66,28 @@
         },
         {
           "name": "meta.orchestra.csound-document",
-          "begin": "<(CsInstruments)>",
-          "end": "</(CsInstruments)>",
+          "begin": "(<)(CsInstruments)(>)",
+          "end": "(</)(CsInstruments)(>)",
           "beginCaptures": {
             "1": {
-              "name": "entity.name.tag.csound-document"
+              "name": "punctuation.definition.tag.begin.csound-document"
+            },
+            "2": {
+              "name": "entity.name.tag.begin.csound-document"
+            },
+            "3": {
+              "name": "punctuation.definition.tag.begin.csound-document"
             }
           },
           "endCaptures": {
             "1": {
-              "name": "entity.name.tag.csound-document"
+              "name": "punctuation.definition.tag.end.csound-document"
+            },
+            "2": {
+              "name": "entity.name.tag.end.csound-document"
+            },
+            "3": {
+              "name": "punctuation.definition.tag.end.csound-document"
             }
           },
           "patterns": [
@@ -62,16 +98,28 @@
         },
         {
           "name": "meta.score.csound-document",
-          "begin": "<(CsScore)>",
-          "end": "</(CsScore)>",
+          "begin": "(<)(CsScore)(>)",
+          "end": "(</)(CsScore)(>)",
           "beginCaptures": {
             "1": {
-              "name": "entity.name.tag.csound-document"
+              "name": "punctuation.definition.tag.begin.csound-document"
+            },
+            "2": {
+              "name": "entity.name.tag.begin.csound-document"
+            },
+            "3": {
+              "name": "punctuation.definition.tag.begin.csound-document"
             }
           },
           "endCaptures": {
             "1": {
-              "name": "entity.name.tag.csound-document"
+              "name": "punctuation.definition.tag.end.csound-document"
+            },
+            "2": {
+              "name": "entity.name.tag.end.csound-document"
+            },
+            "3": {
+              "name": "punctuation.definition.tag.end.csound-document"
             }
           },
           "patterns": [
@@ -183,16 +231,28 @@
     "tags": {
       "patterns": [
         {
-          "begin": "<([a-zA-Z0-9:-]+)>",
-          "end": "</([a-zA-Z0-9:-]+)>",
+          "begin": "(<)([a-zA-Z0-9:-]+)(>)",
+          "end": "(</)([a-zA-Z0-9:-]+)(>)",
           "beginCaptures": {
             "1": {
-              "name": "entity.name.tag.csound-document"
+              "name": "punctuation.definition.tag.begin.csound-document"
+            },
+            "2": {
+              "name": "entity.name.tag.begin.csound-document"
+            },
+            "3": {
+              "name": "punctuation.definition.tag.begin.csound-document"
             }
           },
           "endCaptures": {
             "1": {
-              "name": "entity.name.tag.csound-document"
+              "name": "punctuation.definition.tag.end.csound-document"
+            },
+            "2": {
+              "name": "entity.name.tag.end.csound-document"
+            },
+            "3": {
+              "name": "punctuation.definition.tag.end.csound-document"
             }
           }
         }

data/grammars/source.css.json

@@ -1328,7 +1328,7 @@
               "name": "keyword.other.unit.${2:/downcase}.css"
             }
           },
-          "match": "(?xi) (?<![\\w-])\n[-+]?                               # Sign indicator\n\n(?:                                 # Numerals\n    [0-9]+ (?:\\.[0-9]+)?           # Integer/float with leading digits\n  | \\.[0-9]+                       # Float without leading digits\n)\n\n(?:                                 # Scientific notation\n  (?<=[0-9])                        # Exponent must follow a digit\n  E                                 # Exponent indicator\n  [-+]?                             # Possible sign indicator\n  [0-9]+                            # Exponent value\n)?\n\n(?:                                 # Possible unit for data-type:\n  (%)                               # - Percentage\n  | ( deg|grad|rad|turn             # - Angle\n    | Hz|kHz                        # - Frequency\n    | ch|cm|em|ex|in|mm|mozmm|pc|   # - Length\n      pt|px|q|rem|vh|vmax|vmin|vw\n    | dpi|dpcm|dppx                 # - Resolution\n    | s|ms                          # - Time\n    )\n  \\b                               # Boundary checking intentionally lax to\n)?                                  # facilitate embedding in CSS-like grammars",
+          "match": "(?xi) (?<![\\w-])\n[-+]?                               # Sign indicator\n\n(?:                                 # Numerals\n    [0-9]+ (?:\\.[0-9]+)?           # Integer/float with leading digits\n  | \\.[0-9]+                       # Float without leading digits\n)\n\n(?:                                 # Scientific notation\n  (?<=[0-9])                        # Exponent must follow a digit\n  E                                 # Exponent indicator\n  [-+]?                             # Possible sign indicator\n  [0-9]+                            # Exponent value\n)?\n\n(?:                                 # Possible unit for data-type:\n  (%)                               # - Percentage\n  | ( deg|grad|rad|turn             # - Angle\n    | Hz|kHz                        # - Frequency\n    | ch|cm|em|ex|fr|in|mm|mozmm|   # - Length\n      pc|pt|px|q|rem|vh|vmax|vmin|\n      vw\n    | dpi|dpcm|dppx                 # - Resolution\n    | s|ms                          # - Time\n    )\n  \\b                               # Boundary checking intentionally lax to\n)?                                  # facilitate embedding in CSS-like grammars",
           "name": "constant.numeric.css"
         }
       ]

data/grammars/source.css.less.json

@@ -146,12 +146,7 @@
       "name": "comment.block.css"
     },
     {
-      "match": "[+-]?\\d*\\.?\\d+",
-      "name": "constant.numeric.css"
-    },
-    {
-      "match": "(?<=[\\d])(ch|cm|deg|dpi|dpcm|dppx|em|ex|grad|in|mm|ms|pc|pt|px|rad|rem|turn|s|vh|vmin|vw)\\b|%",
-      "name": "keyword.other.unit.css"
+      "include": "source.css#numeric-values"
     },
     {
       "captures": {
@@ -281,13 +276,13 @@
       ]
     },
     {
+      "match": "(@|\\-\\-)[\\w-]+(?=\\s*)",
+      "name": "variable.other.less",
       "captures": {
         "1": {
           "name": "punctuation.definition.variable.less"
         }
-      },
-      "match": "(?:@|\\-\\-)[a-zA-Z0-9_-][\\w-]*(?=\\s*)",
-      "name": "variable.other.less"
+      }
     },
     {
       "include": "#variable_interpolation"
@@ -516,7 +511,7 @@
               "include": "#strings"
             },
             {
-              "match": "(\\b|\\.{0,2}/).*\\b",
+              "match": "(\\b|\\.{0,2}/)[^)]*\\b",
               "name": "string.url.css"
             }
           ]

data/grammars/source.d.json

@@ -376,6 +376,10 @@
       "match": "(\\-|\\+|\\*|\\/|~|%|\\^|\\^\\^)=?",
       "name": "keyword.operator.arithmetic.d"
     },
+    {
+      "match": "(\\.\\.\\.)",
+      "name": "keyword.operator.variadic.d"
+    },
     {
       "match": "(\\.\\.)",
       "name": "keyword.operator.slice.d"

data/grammars/source.dart.json

@@ -2,6 +2,8 @@
   "fileTypes": [
     "dart"
   ],
+  "foldingStartMarker": "\\{\\s*$",
+  "foldingStopMarker": "^\\s*\\}",
   "name": "Dart",
   "patterns": [
     {
@@ -9,7 +11,7 @@
       "name": "meta.preprocessor.script.dart"
     },
     {
-      "begin": "^\\s*\\b(library|import|export|part of|part)\\b",
+      "begin": "^\\w*\\b(library|import|part of|part|export)\\b",
       "beginCaptures": {
         "0": {
           "name": "keyword.other.import.dart"
@@ -27,7 +29,7 @@
           "include": "#strings"
         },
         {
-          "match": "\\b(as|show|hide|deferred)\\b",
+          "match": "\\b(as|show|hide)\\b",
           "name": "keyword.other.import.dart"
         }
       ]
@@ -36,22 +38,13 @@
       "include": "#comments"
     },
     {
-      "include": "#constants-and-special-vars"
+      "include": "#punctuation"
     },
     {
       "include": "#annotations"
     },
     {
-      "include": "#decl-typedef"
-    },
-    {
-      "include": "#decl-class"
-    },
-    {
-      "include": "#decl-enum"
-    },
-    {
-      "include": "#decl-function"
+      "include": "#constants-and-special-vars"
     },
     {
       "include": "#keywords"
@@ -61,21 +54,34 @@
     }
   ],
   "repository": {
-    "annotations": {
+    "dartdoc": {
       "patterns": [
         {
+          "match": "(\\[.*?\\])",
+          "captures": {
+            "0": {
+              "name": "variable.name.source.dart"
+            }
+          }
+        },
+        {
+          "match": "(`.*?`)",
+          "captures": {
+            "0": {
+              "name": "variable.other.source.dart"
+            }
+          }
+        },
+        {
+          "match": "(\\* ((    ).*))$",
           "captures": {
-            "1": {
-              "name": "annotation.dart"
-            },
             "2": {
-              "name": "entity.name.function.annotation.dart"
-            },
-            "3": {
-              "name": "support.type.dart"
+              "name": "variable.other.source.dart"
             }
-          },
-          "match": "^(?:\\s*)((@)([a-zA-Z0-9_]+))"
+          }
+        },
+        {
+          "match": "(\\*    .*)$"
         }
       ]
     },
@@ -91,451 +97,156 @@
           "name": "comment.block.empty.dart"
         },
         {
-          "include": "#comments-inline"
-        }
-      ]
-    },
-    "comments-inline": {
-      "patterns": [
-        {
-          "begin": "/\\*",
-          "end": "\\*/",
-          "name": "comment.block.dart",
-          "patterns": [
-            {
-              "include": "text.dart-doccomments"
-            }
-          ]
-        },
-        {
-          "begin": "(///)",
-          "beginCaptures": {
-            "1": {
-              "name": "marker.dart"
-            }
-          },
-          "end": "$",
-          "name": "comment.line.triple-slash.dart",
-          "patterns": [
-            {
-              "include": "text.dart-doccomments"
-            }
-          ]
-        },
-        {
-          "begin": "(//)",
-          "beginCaptures": {
-            "1": {
-              "name": "marker.dart"
-            }
-          },
-          "end": "$",
-          "name": "comment.line.double-slash.dart",
-          "patterns": [
-            {
-              "include": "text.dart-doccomments"
-            }
-          ]
-        }
-      ]
-    },
-    "constants-and-special-vars": {
-      "patterns": [
-        {
-          "match": "\\b(true|false|null)\\b",
-          "name": "constant.language.dart"
+          "include": "#comments-doc-oldschool"
         },
         {
-          "match": "\\b(this|super)\\b",
-          "name": "variable.language.dart"
+          "include": "#comments-doc"
         },
         {
-          "match": "\\b((0(x|X)[0-9a-fA-F]*)|(([0-9]+\\.?[0-9]*)|(\\.[0-9]+))((e|E)(\\+|-)?[0-9]+)?)\\b",
-          "name": "constant.numeric.dart"
-        }
-      ]
-    },
-    "decl-class": {
-      "patterns": [
-        {
-          "begin": "\\bclass\\b",
-          "beginCaptures": {
-            "0": {
-              "name": "keyword.control.new.dart"
-            }
-          },
-          "end": "(?={)",
-          "name": "meta.declaration.class.dart",
-          "patterns": [
-            {
-              "include": "#keywords"
-            },
-            {
-              "match": "[A-Za-z_][A-Za-z0-9_]*",
-              "name": "class.name.dart"
-            }
-          ]
+          "include": "#comments-inline"
         }
       ]
     },
-    "decl-enum": {
+    "comments-doc-oldschool": {
       "patterns": [
         {
-          "begin": "\\benum\\b",
-          "beginCaptures": {
-            "0": {
-              "name": "keyword.declaration.dart"
-            }
-          },
-          "end": "(?={)",
-          "name": "meta.declaration.enum.dart",
+          "begin": "/\\*\\*",
+          "end": "\\*/",
+          "name": "comment.block.documentation.dart",
           "patterns": [
             {
-              "include": "#keywords"
-            },
-            {
-              "match": "[A-Za-z_][A-Za-z0-9_]*",
-              "name": "enum.name.dart"
+              "include": "#dartdoc"
             }
           ]
         }
       ]
     },
-    "decl-function": {
+    "comments-doc": {
       "patterns": [
         {
+          "match": "(///)     (.*?)$",
           "captures": {
             "1": {
-              "name": "storage.type.primitive.dart"
+              "name": "comment.block.triple-slash.dart"
             },
             "2": {
-              "name": "keyword.declaration.dart"
-            },
-            "3": {
-              "name": "function.name.dart"
+              "name": "variable.other.source.dart"
             }
-          },
-          "comment": "A getter with a primitive return type.",
-          "match": "^\\s*(?:\\b(void|bool|num|int|double|dynamic|var|String|List|Map)\\b)\\s+(get)\\s+(\\w+)\\s+(?==>)",
-          "name": "meta.declaration.function.dart"
+          }
         },
         {
+          "match": "(///)(.*?)$",
           "captures": {
             "1": {
-              "name": "type.user-defined.dart"
+              "name": "comment.block.triple-slash.dart"
             },
             "2": {
-              "name": "keyword.declaration.dart"
-            },
-            "3": {
-              "name": "function.name.dart"
-            }
-          },
-          "comment": "A getter with a user-defined return type or no return type.",
-          "match": "^\\s*(?:\\b(\\w+)\\b\\s+)?(get)\\s+(\\w+)\\s+(?==>)",
-          "name": "meta.declaration.function.dart"
-        },
-        {
-          "begin": "^\\s*(set)\\s+(\\w+)(?=\\()",
-          "beginCaptures": {
-            "1": {
-              "name": "keyword.declaration.dart"
-            },
-            "2": {
-              "name": "function.name.dart"
-            }
-          },
-          "comment": "A setter.",
-          "end": "\\)",
-          "name": "meta.declaration.function.dart",
-          "patterns": [
-            {
-              "include": "#comments-inline"
-            },
-            {
-              "include": "#decl-function-parameter"
-            },
-            {
-              "include": "#strings"
-            },
-            {
-              "include": "#keywords"
+              "name": "comment.block.documentation.dart",
+              "patterns": [
+                {
+                  "include": "#dartdoc"
+                }
+              ]
             }
-          ]
-        },
+          }
+        }
+      ]
+    },
+    "comments-inline": {
+      "patterns": [
         {
-          "begin": "^\\s*(?:\\b(void|bool|num|int|double|dynamic|var|String|List|Map)\\b)\\s+(\\w+)(?=\\()",
-          "beginCaptures": {
-            "1": {
-              "name": "storage.type.primitive.dart"
-            },
-            "2": {
-              "name": "function.name.dart"
-            }
-          },
-          "comment": "A function with a primitive return type.",
-          "end": "\\)",
-          "name": "meta.declaration.function.dart",
-          "patterns": [
-            {
-              "include": "#comments-inline"
-            },
-            {
-              "include": "#decl-function-parameter"
-            },
-            {
-              "include": "#strings"
-            },
-            {
-              "include": "#keywords"
-            }
-          ]
+          "begin": "/\\*",
+          "end": "\\*/",
+          "name": "comment.block.dart"
         },
         {
-          "begin": "^\\s*(?:\\b(return)\\b)\\s+(\\w+)(?=\\()",
-          "beginCaptures": {
+          "captures": {
             "1": {
-              "name": "keyword.control.dart"
-            },
-            "2": {
-              "name": "function.name.dart"
+              "name": "comment.line.double-slash.dart"
             }
           },
-          "comment": "A function invocation after 'return'",
-          "end": "\\)",
-          "name": "meta.invocation.function.dart",
-          "patterns": [
-            {
-              "include": "#comments-inline"
-            },
-            {
-              "include": "#decl-function-parameter"
-            },
-            {
-              "include": "#strings"
-            },
-            {
-              "include": "#keywords"
-            }
-          ]
-        },
+          "match": "((//).*)$"
+        }
+      ]
+    },
+    "annotations": {
+      "patterns": [
         {
-          "begin": "^\\s*\\b(new)\\b\\s+(\\w+)(?=\\()",
-          "beginCaptures": {
-            "1": {
-              "name": "keyword.declaration.dart"
-            },
-            "2": {
-              "name": "function.name.dart"
-            }
-          },
-          "comment": "A class instantiation after 'new'",
-          "end": "\\)",
-          "name": "meta.invocation.function.dart",
-          "patterns": [
-            {
-              "include": "#comments-inline"
-            },
-            {
-              "include": "#decl-function-parameter"
-            },
-            {
-              "include": "#strings"
-            },
-            {
-              "include": "#keywords"
-            }
-          ]
+          "match": "@[a-zA-Z]+",
+          "name": "storage.type.annotation.dart"
         }
       ]
     },
-    "decl-function-parameter": {
+    "constants-and-special-vars": {
       "patterns": [
         {
-          "include": "#constants-and-special-vars"
+          "match": "\\b(true|false|null)\\b",
+          "name": "constant.language.dart"
         },
         {
-          "begin": "(?:\\b(void|bool|num|int|double|dynamic|var|String|List|Map)\\b)\\s+(\\w+)(?=\\()",
-          "beginCaptures": {
-            "1": {
-              "name": "storage.type.primitive.dart"
-            },
-            "2": {
-              "name": "function.name.dart"
-            }
-          },
-          "comment": "A function with a primitive return type.",
-          "end": "\\)",
-          "name": "meta.parameter.function.dart",
-          "patterns": [
-            {
-              "include": "#decl-function-parameter"
-            },
-            {
-              "include": "#strings"
-            },
-            {
-              "include": "#keywords"
-            }
-          ]
+          "match": "\\b(this|super)\\b",
+          "name": "variable.language.dart"
         },
         {
-          "begin": "\\b(new)\\b\\s+(\\w+)(?=\\()",
-          "beginCaptures": {
-            "1": {
-              "name": "keyword.declaration.dart"
-            },
-            "2": {
-              "name": "function.name.dart"
-            }
-          },
-          "comment": "A class instantiation after 'new'",
-          "end": "\\)",
-          "name": "meta.invocation.function.dart",
-          "patterns": [
-            {
-              "include": "#decl-function-parameter"
-            },
-            {
-              "include": "#strings"
-            },
-            {
-              "include": "#keywords"
-            }
-          ]
+          "match": "\\b((0(x|X)[0-9a-fA-F]*)|(([0-9]+\\.?[0-9]*)|(\\.[0-9]+))((e|E)(\\+|-)?[0-9]+)?)\\b",
+          "name": "constant.numeric.dart"
         },
         {
-          "begin": "(?:\\b(\\w+)\\b)\\s+(\\w+)(?=\\()",
-          "beginCaptures": {
-            "1": {
-              "name": "type.user-defined.dart"
-            },
-            "2": {
-              "name": "function.name.dart"
-            }
-          },
-          "comment": "A function with a user-defined return type.",
-          "end": "\\)",
-          "name": "meta.parameter.function.dart",
-          "patterns": [
-            {
-              "include": "#decl-function-parameter"
-            },
-            {
-              "include": "#strings"
-            },
-            {
-              "include": "#keywords"
-            }
-          ]
+          "match": "\\b_?[A-Z][a-zA-Z0-9_]+\\b",
+          "name": "support.class.dart"
         },
         {
-          "begin": "(\\w+)(?=\\()",
-          "beginCaptures": {
+          "match": "(_?[a-z][a-zA-Z0-9_]+)(\\(|\\s+=>)",
+          "captures": {
             "1": {
-              "name": "function.name.dart"
+              "name": "entity.name.function.dart"
             }
-          },
-          "comment": "A function with no return type.",
-          "end": "\\)",
-          "name": "meta.parameter.function.dart",
-          "patterns": [
-            {
-              "include": "#decl-function-parameter"
-            },
-            {
-              "include": "#strings"
-            },
-            {
-              "include": "#keywords"
-            }
-          ]
-        }
-      ]
-    },
-    "decl-typedef": {
-      "patterns": [
+          }
+        },
         {
-          "begin": "typedef",
-          "beginCaptures": {
-            "0": {
-              "name": "keyword.control.new.dart"
-            }
-          },
-          "end": ";",
-          "endCaptures": {
-            "0": {
-              "name": "punctuation.terminator.dart"
-            }
-          },
-          "name": "meta.declaration.typedef.dart",
-          "patterns": [
-            {
-              "captures": {
-                "1": {
-                  "name": "storage.type.primitive.dart"
-                },
-                "2": {
-                  "name": "typedef.return.dart"
-                },
-                "3": {
-                  "name": "typedef.name.dart"
-                }
-              },
-              "match": "(?:\\b(void|bool|num|int|double|dynamic|var|String|List|Map)\\b|([a-zA-Z_][a-zA-Z0-9_]*))\\s+([a-zA-Z_][a-zA-Z0-9_]+)"
-            },
-            {
-              "begin": "\\(",
-              "end": "\\)",
-              "name": "typedef.params.dart",
-              "patterns": [
-                {
-                  "include": "#keywords"
-                }
-              ]
-            }
-          ]
+          "match": "\\b[A-Z_0-9]+\\b",
+          "name": "support.constant.dart"
         }
       ]
     },
     "keywords": {
       "patterns": [
-        {
-          "match": "\\bassert\\b",
-          "name": "keyword.control.assert.dart"
-        },
         {
           "match": "\\bas\\b",
           "name": "keyword.cast.dart"
         },
         {
-          "match": "\\b(try|catch|finally|throw|on|rethrow)\\b",
+          "match": "\\b(try|on|catch|finally|throw|rethrow)\\b",
           "name": "keyword.control.catch-exception.dart"
         },
         {
-          "match": "\\s+\\?\\s+|\\s+:\\s+",
-          "name": "keyword.control.ternary.dart"
+          "match": "\\b(break|case|continue|default|do|else|for|if|in|return|switch|while)\\b",
+          "name": "keyword.control.dart"
         },
         {
-          "match": "\\b(break|case|continue|default|do|else|for|if|in|return|switch|while)\\b",
+          "match": "\\b(sync(\\*)?|async(\\*)?|await|yield(\\*)?)\\b",
           "name": "keyword.control.dart"
         },
         {
-          "match": "\\b(async\\*|async|await\\*|await|yield)\\b",
-          "name": "keyword.control.async.dart"
+          "match": "\\bassert\\b",
+          "name": "keyword.control.dart"
         },
         {
           "match": "\\b(new)\\b",
           "name": "keyword.control.new.dart"
         },
         {
-          "match": "\\b(abstract|extends|external|factory|implements|with|interface|get|native|operator|set|typedef)\\b",
+          "match": "\\b(abstract|class|enum|extends|external|factory|implements|interface|get|native|operator|set|typedef|with)\\b",
           "name": "keyword.declaration.dart"
         },
         {
           "match": "\\b(is\\!?)\\b",
           "name": "keyword.operator.dart"
         },
+        {
+          "match": "\\?|:",
+          "name": "keyword.operator.ternary.dart"
+        },
         {
           "match": "(<<|>>>?|~|\\^|\\||&)",
           "name": "keyword.operator.bitwise.dart"
@@ -545,7 +256,7 @@
           "name": "keyword.operator.assignment.bitwise.dart"
         },
         {
-          "match": "(===?|!==?|<=?|>=?)",
+          "match": "(==|!=|<=?|>=?)",
           "name": "keyword.operator.comparison.dart"
         },
         {
@@ -568,110 +279,28 @@
           "match": "(!|&&|\\|\\|)",
           "name": "keyword.operator.logical.dart"
         },
-        {
-          "match": ";",
-          "name": "punctuation.terminator.dart"
-        },
         {
           "match": "\\b(static|final|const)\\b",
           "name": "storage.modifier.dart"
         },
         {
-          "match": "\\b(?:void|bool|num|int|double|dynamic|var|String|List|Map)\\b",
+          "match": "\\b(?:void|bool|num|int|double|dynamic|var)\\b",
           "name": "storage.type.primitive.dart"
         }
       ]
     },
-    "regexp": {
-      "patterns": [
-        {
-          "match": "\\\\[^'\"]",
-          "name": "constant.character.escaped.regex.dart"
-        },
-        {
-          "begin": "\\(",
-          "contentName": "meta.capture.regex.dart",
-          "end": "\\)",
-          "patterns": [
-            {
-              "match": "\\?(:|=|!)",
-              "name": "ignore.capture.regex.dart"
-            },
-            {
-              "include": "#regex.dart"
-            }
-          ]
-        },
-        {
-          "match": "\\*|\\+|\\?|\\.|\\|",
-          "name": "keyword.other.regex.dart"
-        },
-        {
-          "match": "\\^|\\$",
-          "name": "keyword.other.regex.dart"
-        },
-        {
-          "match": "\\.",
-          "name": "constant.other.regex.dart"
-        },
-        {
-          "begin": "\\[(\\^)?",
-          "beginCaptures": {
-            "1": {
-              "name": "keyword.other.negation.regex.dart"
-            }
-          },
-          "end": "\\]",
-          "name": "constant.character.range.regex.dart",
-          "patterns": [
-            {
-              "match": "\\\\[^\"']",
-              "name": "constant.character.escaped.regex.dart"
-            }
-          ]
-        },
-        {
-          "match": "\\{(?:\\d+)?,(?:\\d+)?\\}",
-          "name": "keyword.other.regex.dart"
-        }
-      ]
-    },
     "string-interp": {
       "patterns": [
-        {
-          "begin": "(\\$)(\\{)",
-          "beginCaptures": {
-            "1": {
-              "name": "keyword.other.dart"
-            },
-            "2": {
-              "name": "keyword.other.dart"
-            }
-          },
-          "contentName": "source.dart",
-          "end": "(\\})",
-          "endCaptures": {
-            "1": {
-              "name": "keyword.other.dart"
-            }
-          },
-          "name": "interpolation.dart",
-          "patterns": [
-            {
-              "include": "$self"
-            }
-          ]
-        },
         {
           "captures": {
-            "1": {
-              "name": "keyword.other.dart"
-            },
             "2": {
               "name": "variable.parameter.dart"
+            },
+            "3": {
+              "name": "variable.parameter.dart"
             }
           },
-          "match": "(\\$)(\\w+)"
+          "match": "\\$((\\w+)|\\{(\\w+)\\})"
         },
         {
           "match": "\\\\.",
@@ -712,7 +341,7 @@
           "name": "string.quoted.triple.single.dart"
         },
         {
-          "begin": "(?<!\\\\|r)\"",
+          "begin": "(?<!\\|r)\"",
           "end": "\"",
           "name": "string.interpolated.double.dart",
           "patterns": [
@@ -731,7 +360,8 @@
           "name": "string.quoted.double.dart",
           "patterns": [
             {
-              "include": "#regexp"
+              "match": "\\n",
+              "name": "invalid.string.newline"
             }
           ]
         },
@@ -740,6 +370,10 @@
           "end": "'",
           "name": "string.interpolated.single.dart",
           "patterns": [
+            {
+              "match": "\\n",
+              "name": "invalid.string.newline"
+            },
             {
               "include": "#string-interp"
             }
@@ -751,13 +385,29 @@
           "name": "string.quoted.single.dart",
           "patterns": [
             {
-              "include": "#regexp"
+              "match": "\\n",
+              "name": "invalid.string.newline"
             }
           ]
         }
       ]
+    },
+    "punctuation": {
+      "patterns": [
+        {
+          "match": ",",
+          "name": "punctuation.comma.dart"
+        },
+        {
+          "match": ";",
+          "name": "punctuation.terminator.dart"
+        },
+        {
+          "match": "\\.",
+          "name": "punctuation.dot.dart"
+        }
+      ]
     }
   },
-  "scopeName": "source.dart",
-  "uuid": "958518BC-799F-477A-99F9-5B28EBF230F6"
+  "scopeName": "source.dart"
 }