github-linguist 6.2.0 → 6.3.0

data/grammars/source.batchfile.json

@@ -132,12 +132,6 @@
           "begin": "\\s+/[aA]\\s+",
           "end": "(?=$\\n|[\u0026|\u003e\u003c)])",
           "patterns": [
-            {
-              "include": "#command_set_inside_arithmetic"
-            },
-            {
-              "include": "#command_set_group"
-            },
             {
               "name": "string.quoted.double.batchfile",
               "begin": "\"",
@@ -163,6 +157,12 @@
                   "name": "punctuation.definition.string.end.batchfile"
                 }
               }
+            },
+            {
+              "include": "#command_set_inside_arithmetic"
+            },
+            {
+              "include": "#command_set_group"
             }
           ]
         },
@@ -212,8 +212,15 @@
     "command_set_operators": {
       "patterns": [
         {
-          "name": "keyword.operator.assignment.augmented.batchfile",
-          "match": "\\+\\=|\\-\\=|\\*\\=|/\\=|%%\\=|\u0026\\=|\\|\\=|\\^\\=|\u003c\u003c\\=|\u003e\u003e\\="
+          "match": "([^ ]*)(\\+\\=|\\-\\=|\\*\\=|\\/\\=|%%\\=|\u0026\\=|\\|\\=|\\^\\=|\u003c\u003c\\=|\u003e\u003e\\=)",
+          "captures": {
+            "1": {
+              "name": "variable.other.readwrite.batchfile"
+            },
+            "2": {
+              "name": "keyword.operator.assignment.augmented.batchfile"
+            }
+          }
         },
         {
           "name": "keyword.operator.arithmetic.batchfile",
@@ -224,8 +231,15 @@
           "match": "!"
         },
         {
-          "name": "keyword.operator.assignment.batchfile",
-          "match": "="
+          "match": "([^ ][^=]*)(=)",
+          "captures": {
+            "1": {
+              "name": "variable.other.readwrite.batchfile"
+            },
+            "2": {
+              "name": "keyword.operator.assignment.batchfile"
+            }
+          }
         }
       ]
     },

data/grammars/source.bsl.json

@@ -12,6 +12,9 @@
       "begin": "(?i:(?\u003c=[^\\wа-яё\\.]|^)(Процедура|Procedure|Функция|Function)\\s+([a-zа-яё0-9_]+)\\s*(\\())",
       "end": "(?i:(\\))\\s*((Экспорт|Export)(?=[^\\wа-яё\\.]|$))?)",
       "patterns": [
+        {
+          "include": "#annotations"
+        },
         {
           "include": "#basic"
         },
@@ -160,16 +163,7 @@
       "match": "(?i:\u0026(НаКлиенте((НаСервере(БезКонтекста)?)?)|AtClient((AtServer(NoContext)?)?)|НаСервере(БезКонтекста)?|AtServer(NoContext)?))"
     },
     {
-      "begin": "(?i)(\u0026(Перед|Before|После|After|Вместо|Around))\\s*\\((.*)\\)",
-      "end": "$",
-      "beginCaptures": {
-        "1": {
-          "name": "storage.type.annotation.bsl"
-        },
-        "3": {
-          "name": "string.quoted.double.bsl"
-        }
-      }
+      "include": "#annotations"
     },
     {
       "name": "keyword.other.preprocessor.bsl",
@@ -193,6 +187,52 @@
     }
   ],
   "repository": {
+    "annotations": {
+      "patterns": [
+        {
+          "begin": "(?i)(\u0026([a-zа-яё0-9_]+))\\s*(\\()",
+          "end": "(\\))",
+          "patterns": [
+            {
+              "include": "#basic"
+            },
+            {
+              "name": "keyword.operator.assignment.bsl",
+              "match": "(=)"
+            },
+            {
+              "name": "invalid.illegal.bsl",
+              "match": "(?\u003c=[^\\wа-яё\\.]|^)((?\u003c==)(?i)[a-zа-яё0-9_]+)(?=[^\\wа-яё\\.]|$)"
+            },
+            {
+              "name": "invalid.illegal.bsl",
+              "match": "(?\u003c=[^\\wа-яё\\.]|^)((?\u003c==\\s)\\s*(?i)[a-zа-яё0-9_]+)(?=[^\\wа-яё\\.]|$)"
+            },
+            {
+              "name": "variable.annotation.bsl",
+              "match": "(?i)[a-zа-яё0-9_]+"
+            }
+          ],
+          "beginCaptures": {
+            "1": {
+              "name": "storage.type.annotation.bsl"
+            },
+            "3": {
+              "name": "punctuation.bracket.begin.bsl"
+            }
+          },
+          "endCaptures": {
+            "1": {
+              "name": "punctuation.bracket.end.bsl"
+            }
+          }
+        },
+        {
+          "name": "storage.type.annotation.bsl",
+          "match": "(?i)(\u0026([a-zа-яё0-9_]+))"
+        }
+      ]
+    },
     "basic": {
       "patterns": [
         {

data/grammars/source.cobol.json

@@ -109,7 +109,7 @@
     },
     {
       "name": "string.quoted.cobol",
-      "begin": "(?i:exec\\s*sql)",
+      "begin": "(?i:exec\\s+sql)",
       "end": "(?i:end-exec|end\\s*exec)",
       "patterns": [
         {
@@ -123,7 +123,7 @@
     },
     {
       "name": "string.quoted.cobol",
-      "begin": "(?i:exec\\s*cics)",
+      "begin": "(?i:exec\\s+cics)",
       "end": "(?i:end\\-exec|end\\s*exec)",
       "patterns": [
         {
@@ -132,7 +132,7 @@
         },
         {
           "name": "keyword.identifiers.cobol",
-          "match": "(?i:FROM|ERASE|LENGTH|RESP|ISSUE\\s*WAIT|LINK\\s*ACQPROCESS|LINK\\s*ACTIVITY|LINK|LOAD|MONITOR|MOVE\\s*CONTAINER|POINT|POP\\s*HANDLE|POST|PURGE\\s*MESSAGE|PUSH\\s*HANDLE|PUT\\s*CONTAINER|QUERY\\s*COUNTER|QUERY\\s*DCOUNTER|QUERY\\s*SECURITY|READNEXT|READPREV|READQ\\s*TD|READQ\\s*TS|READ|RECEIVE\\s*MAP\\s*MAPPINGDEV|RECEIVE\\s*MAP|RECEIVE\\s*PARTN|RECEIVE|RELEASE|REMOVE\\s*SUBEVENT|RESETBR|RESET\\s*ACQPROCESS|RESET\\s*ACTIVITY|RESUME|RETRIEVE\\s*REATTACH\\s*EVENT|RETRIEVE\\s*SUBEVENT|RETRIEVE|RETURN|REWIND\\s*COUNTER|REWIND\\s*DCOUNTER|REWRITE|ROUTE|RUN|SEND\\s*CONTROL|SEND\\s*MAP\\s*MAPPINGDEV|SEND\\s*MAP|SEND\\s*PAGE|SEND\\s*PARTNSET|SEND\\s*TEXTNOEDIT|SEND\\s*TEXT\\s*MAPPED|SEND\\s*TEXT|SEND|SIGNAL\\s*EVENT|SIGNOFF|SIGNON|SOAPFAULT\\s*ADD|SOAPFAULT\\s*CREATE|SOAPFAULT\\s*DELETE|SPOOLCLOSE|SPOOLOPEN\\s*INPUT|SPOOLOPEN\\s*OUTPUT|SPOOLREAD|SPOOLWRITE|STARTBROWSE\\s*ACTIVITY|STARTBROWSE\\s*CONTAINER|STARTBROWSE\\s*EVENT|STARTBROWSE\\s*PROCESS|STARTBR|START\\s*ATTACH|START\\s*BREXIT|START\\s*TRANSID|START|SUSPEND|SYNCPOINT\\s*ROLLBACK|SYNCPOINT|TEST\\s*EVENT|TRANSFORM\\s*DATATOXML|TRANSFORM\\s*XMLTODATA|UNLOCK|UPDATE\\s*COUNTER|UPDATE\\s*DCOUNTER|WAITCICS|WAIT\\s*CONVID|WAIT\\s*EVENT|WAIT\\s*EXTERNAL|WAIT\\s*JOURNALNAME|WAIT\\s*JOURNALNUM|WAIT\\s*SIGNAL|WAIT\\s*TERMINAL|WEB\\s*CLOSE|WEB\\s*CONVERSE|WEB\\s*ENDBROWSE\\s*FORMFIELD|WEB\\s*ENDBROWSE\\s*HTTPHEADER|WEB\\s*EXTRACT|WEB\\s*OPEN|WEB\\s*PARSE\\s*URL|WEB\\s*READNEXT\\s*FORMFIELD|WEB\\s*READNEXT\\s*HTTPHEADER|WEB\\s*READ\\s*FORMFIELD|WEB\\s*READ\\s*HTTPHEADER|WEB\\s*RECEIVE|WEB\\s*RETRIEVE|WEB\\s*SEND|WEB\\s*STARTBROWSE\\s*FORMFIELD|WEB\\s*STARTBROWSE\\s*HTTPHEADER|WEB\\s*WRITE\\s*HTTPHEADER|WRITEQ\\s*TD|WRITEQ\\s*TS|WRITE\\s*JOURNALNAME|WRITE\\s*JOURNALNUM|WRITE\\s*OPERATOR|WRITE|WSACONTEXT\\s*BUILD|WSACONTEXT\\s*DELETE|WSACONTEXT\\s*GET|WSAEPR\\s*CREATE|XCTL)"
+          "match": "(?\u003c!-)(?i:FROM|ERASE|LENGTH|RESP|ISSUE\\s*WAIT|LINK\\s*ACQPROCESS|LINK\\s*ACTIVITY|LINK|LOAD|MONITOR|MOVE\\s*CONTAINER|POINT|POP\\s*HANDLE|POST|PURGE\\s*MESSAGE|PUSH\\s*HANDLE|PUT\\s*CONTAINER|QUERY\\s*COUNTER|QUERY\\s*DCOUNTER|QUERY\\s*SECURITY|READNEXT|READPREV|READQ\\s*TD|READQ\\s*TS|READ|RECEIVE\\s*MAP\\s*MAPPINGDEV|RECEIVE\\s*MAP|RECEIVE\\s*PARTN|RECEIVE|RELEASE|REMOVE\\s*SUBEVENT|RESETBR|RESET\\s*ACQPROCESS|RESET\\s*ACTIVITY|RESUME|RETRIEVE\\s*REATTACH\\s*EVENT|RETRIEVE\\s*SUBEVENT|RETRIEVE|RETURN|REWIND\\s*COUNTER|REWIND\\s*DCOUNTER|REWRITE|ROUTE|RUN|SEND\\s*CONTROL|SEND\\s*MAP\\s*MAPPINGDEV|SEND\\s*MAP|SEND\\s*PAGE|SEND\\s*PARTNSET|SEND\\s*TEXTNOEDIT|SEND\\s*TEXT\\s*MAPPED|SEND\\s*TEXT|SEND|SIGNAL\\s*EVENT|SIGNOFF|SIGNON|SOAPFAULT\\s*ADD|SOAPFAULT\\s*CREATE|SOAPFAULT\\s*DELETE|SPOOLCLOSE|SPOOLOPEN\\s*INPUT|SPOOLOPEN\\s*OUTPUT|SPOOLREAD|SPOOLWRITE|STARTBROWSE\\s*ACTIVITY|STARTBROWSE\\s*CONTAINER|STARTBROWSE\\s*EVENT|STARTBROWSE\\s*PROCESS|STARTBR|START\\s*ATTACH|START\\s*BREXIT|START\\s*TRANSID|START|SUSPEND|SYNCPOINT\\s*ROLLBACK|SYNCPOINT|TEST\\s*EVENT|TRANSFORM\\s*DATATOXML|TRANSFORM\\s*XMLTODATA|UNLOCK|UPDATE\\s*COUNTER|UPDATE\\s*DCOUNTER|WAITCICS|WAIT\\s*CONVID|WAIT\\s*EVENT|WAIT\\s*EXTERNAL|WAIT\\s*JOURNALNAME|WAIT\\s*JOURNALNUM|WAIT\\s*SIGNAL|WAIT\\s*TERMINAL|WEB\\s*CLOSE|WEB\\s*CONVERSE|WEB\\s*ENDBROWSE\\s*FORMFIELD|WEB\\s*ENDBROWSE\\s*HTTPHEADER|WEB\\s*EXTRACT|WEB\\s*OPEN|WEB\\s*PARSE\\s*URL|WEB\\s*READNEXT\\s*FORMFIELD|WEB\\s*READNEXT\\s*HTTPHEADER|WEB\\s*READ\\s*FORMFIELD|WEB\\s*READ\\s*HTTPHEADER|WEB\\s*RECEIVE|WEB\\s*RETRIEVE|WEB\\s*SEND|WEB\\s*STARTBROWSE\\s*FORMFIELD|WEB\\s*STARTBROWSE\\s*HTTPHEADER|WEB\\s*WRITE\\s*HTTPHEADER|WRITEQ\\s*TD|WRITEQ\\s*TS|WRITE\\s*JOURNALNAME|WRITE\\s*JOURNALNUM|WRITE\\s*OPERATOR|WRITE|WSACONTEXT\\s*BUILD|WSACONTEXT\\s*DELETE|WSACONTEXT\\s*GET|WSAEPR\\s*CREATE|XCTL)"
         },
         {
           "name": "constant.numeric.cobol",
@@ -291,7 +291,7 @@
     },
     {
       "name": "support.function.cobol",
-      "match": "(?i:function)\\s(?i:max|min|integer-of-date|integer-of-day|integer-part|integer|date-to-yyyymmdd|year-to-yyyy|day-to-yyyyddd|exp|exception-file|exception-location|exception-statement|exception-status|e|variance|integer-of-date|rem|pi|factorial|sqrt|log10|fraction-part|mean|exp|log|char|day-of-integer|date-of-integer|exp10|atan|integer-part|tan|sin|cos|midrange|addr|acos|asin|annuity|present-value|integer-of-day|ord-max|ord-min|ord|random|integer-of-date|sum|sign|standard-deviation|median|reverse|abs|upper-case|lower-case|char-national|numval|mod|range|length|locale-date|locale-time-from-seconds|locale-time|seconds-past-midnight|stored-char-length|substitute-case|substitute|seconds-from-formatted-time|seconds=past-midnight|trim|length-an|numval-c|current-date|national-of|display-of|when-compiled|integer-of-boolean|combined-datetime|concatenate)"
+      "match": "(?\u003c!-)(?i:function)\\s(?i:max|min|integer-of-date|integer-of-day|integer-part|integer|date-to-yyyymmdd|year-to-yyyy|day-to-yyyyddd|exp|exception-file|exception-location|exception-statement|exception-status|e|variance|integer-of-date|rem|pi|factorial|sqrt|log10|fraction-part|mean|exp|log|char|day-of-integer|date-of-integer|exp10|atan|integer-part|tan|sin|cos|midrange|addr|acos|asin|annuity|present-value|integer-of-day|ord-max|ord-min|ord|random|integer-of-date|sum|sign|standard-deviation|median|reverse|abs|upper-case|lower-case|char-national|numval|mod|range|length|locale-date|locale-time-from-seconds|locale-time|seconds-past-midnight|stored-char-length|substitute-case|substitute|seconds-from-formatted-time|seconds=past-midnight|trim|length-an|numval-c|current-date|national-of|display-of|when-compiled|integer-of-boolean|combined-datetime|concatenate)"
     },
     {
       "name": "support.function.cobol",

data/grammars/source.css.json

@@ -1353,7 +1353,7 @@
       "patterns": [
         {
           "name": "support.type.property-name.css",
-          "match": "(?xi) (?\u003c![\\w-])\n(?:\n    # Standard CSS\n    additive-symbols|align-content|align-items|align-self|all|animation|animation-delay|animation-direction\n  | animation-duration|animation-fill-mode|animation-iteration-count|animation-name|animation-play-state\n  | animation-timing-function|backface-visibility|background|background-attachment|background-blend-mode\n  | background-clip|background-color|background-image|background-origin|background-position|background-position-[xy]\n  | background-repeat|background-size|block-size|border|border-block-end|border-block-end-color|border-block-end-style\n  | border-block-end-width|border-block-start|border-block-start-color|border-block-start-style\n  | border-block-start-width|border-bottom|border-bottom-color|border-bottom-left-radius|border-bottom-right-radius\n  | border-bottom-style|border-bottom-width|border-collapse|border-color|border-image|border-image-outset\n  | border-image-repeat|border-image-slice|border-image-source|border-image-width|border-inline-end\n  | border-inline-end-color|border-inline-end-style|border-inline-end-width|border-inline-start\n  | border-inline-start-color|border-inline-start-style|border-inline-start-width|border-left|border-left-color\n  | border-left-style|border-left-width|border-radius|border-right|border-right-color|border-right-style\n  | border-right-width|border-spacing|border-style|border-top|border-top-color|border-top-left-radius\n  | border-top-right-radius|border-top-style|border-top-width|border-width|bottom|box-decoration-break\n  | box-shadow|box-sizing|break-after|break-before|break-inside|caption-side|clear|clip|clip-path|color\n  | column-count|column-fill|column-gap|column-rule|column-rule-color|column-rule-style|column-rule-width\n  | column-span|column-width|columns|content|counter-increment|counter-reset|cursor|direction|display\n  | empty-cells|filter|flex|flex-basis|flex-direction|flex-flow|flex-grow|flex-shrink|flex-wrap|float\n  | font|font-display|font-family|font-feature-settings|font-kerning|font-language-override|font-size|font-size-adjust\n  | font-stretch|font-style|font-synthesis|font-variant|font-variant-alternates|font-variant-caps\n  | font-variant-east-asian|font-variant-ligatures|font-variant-numeric|font-variant-position|font-weight\n  | grid|grid-area|grid-auto-columns|grid-auto-flow|grid-auto-rows|grid-column|grid-column-end|grid-column-gap\n  | grid-column-start|grid-gap|grid-row|grid-row-end|grid-row-gap|grid-row-start|grid-template|grid-template-areas\n  | grid-template-columns|grid-template-rows|height|hyphens|image-orientation|image-rendering|image-resolution\n  | ime-mode|inline-size|isolation|justify-content|left|letter-spacing|line-break|line-height|list-style\n  | list-style-image|list-style-position|list-style-type|margin|margin-block-end|margin-block-start|margin-bottom\n  | margin-inline-end|margin-inline-start|margin-left|margin-right|margin-top|mask|mask-clip|mask-composite\n  | mask-image|mask-mode|mask-origin|mask-position|mask-repeat|mask-size|mask-type|max-block-size|max-height\n  | max-inline-size|max-width|max-zoom|min-block-size|min-height|min-inline-size|min-width|min-zoom|mix-blend-mode\n  | negative|object-fit|object-position|offset-block-end|offset-block-start|offset-inline-end|offset-inline-start\n  | opacity|order|orientation|orphans|outline|outline-color|outline-offset|outline-style|outline-width|overflow\n  | overflow-wrap|overflow-[xy]|pad|padding|padding-block-end|padding-block-start|padding-bottom|padding-inline-end\n  | padding-inline-start|padding-left|padding-right|padding-top|page-break-after|page-break-before|page-break-inside\n  | perspective|perspective-origin|pointer-events|position|prefix|quotes|range|resize|right|ruby-align|ruby-merge\n  | ruby-position|scroll-behavior|scroll-snap-coordinate|scroll-snap-destination|scroll-snap-type|shape-image-threshold\n  | shape-margin|shape-outside|speak-as|src|suffix|symbols|system|tab-size|table-layout|text-align|text-align-last\n  | text-combine-upright|text-decoration|text-decoration-color|text-decoration-line|text-decoration-style|text-emphasis\n  | text-emphasis-color|text-emphasis-position|text-emphasis-style|text-indent|text-orientation|text-overflow\n  | text-rendering|text-shadow|text-transform|text-underline-position|top|touch-action|transform|transform-box\n  | transform-origin|transform-style|transition|transition-delay|transition-duration|transition-property\n  | transition-timing-function|unicode-bidi|unicode-range|user-zoom|vertical-align|visibility|white-space|widows\n  | width|will-change|word-break|word-spacing|word-wrap|writing-mode|z-index|zoom\n\n  # SVG attributes\n  | alignment-baseline|baseline-shift|clip-rule|color-interpolation|color-interpolation-filters|color-profile\n  | color-rendering|dominant-baseline|enable-background|fill|fill-opacity|fill-rule|flood-color|flood-opacity\n  | glyph-orientation-horizontal|glyph-orientation-vertical|kerning|lighting-color|marker-end|marker-mid\n  | marker-start|shape-rendering|stop-color|stop-opacity|stroke|stroke-dasharray|stroke-dashoffset|stroke-linecap\n  | stroke-linejoin|stroke-miterlimit|stroke-opacity|stroke-width|text-anchor|x|y\n\n  # Not listed on MDN; presumably deprecated\n  | adjust|after|align|align-last|alignment|alignment-adjust|appearance|attachment|azimuth|background-break\n  | balance|baseline|before|bidi|binding|bookmark|bookmark-label|bookmark-level|bookmark-target|border-length\n  | bottom-color|bottom-left-radius|bottom-right-radius|bottom-style|bottom-width|box|box-align|box-direction\n  | box-flex|box-flex-group|box-lines|box-ordinal-group|box-orient|box-pack|break|character|collapse|column\n  | column-break-after|column-break-before|count|counter|crop|cue|cue-after|cue-before|decoration|decoration-break\n  | delay|display-model|display-role|down|drop|drop-initial-after-adjust|drop-initial-after-align|drop-initial-before-adjust\n  | drop-initial-before-align|drop-initial-size|drop-initial-value|duration|elevation|emphasis|family|fit|fit-position\n  | flex-group|float-offset|gap|grid-columns|grid-rows|hanging-punctuation|header|hyphenate|hyphenate-after|hyphenate-before\n  | hyphenate-character|hyphenate-lines|hyphenate-resource|icon|image|increment|indent|index|initial-after-adjust\n  | initial-after-align|initial-before-adjust|initial-before-align|initial-size|initial-value|inline-box-align|iteration-count\n  | justify|label|left-color|left-style|left-width|length|level|line|line-stacking|line-stacking-ruby|line-stacking-shift\n  | line-stacking-strategy|lines|list|mark|mark-after|mark-before|marks|marquee|marquee-direction|marquee-play-count|marquee-speed\n  | marquee-style|max|min|model|move-to|name|nav|nav-down|nav-index|nav-left|nav-right|nav-up|new|numeral|offset|ordinal-group\n  | orient|origin|overflow-style|overhang|pack|page|page-policy|pause|pause-after|pause-before|phonemes|pitch|pitch-range\n  | play-count|play-during|play-state|point|presentation|presentation-level|profile|property|punctuation|punctuation-trim\n  | radius|rate|rendering-intent|repeat|replace|reset|resolution|resource|respond-to|rest|rest-after|rest-before|richness\n  | right-color|right-style|right-width|role|rotation|rotation-point|rows|ruby|ruby-overhang|ruby-span|rule|rule-color\n  | rule-style|rule-width|shadow|size|size-adjust|sizing|space|space-collapse|spacing|span|speak|speak-header|speak-numeral\n  | speak-punctuation|speech|speech-rate|speed|stacking|stacking-ruby|stacking-shift|stacking-strategy|stress|stretch\n  | string-set|style|style-image|style-position|style-type|target|target-name|target-new|target-position|text|text-height\n  | text-justify|text-outline|text-replace|text-wrap|timing-function|top-color|top-left-radius|top-right-radius|top-style\n  | top-width|trim|unicode|up|user-select|variant|voice|voice-balance|voice-duration|voice-family|voice-pitch|voice-pitch-range\n  | voice-rate|voice-stress|voice-volume|volume|weight|white|white-space-collapse|word|wrap\n)\n(?![\\w-])"
+          "match": "(?xi) (?\u003c![\\w-])\n(?:\n    # Standard CSS\n    additive-symbols|align-content|align-items|align-self|all|animation|animation-delay|animation-direction\n  | animation-duration|animation-fill-mode|animation-iteration-count|animation-name|animation-play-state\n  | animation-timing-function|backface-visibility|background|background-attachment|background-blend-mode\n  | background-clip|background-color|background-image|background-origin|background-position|background-position-[xy]\n  | background-repeat|background-size|block-size|border|border-block-end|border-block-end-color|border-block-end-style\n  | border-block-end-width|border-block-start|border-block-start-color|border-block-start-style\n  | border-block-start-width|border-bottom|border-bottom-color|border-bottom-left-radius|border-bottom-right-radius\n  | border-bottom-style|border-bottom-width|border-collapse|border-color|border-image|border-image-outset\n  | border-image-repeat|border-image-slice|border-image-source|border-image-width|border-inline-end\n  | border-inline-end-color|border-inline-end-style|border-inline-end-width|border-inline-start\n  | border-inline-start-color|border-inline-start-style|border-inline-start-width|border-left|border-left-color\n  | border-left-style|border-left-width|border-radius|border-right|border-right-color|border-right-style\n  | border-right-width|border-spacing|border-style|border-top|border-top-color|border-top-left-radius\n  | border-top-right-radius|border-top-style|border-top-width|border-width|bottom|box-decoration-break\n  | box-shadow|box-sizing|break-after|break-before|break-inside|caption-side|clear|clip|clip-path|color\n  | column-count|column-fill|column-gap|column-rule|column-rule-color|column-rule-style|column-rule-width\n  | column-span|column-width|columns|content|counter-increment|counter-reset|cursor|direction|display\n  | empty-cells|filter|flex|flex-basis|flex-direction|flex-flow|flex-grow|flex-shrink|flex-wrap|float\n  | font|font-display|font-family|font-feature-settings|font-kerning|font-language-override|font-size|font-size-adjust\n  | font-stretch|font-style|font-synthesis|font-variant|font-variant-alternates|font-variant-caps\n  | font-variant-east-asian|font-variant-ligatures|font-variant-numeric|font-variant-position|font-weight\n  | grid|grid-area|grid-auto-columns|grid-auto-flow|grid-auto-rows|grid-column|grid-column-end|grid-column-gap\n  | grid-column-start|grid-gap|grid-row|grid-row-end|grid-row-gap|grid-row-start|grid-template|grid-template-areas\n  | grid-template-columns|grid-template-rows|height|hyphens|image-orientation|image-rendering|image-resolution\n  | ime-mode|inline-size|isolation|justify-content|left|letter-spacing|line-break|line-height|list-style\n  | list-style-image|list-style-position|list-style-type|margin|margin-block-end|margin-block-start|margin-bottom\n  | margin-inline-end|margin-inline-start|margin-left|margin-right|margin-top|mask|mask-clip|mask-composite\n  | mask-image|mask-mode|mask-origin|mask-position|mask-repeat|mask-size|mask-type|max-block-size|max-height\n  | max-inline-size|max-width|max-zoom|min-block-size|min-height|min-inline-size|min-width|min-zoom|mix-blend-mode\n  | negative|object-fit|object-position|offset-block-end|offset-block-start|offset-inline-end|offset-inline-start\n  | opacity|order|orientation|orphans|outline|outline-color|outline-offset|outline-style|outline-width|overflow\n  | overflow-wrap|overflow-[xy]|pad|padding|padding-block-end|padding-block-start|padding-bottom|padding-inline-end\n  | padding-inline-start|padding-left|padding-right|padding-top|page-break-after|page-break-before|page-break-inside\n  | perspective|perspective-origin|pointer-events|position|prefix|quotes|range|resize|right|ruby-align|ruby-merge\n  | ruby-position|scroll-behavior|scroll-snap-coordinate|scroll-snap-destination|scroll-snap-type|shape-image-threshold\n  | shape-margin|shape-outside|speak-as|src|suffix|symbols|system|tab-size|table-layout|text-align|text-align-last\n  | text-combine-upright|text-decoration|text-decoration-color|text-decoration-line|text-decoration-style|text-emphasis\n  | text-emphasis-color|text-emphasis-position|text-emphasis-style|text-indent|text-orientation|text-overflow\n  | text-rendering|text-shadow|text-transform|text-underline-position|top|touch-action|transform|transform-box\n  | transform-origin|transform-style|transition|transition-delay|transition-duration|transition-property\n  | transition-timing-function|unicode-bidi|unicode-range|user-zoom|vertical-align|visibility|white-space|widows\n  | width|will-change|word-break|word-spacing|word-wrap|writing-mode|z-index|zoom\n\n  # SVG attributes\n  | alignment-baseline|baseline-shift|clip-rule|color-interpolation|color-interpolation-filters|color-profile\n  | color-rendering|cx|cy|dominant-baseline|enable-background|fill|fill-opacity|fill-rule|flood-color|flood-opacity\n  | glyph-orientation-horizontal|glyph-orientation-vertical|height|kerning|lighting-color|marker-end|marker-mid\n  | marker-start|r|rx|ry|shape-rendering|stop-color|stop-opacity|stroke|stroke-dasharray|stroke-dashoffset|stroke-linecap\n  | stroke-linejoin|stroke-miterlimit|stroke-opacity|stroke-width|text-anchor|width|x|y\n\n  # Not listed on MDN; presumably deprecated\n  | adjust|after|align|align-last|alignment|alignment-adjust|appearance|attachment|azimuth|background-break\n  | balance|baseline|before|bidi|binding|bookmark|bookmark-label|bookmark-level|bookmark-target|border-length\n  | bottom-color|bottom-left-radius|bottom-right-radius|bottom-style|bottom-width|box|box-align|box-direction\n  | box-flex|box-flex-group|box-lines|box-ordinal-group|box-orient|box-pack|break|character|collapse|column\n  | column-break-after|column-break-before|count|counter|crop|cue|cue-after|cue-before|decoration|decoration-break\n  | delay|display-model|display-role|down|drop|drop-initial-after-adjust|drop-initial-after-align|drop-initial-before-adjust\n  | drop-initial-before-align|drop-initial-size|drop-initial-value|duration|elevation|emphasis|family|fit|fit-position\n  | flex-group|float-offset|gap|grid-columns|grid-rows|hanging-punctuation|header|hyphenate|hyphenate-after|hyphenate-before\n  | hyphenate-character|hyphenate-lines|hyphenate-resource|icon|image|increment|indent|index|initial-after-adjust\n  | initial-after-align|initial-before-adjust|initial-before-align|initial-size|initial-value|inline-box-align|iteration-count\n  | justify|label|left-color|left-style|left-width|length|level|line|line-stacking|line-stacking-ruby|line-stacking-shift\n  | line-stacking-strategy|lines|list|mark|mark-after|mark-before|marks|marquee|marquee-direction|marquee-play-count|marquee-speed\n  | marquee-style|max|min|model|move-to|name|nav|nav-down|nav-index|nav-left|nav-right|nav-up|new|numeral|offset|ordinal-group\n  | orient|origin|overflow-style|overhang|pack|page|page-policy|pause|pause-after|pause-before|phonemes|pitch|pitch-range\n  | play-count|play-during|play-state|point|presentation|presentation-level|profile|property|punctuation|punctuation-trim\n  | radius|rate|rendering-intent|repeat|replace|reset|resolution|resource|respond-to|rest|rest-after|rest-before|richness\n  | right-color|right-style|right-width|role|rotation|rotation-point|rows|ruby|ruby-overhang|ruby-span|rule|rule-color\n  | rule-style|rule-width|shadow|size|size-adjust|sizing|space|space-collapse|spacing|span|speak|speak-header|speak-numeral\n  | speak-punctuation|speech|speech-rate|speed|stacking|stacking-ruby|stacking-shift|stacking-strategy|stress|stretch\n  | string-set|style|style-image|style-position|style-type|target|target-name|target-new|target-position|text|text-height\n  | text-justify|text-outline|text-replace|text-wrap|timing-function|top-color|top-left-radius|top-right-radius|top-style\n  | top-width|trim|unicode|up|user-select|variant|voice|voice-balance|voice-duration|voice-family|voice-pitch|voice-pitch-range\n  | voice-rate|voice-stress|voice-volume|volume|weight|white|white-space-collapse|word|wrap\n)\n(?![\\w-])"
         },
         {
           "name": "support.type.vendored.property-name.css",

data/grammars/source.gfm.json

@@ -682,6 +682,25 @@
         }
       }
     },
+    {
+      "name": "markup.code.git-config.gfm",
+      "contentName": "source.embedded.git-config",
+      "begin": "^\\s*([`~]{3,})\\s*(?i:(properties))\\s*$",
+      "end": "^\\s*\\1\\s*$",
+      "patterns": [
+        {}
+      ],
+      "beginCaptures": {
+        "0": {
+          "name": "support.gfm"
+        }
+      },
+      "endCaptures": {
+        "0": {
+          "name": "support.gfm"
+        }
+      }
+    },
     {
       "name": "markup.code.shell-session.gfm",
       "contentName": "text.embedded.shell-session",
@@ -1003,9 +1022,7 @@
       "begin": "^\\s*(`{3,}|~{3,})\\s*(?i:(elixir))\\s*$",
       "end": "^\\s*\\1((?\u003c=`)`+|(?\u003c=~)~+)?\\s*$",
       "patterns": [
-        {
-          "include": "source.elixir"
-        }
+        {}
       ],
       "beginCaptures": {
         "0": {

data/grammars/source.haskell.json

@@ -968,6 +968,9 @@
                 {
                   "name": "keyword.operator.wildcard.haskell",
                   "match": "\\.\\."
+                },
+                {
+                  "include": "#infix_op"
                 }
               ]
             },

data/grammars/source.hsig.json

@@ -968,6 +968,9 @@
                 {
                   "name": "keyword.operator.wildcard.haskell.hsig",
                   "match": "\\.\\."
+                },
+                {
+                  "include": "#infix_op"
                 }
               ]
             },

data/grammars/source.hx.argument.json

@@ -0,0 +1,80 @@
+{
+  "scopeName": "source.hx.argument",
+  "patterns": [
+    {
+      "include": "#parameter"
+    }
+  ],
+  "repository": {
+    "parameter": {
+      "patterns": [
+        {
+          "include": "#parameter-name"
+        },
+        {
+          "include": "#parameter-type-hint"
+        },
+        {
+          "include": "#parameter-assign"
+        },
+        {
+          "include": "source.hx#punctuation-comma"
+        },
+        {
+          "include": "source.hx#global"
+        }
+      ]
+    },
+    "parameter-assign": {
+      "begin": "=",
+      "end": "$",
+      "patterns": [
+        {
+          "include": "source.hx#block"
+        },
+        {
+          "include": "source.hx#block-contents"
+        }
+      ],
+      "beginCaptures": {
+        "0": {
+          "name": "keyword.operator.assignment.hx"
+        }
+      }
+    },
+    "parameter-name": {
+      "begin": "^",
+      "end": "([_a-zA-Z]\\w*)",
+      "patterns": [
+        {
+          "include": "source.hx#global"
+        },
+        {
+          "include": "source.hx#metadata"
+        },
+        {
+          "include": "source.hx#operator-optional"
+        }
+      ],
+      "endCaptures": {
+        "1": {
+          "name": "variable.parameter.hx"
+        }
+      }
+    },
+    "parameter-type-hint": {
+      "begin": ":",
+      "end": "(?=\\)(?!\\s*-\u003e)|,|=)",
+      "patterns": [
+        {
+          "include": "source.hx#type"
+        }
+      ],
+      "beginCaptures": {
+        "0": {
+          "name": "keyword.operator.type.annotation.hx"
+        }
+      }
+    }
+  }
+}

data/grammars/source.hx.json

@@ -312,6 +312,9 @@
         {
           "include": "#punctuation-comma"
         },
+        {
+          "include": "#punctuation-accessor"
+        },
         {
           "include": "#identifiers"
         }
@@ -730,6 +733,9 @@
         {
           "include": "#function-type-parameter-type-hint"
         },
+        {
+          "include": "#parameter-assign"
+        },
         {
           "include": "#type"
         },
@@ -748,7 +754,7 @@
     },
     "function-type-parameter-type-hint": {
       "begin": ":",
-      "end": "(?=\\)|,)",
+      "end": "(?=\\)|,|=)",
       "patterns": [
         {
           "include": "#type"
@@ -788,31 +794,36 @@
       ]
     },
     "import": {
-      "match": "(import)\\s+(?:((\\b_*[a-z]\\w*\\.?)*)(?:((\\b_*[A-Z]\\w*\\.?)+)|(\\*))?(\\b_*[a-z]\\w*|\\*)?(?:\\s+(as|in)\\s+(\\b_*[A-Z]\\w*)?)?)?\\s*(;)?",
-      "captures": {
-        "1": {
-          "name": "storage.type.import.hx"
-        },
-        "10": {
-          "name": "punctuation.terminator.hx"
-        },
-        "2": {
-          "name": "support.package.hx"
-        },
-        "4": {
-          "name": "entity.name.type.hx"
+      "begin": "import",
+      "end": "$|(;)",
+      "patterns": [
+        {
+          "include": "#type-path"
         },
-        "6": {
-          "name": "support.package.hx"
+        {
+          "name": "keyword.other.hx",
+          "match": "\\b(as|in)\\b"
         },
-        "7": {
-          "name": "support.package.hx"
+        {
+          "name": "constant.language.import-all.hx",
+          "match": "\\*"
         },
-        "8": {
-          "name": "keyword.other.hx"
+        {
+          "name": "variable.other.hxt",
+          "match": "\\b([_A-Za-z]\\w*)\\b(?=\\s*(as|in|$|(;)))"
         },
-        "9": {
-          "name": "entity.name.type.hx"
+        {
+          "include": "#type-path-package-name"
+        }
+      ],
+      "beginCaptures": {
+        "0": {
+          "name": "keyword.other.import.hx"
+        }
+      },
+      "endCaptures": {
+        "1": {
+          "name": "punctuation.terminator.hx"
         }
       }
     },
@@ -1201,13 +1212,22 @@
           }
         },
         {
-          "match": "(@)(:?[a-zA-Z_]*)",
+          "match": "(@)(:?)([a-zA-Z_]*(\\.))*([a-zA-Z_]*)?",
           "captures": {
             "1": {
               "name": "punctuation.metadata.hx"
             },
             "2": {
               "name": "variable.metadata.hx"
+            },
+            "3": {
+              "name": "variable.metadata.hx"
+            },
+            "4": {
+              "name": "punctuation.accessor.hx"
+            },
+            "5": {
+              "name": "variable.metadata.hx"
             }
           }
         }
@@ -1348,9 +1368,13 @@
     },
     "modifiers": {
       "patterns": [
+        {
+          "name": "storage.type.class",
+          "match": "\\b(enum)\\b"
+        },
         {
           "name": "storage.modifier.hx",
-          "match": "\\b(public|private|static|dynamic|inline|macro|extern|override|enum)\\b"
+          "match": "\\b(public|private|static|dynamic|inline|macro|extern|override)\\b"
         },
         {
           "name": "storage.modifier.hx",
@@ -1441,16 +1465,23 @@
       ]
     },
     "package": {
-      "name": "meta.package.hx",
-      "match": "\\b(package)(\\s+([\\w.*]*))?\\s*(;)?",
-      "captures": {
-        "1": {
-          "name": "storage.type.package.hx"
-        },
-        "2": {
-          "name": "support.package.hx"
+      "begin": "package",
+      "end": "$|(;)",
+      "patterns": [
+        {
+          "include": "#type-path"
         },
-        "4": {
+        {
+          "include": "#type-path-package-name"
+        }
+      ],
+      "beginCaptures": {
+        "0": {
+          "name": "keyword.other.package.hx"
+        }
+      },
+      "endCaptures": {
+        "1": {
           "name": "punctuation.terminator.hx"
         }
       }
@@ -1547,6 +1578,10 @@
         }
       }
     },
+    "punctuation-accessor": {
+      "name": "punctuation.accessor.hx",
+      "match": "\\."
+    },
     "punctuation-braces": {
       "begin": "\\(",
       "end": "\\)",
@@ -1899,6 +1934,18 @@
           "name": "keyword.operator.type.function.hx",
           "match": "-\u003e"
         },
+        {
+          "name": "keyword.operator.type.intersection.hx",
+          "match": "\u0026"
+        },
+        {
+          "name": "keyword.operator.optional",
+          "match": "\\?(?=\\s*[_A-Z])"
+        },
+        {
+          "name": "punctuation.definition.tag",
+          "match": "\\?(?!\\s*[_A-Z])"
+        },
         {
           "begin": "(\\{)",
           "end": "(?\u003c=\\})",
@@ -1965,7 +2012,11 @@
         }
       ]
     },
-    "type-parameter-constraint": {
+    "type-parameter-constraint-new": {
+      "name": "keyword.operator.type.annotation.hxt",
+      "match": ":"
+    },
+    "type-parameter-constraint-old": {
       "begin": "(:)\\s*(\\()",
       "end": "\\)",
       "patterns": [
@@ -1999,7 +2050,10 @@
           "include": "#type"
         },
         {
-          "include": "#type-parameter-constraint"
+          "include": "#type-parameter-constraint-old"
+        },
+        {
+          "include": "#type-parameter-constraint-new"
         },
         {
           "include": "#global"
@@ -2034,6 +2088,27 @@
         }
       }
     },
+    "type-path": {
+      "patterns": [
+        {
+          "include": "#global"
+        },
+        {
+          "include": "#punctuation-accessor"
+        },
+        {
+          "include": "#type-path-type-name"
+        }
+      ]
+    },
+    "type-path-package-name": {
+      "name": "support.package.hx",
+      "match": "\\b([_A-Za-z]\\w*)\\b"
+    },
+    "type-path-type-name": {
+      "name": "entity.name.type.hx",
+      "match": "\\b(_*[A-Z]\\w*)\\b"
+    },
     "typedef": {
       "name": "meta.typedef.hx",
       "begin": "(?=typedef)",
@@ -2169,18 +2244,23 @@
       }
     },
     "using": {
-      "match": "(using)\\s+((?:_*[a-z]\\w*\\.?)*)((?:_*[A-Z]\\w*\\.?)+)?(;)?",
-      "captures": {
-        "1": {
-          "name": "storage.type.using.hx"
-        },
-        "2": {
-          "name": "support.package.hx"
-        },
-        "3": {
-          "name": "entity.name.type.hx"
+      "begin": "using",
+      "end": "$|(;)",
+      "patterns": [
+        {
+          "include": "#type-path"
         },
-        "4": {
+        {
+          "include": "#type-path-package-name"
+        }
+      ],
+      "beginCaptures": {
+        "0": {
+          "name": "keyword.other.using.hx"
+        }
+      },
+      "endCaptures": {
+        "1": {
           "name": "punctuation.terminator.hx"
         }
       }
@@ -2254,6 +2334,11 @@
     "variable-name": {
       "begin": "\\b(var|final)\\b",
       "end": "(?=$)|([_a-zA-Z]\\w*)",
+      "patterns": [
+        {
+          "include": "#operator-optional"
+        }
+      ],
       "beginCaptures": {
         "1": {
           "name": "storage.type.variable.hx"