be consistent with default behaviour when closing }

closes #4
predragnikolic · Oct 30, 2023 · 9e7f40a · 9e7f40a
1 parent d49244e
commit 9e7f40a
Showing 1 changed file with 23 additions and 2 deletions.
diff --git a/Default.sublime-keymap b/Default.sublime-keymap
@@ -10,6 +10,7 @@
             { "key": "setting.auto_match_enabled" },
             { "key": "selector", "operand": "source.js | source.jsx | source.ts | source.tsx | text.html.ngx | text.html.svelte | text.html.vue" },
             { "key": "selection_empty", "match_all": true },
+            { "key": "following_text", "operator": "regex_contains", "operand": "^\\{", "match_all": true }
     ]},
     {"keys": ["{"], "command": "chain",
         "args": {
@@ -22,8 +23,26 @@
             { "key": "setting.auto_match_enabled" },
             { "key": "selector", "operand": "source.js | source.jsx | source.ts | source.tsx | text.html.ngx | text.html.svelte | text.html.vue" },
             { "key": "selection_empty", "match_all": true },
-            { "key": "preceding_text", "operator": "not_regex_contains", "operand": "\\\\$", "match_all": true },
+            { "key": "preceding_text", "operator": "regex_contains", "operand": "\\$", "match_all": true },
     ]},
+    // move cursor after '}'
+    // if '}' is in front of cursor
+    {"keys": ["}"], "command": "chain",
+        "args": {
+            "commands": [
+                {"command": "move", "args": {"by": "characters", "forward": true}},
+                {"command": "convert_to_template_string"},
+            ]
+        },
+        "context": [
+            { "key": "setting.auto_match_enabled" },
+            { "key": "selector", "operand": "source.js | source.jsx | source.ts | source.tsx | text.html.ngx | text.html.svelte | text.html.vue" },
+            { "key": "selection_empty", "match_all": true },
+            { "key": "preceding_text", "operator": "regex_contains", "operand": "\\$\\{.?+", "match_all": true },
+            { "key": "following_text", "operator": "regex_contains", "operand": "^\\}", "match_all": true }
+    ]},
+    // insert '}'
+    // if '}' is not in front of cursor
     {"keys": ["}"], "command": "chain",
         "args": {
             "commands": [
@@ -35,5 +54,7 @@
             { "key": "setting.auto_match_enabled" },
             { "key": "selector", "operand": "source.js | source.jsx | source.ts | source.tsx | text.html.ngx | text.html.svelte | text.html.vue" },
             { "key": "selection_empty", "match_all": true },
+            { "key": "preceding_text", "operator": "regex_contains", "operand": "\\$\\{.?+", "match_all": true },
+            { "key": "following_text", "operator": "not_regex_contains", "operand": "^\\}", "match_all": true }
     ]},
-]
+]