feat: Additions to shellScript

Author: RedCMD

package.json

@@ -63,13 +63,15 @@
 					"meta.embedded.shellscript": "shellscript"
 				},
 				"injectTo": [
+					"source.json.comments.embedded",
 					"source.json.embedded"
 				]
 			},
 			{
 				"scopeName": "source.json.shellscript.escaped",
 				"path": "./syntaxes/shellscript-escaped.tmLanguage.json",
 				"injectTo": [
+					"source.json.comments.embedded",
 					"source.json.embedded"
 				]
 			},

syntaxes/shellscript-escaped.tmLanguage.json

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

syntaxes/shellscript.tmLanguage.json

@@ -3,7 +3,15 @@
 	"comment": "\"scripts\" in `package.json` and \"command\" in `tasks.json`",
 	"name": "JSON Embedded ShellScript",
 	"scopeName": "source.json.shellscript",
-	"injectionSelector": "L:source.json.embedded .meta.scripts. meta.structure.dictionary.json string.quoted.double.json\n-meta.structure.dictionary.json meta.structure.dictionary.json meta.structure.dictionary.json\n-meta.structure.array.json\n-meta.embedded.shellscript.json -comment",
+	"injectionSelector": [
+		"L:source.json.embedded .meta.scripts. meta.structure.dictionary.json string.quoted.double.json\n-meta.structure.dictionary.json meta.structure.dictionary.json meta.structure.dictionary.json\n-meta.structure.array.json\n-meta.embedded.shellscript.json -comment",
+		"L:source.json.comments.embedded .meta.tasks. meta.structure.array.json.comments .meta.command. string.quoted.double.json.comments\n-meta.structure.dictionary.json.comments meta.structure.dictionary.json.comments meta.structure.dictionary.json.comments\n-meta.structure.array.json.comments meta.structure.array.json.comments meta.structure.array.json.comments\n-meta.structure.array.json.comments meta.structure.array.json.comments .meta.command.\n-meta.embedded.json.regexp -comment",
+		"L:source.json.comments.embedded .meta.tasks. meta.structure.array.json.comments meta.structure.dictionary.json.comments meta.structure.dictionary.json.comments .meta.command. string.quoted.double.json.comments\n(.meta.windows. | .meta.linux. | .meta.osx.)\n-meta.structure.dictionary.json.comments meta.structure.dictionary.json.comments meta.structure.dictionary.json.comments meta.structure.dictionary.json.comments\n-meta.structure.array.json.comments meta.structure.array.json.comments meta.structure.array.json.comments\n-meta.structure.array.json.comments meta.structure.array.json.comments .meta.command.\n-meta.embedded.json.regexp -comment",
+		"L:source.json.comments.embedded .meta.tasks. .meta.tasks. meta.structure.array.json.comments .meta.command. string.quoted.double.json.comments\n-meta.structure.dictionary.json.comments meta.structure.dictionary.json.comments meta.structure.dictionary.json.comments meta.structure.dictionary.json.comments\n-meta.structure.array.json.comments meta.structure.array.json.comments meta.structure.array.json.comments\n-meta.structure.array.json.comments meta.structure.array.json.comments .meta.command.\n-meta.embedded.json.regexp -comment",
+		"L:source.json.comments.embedded .meta.tasks. .meta.tasks. meta.structure.array.json.comments meta.structure.dictionary.json.comments meta.structure.dictionary.json.comments .meta.command. string.quoted.double.json.comments\n(.meta.windows. | .meta.linux. | .meta.osx.)\n-meta.structure.dictionary.json.comments meta.structure.dictionary.json.comments meta.structure.dictionary.json.comments meta.structure.dictionary.json.comments meta.structure.dictionary.json.comments\n-meta.structure.array.json.comments meta.structure.array.json.comments meta.structure.array.json.comments\n-meta.structure.array.json.comments meta.structure.array.json.comments .meta.command.\n-meta.embedded.json.regexp -comment",
+		"L:source.json.comments.embedded .meta.mcp. .meta.servers. meta.structure.dictionary.json.comments meta.structure.dictionary.json.comments .meta.command. string.quoted.double.json.comments\n-meta.structure.dictionary.json.comments meta.structure.dictionary.json.comments meta.structure.dictionary.json.comments meta.structure.dictionary.json.comments meta.structure.dictionary.json.comments\n-meta.structure.array.json.comments\n-meta.embedded.json.regexp -comment",
+		"L:source.json.comments.embedded .meta.launch. .meta.configurations. meta.structure.array.json.comments .meta.command. string.quoted.double.json.comments\n-meta.structure.dictionary.json.comments meta.structure.dictionary.json.comments meta.structure.dictionary.json.comments meta.structure.dictionary.json.comments\n-meta.structure.array.json.comments meta.structure.array.json.comments\n-meta.embedded.json.regexp -comment"
+	],
 	"patterns": [
 		{
 			"comment": "https://github.com/microsoft/vscode-textmate/issues/242",

syntaxes/tests/JSON/package.json

@@ -28,7 +28,7 @@
 	],
 	"scripts": {
 		"build": "npm run compile && npm run compile-web && npm run generate-wasm && node ./out/Onigmo/moveOnigmo",
-		"package": "vsce package",
+		"package": "vsce package $\"escape \\\\ \\\" \\$ \\` $@ string\"",
 		"watch": "tsc -watch -p ./",
 		"watch-web": "webpack --watch",
 		"compile": "tsc -p ./",

syntaxes/tests/JSON/package.json.snap

@@ -277,7 +277,7 @@
 #                                                                                    ^^^^^^^^^^^^^^^^^^^^^^^ source.json.embedded meta.structure.dictionary.json .meta.scripts. meta.structure.dictionary.value.json meta.structure.dictionary.json .meta.build. meta.structure.dictionary.value.json string.quoted.double.json meta.embedded.shellscript.json meta.statement.shell meta.statement.command.shell meta.argument.shell string.unquoted.argument.shell
 #                                                                                                           ^ source.json.embedded meta.structure.dictionary.json .meta.scripts. meta.structure.dictionary.value.json meta.structure.dictionary.json .meta.build. meta.structure.dictionary.value.json string.quoted.double.json punctuation.definition.string.end.json
 #                                                                                                            ^ source.json.embedded meta.structure.dictionary.json .meta.scripts. meta.structure.dictionary.value.json meta.structure.dictionary.json .meta.build. meta.structure.dictionary.value.json punctuation.separator.dictionary.pair.json
->		"package": "vsce package",
+>		"package": "vsce package $\"escape \\\\ \\\" \\$ \\` $@ string\"",
 #^^ source.json.embedded meta.structure.dictionary.json .meta.scripts. meta.structure.dictionary.value.json meta.structure.dictionary.json
 #  ^ source.json.embedded meta.structure.dictionary.json .meta.scripts. meta.structure.dictionary.value.json meta.structure.dictionary.json .meta.package. string.json support.type.property-name.json punctuation.support.type.property-name.begin.json
 #   ^^^^^^^ source.json.embedded meta.structure.dictionary.json .meta.scripts. meta.structure.dictionary.value.json meta.structure.dictionary.json .meta.package. string.json support.type.property-name.json
@@ -288,8 +288,24 @@
 #              ^^^^ source.json.embedded meta.structure.dictionary.json .meta.scripts. meta.structure.dictionary.value.json meta.structure.dictionary.json .meta.package. meta.structure.dictionary.value.json string.quoted.double.json meta.embedded.shellscript.json meta.statement.shell meta.statement.command.shell meta.statement.command.name.shell entity.name.function.call.shell entity.name.command.shell
 #                  ^ source.json.embedded meta.structure.dictionary.json .meta.scripts. meta.structure.dictionary.value.json meta.structure.dictionary.json .meta.package. meta.structure.dictionary.value.json string.quoted.double.json meta.embedded.shellscript.json meta.statement.shell meta.statement.command.shell meta.argument.shell
 #                   ^^^^^^^ source.json.embedded meta.structure.dictionary.json .meta.scripts. meta.structure.dictionary.value.json meta.structure.dictionary.json .meta.package. meta.structure.dictionary.value.json string.quoted.double.json meta.embedded.shellscript.json meta.statement.shell meta.statement.command.shell meta.argument.shell string.unquoted.argument.shell
-#                          ^ source.json.embedded meta.structure.dictionary.json .meta.scripts. meta.structure.dictionary.value.json meta.structure.dictionary.json .meta.package. meta.structure.dictionary.value.json string.quoted.double.json punctuation.definition.string.end.json
-#                           ^ source.json.embedded meta.structure.dictionary.json .meta.scripts. meta.structure.dictionary.value.json meta.structure.dictionary.json .meta.package. meta.structure.dictionary.value.json punctuation.separator.dictionary.pair.json
+#                          ^ source.json.embedded meta.structure.dictionary.json .meta.scripts. meta.structure.dictionary.value.json meta.structure.dictionary.json .meta.package. meta.structure.dictionary.value.json string.quoted.double.json meta.embedded.shellscript.json meta.statement.shell meta.statement.command.shell meta.argument.shell
+#                           ^ source.json.embedded meta.structure.dictionary.json .meta.scripts. meta.structure.dictionary.value.json meta.structure.dictionary.json .meta.package. meta.structure.dictionary.value.json string.quoted.double.json meta.embedded.shellscript.json meta.statement.shell meta.statement.command.shell meta.argument.shell string.quoted.double.shell punctuation.definition.string.begin.shell
+#                            ^^ source.json.embedded meta.structure.dictionary.json .meta.scripts. meta.structure.dictionary.value.json meta.structure.dictionary.json .meta.package. meta.structure.dictionary.value.json string.quoted.double.json meta.embedded.shellscript.json meta.statement.shell meta.statement.command.shell meta.argument.shell string.quoted.double.shell punctuation.definition.string.begin.shell constant.character.escape.json
+#                              ^^^^^^^ source.json.embedded meta.structure.dictionary.json .meta.scripts. meta.structure.dictionary.value.json meta.structure.dictionary.json .meta.package. meta.structure.dictionary.value.json string.quoted.double.json meta.embedded.shellscript.json meta.statement.shell meta.statement.command.shell meta.argument.shell string.quoted.double.shell
+#                                     ^^^^ source.json.embedded meta.structure.dictionary.json .meta.scripts. meta.structure.dictionary.value.json meta.structure.dictionary.json .meta.package. meta.structure.dictionary.value.json string.quoted.double.json meta.embedded.shellscript.json meta.statement.shell meta.statement.command.shell meta.argument.shell string.quoted.double.shell constant.character.escape.shell
+#                                         ^ source.json.embedded meta.structure.dictionary.json .meta.scripts. meta.structure.dictionary.value.json meta.structure.dictionary.json .meta.package. meta.structure.dictionary.value.json string.quoted.double.json meta.embedded.shellscript.json meta.statement.shell meta.statement.command.shell meta.argument.shell string.quoted.double.shell
+#                                          ^^^^ source.json.embedded meta.structure.dictionary.json .meta.scripts. meta.structure.dictionary.value.json meta.structure.dictionary.json .meta.package. meta.structure.dictionary.value.json string.quoted.double.json meta.embedded.shellscript.json meta.statement.shell meta.statement.command.shell meta.argument.shell string.quoted.double.shell constant.character.escape.shell
+#                                              ^ source.json.embedded meta.structure.dictionary.json .meta.scripts. meta.structure.dictionary.value.json meta.structure.dictionary.json .meta.package. meta.structure.dictionary.value.json string.quoted.double.json meta.embedded.shellscript.json meta.statement.shell meta.statement.command.shell meta.argument.shell string.quoted.double.shell
+#                                               ^^^ source.json.embedded meta.structure.dictionary.json .meta.scripts. meta.structure.dictionary.value.json meta.structure.dictionary.json .meta.package. meta.structure.dictionary.value.json string.quoted.double.json meta.embedded.shellscript.json meta.statement.shell meta.statement.command.shell meta.argument.shell string.quoted.double.shell constant.character.escape.shell
+#                                                  ^ source.json.embedded meta.structure.dictionary.json .meta.scripts. meta.structure.dictionary.value.json meta.structure.dictionary.json .meta.package. meta.structure.dictionary.value.json string.quoted.double.json meta.embedded.shellscript.json meta.statement.shell meta.statement.command.shell meta.argument.shell string.quoted.double.shell
+#                                                   ^^^ source.json.embedded meta.structure.dictionary.json .meta.scripts. meta.structure.dictionary.value.json meta.structure.dictionary.json .meta.package. meta.structure.dictionary.value.json string.quoted.double.json meta.embedded.shellscript.json meta.statement.shell meta.statement.command.shell meta.argument.shell string.quoted.double.shell constant.character.escape.shell
+#                                                      ^ source.json.embedded meta.structure.dictionary.json .meta.scripts. meta.structure.dictionary.value.json meta.structure.dictionary.json .meta.package. meta.structure.dictionary.value.json string.quoted.double.json meta.embedded.shellscript.json meta.statement.shell meta.statement.command.shell meta.argument.shell string.quoted.double.shell
+#                                                       ^ source.json.embedded meta.structure.dictionary.json .meta.scripts. meta.structure.dictionary.value.json meta.structure.dictionary.json .meta.package. meta.structure.dictionary.value.json string.quoted.double.json meta.embedded.shellscript.json meta.statement.shell meta.statement.command.shell meta.argument.shell string.quoted.double.shell punctuation.definition.variable.shell variable.parameter.positional.all.shell
+#                                                        ^ source.json.embedded meta.structure.dictionary.json .meta.scripts. meta.structure.dictionary.value.json meta.structure.dictionary.json .meta.package. meta.structure.dictionary.value.json string.quoted.double.json meta.embedded.shellscript.json meta.statement.shell meta.statement.command.shell meta.argument.shell string.quoted.double.shell variable.parameter.positional.all.shell
+#                                                         ^^^^^^^ source.json.embedded meta.structure.dictionary.json .meta.scripts. meta.structure.dictionary.value.json meta.structure.dictionary.json .meta.package. meta.structure.dictionary.value.json string.quoted.double.json meta.embedded.shellscript.json meta.statement.shell meta.statement.command.shell meta.argument.shell string.quoted.double.shell
+#                                                                ^^ source.json.embedded meta.structure.dictionary.json .meta.scripts. meta.structure.dictionary.value.json meta.structure.dictionary.json .meta.package. meta.structure.dictionary.value.json string.quoted.double.json meta.embedded.shellscript.json meta.statement.shell meta.statement.command.shell meta.argument.shell string.quoted.double.shell punctuation.definition.string.end.shell constant.character.escape.json
+#                                                                  ^ source.json.embedded meta.structure.dictionary.json .meta.scripts. meta.structure.dictionary.value.json meta.structure.dictionary.json .meta.package. meta.structure.dictionary.value.json string.quoted.double.json punctuation.definition.string.end.json
+#                                                                   ^ source.json.embedded meta.structure.dictionary.json .meta.scripts. meta.structure.dictionary.value.json meta.structure.dictionary.json .meta.package. meta.structure.dictionary.value.json punctuation.separator.dictionary.pair.json
 >		"watch": "tsc -watch -p ./",
 #^^ source.json.embedded meta.structure.dictionary.json .meta.scripts. meta.structure.dictionary.value.json meta.structure.dictionary.json
 #  ^ source.json.embedded meta.structure.dictionary.json .meta.scripts. meta.structure.dictionary.value.json meta.structure.dictionary.json .meta.watch. string.json support.type.property-name.json punctuation.support.type.property-name.begin.json

syntaxes/tests/JSONC/negatives.json

@@ -68,6 +68,13 @@
 			]
 		}
 	},
+	{
+		"tasks": [
+			{
+				"command": "not-shell"
+			}
+		]
+	},
 	{
 		"problemMatcher": {
 			"pattern": {