From 8b3071b72de6f85ea29f1c06314ebd6871c820d0 Mon Sep 17 00:00:00 2001 From: RedCMD Date: Sun, 1 Dec 2024 15:13:41 +1300 Subject: [PATCH] Fix standardTokenType scopeName strings from disabling brackets --- syntaxes/JSON.tmLanguage.json | 2 +- syntaxes/JSONC.tmLanguage.json | 2 +- syntaxes/language-configuration.tmLanguage.json | 2 +- syntaxes/legacy_tox_ini.tmLanguage.json | 2 +- syntaxes/scripts.tmLanguage.json | 2 +- syntaxes/test.query.sql.tmLanguage.json | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/syntaxes/JSON.tmLanguage.json b/syntaxes/JSON.tmLanguage.json index c9dcec7..53d6189 100644 --- a/syntaxes/JSON.tmLanguage.json +++ b/syntaxes/JSON.tmLanguage.json @@ -64,7 +64,7 @@ { "begin": "(?=\"((?>[^\\\\\"]++|\\\\.)*+)\")", "end": "(?!\\G)(?<=,)|(?=})", - "name": ".$1.", + "name": ".meta.embedded.$1.", "patterns": [ { "include": "#objectpair" } ] }, { "include": "#objectpair" } diff --git a/syntaxes/JSONC.tmLanguage.json b/syntaxes/JSONC.tmLanguage.json index a4a7606..d0507b0 100644 --- a/syntaxes/JSONC.tmLanguage.json +++ b/syntaxes/JSONC.tmLanguage.json @@ -64,7 +64,7 @@ { "begin": "(?=\"((?>[^\\\\\"]++|\\\\.)*+)\")", "end": "(?!\\G)(?<=,)|(?=})", - "name": ".$1.", + "name": ".meta.embedded.$1.", "patterns": [ { "include": "#objectpair" } ] }, { "include": "#objectpair" } diff --git a/syntaxes/language-configuration.tmLanguage.json b/syntaxes/language-configuration.tmLanguage.json index 5e3b5e3..380488b 100644 --- a/syntaxes/language-configuration.tmLanguage.json +++ b/syntaxes/language-configuration.tmLanguage.json @@ -3,7 +3,7 @@ "comment": "https://github.com/wraith13/vscode-schemas/blob/master/en/latest/schemas/language-configuration.json#L237-L258", "name": "language-configuration", "scopeName": "source.json.comments.language-configuration", - "injectionSelector": "L:source.json.comments .wordPattern. meta.structure.dictionary.value.json.comments -(meta.structure.dictionary.json.comments meta.structure.dictionary.json.comments) -meta.structure.array.json.comments -string -comment, L:source.json.comments .wordPattern. .pattern. meta.structure.dictionary.value.json.comments -(meta.structure.dictionary.json.comments meta.structure.dictionary.json.comments meta.structure.dictionary.json.comments) -meta.structure.array.json.comments -string -comment", + "injectionSelector": "L:source.json.comments .meta.embedded.wordPattern. meta.structure.dictionary.value.json.comments -(meta.structure.dictionary.json.comments meta.structure.dictionary.json.comments) -meta.structure.array.json.comments -string -comment, L:source.json.comments .meta.embedded.wordPattern. .meta.embedded.pattern. meta.structure.dictionary.value.json.comments -(meta.structure.dictionary.json.comments meta.structure.dictionary.json.comments meta.structure.dictionary.json.comments) -meta.structure.array.json.comments -string -comment", "patterns": [ { "include": "#wordPattern" } ], diff --git a/syntaxes/legacy_tox_ini.tmLanguage.json b/syntaxes/legacy_tox_ini.tmLanguage.json index afd495a..5ebe451 100644 --- a/syntaxes/legacy_tox_ini.tmLanguage.json +++ b/syntaxes/legacy_tox_ini.tmLanguage.json @@ -3,7 +3,7 @@ "comment": "https://github.com/SchemaStore/schemastore/blob/master/src/schemas/json/pyproject.json", "name": "json.legacy_tox_ini", "scopeName": "source.json.legacy_tox_ini", - "injectionSelector": "L:source.json .tool. .tox. .legacy_tox_ini. meta.structure.dictionary.value.json -(meta.structure.dictionary.json meta.structure.dictionary.json meta.structure.dictionary.json meta.structure.dictionary.json) -meta.structure.array.json -string -comment", + "injectionSelector": "L:source.json .meta.embedded.tool. .meta.embedded.tox. .meta.embedded.legacy_tox_ini. meta.structure.dictionary.value.json -(meta.structure.dictionary.json meta.structure.dictionary.json meta.structure.dictionary.json meta.structure.dictionary.json) -meta.structure.array.json -string -comment", "patterns": [ { "include": "#legacy_tox_ini" } ], diff --git a/syntaxes/scripts.tmLanguage.json b/syntaxes/scripts.tmLanguage.json index 7aaae00..d28d61d 100644 --- a/syntaxes/scripts.tmLanguage.json +++ b/syntaxes/scripts.tmLanguage.json @@ -2,7 +2,7 @@ "$schema": "https://raw.githubusercontent.com/RedCMD/TmLanguage-Syntax-Highlighter/main/vscode.tmLanguage.schema.json", "name": "package.json", "scopeName": "source.json.shellscript", - "injectionSelector": "L:source.json .scripts. meta.structure.dictionary.json meta.structure.dictionary.value.json -(meta.structure.dictionary.json meta.structure.dictionary.json meta.structure.dictionary.json) -meta.structure.array.json -string -comment", + "injectionSelector": "L:source.json .meta.embedded.scripts. meta.structure.dictionary.json meta.structure.dictionary.value.json -(meta.structure.dictionary.json meta.structure.dictionary.json meta.structure.dictionary.json) -meta.structure.array.json -string -comment", "patterns": [ { "include": "#scripts" } ], diff --git a/syntaxes/test.query.sql.tmLanguage.json b/syntaxes/test.query.sql.tmLanguage.json index bd9be47..3b68a6c 100644 --- a/syntaxes/test.query.sql.tmLanguage.json +++ b/syntaxes/test.query.sql.tmLanguage.json @@ -3,7 +3,7 @@ "comment": "https://github.com/omnigres/omnigres/blob/master/pg_yregress/schema.json#L190", "name": "json.query", "scopeName": "source.json.sql", - "injectionSelector": "L:source.json .test. .query. meta.structure.dictionary.value.json -(meta.structure.dictionary.json meta.structure.dictionary.json meta.structure.dictionary.json) -meta.structure.array.json -string -comment", + "injectionSelector": "L:source.json .meta.embedded.test. .meta.embedded.query. meta.structure.dictionary.value.json -(meta.structure.dictionary.json meta.structure.dictionary.json meta.structure.dictionary.json) -meta.structure.array.json -string -comment", "patterns": [ { "include": "#query" } ],