diff --git a/packages/tm-grammars/README.md b/packages/tm-grammars/README.md index e2b9213..61cad8b 100644 --- a/packages/tm-grammars/README.md +++ b/packages/tm-grammars/README.md @@ -184,7 +184,7 @@ import { grammars } from 'tm-grammars' | `rust` | `rs` | [microsoft/vscode](https://github.com/microsoft/vscode/blob/03dc55030b3b2b5c4779d4ac1e2e46cd1f5a6b7c/extensions/rust/syntaxes/rust.tmLanguage.json) | [MIT](https://raw.githubusercontent.com/microsoft/vscode/main/LICENSE.txt) | | 16.82 kB | | `sas` | | [rpardee/sas](https://github.com/rpardee/sas/blob/49f6e733c6c0b918a2a825ca2f63dba704f3e8c0/syntaxes/sas.tmLanguage) | [MIT](https://raw.githubusercontent.com/rpardee/sas/master/LICENSE) | `sql` | 9.31 kB | | `sass` | | [TheRealSyler/vscode-sass-indented](https://github.com/TheRealSyler/vscode-sass-indented/blob/7b0bd6bbbb768c0cf21b2aa0899cb872ee42fd50/syntaxes/sass.tmLanguage.json) | [NOASSERTION](https://raw.githubusercontent.com/TheRealSyler/vscode-sass-indented/master/LICENSE) | | 8.84 kB | -| `scala` | | [scala/vscode-scala-syntax](https://github.com/scala/vscode-scala-syntax/blob/d868753f29b0281fdf221785d3530d5066f5b77d/syntaxes/Scala.tmLanguage.json) | [MIT](https://raw.githubusercontent.com/scala/vscode-scala-syntax/main/LICENSE.md) | | 27.23 kB | +| `scala` | | [scala/vscode-scala-syntax](https://github.com/scala/vscode-scala-syntax/blob/1d4029f21c9c57ce3e05486968b5de2847c25c62/syntaxes/Scala.tmLanguage.json) | [MIT](https://raw.githubusercontent.com/scala/vscode-scala-syntax/main/LICENSE.md) | | 27.55 kB | | `scheme` | | [sjhuangx/vscode-scheme](https://github.com/sjhuangx/vscode-scheme/blob/4e21683666e1e2edfa21d040ecd427f628e7b5ff/syntaxes/scheme.tmLanguage) | [MIT](https://raw.githubusercontent.com/tinyjiahao/vscode-scheme/master/LICENSE.md) | | 8.09 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.67 kB | | `sdbl` | `1c-query` | [1c-syntax/vsc-language-1c-bsl](https://github.com/1c-syntax/vsc-language-1c-bsl/blob/c60d42089e5139942ff5b1db3a0a3ca8dd094ce6/syntaxes/1c-query.tmLanguage.json) | [MIT](https://raw.githubusercontent.com/1c-syntax/vsc-language-1c-bsl/develop/LICENSE.md) | | 4.74 kB | diff --git a/packages/tm-grammars/grammars/scala.json b/packages/tm-grammars/grammars/scala.json index f452c53..d539c9c 100644 --- a/packages/tm-grammars/grammars/scala.json +++ b/packages/tm-grammars/grammars/scala.json @@ -191,6 +191,9 @@ { "include": "#xml-literal" }, + { + "include": "#namedBounds" + }, { "include": "#keywords" }, @@ -827,6 +830,21 @@ } ] }, + "namedBounds": { + "patterns": [ + { + "captures": { + "1": { + "name": "keyword.other.import.as.scala" + }, + "2": { + "name": "variable.stable.declaration.scala" + } + }, + "match": "\\s+(as)\\s+([_a-z\\$\\p{Lo}\\p{Nl}\\p{Ll}][A-Z\\p{Lt}\\p{Lu}_a-z\\$\\p{Lo}\\p{Nl}\\p{Ll}0-9]*(?:(?<=_)[!#%&*+\\-\\/:<>=?@^|~\\p{Sm}\\p{So}]+)?)\\b" + } + ] + }, "parameter-list": { "patterns": [ { diff --git a/packages/tm-grammars/index.js b/packages/tm-grammars/index.js index 1a775d9..cd7e931 100644 --- a/packages/tm-grammars/index.js +++ b/packages/tm-grammars/index.js @@ -2826,16 +2826,16 @@ export const grammars = [ source: 'https://github.com/TheRealSyler/vscode-sass-indented/blob/7b0bd6bbbb768c0cf21b2aa0899cb872ee42fd50/syntaxes/sass.tmLanguage.json', }, { - byteSize: 27888, + byteSize: 28211, displayName: 'Scala', - hash: 'TXBe2fD11I', - lastUpdate: '2024-10-09T13:56:15Z', + hash: 'jFx7a5afQ0', + lastUpdate: '2025-01-13T17:26:01Z', license: 'MIT', licenseUrl: 'https://raw.githubusercontent.com/scala/vscode-scala-syntax/main/LICENSE.md', name: 'scala', scopeName: 'source.scala', - sha: 'd868753f29b0281fdf221785d3530d5066f5b77d', - source: 'https://github.com/scala/vscode-scala-syntax/blob/d868753f29b0281fdf221785d3530d5066f5b77d/syntaxes/Scala.tmLanguage.json', + sha: '1d4029f21c9c57ce3e05486968b5de2847c25c62', + source: 'https://github.com/scala/vscode-scala-syntax/blob/1d4029f21c9c57ce3e05486968b5de2847c25c62/syntaxes/Scala.tmLanguage.json', }, { byteSize: 8288, diff --git a/packages/tm-grammars/package.json b/packages/tm-grammars/package.json index 8e373d7..6b3aa15 100644 --- a/packages/tm-grammars/package.json +++ b/packages/tm-grammars/package.json @@ -1,7 +1,7 @@ { "name": "tm-grammars", "type": "module", - "version": "1.22.5", + "version": "1.22.6", "description": "Collecton of TextMate grammars in JSON", "author": "Anthony Fu ", "license": "MIT", diff --git a/packages/tm-grammars/raw/scala.json b/packages/tm-grammars/raw/scala.json index 30b724d..84bf59e 100644 --- a/packages/tm-grammars/raw/scala.json +++ b/packages/tm-grammars/raw/scala.json @@ -192,6 +192,9 @@ { "include": "#xml-literal" }, + { + "include": "#namedBounds" + }, { "include": "#keywords" }, @@ -828,6 +831,21 @@ } ] }, + "namedBounds": { + "patterns": [ + { + "captures": { + "1": { + "name": "keyword.other.import.as.scala" + }, + "2": { + "name": "variable.stable.declaration.scala" + } + }, + "match": "\\s+(as)\\s+([_a-z\\$\\p{Lo}\\p{Nl}\\p{Ll}][A-Z\\p{Lt}\\p{Lu}_a-z\\$\\p{Lo}\\p{Nl}\\p{Ll}0-9]*(?:(?<=_)[!#%&*+\\-\\/:<>=?@^|~\\p{Sm}\\p{So}]+)?)\\b" + } + ] + }, "parameter-list": { "patterns": [ {