Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[YAML-tmLanguage] Remove empty capture group from multi-line match rule #397

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

[YAML-tmLanguage] Remove empty capture group from multi-line match rule #397

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ec83d0e
Remove empty capture group from multi-line match rule
radium-v Jul 21, 2024
dd512c4
remove extra non-capturing groups
radium-v Jul 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 8 additions & 11 deletions Package/TextMate Syntax Definition (YAML)/TextMate Syntax Definition (YAML).YAML-tmLanguage
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,18 +294,15 @@ repository:
# multi-line (block style)
- name: meta.match.block.yaml-tmlanguage
contentName: meta.value.yaml-tmlanguage
# I don't have a single fucking clue why but apparently removing
# the empty capturing group BREAKS the regexp
begin: ^( *)(?:-?( +)())((["']?)(match|begin|end)(\3))(:) +([|>](\d*)[-+]?)(?=, |,$| +#| *$)
begin: ^( *)-?( +)((["']?)(match|begin|end)(\4))(:) +([|>](\d*)[-+]?)(?=, |,$| +#| *$)
beginCaptures:
'4': {name: string.other.quoted-or-unquoted.yaml-tmlanguage}
'5': {name: punctuation.definition.string.yaml-tmlanguage}
'6': {name: keyword.other.match.yaml-tmlanguage}
'7': {name: punctuation.definition.string.yaml-tmlanguage}
'8': {name: keyword.control.definition.yaml-tmlanguage}

'9': {name: keyword.control.block.yaml-tmlanguage}
'10': {name: constant.numeric.indentation-indicator.yaml-tmlanguage}
'3': {name: string.other.quoted-or-unquoted.yaml-tmlanguage}
'4': {name: punctuation.definition.string.yaml-tmlanguage}
'5': {name: keyword.other.match.yaml-tmlanguage}
'6': {name: punctuation.definition.string.yaml-tmlanguage}
'7': {name: keyword.control.definition.yaml-tmlanguage}
'8': {name: keyword.control.block.yaml-tmlanguage}
'9': {name: constant.numeric.indentation-indicator.yaml-tmlanguage}
# must be indented by at least as much as the key line + 1 (+ 1 for the potential '-')
end: ^(?! *$|\1\2 )
patterns:
Expand Down
18 changes: 9 additions & 9 deletions Package/TextMate Syntax Definition (YAML)/TextMate Syntax Definition (YAML).tmLanguage
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -661,43 +661,43 @@ comment
<array>
<dict>
<key>begin</key>
<string>^( *)(?:-?( +)())((["']?)(match|begin|end)(\3))(:) +([|&gt;](\d*)[-+]?)(?=, |,$| +#| *$)</string>
<string>^( *)-?( +)((["']?)(match|begin|end)(\4))(:) +([|&gt;](\d*)[-+]?)(?=, |,$| +#| *$)</string>
<key>beginCaptures</key>
<dict>
<key>10</key>
<key>3</key>
<dict>
<key>name</key>
<string>constant.numeric.indentation-indicator.yaml-tmlanguage</string>
<string>string.other.quoted-or-unquoted.yaml-tmlanguage</string>
</dict>
<key>4</key>
<dict>
<key>name</key>
<string>string.other.quoted-or-unquoted.yaml-tmlanguage</string>
<string>punctuation.definition.string.yaml-tmlanguage</string>
</dict>
<key>5</key>
<dict>
<key>name</key>
<string>punctuation.definition.string.yaml-tmlanguage</string>
<string>keyword.other.match.yaml-tmlanguage</string>
</dict>
<key>6</key>
<dict>
<key>name</key>
<string>keyword.other.match.yaml-tmlanguage</string>
<string>punctuation.definition.string.yaml-tmlanguage</string>
</dict>
<key>7</key>
<dict>
<key>name</key>
<string>punctuation.definition.string.yaml-tmlanguage</string>
<string>keyword.control.definition.yaml-tmlanguage</string>
</dict>
<key>8</key>
<dict>
<key>name</key>
<string>keyword.control.definition.yaml-tmlanguage</string>
<string>keyword.control.block.yaml-tmlanguage</string>
</dict>
<key>9</key>
<dict>
<key>name</key>
<string>keyword.control.block.yaml-tmlanguage</string>
<string>constant.numeric.indentation-indicator.yaml-tmlanguage</string>
</dict>
</dict>
<key>contentName</key>
Expand Down