tm-grammars 1.15.2 → 1.16.0

package/NOTICE

@@ -2214,6 +2214,33 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 
+=========================================================================================================
+Files:   dotenv.json
+License: https://raw.githubusercontent.com/dotenv-org/dotenv-vscode/master/LICENSE
+SPDX:    MIT
+---------------------------------------------------------------------------------------------------------
+MIT License
+
+Copyright (c) 2022 Scott Motte
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
 =========================================================================================================
 Files:   edge.json
 License: https://raw.githubusercontent.com/edge-js/edge-vscode/main/LICENSE.md

package/README.md

@@ -64,6 +64,7 @@ import { grammars } from 'tm-grammars'
 | `desktop` |  | [nico-castell/desktop-file-support](https://github.com/nico-castell/desktop-file-support/blob/63720f5f05313de22b68ecbd0ca3d3ed8ba57e7e/syntaxes/desktop.tmLanguage.json) | [MIT](https://raw.githubusercontent.com/nico-castell/desktop-file-support/main/LICENSE) |  | 1.81 kB |
 | `diff` |  | [microsoft/vscode](https://github.com/microsoft/vscode/blob/4549bd26c7b799284e0ebd8dc1e0310e6a8707a1/extensions/diff/syntaxes/diff.tmLanguage.json) | [MIT](https://raw.githubusercontent.com/microsoft/vscode/main/LICENSE.txt) |  | 2.45 kB |
 | `docker` | `dockerfile` | [microsoft/vscode](https://github.com/microsoft/vscode/blob/8fdf170a0850c1cc027382f31650aaf300d3ae2a/extensions/docker/syntaxes/docker.tmLanguage.json) | [MIT](https://raw.githubusercontent.com/microsoft/vscode/main/LICENSE.txt) |  | 1.51 kB |
+| `dotenv` | `dotEnv` | [dotenv-org/dotenv-vscode](https://github.com/dotenv-org/dotenv-vscode/blob/e7e41baa5b23e01c1ff0567a4e596c24860e7def/syntaxes/dotenv.tmLanguage.json) | [MIT](https://raw.githubusercontent.com/dotenv-org/dotenv-vscode/master/LICENSE) |  | 1.57 kB |
 | `dream-maker` |  | [gbasood/vscode-atomic-dreams](https://github.com/gbasood/vscode-atomic-dreams/blob/22d2bf0325f65697ea542856280f66e9e098f4a2/syntaxes/dm.tmLanguage.json) |  |  | 9.99 kB |
 | `edge` |  | [edge-js/edge-vscode](https://github.com/edge-js/edge-vscode/blob/04352c41981ca664598674556afa63bd393a10f3/syntaxes/edge.tmLanguage.json) | [MIT](https://raw.githubusercontent.com/edge-js/edge-vscode/main/LICENSE.md) | `typescript` `html` `html-derivative` | 1.97 kB |
 | `elixir` |  | [elixir-editors/elixir-tmbundle](https://github.com/elixir-editors/elixir-tmbundle/blob/43c8cd957d5ac6e1abbd8730fc7a08c81a6e76c9/Syntaxes/Elixir.tmLanguage) | [NOASSERTION](https://raw.githubusercontent.com/elixir-editors/elixir-tmbundle/master/LICENSE) | `html` | 16.96 kB |
@@ -76,7 +77,7 @@ import { grammars } from 'tm-grammars'
 | `fluent` | `ftl` | [macabeus/vscode-fluent](https://github.com/macabeus/vscode-fluent/blob/8544ea296a7769a359f43ddff4dc4b6c61f5cf59/syntaxes/fluent.tmLanguage.json) | [MIT](https://raw.githubusercontent.com/macabeus/vscode-fluent/master/LICENSE) |  | 3.39 kB |
 | `fortran-fixed-form` | `f` `for` `f77` | [fortran-lang/vscode-fortran-support](https://github.com/fortran-lang/vscode-fortran-support/blob/e642012094fc0a7379f204bb4e61243005afb1da/syntaxes/fortran_fixed-form.tmLanguage.json) | [MIT](https://raw.githubusercontent.com/fortran-lang/vscode-fortran-support/main/LICENSE) | `fortran-free-form` | 905.00 B |
 | `fortran-free-form` | `f90` `f95` `f03` `f08` `f18` | [fortran-lang/vscode-fortran-support](https://github.com/fortran-lang/vscode-fortran-support/blob/f7fb41579770a0d8c75b9f295d167b31147b4f33/syntaxes/fortran_free-form.tmLanguage.json) | [MIT](https://raw.githubusercontent.com/fortran-lang/vscode-fortran-support/main/LICENSE) |  | 92.92 kB |
-| `fsharp` | `f#` `fs` | [microsoft/vscode](https://github.com/microsoft/vscode/blob/ed4e6eda599f37bac9a11952403a6e63fd4f5a4d/extensions/fsharp/syntaxes/fsharp.tmLanguage.json) | [MIT](https://raw.githubusercontent.com/microsoft/vscode/main/LICENSE.txt) | `markdown` | 24.25 kB |
+| `fsharp` | `f#` `fs` | [microsoft/vscode](https://github.com/microsoft/vscode/blob/9473445f7d3dcb5c579f42ece8b6c18c43c63ed3/extensions/fsharp/syntaxes/fsharp.tmLanguage.json) | [MIT](https://raw.githubusercontent.com/microsoft/vscode/main/LICENSE.txt) | `markdown` | 24.25 kB |
 | `gdresource` |  | [godotengine/godot-vscode-plugin](https://github.com/godotengine/godot-vscode-plugin/blob/e7e2d0439dea0fb3a568378554c81e0a17348a84/syntaxes/GDResource.tmLanguage.json) | [MIT](https://raw.githubusercontent.com/godotengine/godot-vscode-plugin/master/LICENSE) | `gdshader` `gdscript` | 4.90 kB |
 | `gdscript` |  | [godotengine/godot-vscode-plugin](https://github.com/godotengine/godot-vscode-plugin/blob/9750f8dfc6e4eeba96f7df62432751930af95337/syntaxes/GDScript.tmLanguage.json) | [MIT](https://raw.githubusercontent.com/godotengine/godot-vscode-plugin/master/LICENSE) |  | 17.83 kB |
 | `gdshader` |  | [godotengine/godot-vscode-plugin](https://github.com/godotengine/godot-vscode-plugin/blob/e7e2d0439dea0fb3a568378554c81e0a17348a84/syntaxes/GDShader.tmLanguage.json) | [MIT](https://raw.githubusercontent.com/godotengine/godot-vscode-plugin/master/LICENSE) |  | 5.95 kB |
@@ -118,12 +119,12 @@ import { grammars } from 'tm-grammars'
 | `jsonnet` |  | [heptio/vscode-jsonnet](https://github.com/heptio/vscode-jsonnet/blob/39088f9cde9f483c8e0efeb67a3fd561cd873aad/syntaxes/jsonnet.tmLanguage.json) | [Apache-2.0](https://raw.githubusercontent.com/heptio/vscode-jsonnet/master/LICENSE) |  | 3.32 kB |
 | `jssm` | `fsl` | [StoneCypher/sublime-jssm](https://github.com/StoneCypher/sublime-jssm/blob/2be02a59d284229bbbfb3dc6c2bdcec9b2c263ef/jssm.tmLanguage) | [MIT](https://raw.githubusercontent.com/StoneCypher/sublime-jssm/master/LICENSE) |  | 2.79 kB |
 | `jsx` |  | [microsoft/vscode](https://github.com/microsoft/vscode/blob/35d97bc7e439fce0f50f42074041ab2d8571b20a/extensions/javascript/syntaxes/JavaScriptReact.tmLanguage.json) | [MIT](https://raw.githubusercontent.com/microsoft/vscode/main/LICENSE.txt) |  | 173.35 kB |
-| `julia` | `jl` | [microsoft/vscode](https://github.com/microsoft/vscode/blob/5c213a1e84928c7a7d11ca5b282ca602d40c1352/extensions/julia/syntaxes/julia.tmLanguage.json) | [MIT](https://raw.githubusercontent.com/microsoft/vscode/main/LICENSE.txt) | `cpp` `python` `javascript` `r` `sql` | 32.82 kB |
+| `julia` | `jl` | [microsoft/vscode](https://github.com/microsoft/vscode/blob/9473445f7d3dcb5c579f42ece8b6c18c43c63ed3/extensions/julia/syntaxes/julia.tmLanguage.json) | [MIT](https://raw.githubusercontent.com/microsoft/vscode/main/LICENSE.txt) | `cpp` `python` `javascript` `r` `sql` | 32.82 kB |
 | `kotlin` | `kt` `kts` | [fwcd/vscode-kotlin](https://github.com/fwcd/vscode-kotlin/blob/626e20d5c51a4379c4c0ee293aa89e58b5232aec/syntaxes/kotlin.tmLanguage.json) | [MIT](https://raw.githubusercontent.com/fwcd/vscode-kotlin/main/LICENSE) |  | 8.21 kB |
 | `kusto` | `kql` | [rosshamish/kuskus](https://github.com/rosshamish/kuskus/blob/6e6deead4af243432902869e1767df8a612cffe1/kusto-syntax-highlighting/syntaxes/kusto.tmLanguage.json) |  |  | 19.60 kB |
-| `latex` |  | [microsoft/vscode](https://github.com/microsoft/vscode/blob/ed4e6eda599f37bac9a11952403a6e63fd4f5a4d/extensions/latex/syntaxes/LaTeX.tmLanguage.json) | [MIT](https://raw.githubusercontent.com/microsoft/vscode/main/LICENSE.txt) | `tex` `shellscript` `css` `gnuplot` `haskell` `html` `java` `julia` `javascript` `lua` `python` `ruby` `rust` `typescript` `xml` `yaml` `scala` | 53.80 kB |
+| `latex` |  | [microsoft/vscode](https://github.com/microsoft/vscode/blob/9473445f7d3dcb5c579f42ece8b6c18c43c63ed3/extensions/latex/syntaxes/LaTeX.tmLanguage.json) | [MIT](https://raw.githubusercontent.com/microsoft/vscode/main/LICENSE.txt) | `tex` `shellscript` `css` `gnuplot` `haskell` `html` `java` `julia` `javascript` `lua` `python` `ruby` `rust` `typescript` `xml` `yaml` `scala` | 54.75 kB |
 | `lean` | `lean4` | [leanprover/vscode-lean4](https://github.com/leanprover/vscode-lean4/blob/2255bc20c9d28d868d04fb91428652a95cc87a92/vscode-lean4/syntaxes/lean4.json) | [Apache-2.0](https://raw.githubusercontent.com/leanprover/vscode-lean4/master/LICENSE) |  | 3.96 kB |
-| `less` |  | [microsoft/vscode](https://github.com/microsoft/vscode/blob/2b9ebd6897fb57f2f3dc9dc04957288c50717190/extensions/less/syntaxes/less.tmLanguage.json) | [MIT](https://raw.githubusercontent.com/microsoft/vscode/main/LICENSE.txt) |  | 82.08 kB |
+| `less` |  | [microsoft/vscode](https://github.com/microsoft/vscode/blob/9473445f7d3dcb5c579f42ece8b6c18c43c63ed3/extensions/less/syntaxes/less.tmLanguage.json) | [MIT](https://raw.githubusercontent.com/microsoft/vscode/main/LICENSE.txt) |  | 88.66 kB |
 | `liquid` |  | [Shopify/liquid-tm-grammar](https://github.com/Shopify/liquid-tm-grammar/blob/909aab5b1d8be374585bd02ef46e0e38d65f2f89/grammars/liquid.tmLanguage.json) | [MIT](https://raw.githubusercontent.com/Shopify/liquid-tm-grammar/main/LICENSE.md) | `html` `css` `json` `javascript` | 15.31 kB |
 | `log` |  | [emilast/vscode-logfile-highlighter](https://github.com/emilast/vscode-logfile-highlighter/blob/eb50e785c27b4b4f7dbf6c0e801c58fe91baef5d/syntaxes/log.tmLanguage) | [MIT](https://raw.githubusercontent.com/emilast/vscode-logfile-highlighter/master/LICENSE) |  | 2.51 kB |
 | `logo` |  | [textmate/logo.tmbundle](https://github.com/textmate/logo.tmbundle/blob/3205e987ed2a2aa11accdd55a7d094832441f89c/Syntaxes/Logo.tmLanguage) |  |  | 3.03 kB |
@@ -182,7 +183,7 @@ import { grammars } from 'tm-grammars'
 | `scheme` |  | [sjhuangx/vscode-scheme](https://github.com/sjhuangx/vscode-scheme/blob/4e21683666e1e2edfa21d040ecd427f628e7b5ff/syntaxes/scheme.tmLanguage) | [MIT](https://raw.githubusercontent.com/sjhuangx/vscode-scheme/master/LICENSE.md) |  | 8.35 kB |
 | `scss` |  | [microsoft/vscode](https://github.com/microsoft/vscode/blob/cf8d61ebd2f022f4ce8280171f0360d1fe0a206d/extensions/scss/syntaxes/scss.tmLanguage.json) | [MIT](https://raw.githubusercontent.com/microsoft/vscode/main/LICENSE.txt) | `css` | 26.21 kB |
 | `shaderlab` | `shader` | [microsoft/vscode](https://github.com/microsoft/vscode/blob/8fdf170a0850c1cc027382f31650aaf300d3ae2a/extensions/shaderlab/syntaxes/shaderlab.tmLanguage.json) | [MIT](https://raw.githubusercontent.com/microsoft/vscode/main/LICENSE.txt) | `hlsl` | 5.83 kB |
-| `shellscript` | `bash` `sh` `shell` `zsh` | [microsoft/vscode](https://github.com/microsoft/vscode/blob/5c213a1e84928c7a7d11ca5b282ca602d40c1352/extensions/shellscript/syntaxes/shell-unix-bash.tmLanguage.json) | [MIT](https://raw.githubusercontent.com/microsoft/vscode/main/LICENSE.txt) |  | 40.03 kB |
+| `shellscript` | `bash` `sh` `shell` `zsh` | [microsoft/vscode](https://github.com/microsoft/vscode/blob/9473445f7d3dcb5c579f42ece8b6c18c43c63ed3/extensions/shellscript/syntaxes/shell-unix-bash.tmLanguage.json) | [MIT](https://raw.githubusercontent.com/microsoft/vscode/main/LICENSE.txt) |  | 40.04 kB |
 | `shellsession` | `console` | [hronro/sublime-linguist-syntax](https://github.com/hronro/sublime-linguist-syntax/blob/9c84f1d69dbe89bc23292f129cf2d408a9c7afe1/syntaxes/ShellSession.tmLanguage) | [MIT](https://raw.githubusercontent.com/hronro/sublime-linguist-syntax/master/LICENSE) | `shellscript` | 567.00 B |
 | `smalltalk` |  | [leocamello/vscode-smalltalk](https://github.com/leocamello/vscode-smalltalk/blob/bc888519a21740b4dbd4edcf2f884c61855dc58b/syntaxes/smalltalk.tmLanguage.json) | [MIT](https://raw.githubusercontent.com/leocamello/vscode-smalltalk/master/LICENSE) |  | 3.91 kB |
 | `solidity` |  | [juanfranblanco/vscode-solidity](https://github.com/juanfranblanco/vscode-solidity/blob/75531be0beda99b7293d778eb0b1c63f70d8ac59/syntaxes/solidity.json) | [MIT](https://raw.githubusercontent.com/juanfranblanco/vscode-solidity/master/License.txt) |  | 15.15 kB |

package/grammars/dotenv.json

@@ -0,0 +1,123 @@
+{
+  "displayName": "dotEnv",
+  "name": "dotenv",
+  "patterns": [
+    {
+      "captures": {
+        "1": {
+          "patterns": [
+            {
+              "include": "#line-comment"
+            }
+          ]
+        }
+      },
+      "comment": "Full Line Comment",
+      "match": "^\\s?(#.*$)\\n"
+    },
+    {
+      "captures": {
+        "1": {
+          "patterns": [
+            {
+              "include": "#key"
+            }
+          ]
+        },
+        "2": {
+          "name": "keyword.operator.assignment.dotenv"
+        },
+        "3": {
+          "name": "property.value.dotenv",
+          "patterns": [
+            {
+              "include": "#line-comment"
+            },
+            {
+              "include": "#double-quoted-string"
+            },
+            {
+              "include": "#single-quoted-string"
+            },
+            {
+              "include": "#interpolation"
+            }
+          ]
+        }
+      },
+      "comment": "ENV entry",
+      "match": "^\\s?(.*?)\\s?(\\=)(.*)$"
+    }
+  ],
+  "repository": {
+    "double-quoted-string": {
+      "captures": {
+        "1": {
+          "patterns": [
+            {
+              "include": "#interpolation"
+            },
+            {
+              "include": "#escape-characters"
+            }
+          ]
+        }
+      },
+      "comment": "Double Quoted String",
+      "match": "\"(.*)\"",
+      "name": "string.quoted.double.dotenv"
+    },
+    "escape-characters": {
+      "comment": "Escape characters",
+      "match": "\\\\[nrtfb\"'\\\\]|\\\\u[0123456789ABCDEF]{4}",
+      "name": "constant.character.escape.dotenv"
+    },
+    "interpolation": {
+      "captures": {
+        "1": {
+          "name": "keyword.interpolation.begin.dotenv"
+        },
+        "2": {
+          "name": "variable.interpolation.dotenv"
+        },
+        "3": {
+          "name": "keyword.interpolation.end.dotenv"
+        }
+      },
+      "comment": "Interpolation (variable substitution)",
+      "match": "(\\$\\{)(.*)(\\})"
+    },
+    "key": {
+      "captures": {
+        "1": {
+          "name": "keyword.key.export.dotenv"
+        },
+        "2": {
+          "name": "variable.key.dotenv",
+          "patterns": [
+            {
+              "include": "#variable"
+            }
+          ]
+        }
+      },
+      "comment": "Key",
+      "match": "(export\\s)?(.*)"
+    },
+    "line-comment": {
+      "comment": "Comment",
+      "match": "#.*$",
+      "name": "comment.line.dotenv"
+    },
+    "single-quoted-string": {
+      "comment": "Single Quoted String",
+      "match": "'(.*)'",
+      "name": "string.quoted.single.dotenv"
+    },
+    "variable": {
+      "comment": "env variable",
+      "match": "[a-zA-Z_]+[a-zA-Z0-9_]*"
+    }
+  },
+  "scopeName": "source.dotenv"
+}

package/grammars/fsharp.json

@@ -476,7 +476,7 @@
               "name": "keyword.symbol.fsharp"
             }
           },
-          "end": "(\\)\\s*(([?[:alpha:]0-9'`^._ ]+))+)",
+          "end": "(\\)\\s*(([?[:alpha:]0-9'`^._ ]+))*)",
           "endCaptures": {
             "1": {
               "name": "keyword.symbol.fsharp"

package/grammars/julia.json

@@ -300,7 +300,7 @@
           "name": "keyword.control.using.julia"
         },
         {
-          "match": "(?<=\\w\\s)\\b(as)\\b(?=\\s\\w)",
+          "match": "(?<=\\S\\s+)\\b(as)\\b(?=\\s+\\S)",
           "name": "keyword.control.as.julia"
         },
         {

package/grammars/latex.json

@@ -88,7 +88,7 @@
         "4": {
           "patterns": [
             {
-              "include": "#optional-arg"
+              "include": "#optional-arg-bracket"
             }
           ]
         },
@@ -1894,7 +1894,7 @@
         "3": {
           "patterns": [
             {
-              "include": "#optional-arg"
+              "include": "#optional-arg-bracket"
             }
           ]
         },
@@ -1904,7 +1904,7 @@
         "5": {
           "patterns": [
             {
-              "include": "#optional-arg"
+              "include": "#optional-arg-bracket"
             }
           ]
         },
@@ -2362,7 +2362,7 @@
         "3": {
           "patterns": [
             {
-              "include": "#optional-arg"
+              "include": "#optional-arg-bracket"
             }
           ]
         },
@@ -2398,7 +2398,7 @@
         "3": {
           "patterns": [
             {
-              "include": "#optional-arg"
+              "include": "#optional-arg-bracket"
             }
           ]
         },
@@ -2556,7 +2556,7 @@
       "name": "meta.scope.item.latex"
     },
     {
-      "begin": "((\\\\)(?:[aA]uto|foot|full|no|ref|short|[tT]ext|[pP]aren|[sS]mart)?[cC]ite(?:al)?(?:p|s|t|author|year(?:par)?|title)?[ANP]*\\*?)((?:(?:\\([^\\)]*\\)){0,2}(?:\\[[^\\]]*\\]){0,2}\\{[\\p{Alphabetic}:.]*\\})*)(?:([<\\[])[^\\]<>]*([>\\]]))?(?:(\\[)[^\\]]*(\\]))?(\\{)",
+      "begin": "((\\\\)(?:[aA]uto|foot|full|no|ref|short|[tT]ext|[pP]aren|[sS]mart)?[cC]ite(?:al)?(?:p|s|t|author|year(?:par)?|title)?[ANP]*\\*?)((?:(?:\\([^\\)]*\\)){0,2}(?:\\[[^\\]]*\\]){0,2}\\{[\\p{Alphabetic}\\p{Number}_:.-]*\\})*)(<[^\\]<>]*>)?((?:\\[[^\\]]*\\])*)(\\{)",
       "captures": {
         "1": {
           "name": "keyword.control.cite.latex"
@@ -2572,18 +2572,20 @@
           ]
         },
         "4": {
-          "name": "punctuation.definition.arguments.optional.begin.latex"
+          "patterns": [
+            {
+              "include": "#optional-arg-angle-no-highlight"
+            }
+          ]
         },
         "5": {
-          "name": "punctuation.definition.arguments.optional.end.latex"
+          "patterns": [
+            {
+              "include": "#optional-arg-bracket-no-highlight"
+            }
+          ]
         },
         "6": {
-          "name": "punctuation.definition.arguments.optional.begin.latex"
-        },
-        "7": {
-          "name": "punctuation.definition.arguments.optional.end.latex"
-        },
-        "8": {
           "name": "punctuation.definition.arguments.begin.latex"
         }
       },
@@ -2740,7 +2742,7 @@
         "3": {
           "patterns": [
             {
-              "include": "#optional-arg"
+              "include": "#optional-arg-bracket"
             }
           ]
         },
@@ -2777,7 +2779,7 @@
         "3": {
           "patterns": [
             {
-              "include": "#optional-arg"
+              "include": "#optional-arg-bracket"
             }
           ]
         },
@@ -2814,7 +2816,7 @@
         "3": {
           "patterns": [
             {
-              "include": "#optional-arg"
+              "include": "#optional-arg-bracket"
             }
           ]
         },
@@ -2861,7 +2863,7 @@
         "3": {
           "patterns": [
             {
-              "include": "#optional-arg"
+              "include": "#optional-arg-bracket"
             }
           ]
         },
@@ -3042,7 +3044,7 @@
           "name": "punctuation.definition.variable.latex"
         }
       },
-      "match": "(\\\\)[cgl](?:[_\\p{Alphabetic}@]+)+_[a-z]+",
+      "match": "(\\\\)(?:[cgl]_+[_\\p{Alphabetic}@]+_[a-z]+|[qs]_[_\\p{Alphabetic}@]+[\\p{Alphabetic}@])",
       "name": "variable.other.latex3.latex"
     },
     {
@@ -3067,27 +3069,29 @@
         {
           "captures": {
             "1": {
-              "name": "punctuation.definition.arguments.optional.begin.latex"
+              "patterns": [
+                {
+                  "include": "#optional-arg-parenthesis-no-highlight"
+                }
+              ]
             },
             "2": {
-              "name": "punctuation.definition.arguments.optional.end.latex"
+              "patterns": [
+                {
+                  "include": "#optional-arg-bracket-no-highlight"
+                }
+              ]
             },
             "3": {
-              "name": "punctuation.definition.arguments.optional.begin.latex"
-            },
-            "4": {
-              "name": "punctuation.definition.arguments.optional.end.latex"
-            },
-            "5": {
               "name": "punctuation.definition.arguments.begin.latex"
             },
-            "6": {
+            "4": {
               "name": "constant.other.reference.citation.latex"
             },
-            "7": {
+            "5": {
               "name": "punctuation.definition.arguments.end.latex"
             },
-            "8": {
+            "6": {
               "patterns": [
                 {
                   "include": "#autocites-arg"
@@ -3095,7 +3099,7 @@
               ]
             }
           },
-          "match": "(?:(\\()[^\\)]*(\\))){0,2}(?:(\\[)[^\\]]*(\\])){0,2}(\\{)([\\p{Alphabetic}\\p{Number}:.]+)(\\})(.*)"
+          "match": "((?:\\([^\\)]*\\)){0,2})((?:\\[[^\\]]*\\]){0,2})(\\{)([\\p{Alphabetic}\\p{Number}_:.-]+)(\\})(.*)"
         }
       ]
     },
@@ -3153,7 +3157,7 @@
         "3": {
           "patterns": [
             {
-              "include": "#optional-arg"
+              "include": "#optional-arg-bracket"
             }
           ]
         },
@@ -3216,7 +3220,23 @@
         }
       ]
     },
-    "optional-arg": {
+    "optional-arg-angle-no-highlight": {
+      "patterns": [
+        {
+          "captures": {
+            "1": {
+              "name": "punctuation.definition.arguments.optional.begin.latex"
+            },
+            "2": {
+              "name": "punctuation.definition.arguments.optional.end.latex"
+            }
+          },
+          "match": "(<)[^<]*?(>)",
+          "name": "meta.parameter.optional.latex"
+        }
+      ]
+    },
+    "optional-arg-bracket": {
       "patterns": [
         {
           "captures": {
@@ -3234,6 +3254,57 @@
           "name": "meta.parameter.optional.latex"
         }
       ]
+    },
+    "optional-arg-bracket-no-highlight": {
+      "patterns": [
+        {
+          "captures": {
+            "1": {
+              "name": "punctuation.definition.arguments.optional.begin.latex"
+            },
+            "2": {
+              "name": "punctuation.definition.arguments.optional.end.latex"
+            }
+          },
+          "match": "(\\[)[^\\[]*?(\\])",
+          "name": "meta.parameter.optional.latex"
+        }
+      ]
+    },
+    "optional-arg-parenthesis": {
+      "patterns": [
+        {
+          "captures": {
+            "1": {
+              "name": "punctuation.definition.arguments.optional.begin.latex"
+            },
+            "2": {
+              "name": "variable.parameter.function.latex"
+            },
+            "3": {
+              "name": "punctuation.definition.arguments.optional.end.latex"
+            }
+          },
+          "match": "(\\()([^\\(]*?)(\\))",
+          "name": "meta.parameter.optional.latex"
+        }
+      ]
+    },
+    "optional-arg-parenthesis-no-highlight": {
+      "patterns": [
+        {
+          "captures": {
+            "1": {
+              "name": "punctuation.definition.arguments.optional.begin.latex"
+            },
+            "2": {
+              "name": "punctuation.definition.arguments.optional.end.latex"
+            }
+          },
+          "match": "(\\()[^\\(]*?(\\))",
+          "name": "meta.parameter.optional.latex"
+        }
+      ]
     }
   },
   "scopeName": "text.tex.latex"