Merge branch 'st4-develop'

deathaxe · deathaxe · commit f47b45a93f96 · 2025-09-08T20:03:15.000+02:00
diff --git a/macros/Commit Critic Addition.sublime-macro b/macros/Commit Critic Addition.sublime-macro
@@ -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}"}}
 ]
diff --git a/macros/Commit Critic Deletion.sublime-macro b/macros/Commit Critic Deletion.sublime-macro
@@ -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}"}}
 ]
diff --git a/macros/Commit Critic Substitution.sublime-macro b/macros/Commit Critic Substitution.sublime-macro
@@ -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}"}}
 ]
diff --git a/macros/Discard Critic Addition.sublime-macro b/macros/Discard Critic Addition.sublime-macro
@@ -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}"}}
 ]
diff --git a/macros/Discard Critic Comment.sublime-macro b/macros/Discard Critic Comment.sublime-macro
@@ -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}"}}
 ]
diff --git a/macros/Discard Critic Deletion.sublime-macro b/macros/Discard Critic Deletion.sublime-macro
@@ -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}"}}
 ]
diff --git a/macros/Discard Critic Highlight.sublime-macro b/macros/Discard Critic Highlight.sublime-macro
@@ -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}"}}
 ]
diff --git a/macros/Discard Critic Substitution.sublime-macro b/macros/Discard Critic Substitution.sublime-macro
@@ -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}"}}
 ]

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`[`
`2`	`2`	`{"command": "expand_selection", "args": {"to": "brackets"}},`
`3`	`3`	`{"command": "expand_selection", "args": {"to": "brackets"}},`
`4`		`- {"command": "insert_snippet", "args": {"contents": "${SELECTION/\\{\\+\\+\\s?(.?)\\s\\+\\+\\}$/\\1/g}"}}`
	`4`	`+ {"command": "insert_snippet", "args": {"contents": "${SELECTION/\\{\\+\\+(.*?)\\+\\+\\}/\\1/g}"}}`
`5`	`5`	`]`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,5 @@`
`1`	`1`	`[`
`2`	`2`	`{"command": "expand_selection", "args": {"to": "brackets"}},`
`3`	`3`	`{"command": "expand_selection", "args": {"to": "brackets"}},`
`4`		`- {"command": "move", "args": {"by": "words", "extend": true, "forward": true}},`
`5`		`- {"command": "insert_snippet", "args": {"contents": "${SELECTION/\\{--.--\\}[ \\t]//g}"}}`
	`4`	`+ {"command": "insert_snippet", "args": {"contents": "${SELECTION/\\{--.*?--\\}//g}"}}`
`6`	`5`	`]`