Fix parsing of minified JSON

RedCMD · RedCMD · commit a5287263abff · 2024-12-01T14:36:00.000+13:00
diff --git a/syntaxes/JSON.tmLanguage.json b/syntaxes/JSON.tmLanguage.json
@@ -63,7 +63,7 @@
 			"patterns": [
 				{
 					"begin": "(?=\"((?>[^\\\\\"]++|\\\\.)*+)\")",
-					"end": "(?<=,)|(?=})",
+					"end": "(?!\\G)(?<=,)|(?=})",
 					"name": ".$1.",
 					"patterns": [ { "include": "#objectpair" } ]
 				},
@@ -80,8 +80,8 @@
 				{
 					"begin": ":",
 					"beginCaptures": { "0": { "name": "punctuation.separator.dictionary.key-value.json" } },
-					"end": "(,)|(?=})",
-					"endCaptures": { "1": { "name": "punctuation.separator.dictionary.pair.json" } },
+					"end": ",|(?=})",
+					"endCaptures": { "0": { "name": "punctuation.separator.dictionary.pair.json" } },
 					"name": "meta.structure.dictionary.value.json",
 					"patterns": [
 						{
diff --git a/syntaxes/JSONC.tmLanguage.json b/syntaxes/JSONC.tmLanguage.json
@@ -63,7 +63,7 @@
 			"patterns": [
 				{
 					"begin": "(?=\"((?>[^\\\\\"]++|\\\\.)*+)\")",
-					"end": "(?<=,)|(?=})",
+					"end": "(?!\\G)(?<=,)|(?=})",
 					"name": ".$1.",
 					"patterns": [ { "include": "#objectpair" } ]
 				},
@@ -80,8 +80,8 @@
 				{
 					"begin": ":",
 					"beginCaptures": { "0": { "name": "punctuation.separator.dictionary.key-value.json.comments" } },
-					"end": "(,)|(?=})",
-					"endCaptures": { "1": { "name": "punctuation.separator.dictionary.pair.json.comments" } },
+					"end": ",|(?=})",
+					"endCaptures": { "0": { "name": "punctuation.separator.dictionary.pair.json.comments" } },
 					"name": "meta.structure.dictionary.value.json.comments",
 					"patterns": [
 						{

Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@`
`63`	`63`	`"patterns": [`
`64`	`64`	`{`
`65`	`65`	`"begin": "(?=\"((?>[^\\\\\"]++\|\\\\.)*+)\")",`
`66`		`- "end": "(?<=,)\|(?=})",`
	`66`	`+ "end": "(?!\\G)(?<=,)\|(?=})",`
`67`	`67`	`"name": ".$1.",`
`68`	`68`	`"patterns": [ { "include": "#objectpair" } ]`
`69`	`69`	`},`
`@@ -80,8 +80,8 @@`
`80`	`80`	`{`
`81`	`81`	`"begin": ":",`
`82`	`82`	`"beginCaptures": { "0": { "name": "punctuation.separator.dictionary.key-value.json" } },`
`83`		`- "end": "(,)\|(?=})",`
`84`		`- "endCaptures": { "1": { "name": "punctuation.separator.dictionary.pair.json" } },`
	`83`	`+ "end": ",\|(?=})",`
	`84`	`+ "endCaptures": { "0": { "name": "punctuation.separator.dictionary.pair.json" } },`
`85`	`85`	`"name": "meta.structure.dictionary.value.json",`
`86`	`86`	`"patterns": [`
`87`	`87`	`{`