Merge pull request #274 from kasecato/#248/formatSelection

Fixed #248 that is Reformat selected code is not work
kasecato · Sep 19, 2022 · d6e85ef · d6e85ef
2 parents 3214b01 + b289463
commit d6e85ef
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/package.json b/package.json
@@ -210,14 +210,14 @@
                 "key": "ctrl+alt+l",
                 "mac": "cmd+alt+l",
                 "command": "editor.action.formatDocument",
-                "when": "editorHasDocumentFormattingProvider && editorTextFocus && !editorReadonly",
+                "when": "editorHasDocumentFormattingProvider && editorTextFocus && !editorReadonly && !inCompositeEditor",
                 "intellij": "Reformat code"
             },
             {
                 "key": "ctrl+alt+l",
                 "mac": "cmd+alt+l",
                 "command": "editor.action.formatSelection",
-                "when": "editorHasDocumentFormattingProvider && editorHasSelection && editorTextFocus && !editorReadonly",
+                "when": "editorHasDocumentSelectionFormattingProvider && editorTextFocus && !editorReadonly",
                 "intellij": "Reformat selected code"
             },
             {

diff --git a/src/package-with-comment.json b/src/package-with-comment.json
@@ -265,14 +265,14 @@
                 "key": "ctrl+alt+l",
                 "mac": "cmd+alt+l",
                 "command": "editor.action.formatDocument",
-                "when": "editorHasDocumentFormattingProvider && editorTextFocus && !editorReadonly",
+                "when": "editorHasDocumentFormattingProvider && editorTextFocus && !editorReadonly && !inCompositeEditor",
                 "intellij": "Reformat code"
             },
             {
                 "key": "ctrl+alt+l",
                 "mac": "cmd+alt+l",
                 "command": "editor.action.formatSelection",
-                "when": "editorHasDocumentFormattingProvider && editorHasSelection && editorTextFocus && !editorReadonly",
+                "when": "editorHasDocumentSelectionFormattingProvider && editorTextFocus && !editorReadonly",
                 "intellij": "Reformat selected code"
             },
             {