Improve and fix package.json "scripts" injection

Author: RedCMD

syntaxes/scripts.tmLanguage.json

@@ -1,51 +1,40 @@
 {
 	"$schema": "https://raw.githubusercontent.com/RedCMD/TmLanguage-Syntax-Highlighter/main/vscode.tmLanguage.schema.json",
-	"name": "package.json",
+	"name": "`package.json` \"scripts\": {}",
 	"scopeName": "source.json.shellscript",
-	"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",
+	"injectionSelector": "L:source.json .meta.embedded.scripts. meta.structure.dictionary.json string.quoted.double.json -(meta.structure.dictionary.json meta.structure.dictionary.json meta.structure.dictionary.json) -meta.structure.array.json -meta.embedded.shellscript.json -comment -source.json.comments",
 	"patterns": [
+		{
+			"comment": "https://github.com/microsoft/vscode-textmate/issues/242",
+			"include": "source.shell#_pre-load_"
+		},
 		{ "include": "#scripts" }
 	],
 	"repository": {
 		"scripts": {
-			"patterns": [
-				{
-					"comment": "VSCode TextMate bug. For some reason, including a grammar from within a capture group doesn't load the include. We have to pre-load the include outside of a capture group. `source.shell`",
-					"begin": "(*FAIL)",
-					"end": "|",
-					"patterns": [ { "include": "source.shell" } ]
-				},
-				{
-					"match": "(\")((?>[^\\\\\"]++|\\\\.)++)(\")",
-					"captures": {
-						"0": { "name": "string.quoted.double.json" },
-						"1": { "name": "punctuation.definition.string.begin.json" },
-						"2": {
-							"name": "meta.embedded.shellscript.json",
+			"match": "\\G(?>[^\\\\\"\\x-\\x1F]++|\\\\.)++",
+			"captures": {
+				"0": {
+					"name": "meta.embedded.shellscript.json",
+					"patterns": [
+						{
+							"comment": "Setup a `\\G` anchor for ShellScript to use",
+							"begin": "|",
+							"end": "(*FAIL)",
 							"patterns": [
+								{ "include": "source.shell" },
 								{
-									"comment": "Setup a `\\G` anchor for ShellScript to use",
-									"begin": "|",
-									"end": "(*FAIL)",
-									"patterns": [
-										{ "include": "source.shell" },
-										{
-											"begin": "(?!^[ \\t]*+$)(?:(?<=^until | until |\\tuntil |^while | while |\\twhile |^elif | elif |\\telif |^else | else |\\telse |^then | then |\\tthen |^do | do |\\tdo |^if | if |\\tif )|(?<=\"\\G|^|;|\\||&|!|\\(|\\{|`))[ \\t]*+(?!nocorrect\\W|nocorrect\\$|function\\W|function\\$|foreach\\W|foreach\\$|repeat\\W|repeat\\$|logout\\W|logout\\$|coproc\\W|coproc\\$|select\\W|select\\$|while\\W|while\\$|pushd\\W|pushd\\$|until\\W|until\\$|case\\W|case\\$|done\\W|done\\$|elif\\W|elif\\$|else\\W|else\\$|esac\\W|esac\\$|popd\\W|popd\\$|then\\W|then\\$|time\\W|time\\$|for\\W|for\\$|end\\W|end\\$|fi\\W|fi\\$|do\\W|do\\$|in\\W|in\\$|if\\W|if\\$)",
-											"end": "(?=;|\\||&|\\n|\\)|`|\\{|\\}|[ \\t]*#|\\])(?<!\\\\)",
-											"beginCaptures": { },
-											"endCaptures": { },
-											"name": "meta.statement.shell",
-											"patterns": [ { "include": "source.shell#typical_statements" } ]
-										}
-									]
+									"begin": "(?<=\"\\G)[ \\t]*+(?!(?>nocorrect|function|foreach|repeat|logout|coproc|select|while|pushd|until|case|done|elif|else|esac|popd|then|time|for|end|fi|do|in|if)\\W)",
+									"end": "(?<!\\\\)(?=[];|&\n)`{}]|[ \t]*+#)",
+									"name": "meta.statement.shell",
+									"patterns": [ { "include": "source.shell#typical_statements" } ]
 								},
 								{ "include": "source.json#stringcontent" }
 							]
-						},
-						"3": { "name": "punctuation.definition.string.end.json" }
-					}
+						}
+					]
 				}
-			]
+			}
 		}
 	}
 }

syntaxes/shellscript.json.escaped.tmLanguage.json

@@ -3,7 +3,7 @@
 	"name": "Shellscript JSON escaped",
 	"comment": "Double quotes requiring escaping when embedded inside JSON",
 	"scopeName": "source.shellscript.json.escaped",
-	"injectionSelector": "L:source.json meta.embedded.shellscript.json.scripts -string.quoted.double.shell",
+	"injectionSelector": "L:source.json meta.embedded.shellscript.json -string.quoted.double.shell",
 	"patterns": [
 		{ "include": "#string" }
 	],