diff --git a/packages/tm-grammars/README.md b/packages/tm-grammars/README.md index d53f612..828f1ee 100644 --- a/packages/tm-grammars/README.md +++ b/packages/tm-grammars/README.md @@ -157,7 +157,7 @@ import { grammars } from 'tm-grammars' | `rust` | `rs` | [microsoft/vscode](https://github.com/microsoft/vscode/blob/35d97bc7e439fce0f50f42074041ab2d8571b20a/extensions/rust/syntaxes/rust.tmLanguage.json) | [MIT](https://raw.githubusercontent.com/microsoft/vscode/main/LICENSE.txt) | | 16.77 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/ffeefb25ec5e0808fa98799098bb59d03c8e5901/syntaxes/Scala.tmLanguage.json) | [MIT](https://raw.githubusercontent.com/scala/vscode-scala-syntax/main/LICENSE.md) | | 26.48 kB | +| `scala` | | [scala/vscode-scala-syntax](https://github.com/scala/vscode-scala-syntax/blob/d4207351671160b65ec05a43f5452ad8c9138950/syntaxes/Scala.tmLanguage.json) | [MIT](https://raw.githubusercontent.com/scala/vscode-scala-syntax/main/LICENSE.md) | | 26.72 kB | | `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 | diff --git a/packages/tm-grammars/grammars/scala.json b/packages/tm-grammars/grammars/scala.json index 3b55211..75f9f7a 100644 --- a/packages/tm-grammars/grammars/scala.json +++ b/packages/tm-grammars/grammars/scala.json @@ -105,35 +105,51 @@ ] }, "char-literal": { - "begin": "'", - "beginCaptures": { - "0": { - "name": "punctuation.definition.character.begin.scala" - } - }, - "end": "'|$", - "endCaptures": { - "0": { - "name": "punctuation.definition.character.end.scala" - } - }, - "name": "string.quoted.other constant.character.literal.scala", "patterns": [ { - "match": "\\\\(?:[btnfr\\\\\"']|[0-7]{1,3}|u[0-9A-Fa-f]{4})", - "name": "constant.character.escape.scala" - }, - { - "match": "\\\\.", - "name": "invalid.illegal.unrecognized-character-escape.scala" - }, - { - "match": "[^']{2,}", - "name": "invalid.illegal.character-literal-too-long" + "captures": { + "1": { + "name": "punctuation.definition.character.begin.scala" + }, + "2": { + "name": "punctuation.definition.character.end.scala" + } + }, + "match": "(')'(')", + "name": "string.quoted.other constant.character.literal.scala" }, { - "match": "(?=?@^|~\\p{Sm}\\p{So}]+)?|[!#%&*+\\-\\/:<>=?@^|~\\p{Sm}\\p{So}]+)|`[^`]+`)(?:\\s*,\\s*(?:(?:[A-Z\\p{Lt}\\p{Lu}_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}]+)?|[!#%&*+\\-\\/:<>=?@^|~\\p{Sm}\\p{So}]+)|`[^`]+`))*)?" + "match": "\\b(val)\\b\\s*(?!//|/\\*)((?:(?:[A-Z\\p{Lt}\\p{Lu}_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}]+)?|[!#%&*+\\-\\/:<>=?@^|~\\p{Sm}\\p{So}]+)|`[^`]+`)(?:\\s*,\\s*(?:(?:[A-Z\\p{Lt}\\p{Lu}_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}]+)?|[!#%&*+\\-\\/:<>=?@^|~\\p{Sm}\\p{So}]+)|`[^`]+`))*)?(?!\")" }, { "captures": { @@ -373,12 +389,12 @@ "name": "variable.volatile.declaration.scala" } }, - "match": "\\b(var)\\b\\s*(?!//|/\\*)((?:(?:[A-Z\\p{Lt}\\p{Lu}_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}]+)?|[!#%&*+\\-\\/:<>=?@^|~\\p{Sm}\\p{So}]+)|`[^`]+`)(?:\\s*,\\s*(?:(?:[A-Z\\p{Lt}\\p{Lu}_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}]+)?|[!#%&*+\\-\\/:<>=?@^|~\\p{Sm}\\p{So}]+)|`[^`]+`))*)?" + "match": "\\b(var)\\b\\s*(?!//|/\\*)((?:(?:[A-Z\\p{Lt}\\p{Lu}_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}]+)?|[!#%&*+\\-\\/:<>=?@^|~\\p{Sm}\\p{So}]+)|`[^`]+`)(?:\\s*,\\s*(?:(?:[A-Z\\p{Lt}\\p{Lu}_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}]+)?|[!#%&*+\\-\\/:<>=?@^|~\\p{Sm}\\p{So}]+)|`[^`]+`))*)?(?!\")" }, { "captures": { "1": { - "name": "keyword.other.scoping.scala" + "name": "keyword.other.package.scala" }, "2": { "name": "keyword.declaration.scala" @@ -393,7 +409,7 @@ "begin": "\\b(package)\\s+", "beginCaptures": { "1": { - "name": "keyword.other.import.scala" + "name": "keyword.other.package.scala" } }, "end": "(?<=[\\n;])", diff --git a/packages/tm-grammars/index.js b/packages/tm-grammars/index.js index 3e1a3d7..dca05dd 100644 --- a/packages/tm-grammars/index.js +++ b/packages/tm-grammars/index.js @@ -2205,15 +2205,15 @@ export const grammars = [ source: 'https://github.com/TheRealSyler/vscode-sass-indented/blob/7b0bd6bbbb768c0cf21b2aa0899cb872ee42fd50/syntaxes/sass.tmLanguage.json', }, { - byteSize: 27118, + byteSize: 27359, displayName: 'Scala', - lastUpdate: '2023-07-11T12:19:41Z', + lastUpdate: '2024-02-13T11:53:11Z', license: 'MIT', licenseUrl: 'https://raw.githubusercontent.com/scala/vscode-scala-syntax/main/LICENSE.md', name: 'scala', scopeName: 'source.scala', - sha: 'ffeefb25ec5e0808fa98799098bb59d03c8e5901', - source: 'https://github.com/scala/vscode-scala-syntax/blob/ffeefb25ec5e0808fa98799098bb59d03c8e5901/syntaxes/Scala.tmLanguage.json', + sha: 'd4207351671160b65ec05a43f5452ad8c9138950', + source: 'https://github.com/scala/vscode-scala-syntax/blob/d4207351671160b65ec05a43f5452ad8c9138950/syntaxes/Scala.tmLanguage.json', }, { byteSize: 8548, diff --git a/packages/tm-grammars/package.json b/packages/tm-grammars/package.json index d7c9802..2f7187c 100644 --- a/packages/tm-grammars/package.json +++ b/packages/tm-grammars/package.json @@ -1,7 +1,7 @@ { "name": "tm-grammars", "type": "module", - "version": "1.2.0", + "version": "1.2.1", "packageManager": "pnpm@8.15.1", "description": "Collecton of TextMate grammars in JSON", "author": "Anthony Fu ",