Skip to content

Commit 8d7d882

Browse files
RedCMDRedCMD
committed
Fix end/while escaped backreferences
1 parent 6070ed8 commit 8d7d882

File tree

3 files changed

+38
-37
lines changed

3 files changed

+38
-37
lines changed

‎syntaxes/json.tmLanguage.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
"patterns": [
3333
{
3434
"comment": "VSCode TextMate replaces all numbers following a backslash, not just regex backreferences",
35-
"match": "(\\\\{2})(\\\\{2})(0*[0-9]{1,2})([0-9]*)",
35+
"match": "(\\\\{2})?(\\\\{2})(0*[0-9]{1,2})([0-9]*)",
3636
"captures": {
3737
"1": { "name": "constant.character.escape.tm" },
3838
"2": { "name": "string.regexp.tm" },

‎syntaxes/tests/snaps/json.tmLanguage.json.snap‎

Lines changed: 31 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -399,7 +399,7 @@
399399
# ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ source.json.textmate quoted.double.json.tm comment.json.tm
400400
# ^ source.json.textmate quoted.double.json.tm comment.json.tm punctuation.definition.string.end.json.tm
401401
# ^ source.json.textmate punctuation.separator.dictionary.json.tm
402-
> "match": "(\\\\{2})(\\\\{2})(0*[0-9]{1,2})([0-9]*)",
402+
> "match": "(\\\\{2})?(\\\\{2})(0*[0-9]{1,2})([0-9]*)",
403403
#^^^^^ source.json.textmate
404404
# ^ source.json.textmate meta.match.regexp punctuation.definition.string.begin.json.tm
405405
# ^^^^^ source.json.textmate meta.match.regexp keyword.property-name.string.match.json.tm
@@ -414,37 +414,38 @@
414414
# ^ source.json.textmate meta.match.regexp meta.embedded.json.textmate.regexp constant.numeric.tm
415415
# ^ source.json.textmate meta.match.regexp meta.embedded.json.textmate.regexp keyword.tm
416416
# ^ source.json.textmate meta.match.regexp meta.embedded.json.textmate.regexp constant.character.set.regexp.tm strong
417-
# ^ source.json.textmate meta.match.regexp meta.embedded.json.textmate.regexp constant.character.set.regexp.tm strong
418-
# ^^^ source.json.textmate meta.match.regexp meta.embedded.json.textmate.regexp constant.character.escape.tm
419-
# ^ source.json.textmate meta.match.regexp meta.embedded.json.textmate.regexp entity.name.label.tm strong
420-
# ^ source.json.textmate meta.match.regexp meta.embedded.json.textmate.regexp keyword.tm
421-
# ^ source.json.textmate meta.match.regexp meta.embedded.json.textmate.regexp constant.numeric.tm
422-
# ^ source.json.textmate meta.match.regexp meta.embedded.json.textmate.regexp keyword.tm
423-
# ^ source.json.textmate meta.match.regexp meta.embedded.json.textmate.regexp constant.character.set.regexp.tm strong
417+
# ^ source.json.textmate meta.match.regexp meta.embedded.json.textmate.regexp keyword.tm
418+
# ^ source.json.textmate meta.match.regexp meta.embedded.json.textmate.regexp constant.character.set.regexp.tm strong
419+
# ^^^ source.json.textmate meta.match.regexp meta.embedded.json.textmate.regexp constant.character.escape.tm
420+
# ^ source.json.textmate meta.match.regexp meta.embedded.json.textmate.regexp entity.name.label.tm strong
421+
# ^ source.json.textmate meta.match.regexp meta.embedded.json.textmate.regexp keyword.tm
422+
# ^ source.json.textmate meta.match.regexp meta.embedded.json.textmate.regexp constant.numeric.tm
423+
# ^ source.json.textmate meta.match.regexp meta.embedded.json.textmate.regexp keyword.tm
424424
# ^ source.json.textmate meta.match.regexp meta.embedded.json.textmate.regexp constant.character.set.regexp.tm strong
425-
# ^ source.json.textmate meta.match.regexp meta.embedded.json.textmate.regexp entity.name.label.tm strong regex
426-
# ^ source.json.textmate meta.match.regexp meta.embedded.json.textmate.regexp keyword.tm
427-
# ^ source.json.textmate meta.match.regexp meta.embedded.json.textmate.regexp support.class.tm
428-
# ^ source.json.textmate meta.match.regexp meta.embedded.json.textmate.regexp character-class character-class-range.tm constant.numeric.tm
429-
# ^ source.json.textmate meta.match.regexp meta.embedded.json.textmate.regexp character-class character-class-range.tm constant.numeric.tm strong
430-
# ^ source.json.textmate meta.match.regexp meta.embedded.json.textmate.regexp character-class character-class-range.tm constant.numeric.tm
431-
# ^ source.json.textmate meta.match.regexp meta.embedded.json.textmate.regexp support.class.tm
432-
# ^ source.json.textmate meta.match.regexp meta.embedded.json.textmate.regexp keyword.tm
433-
# ^ source.json.textmate meta.match.regexp meta.embedded.json.textmate.regexp constant.numeric.tm
434-
# ^ source.json.textmate meta.match.regexp meta.embedded.json.textmate.regexp support.function.tm
435-
# ^ source.json.textmate meta.match.regexp meta.embedded.json.textmate.regexp constant.numeric.tm
436-
# ^ source.json.textmate meta.match.regexp meta.embedded.json.textmate.regexp keyword.tm
437-
# ^ source.json.textmate meta.match.regexp meta.embedded.json.textmate.regexp constant.character.set.regexp.tm strong
425+
# ^ source.json.textmate meta.match.regexp meta.embedded.json.textmate.regexp constant.character.set.regexp.tm strong
426+
# ^ source.json.textmate meta.match.regexp meta.embedded.json.textmate.regexp entity.name.label.tm strong regex
427+
# ^ source.json.textmate meta.match.regexp meta.embedded.json.textmate.regexp keyword.tm
428+
# ^ source.json.textmate meta.match.regexp meta.embedded.json.textmate.regexp support.class.tm
429+
# ^ source.json.textmate meta.match.regexp meta.embedded.json.textmate.regexp character-class character-class-range.tm constant.numeric.tm
430+
# ^ source.json.textmate meta.match.regexp meta.embedded.json.textmate.regexp character-class character-class-range.tm constant.numeric.tm strong
431+
# ^ source.json.textmate meta.match.regexp meta.embedded.json.textmate.regexp character-class character-class-range.tm constant.numeric.tm
432+
# ^ source.json.textmate meta.match.regexp meta.embedded.json.textmate.regexp support.class.tm
433+
# ^ source.json.textmate meta.match.regexp meta.embedded.json.textmate.regexp keyword.tm
434+
# ^ source.json.textmate meta.match.regexp meta.embedded.json.textmate.regexp constant.numeric.tm
435+
# ^ source.json.textmate meta.match.regexp meta.embedded.json.textmate.regexp support.function.tm
436+
# ^ source.json.textmate meta.match.regexp meta.embedded.json.textmate.regexp constant.numeric.tm
437+
# ^ source.json.textmate meta.match.regexp meta.embedded.json.textmate.regexp keyword.tm
438438
# ^ source.json.textmate meta.match.regexp meta.embedded.json.textmate.regexp constant.character.set.regexp.tm strong
439-
# ^ source.json.textmate meta.match.regexp meta.embedded.json.textmate.regexp support.class.tm
440-
# ^ source.json.textmate meta.match.regexp meta.embedded.json.textmate.regexp character-class character-class-range.tm constant.numeric.tm
441-
# ^ source.json.textmate meta.match.regexp meta.embedded.json.textmate.regexp character-class character-class-range.tm constant.numeric.tm strong
442-
# ^ source.json.textmate meta.match.regexp meta.embedded.json.textmate.regexp character-class character-class-range.tm constant.numeric.tm
443-
# ^ source.json.textmate meta.match.regexp meta.embedded.json.textmate.regexp support.class.tm
444-
# ^ source.json.textmate meta.match.regexp meta.embedded.json.textmate.regexp keyword.tm
445-
# ^ source.json.textmate meta.match.regexp meta.embedded.json.textmate.regexp constant.character.set.regexp.tm strong
446-
# ^ source.json.textmate meta.match.regexp punctuation.definition.string.end.json.tm
447-
# ^ source.json.textmate punctuation.separator.dictionary.json.tm
439+
# ^ source.json.textmate meta.match.regexp meta.embedded.json.textmate.regexp constant.character.set.regexp.tm strong
440+
# ^ source.json.textmate meta.match.regexp meta.embedded.json.textmate.regexp support.class.tm
441+
# ^ source.json.textmate meta.match.regexp meta.embedded.json.textmate.regexp character-class character-class-range.tm constant.numeric.tm
442+
# ^ source.json.textmate meta.match.regexp meta.embedded.json.textmate.regexp character-class character-class-range.tm constant.numeric.tm strong
443+
# ^ source.json.textmate meta.match.regexp meta.embedded.json.textmate.regexp character-class character-class-range.tm constant.numeric.tm
444+
# ^ source.json.textmate meta.match.regexp meta.embedded.json.textmate.regexp support.class.tm
445+
# ^ source.json.textmate meta.match.regexp meta.embedded.json.textmate.regexp keyword.tm
446+
# ^ source.json.textmate meta.match.regexp meta.embedded.json.textmate.regexp constant.character.set.regexp.tm strong
447+
# ^ source.json.textmate meta.match.regexp punctuation.definition.string.end.json.tm
448+
# ^ source.json.textmate punctuation.separator.dictionary.json.tm
448449
> "captures": {
449450
#^^^^^ source.json.textmate
450451
# ^ source.json.textmate punctuation.definition.string.begin.json.tm

‎syntaxes/tests/snaps/yaml-regex.tmLanguage.json.snap‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6186,9 +6186,9 @@
61866186
# ^ source.json.textmate meta.end.regexp meta.embedded.json.textmate.regexp constant.character.set.regexp.tm markup.italic
61876187
# ^^ source.json.textmate meta.end.regexp meta.embedded.json.textmate.regexp support.function.tm
61886188
# ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ source.json.textmate meta.end.regexp meta.embedded.json.textmate.regexp comment.tm
6189-
# ^ source.json.textmate meta.end.regexp meta.embedded.json.textmate.regexp comment.tm constant.character.escape.json.tm
6190-
# ^ source.json.textmate meta.end.regexp meta.embedded.json.textmate.regexp comment.tm
6191-
# ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ source.json.textmate meta.end.regexp meta.embedded.json.textmate.regexp comment.tm
6189+
# ^^ source.json.textmate meta.end.regexp meta.embedded.json.textmate.regexp comment.tm string.regexp.tm
6190+
# ^ source.json.textmate meta.end.regexp meta.embedded.json.textmate.regexp comment.tm constant.numeric.tm
6191+
# ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ source.json.textmate meta.end.regexp meta.embedded.json.textmate.regexp comment.tm
61926192
# ^ source.json.textmate meta.end.regexp meta.embedded.json.textmate.regexp constant.character.set.regexp.tm markup.italic
61936193
# ^ source.json.textmate meta.end.regexp meta.embedded.json.textmate.regexp keyword.control.tm
61946194
# ^ source.json.textmate meta.end.regexp meta.embedded.json.textmate.regexp constant.character.set.regexp.tm markup.italic
@@ -6648,9 +6648,9 @@
66486648
# ^ source.json.textmate meta.end.regexp meta.embedded.json.textmate.regexp constant.character.set.regexp.tm markup.italic
66496649
# ^^ source.json.textmate meta.end.regexp meta.embedded.json.textmate.regexp support.function.tm
66506650
# ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ source.json.textmate meta.end.regexp meta.embedded.json.textmate.regexp comment.tm
6651-
# ^ source.json.textmate meta.end.regexp meta.embedded.json.textmate.regexp comment.tm constant.character.escape.json.tm
6652-
# ^ source.json.textmate meta.end.regexp meta.embedded.json.textmate.regexp comment.tm
6653-
# ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ source.json.textmate meta.end.regexp meta.embedded.json.textmate.regexp comment.tm
6651+
# ^^ source.json.textmate meta.end.regexp meta.embedded.json.textmate.regexp comment.tm string.regexp.tm
6652+
# ^ source.json.textmate meta.end.regexp meta.embedded.json.textmate.regexp comment.tm constant.numeric.tm
6653+
# ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ source.json.textmate meta.end.regexp meta.embedded.json.textmate.regexp comment.tm
66546654
# ^ source.json.textmate meta.end.regexp meta.embedded.json.textmate.regexp constant.character.set.regexp.tm markup.italic
66556655
# ^ source.json.textmate meta.end.regexp meta.embedded.json.textmate.regexp keyword.control.tm
66566656
# ^ source.json.textmate meta.end.regexp meta.embedded.json.textmate.regexp constant.character.set.regexp.tm markup.italic

0 commit comments

Comments
 (0)