tm-grammars 1.31.0 → 1.31.1

package/NOTICE

@@ -3209,7 +3209,7 @@ SPDX:    Apache-2.0
    limitations under the License.
 
 =========================================================================================================
-Files:   es-tag-css.json, es-tag-glsl.json, es-tag-html.json, es-tag-sql.json, es-tag-xml.json
+Files:   es-tag-css.json, es-tag-glsl.json, es-tag-html.json, es-tag-xml.json
 License: https://raw.githubusercontent.com/0x00000001A/es6-string-html/master/LICENSE
 SPDX:    MIT
 ---------------------------------------------------------------------------------------------------------
@@ -3235,6 +3235,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:   es-tag-sql.json
+License: https://raw.githubusercontent.com/frigus02/vscode-sql-tagged-template-literals/main/LICENSE
+SPDX:    MIT
+---------------------------------------------------------------------------------------------------------
+The MIT License (MIT)
+
+Copyright (c) 2019 Jan Kühle
+
+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:   fennel.json
 License: https://raw.githubusercontent.com/kongeor/vsc-fennel/master/LICENSE

package/README.md

@@ -40,7 +40,7 @@ import { grammars } from 'tm-grammars'
 | `berry` | `be` | [berry-lang/berry](https://github.com/berry-lang/berry/blob/74611286b8d2d2c2ee16ea187029f2a9c4257f5f/tools/plugins/vscode/skiars.berry-1.2.0/syntaxes/berry.json) | [MIT](https://raw.githubusercontent.com/berry-lang/berry/master/LICENSE) |  |  | 2.63 kB |
 | `bibtex` |  | [microsoft/vscode](https://github.com/microsoft/vscode/blob/9a2c94d213696a4453b6d9988b003d98e7646e75/extensions/latex/syntaxes/Bibtex.tmLanguage.json) | [MIT](https://raw.githubusercontent.com/microsoft/vscode/main/LICENSE.txt) |  |  | 4.51 kB |
 | `bicep` |  | [Azure/bicep](https://github.com/Azure/bicep/blob/6252abb94141fc6e774a53652404be30f1cb9000/src/textmate/bicep.tmlanguage) | [MIT](https://raw.githubusercontent.com/Azure/bicep/main/LICENSE) |  |  | 4.92 kB |
-| `bird2` | `bird` | [bird-chinese-community/BIRD-tm-language-grammar](https://github.com/bird-chinese-community/BIRD-tm-language-grammar/blob/2e82aed3f306941105072adf685a91d75bca0bf6/grammars/bird2.tmLanguage.json) | [MPL-2.0](https://raw.githubusercontent.com/bird-chinese-community/BIRD-tm-language-grammar/main/LICENSE) |  |  | 16.08 kB |
+| `bird2` | `bird` | [bird-chinese-community/BIRD-tm-language-grammar](https://github.com/bird-chinese-community/BIRD-tm-language-grammar/blob/17a8d1d61d4bc1ba719e0025e3f8b283c68eddde/grammars/bird2.tmLanguage.json) | [MPL-2.0](https://raw.githubusercontent.com/bird-chinese-community/BIRD-tm-language-grammar/main/LICENSE) |  |  | 16.09 kB |
 | `blade` |  | [laravel/vs-code-extension](https://github.com/laravel/vs-code-extension/blob/80726f64975dc935d6b925d8230cdc1ea075802a/syntaxes/blade.tmLanguage.json) | [MIT](https://raw.githubusercontent.com/laravel/vs-code-extension/main/LICENSE.md) |  | `html-derivative` `html` `xml` `sql` `javascript` `json` `css` | 100.00 kB |
 | `bsl` | `1c` | [1c-syntax/vsc-language-1c-bsl](https://github.com/1c-syntax/vsc-language-1c-bsl/blob/2cde5a65a17b82b5363affadf5a620ebb0a026dc/syntaxes/1c.tmLanguage.json) | [MIT](https://raw.githubusercontent.com/1c-syntax/vsc-language-1c-bsl/refs/heads/master/LICENSE.md) |  | `sdbl` | 32.60 kB |
 | `c` |  | [microsoft/vscode](https://github.com/microsoft/vscode/blob/bd1abe08c38bb5deccf65610f8f3c03d2338d20d/extensions/cpp/syntaxes/c.tmLanguage.json) | [MIT](https://raw.githubusercontent.com/microsoft/vscode/main/LICENSE.txt) |  |  | 67.93 kB |
@@ -272,7 +272,7 @@ Injections are grammars that are embedded in other grammars. They are used to ag
 | `es-tag-css` |  | [0x00000001A/es6-string-html](https://github.com/0x00000001A/es6-string-html/blob/b8f51210b53ce64e789949d4be33b7ecb42cf177/syntaxes/es6-inline-css.json) | [MIT](https://raw.githubusercontent.com/0x00000001A/es6-string-html/master/LICENSE) | [Buy Me A Coffee: **nonholy**](https://www.buymeacoffee.com/nonholy) | `typescript` `css` `javascript` | 1.65 kB |
 | `es-tag-glsl` |  | [0x00000001A/es6-string-html](https://github.com/0x00000001A/es6-string-html/blob/b8f51210b53ce64e789949d4be33b7ecb42cf177/syntaxes/es6-inline-glsl.json) | [MIT](https://raw.githubusercontent.com/0x00000001A/es6-string-html/master/LICENSE) | [Buy Me A Coffee: **nonholy**](https://www.buymeacoffee.com/nonholy) | `typescript` `glsl` `javascript` | 1.53 kB |
 | `es-tag-html` |  | [0x00000001A/es6-string-html](https://github.com/0x00000001A/es6-string-html/blob/b8f51210b53ce64e789949d4be33b7ecb42cf177/syntaxes/es6-inline-html.json) | [MIT](https://raw.githubusercontent.com/0x00000001A/es6-string-html/master/LICENSE) | [Buy Me A Coffee: **nonholy**](https://www.buymeacoffee.com/nonholy) | `typescript` `html` `javascript` | 1.83 kB |
-| `es-tag-sql` |  | [0x00000001A/es6-string-html](https://github.com/0x00000001A/es6-string-html/blob/b8f51210b53ce64e789949d4be33b7ecb42cf177/syntaxes/es6-inline-sql.json) | [MIT](https://raw.githubusercontent.com/0x00000001A/es6-string-html/master/LICENSE) | [Buy Me A Coffee: **nonholy**](https://www.buymeacoffee.com/nonholy) | `typescript` `sql` | 1.45 kB |
+| `es-tag-sql` |  | [frigus02/vscode-sql-tagged-template-literals](https://github.com/frigus02/vscode-sql-tagged-template-literals/blob/80e8ddcb034a3bc66382789d2ca251d0266a9f56/extension-syntax-only/syntaxes/grammar.json) | [MIT](https://raw.githubusercontent.com/frigus02/vscode-sql-tagged-template-literals/main/LICENSE) |  | `typescript` `sql` | 7.86 kB |
 | `es-tag-xml` |  | [0x00000001A/es6-string-html](https://github.com/0x00000001A/es6-string-html/blob/b8f51210b53ce64e789949d4be33b7ecb42cf177/syntaxes/es6-inline-xml.json) | [MIT](https://raw.githubusercontent.com/0x00000001A/es6-string-html/master/LICENSE) | [Buy Me A Coffee: **nonholy**](https://www.buymeacoffee.com/nonholy) | `xml` | 1.04 kB |
 | `jinja-html` |  | [samuelcolvin/jinjahtml-vscode](https://github.com/samuelcolvin/jinjahtml-vscode/blob/64ad369cd167bba2e614944db6d925b7dc6483b4/syntaxes/jinja-html.tmLanguage.json) | [MIT](https://raw.githubusercontent.com/samuelcolvin/jinjahtml-vscode/main/LICENSE) | [GitHub Sponsors: **@samuelcolvin**](https://github.com/sponsors/samuelcolvin) | `html` | 465.00 B |
 | `markdown-nix` |  | [nix-community/vscode-nix-ide](https://github.com/nix-community/vscode-nix-ide/blob/e2aff510787a01beb97c6227adbb96e38a60fac4/dist/injection.json) | [MIT](https://raw.githubusercontent.com/nix-community/vscode-nix-ide/main/LICENSE) | [GitHub Sponsors: **@nix-community**](https://github.com/sponsors/nix-community) [Open Collective: **nix-community**](https://opencollective.com/nix-community) |  | 762.00 B |

package/grammars/bird2.json

@@ -452,7 +452,7 @@
           "name": "keyword.other.flowspec.bird"
         },
         {
-          "match": "\\b(?:vpn|mpls|aspa|roa6??)\\b",
+          "match": "\\b(?:vpn4|vpn6|mpls|aspa|roa4|roa6)\\b",
           "name": "keyword.other.address.bird"
         },
         {

package/grammars/es-tag-sql.json

@@ -1,97 +1,145 @@
 {
-  "fileTypes": [
-    "js",
-    "jsx",
-    "ts",
-    "tsx",
-    "html",
-    "vue",
-    "svelte",
-    "php",
-    "res"
-  ],
   "injectTo": [
     "source.ts",
     "source.js"
   ],
-  "injectionSelector": "L:source.js -comment -string, L:source.jsx -comment -string,  L:source.js.jsx -comment -string, L:source.ts -comment -string, L:source.tsx -comment -string, L:source.rescript -comment -string",
-  "injections": {
-    "L:source": {
-      "patterns": [
-        {
-          "match": "<",
-          "name": "invalid.illegal.bad-angle-bracket.html"
-        }
-      ]
-    }
-  },
+  "injectionSelector": "L:source -comment -string",
   "name": "es-tag-sql",
   "patterns": [
     {
-      "begin": "(?i)\\b(\\w+\\.sql)\\s*(`)",
+      "__COMMENT__": "Literals tagged with an sql function (including optional accessors and types), e.g. sql<User>('user-by-id')`SELECT ...`",
+      "begin": "(?:([$_[:alpha:]][$_[:alnum:]]*)(?:\\s*(\\??\\.)\\s*(#?[$_[:alpha:]][$_[:alnum:]]*))*\\s*(\\??\\.))?\\s*(#?(?i)sql|sqlFragment(?-i))\\s*(?=(?:(\\?\\.\\s*)|(!))?((<\\s*(((keyof|infer|awaited|typeof|readonly)\\s+)|(([$_[:alpha:]][$_[:alnum:]]*|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^]\\[]|(\\[([^]\\[]|\\[[^]\\[]*])*]))*])|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^\\\\`]|\\\\.)*`))(?=\\s*([,.<>\\[]|=>|&(?!&)|\\|(?!\\|)))))([^(<>]|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(?<==)>|<\\s*(((keyof|infer|awaited|typeof|readonly)\\s+)|(([$_[:alpha:]][$_[:alnum:]]*|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^]\\[]|(\\[([^]\\[]|\\[[^]\\[]*])*]))*])|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^\\\\`]|\\\\.)*`))(?=\\s*([,.<>\\[]|=>|&(?!&)|\\|(?!\\|)))))(([^(<>]|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(?<==)>|<\\s*(((keyof|infer|awaited|typeof|readonly)\\s+)|(([$_[:alpha:]][$_[:alnum:]]*|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^]\\[]|(\\[([^]\\[]|\\[[^]\\[]*])*]))*])|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^\\\\`]|\\\\.)*`))(?=\\s*([,.<>\\[]|=>|&(?!&)|\\|(?!\\|)))))([^(<>]|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(?<==)>)*(?<!=)>))*(?<!=)>)*(?<!=)>\\s*)?\\())",
       "beginCaptures": {
         "1": {
-          "name": "variable.parameter"
+          "name": "meta.function-call.ts variable.other.object.ts"
+        },
+        "2": {
+          "name": "meta.function-call.ts punctuation.accessor.optional.ts"
+        },
+        "3": {
+          "name": "meta.function-call.ts variable.other.object.ts"
+        },
+        "4": {
+          "name": "meta.function-call.ts punctuation.accessor.optional.ts"
+        },
+        "5": {
+          "name": "meta.function-call.ts entity.name.function.ts"
         }
       },
-      "end": "(`)",
+      "end": "(?<=(`|\\)\\s*[^`\\s]))",
       "patterns": [
         {
-          "include": "source.ts#template-substitution-element"
+          "include": "source.ts#comment"
         },
         {
-          "include": "source.ts#string-character-escape"
+          "include": "source.ts#function-call-optionals"
         },
         {
-          "include": "source.sql"
+          "include": "source.ts#type-arguments"
         },
         {
-          "include": "source.plpgsql.postgres"
+          "include": "source.ts#paren-expression"
         },
         {
-          "match": "."
+          "include": "#embedded-sql"
         }
       ]
     },
     {
-      "begin": "(?i)(\\s?/?\\*?\\s?((?:|inline-)sql)\\s?\\*?/?\\s?)(`)",
+      "__COMMENT__": "Literals tagged with an sql comment, e.g. /*sql*/`SELECT ...`",
+      "begin": "(/\\*\\s*(?i)sql(?-i)\\s*\\*/)\\s*(?=`)",
       "beginCaptures": {
         "1": {
-          "name": "comment.block"
+          "name": "comment.block.ts"
         }
       },
-      "end": "(`)",
+      "end": "(?<=`)",
       "patterns": [
         {
-          "include": "source.ts#template-substitution-element"
-        },
+          "include": "#embedded-sql"
+        }
+      ]
+    },
+    {
+      "__COMMENT__": "Literals tagged with sql (including optional accessors and types), e.g. my.object?.sql<User>`SELECT ...`. This is based on the 1st #template-call pattern in TypeScript.tmLanguage.json",
+      "begin": "(?=(([$_[:alpha:]][$_[:alnum:]]*\\s*\\??\\.\\s*)*|(\\??\\.\\s*)?)(#?(?i)sql|sqlFragment(?-i))(<\\s*(((keyof|infer|awaited|typeof|readonly)\\s+)|(([$_[:alpha:]][$_[:alnum:]]*|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^]\\[]|(\\[([^]\\[]|\\[[^]\\[]*])*]))*])|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^\\\\`]|\\\\.)*`))(?=\\s*([,.<>\\[]|=>|&(?!&)|\\|(?!\\|)))))([^(<>]|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(?<==)>|<\\s*(((keyof|infer|awaited|typeof|readonly)\\s+)|(([$_[:alpha:]][$_[:alnum:]]*|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^]\\[]|(\\[([^]\\[]|\\[[^]\\[]*])*]))*])|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^\\\\`]|\\\\.)*`))(?=\\s*([,.<>\\[]|=>|&(?!&)|\\|(?!\\|)))))(([^(<>]|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(?<==)>|<\\s*(((keyof|infer|awaited|typeof|readonly)\\s+)|(([$_[:alpha:]][$_[:alnum:]]*|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^]\\[]|(\\[([^]\\[]|\\[[^]\\[]*])*]))*])|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^\\\\`]|\\\\.)*`))(?=\\s*([,.<>\\[]|=>|&(?!&)|\\|(?!\\|)))))([^(<>]|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(?<==)>)*(?<!=)>))*(?<!=)>)*(?<!=)>\\s*)?`)",
+      "end": "(?<=`)",
+      "name": "string.template.ts",
+      "patterns": [
         {
-          "include": "source.ts#string-character-escape"
+          "begin": "(?=(([$_[:alpha:]][$_[:alnum:]]*\\s*\\??\\.\\s*)*|(\\??\\.\\s*)?)(#?(?i)sql|sqlFragment(?-i)))",
+          "end": "(?=(<\\s*(((keyof|infer|awaited|typeof|readonly)\\s+)|(([$_[:alpha:]][$_[:alnum:]]*|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^]\\[]|(\\[([^]\\[]|\\[[^]\\[]*])*]))*])|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^\\\\`]|\\\\.)*`))(?=\\s*([,.<>\\[]|=>|&(?!&)|\\|(?!\\|)))))([^(<>]|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(?<==)>|<\\s*(((keyof|infer|awaited|typeof|readonly)\\s+)|(([$_[:alpha:]][$_[:alnum:]]*|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^]\\[]|(\\[([^]\\[]|\\[[^]\\[]*])*]))*])|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^\\\\`]|\\\\.)*`))(?=\\s*([,.<>\\[]|=>|&(?!&)|\\|(?!\\|)))))(([^(<>]|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(?<==)>|<\\s*(((keyof|infer|awaited|typeof|readonly)\\s+)|(([$_[:alpha:]][$_[:alnum:]]*|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^]\\[]|(\\[([^]\\[]|\\[[^]\\[]*])*]))*])|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^\\\\`]|\\\\.)*`))(?=\\s*([,.<>\\[]|=>|&(?!&)|\\|(?!\\|)))))([^(<>]|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(?<==)>)*(?<!=)>))*(?<!=)>)*(?<!=)>\\s*)?`)",
+          "patterns": [
+            {
+              "include": "source.ts#support-function-call-identifiers"
+            },
+            {
+              "match": "(#?(?i)sql|sqlFragment(?-i))",
+              "name": "entity.name.function.tagged-template.ts"
+            }
+          ]
         },
         {
-          "include": "source.sql"
+          "include": "source.ts#type-arguments"
         },
         {
-          "include": "source.plpgsql.postgres"
+          "include": "#embedded-sql"
+        }
+      ]
+    },
+    {
+      "__COMMENT__": "Literals tagged with sql (including optional types), e.g. sql<User>`SELECT ...`. This is based on the 2nd #template-call pattern in TypeScript.tmLanguage.json",
+      "begin": "\\b((?i)sql|sqlFragment(?-i))\\s*(?=(<\\s*(((keyof|infer|awaited|typeof|readonly)\\s+)|(([$_[:alpha:]][$_[:alnum:]]*|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^]\\[]|(\\[([^]\\[]|\\[[^]\\[]*])*]))*])|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^\\\\`]|\\\\.)*`))(?=\\s*([,.<>\\[]|=>|&(?!&)|\\|(?!\\|)))))([^(<>]|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(?<==)>|<\\s*(((keyof|infer|awaited|typeof|readonly)\\s+)|(([$_[:alpha:]][$_[:alnum:]]*|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^]\\[]|(\\[([^]\\[]|\\[[^]\\[]*])*]))*])|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^\\\\`]|\\\\.)*`))(?=\\s*([,.<>\\[]|=>|&(?!&)|\\|(?!\\|)))))(([^(<>]|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(?<==)>|<\\s*(((keyof|infer|awaited|typeof|readonly)\\s+)|(([$_[:alpha:]][$_[:alnum:]]*|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^]\\[]|(\\[([^]\\[]|\\[[^]\\[]*])*]))*])|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^\\\\`]|\\\\.)*`))(?=\\s*([,.<>\\[]|=>|&(?!&)|\\|(?!\\|)))))([^(<>]|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(?<==)>)*(?<!=)>))*(?<!=)>)*(?<!=)>\\s*)`)",
+      "beginCaptures": {
+        "1": {
+          "name": "entity.name.function.tagged-template.ts"
+        }
+      },
+      "end": "(?<=`)",
+      "name": "string.template.ts",
+      "patterns": [
+        {
+          "include": "source.ts#type-arguments"
         },
         {
-          "match": "."
+          "include": "#embedded-sql"
         }
       ]
     },
     {
-      "begin": "(?i)(?<=[(,:=\\s]|\\$\\()\\s*(((/\\*)|(//))\\s?((?:|inline-)sql) {0,1000}\\*?/?) {0,1000}$",
+      "__COMMENT__": "Literals tagged with sql, e.g. sql`SELECT ...`. This is based on the 2nd #template pattern in TypeScript.tmLanguage.json",
+      "begin": "\\b((?i)sql|sqlFragment(?-i))\\s*(?=`)",
       "beginCaptures": {
         "1": {
-          "name": "comment.line"
+          "name": "entity.name.function.tagged-template.ts"
         }
       },
-      "end": "(`)",
+      "end": "(?<=`)",
+      "name": "string.template.ts",
       "patterns": [
         {
-          "begin": "\\G()",
-          "end": "(`)"
-        },
+          "include": "#embedded-sql"
+        }
+      ]
+    }
+  ],
+  "repository": {
+    "embedded-sql": {
+      "begin": "`",
+      "beginCaptures": {
+        "0": {
+          "name": "punctuation.definition.string.template.begin.js"
+        }
+      },
+      "contentName": "meta.embedded.block.sql",
+      "end": "`",
+      "endCaptures": {
+        "0": {
+          "name": "punctuation.definition.string.template.end.js"
+        }
+      },
+      "name": "string.template.ts",
+      "patterns": [
         {
           "include": "source.ts#template-substitution-element"
         },
@@ -109,6 +157,6 @@
         }
       ]
     }
-  ],
-  "scopeName": "inline.es6-sql"
+  },
+  "scopeName": "inline.tagged-template-sql"
 }

package/index.js

@@ -450,22 +450,22 @@ export const grammars = [
     aliases: [
       'bird',
     ],
-    byteSize: 16465,
+    byteSize: 16474,
     categories: [
       'config',
     ],
     displayName: 'BIRD2 Configuration',
     funding: [
     ],
-    hash: 'aZeLWzKe0MfMsf4TugV0UubLbnVfmdqzqwjWy3i1kNg',
-    lastUpdate: '2025-09-26T03:40:53Z',
+    hash: 'RPCcGQ6UGeD_poiC9GaDEohu-RR2Wui7cDr0_uUV5Fw',
+    lastUpdate: '2026-02-26T13:14:25Z',
     license: 'MPL-2.0',
     licenseUrl: 'https://raw.githubusercontent.com/bird-chinese-community/BIRD-tm-language-grammar/main/LICENSE',
     name: 'bird2',
     scopeName: 'source.bird2',
-    sha: '2e82aed3f306941105072adf685a91d75bca0bf6',
-    source: 'https://github.com/bird-chinese-community/BIRD-tm-language-grammar/blob/2e82aed3f306941105072adf685a91d75bca0bf6/grammars/bird2.tmLanguage.json',
-    sourceApi: 'https://api.github.com/repos/bird-chinese-community/BIRD-tm-language-grammar/contents/grammars/bird2.tmLanguage.json?ref=2e82aed3f306941105072adf685a91d75bca0bf6',
+    sha: '17a8d1d61d4bc1ba719e0025e3f8b283c68eddde',
+    source: 'https://github.com/bird-chinese-community/BIRD-tm-language-grammar/blob/17a8d1d61d4bc1ba719e0025e3f8b283c68eddde/grammars/bird2.tmLanguage.json',
+    sourceApi: 'https://api.github.com/repos/bird-chinese-community/BIRD-tm-language-grammar/contents/grammars/bird2.tmLanguage.json?ref=17a8d1d61d4bc1ba719e0025e3f8b283c68eddde',
   },
   {
     byteSize: 102405,
@@ -5237,7 +5237,7 @@ export const injections = [
     sourceApi: 'https://api.github.com/repos/0x00000001A/es6-string-html/contents/syntaxes/es6-inline-html.json?ref=b8f51210b53ce64e789949d4be33b7ecb42cf177',
   },
   {
-    byteSize: 1483,
+    byteSize: 8046,
     embedded: [
       'typescript',
       'sql',
@@ -5246,25 +5246,20 @@ export const injections = [
       'ts-tags',
     ],
     funding: [
-      {
-        handle: 'nonholy',
-        name: 'Buy Me A Coffee',
-        url: 'https://www.buymeacoffee.com/nonholy',
-      },
     ],
-    hash: '0nxyIHxbOwBjqkgBtKCL-xZPOJ9b-LNJTDdi7VEkB6w',
+    hash: '2AGJ4IowJ_RdN6clwFAQCc7RJnAZdQLa2nleUqKl7BI',
     injectTo: [
       'source.ts',
       'source.js',
     ],
-    lastUpdate: '2024-05-10T19:00:53Z',
+    lastUpdate: '2021-02-26T11:51:19Z',
     license: 'MIT',
-    licenseUrl: 'https://raw.githubusercontent.com/0x00000001A/es6-string-html/master/LICENSE',
+    licenseUrl: 'https://raw.githubusercontent.com/frigus02/vscode-sql-tagged-template-literals/main/LICENSE',
     name: 'es-tag-sql',
-    scopeName: 'inline.es6-sql',
-    sha: 'b8f51210b53ce64e789949d4be33b7ecb42cf177',
-    source: 'https://github.com/0x00000001A/es6-string-html/blob/b8f51210b53ce64e789949d4be33b7ecb42cf177/syntaxes/es6-inline-sql.json',
-    sourceApi: 'https://api.github.com/repos/0x00000001A/es6-string-html/contents/syntaxes/es6-inline-sql.json?ref=b8f51210b53ce64e789949d4be33b7ecb42cf177',
+    scopeName: 'inline.tagged-template-sql',
+    sha: '80e8ddcb034a3bc66382789d2ca251d0266a9f56',
+    source: 'https://github.com/frigus02/vscode-sql-tagged-template-literals/blob/80e8ddcb034a3bc66382789d2ca251d0266a9f56/extension-syntax-only/syntaxes/grammar.json',
+    sourceApi: 'https://api.github.com/repos/frigus02/vscode-sql-tagged-template-literals/contents/extension-syntax-only/syntaxes/grammar.json?ref=80e8ddcb034a3bc66382789d2ca251d0266a9f56',
   },
   {
     byteSize: 1070,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "tm-grammars",
   "type": "module",
-  "version": "1.31.0",
+  "version": "1.31.1",
   "description": "Collecton of TextMate grammars in JSON",
   "author": "Anthony Fu <anthonyfu117@hotmail.com>",
   "license": "MIT",