Skip to content

Commit 79acfaf

Browse files
authoredFeb 16, 2025
Syntax: Remove empty capture group from multi-line match rule (#397)
1 parent 2c5b1b0 commit 79acfaf

File tree

2 files changed

+17
-20
lines changed

2 files changed

+17
-20
lines changed
 

‎Package/TextMate Syntax Definition (YAML)/TextMate Syntax Definition (YAML).YAML-tmLanguage

+8-11
Original file line numberDiff line numberDiff line change
@@ -294,18 +294,15 @@ repository:
294294
# multi-line (block style)
295295
- name: meta.match.block.yaml-tmlanguage
296296
contentName: meta.value.yaml-tmlanguage
297-
# I don't have a single fucking clue why but apparently removing
298-
# the empty capturing group BREAKS the regexp
299-
begin: ^( *)(?:-?( +)())((["']?)(match|begin|end)(\3))(:) +([|>](\d*)[-+]?)(?=, |,$| +#| *$)
297+
begin: ^( *)-?( +)((["']?)(match|begin|end)(\4))(:) +([|>](\d*)[-+]?)(?=, |,$| +#| *$)
300298
beginCaptures:
301-
'4': {name: string.other.quoted-or-unquoted.yaml-tmlanguage}
302-
'5': {name: punctuation.definition.string.yaml-tmlanguage}
303-
'6': {name: keyword.other.match.yaml-tmlanguage}
304-
'7': {name: punctuation.definition.string.yaml-tmlanguage}
305-
'8': {name: keyword.control.definition.yaml-tmlanguage}
306-
307-
'9': {name: keyword.control.block.yaml-tmlanguage}
308-
'10': {name: constant.numeric.indentation-indicator.yaml-tmlanguage}
299+
'3': {name: string.other.quoted-or-unquoted.yaml-tmlanguage}
300+
'4': {name: punctuation.definition.string.yaml-tmlanguage}
301+
'5': {name: keyword.other.match.yaml-tmlanguage}
302+
'6': {name: punctuation.definition.string.yaml-tmlanguage}
303+
'7': {name: keyword.control.definition.yaml-tmlanguage}
304+
'8': {name: keyword.control.block.yaml-tmlanguage}
305+
'9': {name: constant.numeric.indentation-indicator.yaml-tmlanguage}
309306
# must be indented by at least as much as the key line + 1 (+ 1 for the potential '-')
310307
end: ^(?! *$|\1\2 )
311308
patterns:

‎Package/TextMate Syntax Definition (YAML)/TextMate Syntax Definition (YAML).tmLanguage

+9-9
Original file line numberDiff line numberDiff line change
@@ -661,43 +661,43 @@ comment
661661
<array>
662662
<dict>
663663
<key>begin</key>
664-
<string>^( *)(?:-?( +)())((["']?)(match|begin|end)(\3))(:) +([|&gt;](\d*)[-+]?)(?=, |,$| +#| *$)</string>
664+
<string>^( *)-?( +)((["']?)(match|begin|end)(\4))(:) +([|&gt;](\d*)[-+]?)(?=, |,$| +#| *$)</string>
665665
<key>beginCaptures</key>
666666
<dict>
667-
<key>10</key>
667+
<key>3</key>
668668
<dict>
669669
<key>name</key>
670-
<string>constant.numeric.indentation-indicator.yaml-tmlanguage</string>
670+
<string>string.other.quoted-or-unquoted.yaml-tmlanguage</string>
671671
</dict>
672672
<key>4</key>
673673
<dict>
674674
<key>name</key>
675-
<string>string.other.quoted-or-unquoted.yaml-tmlanguage</string>
675+
<string>punctuation.definition.string.yaml-tmlanguage</string>
676676
</dict>
677677
<key>5</key>
678678
<dict>
679679
<key>name</key>
680-
<string>punctuation.definition.string.yaml-tmlanguage</string>
680+
<string>keyword.other.match.yaml-tmlanguage</string>
681681
</dict>
682682
<key>6</key>
683683
<dict>
684684
<key>name</key>
685-
<string>keyword.other.match.yaml-tmlanguage</string>
685+
<string>punctuation.definition.string.yaml-tmlanguage</string>
686686
</dict>
687687
<key>7</key>
688688
<dict>
689689
<key>name</key>
690-
<string>punctuation.definition.string.yaml-tmlanguage</string>
690+
<string>keyword.control.definition.yaml-tmlanguage</string>
691691
</dict>
692692
<key>8</key>
693693
<dict>
694694
<key>name</key>
695-
<string>keyword.control.definition.yaml-tmlanguage</string>
695+
<string>keyword.control.block.yaml-tmlanguage</string>
696696
</dict>
697697
<key>9</key>
698698
<dict>
699699
<key>name</key>
700-
<string>keyword.control.block.yaml-tmlanguage</string>
700+
<string>constant.numeric.indentation-indicator.yaml-tmlanguage</string>
701701
</dict>
702702
</dict>
703703
<key>contentName</key>

0 commit comments

Comments
 (0)
Please sign in to comment.