Skip to content

Fix critic markup commit/discard macros' space sensibility #798

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

Merged
deathaxe merged 2 commits into from
Sep 8, 2025
Merged

Fix critic markup commit/discard macros' space sensibility #798

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
154c85d
Macros: Fix critic markup commit/discard macros' space sensitivity
deathaxe Sep 8, 2025
505cc55
Merge branch 'st4107-develop' into st4-develop
deathaxe Sep 8, 2025
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
2 changes: 1 addition & 1 deletion macros/Commit Critic Addition.sublime-macro
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[
{"command": "expand_selection", "args": {"to": "brackets"}},
{"command": "expand_selection", "args": {"to": "brackets"}},
{"command": "insert_snippet", "args": {"contents": "${SELECTION/\\{\\+\\+\\s?(.*?)\\s*\\+\\+\\}$/\\1/g}"}}
{"command": "insert_snippet", "args": {"contents": "${SELECTION/\\{\\+\\+(.*?)\\+\\+\\}/\\1/g}"}}
]
3 changes: 1 addition & 2 deletions macros/Commit Critic Deletion.sublime-macro
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
[
{"command": "expand_selection", "args": {"to": "brackets"}},
{"command": "expand_selection", "args": {"to": "brackets"}},
{"command": "move", "args": {"by": "words", "extend": true, "forward": true}},
{"command": "insert_snippet", "args": {"contents": "${SELECTION/\\{--.*--\\}[ \\t]*//g}"}}
{"command": "insert_snippet", "args": {"contents": "${SELECTION/\\{--.*?--\\}//g}"}}
]
2 changes: 1 addition & 1 deletion macros/Commit Critic Substitution.sublime-macro
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[
{"command": "expand_selection", "args": {"to": "brackets"}},
{"command": "expand_selection", "args": {"to": "brackets"}},
{"command": "insert_snippet", "args": {"contents": "${SELECTION/\\{~~\\s?(.*?)\\s?~>\\s?(.*?)\\s?~~\\}$/\\2/g}"}}
{"command": "insert_snippet", "args": {"contents": "${SELECTION/\\{~~(.*?)~>(.*?)~~\\}/\\2/g}"}}
]
3 changes: 1 addition & 2 deletions macros/Discard Critic Addition.sublime-macro
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
[
{"command": "expand_selection", "args": {"to": "brackets"}},
{"command": "expand_selection", "args": {"to": "brackets"}},
{"command": "move", "args": {"by": "words", "extend": true, "forward": true}},
{"command": "insert_snippet", "args": {"contents": "${SELECTION/\\{\\+\\+.*\\+\\+\\}[ \\t]*//g}"}}
{"command": "insert_snippet", "args": {"contents": "${SELECTION/\\{\\+\\+.*?\\+\\+\\}//g}"}}
]
3 changes: 1 addition & 2 deletions macros/Discard Critic Comment.sublime-macro
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
[
{"command": "expand_selection", "args": {"to": "brackets"}},
{"command": "expand_selection", "args": {"to": "brackets"}},
{"command": "move", "args": {"by": "words", "extend": true, "forward": true}},
{"command": "insert_snippet", "args": {"contents": "${SELECTION/\\{>>.*<<\\}[ \\t]*//g}"}}
{"command": "insert_snippet", "args": {"contents": "${SELECTION/\\{>>.*?<<\\}//g}"}}
]
2 changes: 1 addition & 1 deletion macros/Discard Critic Deletion.sublime-macro
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[
{"command": "expand_selection", "args": {"to": "brackets"}},
{"command": "expand_selection", "args": {"to": "brackets"}},
{"command": "insert_snippet", "args": {"contents": "${SELECTION/\\{--\\s?(.*?)\\s*--\\}$/\\1/g}"}}
{"command": "insert_snippet", "args": {"contents": "${SELECTION/\\{--(.*?)--\\}/\\1/g}"}}
]
3 changes: 1 addition & 2 deletions macros/Discard Critic Highlight.sublime-macro
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
[
{"command": "expand_selection", "args": {"to": "brackets"}},
{"command": "expand_selection", "args": {"to": "brackets"}},
{"command": "move", "args": {"by": "words", "extend": true, "forward": true}},
{"command": "insert_snippet", "args": {"contents": "${SELECTION/\\{==\\s?(.*?)\\s*==\\}[ \\t]*(.*)$/\\1\\2/g}"}}
{"command": "insert_snippet", "args": {"contents": "${SELECTION/\\{==(.*?)==\\}/\\1/g}"}}
]
2 changes: 1 addition & 1 deletion macros/Discard Critic Substitution.sublime-macro
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[
{"command": "expand_selection", "args": {"to": "brackets"}},
{"command": "expand_selection", "args": {"to": "brackets"}},
{"command": "insert_snippet", "args": {"contents": "${SELECTION/\\{~~\\s?(.*?)\\s?~>\\s?(.*?)\\s?~~\\}$/\\1/g}"}}
{"command": "insert_snippet", "args": {"contents": "${SELECTION/\\{~~(.*?)~>(.*?)~~\\}/\\1/g}"}}
]