Improve regex compatibility

RedCMD · RedCMD · commit dda24c02acc4 · 2025-07-12T14:53:00.000+12:00
diff --git a/syntaxes/package-scopes.tmLanguage.json b/syntaxes/package-scopes.tmLanguage.json
@@ -12,41 +12,38 @@
 	],
 	"repository": {
 		"embeddedLanguages": {
-			"match": "(?<=\")\\G(?>[^\\\\\"\\x-\\x1F]++|\\\\.)++",
-			"captures": {
-				"0": {
-					"name": "meta.embedded.json.textmate.source",
+			"begin": "(?<=\")\\G(?=(?>[^\\x00-\\x1F\"\\\\]++|\\\\.)++\")",
+			"end": "(?=\"|$)",
+			"name": "meta.embedded.json.textmate.source",
+			"patterns": [
+				{
+					"begin": "(?>text|source|markdown)(?=\\.[\\w.:])",
+					"end": "(?![\\w.:-])",
+					"beginCaptures": { "0": { "name": "support.function.tm" } },
+					"name": "string",
 					"patterns": [
 						{
-							"begin": "(?>text|source|markdown)(?=\\.[\\w.:])",
-							"end": "(?![\\w.:-])",
-							"beginCaptures": { "0": { "name": "support.function.tm" } },
-							"name": "string",
-							"patterns": [
-								{
-									"match": "\\.",
-									"name": "support.function.tm"
-								}
-							]
-						},
-						{
-							"match": "[\\w.:][\\w.:-]*",
-							"name": "string $0"
-						},
-						{
-							"comment": "balancedBracketScopes ONLY",
-							"match": "(?<=\")\\*(?!.)",
-							"name": "keyword.control.any"
-						},
-						{
-							"comment": "tokenTypes Type ONLY",
-							"match": "(?<=\")other(?!.)",
-							"name": "meta.embedded.other"
-						},
-						{ "include": "source.json#stringcontent" }
+							"match": "\\.",
+							"name": "support.function.tm"
+						}
 					]
-				}
-			}
+				},
+				{
+					"match": "[\\w.:][\\w.:-]*",
+					"name": "string $0"
+				},
+				{
+					"comment": "balancedBracketScopes ONLY",
+					"match": "(?<=\")\\*(?=\")",
+					"name": "keyword.control.any"
+				},
+				{
+					"comment": "tokenTypes Type ONLY",
+					"match": "(?<=\")other(?=\")",
+					"name": "meta.embedded.other"
+				},
+				{ "include": "source.json#stringcontent" }
+			]
 		}
 	}
-}
+}
diff --git a/syntaxes/package-scripts.tmLanguage.json b/syntaxes/package-scripts.tmLanguage.json
@@ -12,15 +12,15 @@
 	],
 	"repository": {
 		"scripts": {
-			"match": "\\G(?>[^\\\\\"\\x-\\x1F]++|\\\\.)++",
+			"match": "(?<=\")\\G(?>[^\\x00-\\x1F\"\\\\]++|\\\\.)++(?=\")",
 			"captures": {
 				"0": {
 					"name": "meta.embedded.shellscript.json",
 					"patterns": [
 						{
 							"comment": "Setup a `\\G` anchor for ShellScript to use",
 							"begin": "|",
-							"end": "(*FAIL)",
+							"end": "(?!)",
 							"patterns": [
 								{ "include": "source.shell" },
 								{
@@ -37,4 +37,4 @@
 			}
 		}
 	}
-}
+}
diff --git a/syntaxes/schema-defaultSnippets.tmLanguage.json b/syntaxes/schema-defaultSnippets.tmLanguage.json
@@ -17,45 +17,47 @@
 	],
 	"repository": {
 		"body-key": {
-			"match": "(?<={\\s*+\")\\G(?>[^\\\\\"\\x-\\x1F]++|\\\\.)++|(?<=\")\\G(?>[^\\\\\"\\x-\\x1F]++|\\\\.)++(?=\"\\s*+:)",
+			"match": "(?<={\\s*+\")\\G(?>[^\\x00-\\x1F\"\\\\]++|\\\\.)++(?=\")|(?<=\")\\G(?>[^\\x00-\\x1F\"\\\\]++|\\\\.)++(?=\"\\s*+:)",
 			"captures": {
 				"0": {
-					"name": "meta.embedded.json.comments.snippets.snippets string.json support.type.property-name.json",
+					"name": "support.type.property-name.string.json",
 					"patterns": [
 						{ "include": "source.json.comments.snippets#any" },
 						{ "include": "source.json.comments.snippets#body_stringcontent" },
 						{ "include": "source.json#stringcontent" }
 					]
 				}
-			}
+			},
+			"name": "meta.embedded.json.comments.snippets.snippets"
 		},
 		"bodyText-string": {
-			"match": "(?<=\"bodyText\"\\s*+:\\s*+\")\\G(?>[^\\\\\"\\x-\\x1F]++|\\\\.)++",
+			"match": "(?<=\"bodyText\"\\s*+:\\s*+\")\\G(?>[^\\x00-\\x1F\"\\\\]++|\\\\.)++(?=\")",
 			"captures": {
 				"0": {
-					"name": "meta.embedded.json.comments.snippets.snippets string.quoted.double.json",
+					"name": "string.quoted.double.json",
 					"patterns": [
 						{ "include": "source.json.comments.snippets#any" },
 						{ "include": "source.json.comments.snippets#body_stringcontent" },
 						{ "include": "source.json#stringcontent" }
 					]
 				}
-			}
+			},
+			"name": "meta.embedded.json.comments.snippets.snippets"
 		},
 		"body-string": {
-			"match": "(?<=\")\\G(?>(\\^)?+((?>[^\\\\\"\\x-\\x1F]++|\\\\.)++)|(\\^))",
+			"match": "(?<=\")\\G(?!\")(?>(\\^)?+((?>[^\\x00-\\x1F\"\\\\]++|\\\\.)*+))(?=\")",
 			"captures": {
 				"1": { "name": "keyword.control.unstringify.json.schema" },
 				"2": {
-					"name": "meta.embedded.json.comments.snippets.snippets string.quoted.double.json",
+					"name": "string.quoted.double.json",
 					"patterns": [
 						{ "include": "source.json.comments.snippets#any" },
 						{ "include": "source.json.comments.snippets#body_stringcontent" },
 						{ "include": "source.json#stringcontent" }
 					]
-				},
-				"3": { "name": "keyword.control.unstringify.json.schema" }
-			}
+				}
+			},
+			"name": "meta.embedded.json.comments.snippets.snippets"
 		}
 	}
 }
diff --git a/syntaxes/schema-markdown.tmLanguage.json b/syntaxes/schema-markdown.tmLanguage.json
@@ -17,15 +17,15 @@
 	],
 	"repository": {
 		"markdown": {
-			"match": "(?<=\"|\\\\[nr])(?>[^\\\\\"\\x-\\x1F]++|\\\\[^nr])++(?=\"|\\\\[nr])",
+			"match": "(?<=\"|\\\\[nr])(?>[^\\x00-\\x1F\"\\\\]++|\\\\[^nr])++(?=\"|\\\\[nr])",
 			"captures": {
 				"0": {
 					"name": "meta.embedded.text.html.markdown",
 					"patterns": [
 						{
 							"comment": "Setup \\G anchor for Markdown",
 							"begin": "|",
-							"end": "(*FAIL)",
+							"end": "(?!)",
 							"patterns": [ { "include": "text.html.markdown" } ]
 						}
 					]
diff --git a/syntaxes/test-query-sql.tmLanguage.json b/syntaxes/test-query-sql.tmLanguage.json
@@ -13,7 +13,7 @@
 	],
 	"repository": {
 		"query": {
-			"match": "\\G(?>[^\\\\\"\\x-\\x1F]++|\\\\.)++",
+			"match": "\\G(?>[^\\x00-\\x1F\"\\\\]++|\\\\.)++",
 			"captures": {
 				"0": {
 					"name": "meta.embedded.sql.json",
@@ -25,4 +25,4 @@
 			}
 		}
 	}
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -12,15 +12,15 @@`
`12`	`12`	`],`
`13`	`13`	`"repository": {`
`14`	`14`	`"scripts": {`
`15`		`- "match": "\\G(?>[^\\\\\"\\x-\\x1F]++\|\\\\.)++",`
	`15`	`+ "match": "(?<=\")\\G(?>[^\\x00-\\x1F\"\\\\]++\|\\\\.)++(?=\")",`
`16`	`16`	`"captures": {`
`17`	`17`	`"0": {`
`18`	`18`	`"name": "meta.embedded.shellscript.json",`
`19`	`19`	`"patterns": [`
`20`	`20`	`{`
`21`	`21`	"comment": "Setup a `\\G` anchor for ShellScript to use",
`22`	`22`	`"begin": "\|",`
`23`		`- "end": "(*FAIL)",`
	`23`	`+ "end": "(?!)",`
`24`	`24`	`"patterns": [`
`25`	`25`	`{ "include": "source.shell" },`
`26`	`26`	`{`
`@@ -37,4 +37,4 @@`
`37`	`37`	`}`
`38`	`38`	`}`
`39`	`39`	`}`
`40`		`-}`
	`40`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -17,15 +17,15 @@`
`17`	`17`	`],`
`18`	`18`	`"repository": {`
`19`	`19`	`"markdown": {`
`20`		`- "match": "(?<=\"\|\\\\[nr])(?>[^\\\\\"\\x-\\x1F]++\|\\\\[^nr])++(?=\"\|\\\\[nr])",`
	`20`	`+ "match": "(?<=\"\|\\\\[nr])(?>[^\\x00-\\x1F\"\\\\]++\|\\\\[^nr])++(?=\"\|\\\\[nr])",`
`21`	`21`	`"captures": {`
`22`	`22`	`"0": {`
`23`	`23`	`"name": "meta.embedded.text.html.markdown",`
`24`	`24`	`"patterns": [`
`25`	`25`	`{`
`26`	`26`	`"comment": "Setup \\G anchor for Markdown",`
`27`	`27`	`"begin": "\|",`
`28`		`- "end": "(*FAIL)",`
	`28`	`+ "end": "(?!)",`
`29`	`29`	`"patterns": [ { "include": "text.html.markdown" } ]`
`30`	`30`	`}`
`31`	`31`	`]`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@`
`13`	`13`	`],`
`14`	`14`	`"repository": {`
`15`	`15`	`"query": {`
`16`		`- "match": "\\G(?>[^\\\\\"\\x-\\x1F]++\|\\\\.)++",`
	`16`	`+ "match": "\\G(?>[^\\x00-\\x1F\"\\\\]++\|\\\\.)++",`
`17`	`17`	`"captures": {`
`18`	`18`	`"0": {`
`19`	`19`	`"name": "meta.embedded.sql.json",`
`@@ -25,4 +25,4 @@`
`25`	`25`	`}`
`26`	`26`	`}`
`27`	`27`	`}`
`28`		`-}`
	`28`	`+}`