Complete current statement with semicolon if JS and configured

Fixes kasecato#65 by inserting a semicolon at the end of the line if language is JavaScript (or TypeScript) and semicolons are configured as required using the existing `javascript.format.semicolons` configuration option in the JavaScript extension.
grgars · Apr 28, 2024 · 076cdd9 · 076cdd9
1 parent 7a9a83c
commit 076cdd9
Show file tree

Hide file tree

Showing 3 changed files with 51 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -12,7 +12,7 @@ ctrl+space | ctrl+space | Basic code completion (the name of any class, method o
 ctrl+shift+space | ctrl+shift+space | Smart code completion (filters the list of methods and variables by expected type) | N/A
 enter | enter | Choose Lookup Item | ✅
 tab | tab | Choose Lookup Item Replace | ✅
-ctrl+shift+enter | cmd+shift+enter | Complete statement | ✅
+ctrl+shift+enter | cmd+shift+enter | Complete Current Statement | ✅
 ctrl+p | cmd+p | Parameter info (within method call arguments) | ✅
 ctrl+q | ctrl+j | Quick documentation lookup | ✅
 N/A | f1 | Quick documentation lookup | ✅

diff --git a/package.json b/package.json
@@ -114,7 +114,31 @@
                 "mac": "cmd+shift+enter",
                 "command": "acceptSelectedSuggestion",
                 "when": "suggestWidgetVisible && textInputFocus",
-                "intellij": "Complete statement"
+                "intellij": "Complete Current Statement"
+            },
+            {
+                "key": "ctrl+shift+enter",
+                "mac": "cmd+shift+enter",
+                "command": "runCommands",
+                "args": {
+                    "commands": [
+                        "acceptSelectedSuggestion",
+                        {
+                            "command": "cursorMove",
+                            "args": {
+                                "to": "wrappedLineEnd"
+                            }
+                        },
+                        {
+                            "command": "editor.action.insertSnippet",
+                            "args": {
+                                "snippet": ";"
+                            }
+                        }
+                    ]
+                },
+                "when": "suggestWidgetVisible && textInputFocus && (resourceLangId == 'javascript' || resourceLangId == 'typescript') && config.javascript.format.semicolons == 'insert'",
+                "intellij": "Complete Current Statement"
             },
             {
                 "key": "ctrl+p",

diff --git a/src/package-with-comment.json b/src/package-with-comment.json
@@ -133,7 +133,31 @@
                 "mac": "cmd+shift+enter",
                 "command": "acceptSelectedSuggestion",
                 "when": "suggestWidgetVisible && textInputFocus",
-                "intellij": "Complete statement"
+                "intellij": "Complete Current Statement"
+            },
+            {
+                "key": "ctrl+shift+enter",
+                "mac": "cmd+shift+enter",
+                "command": "runCommands",
+                "args": {
+                    "commands": [
+                        "acceptSelectedSuggestion",
+                        {
+                            "command": "cursorMove",
+                            "args": {
+                                "to": "wrappedLineEnd"
+                            }
+                        },
+                        {
+                            "command": "editor.action.insertSnippet",
+                            "args": {
+                                "snippet": ";"
+                            }
+                        }
+                    ]
+                },
+                "when": "suggestWidgetVisible && textInputFocus && (resourceLangId == 'javascript' || resourceLangId == 'typescript') && config.javascript.format.semicolons == 'insert'",
+                "intellij": "Complete Current Statement"
             },
             {
                 "key": "ctrl+p",