Enable autoimport on paste for non-empty files

Signed-off-by: Fred Bricon <[email protected]>

Author: fbricon

CHANGELOG.md

@@ -1,7 +1,7 @@
 # Change Log
 
 ## 0.51.0 (October 16th, 2019)
-* enhancement - automatically trigger auto-import on paste. Can be disabled with `java.actionsOnPaste.organizeImports`. See [#1075](https://github.com/redhat-developer/vscode-java/issues/1075).
+* enhancement - [experimental] automatically trigger auto-import on paste. Can be disabled with `java.actionsOnPaste.organizeImports`. See [#1075](https://github.com/redhat-developer/vscode-java/issues/1075).
 * enhancement - made code snippets context sensitive. See [JLS#977](https://github.com/eclipse/eclipse.jdt.ls/issues/977).
 * enhancement - improve snippet documentation rendering. See [JLS#1205](https://github.com/eclipse/eclipse.jdt.ls/issues/1205).
 * bug fix - fixed preview features enabled at an invalid source release level 12, preview can be enabled only at source level 13. See [#1086](https://github.com/redhat-developer/vscode-java/issues/1086).

README.md

@@ -118,7 +118,7 @@ The following settings are supported:
 * `java.selectionRange.enabled`: Enable/disable Smart Selection support for Java. Disabling this option will not affect the VS Code built-in word-based and bracket-based smart selection.
 
 New in 0.51.0:
-* `java.actionsOnPaste.organizeImports`: Triggers "Organize imports" when java code is pasted into an empty file.
+* `java.actionsOnPaste.organizeImports`: [experimental] Triggers "Organize imports" when code is pasted into a java file.
 
 Troubleshooting
 ===============

src/commands.ts

@@ -128,6 +128,10 @@ export namespace Commands {
      * Organize imports.
      */
     export const ORGANIZE_IMPORTS = "java.action.organizeImports";
+    /**
+     * Organize imports silently.
+     */
+    export const ORGANIZE_IMPORTS_SILENTLY = "java.edit.organizeImports";
     /**
      * Choose type to import.
      */

src/settings.ts

@@ -155,9 +155,7 @@ export function registerOverridePasteCommand(languageClient: LanguageClient, con
 
         const clipboardText: string = await env.clipboard.readText();
         const editor: TextEditor = window.activeTextEditor;
-
         const documentText: string = editor.document.getText();
-
         const isCursorOnly = editor.selection.isEmpty;
         let action: Thenable<boolean>;
         if (isCursorOnly) {
@@ -174,18 +172,21 @@ export function registerOverridePasteCommand(languageClient: LanguageClient, con
         }
 
         action.then((wasApplied) => {
-            const hasText: boolean = documentText !== null && /\S/.test(documentText);
             const fileURI = editor.document.uri.toString();
-            if (wasApplied && !hasText && fileURI.endsWith(".java")) { // only organizing imports if document is blank
-                // Organize imports only requires uri from CodeActionParams
-                const codeActionParams = { textDocument: { uri: fileURI } };
-                commands.executeCommand(Commands.ORGANIZE_IMPORTS, codeActionParams);
+            if (wasApplied && fileURI.endsWith(".java")) {
+                const hasText: boolean = documentText !== null && /\S/.test(documentText);
+                if (hasText) {
+                    // Organize imports silently to avoid surprising the user
+                    commands.executeCommand(Commands.ORGANIZE_IMPORTS_SILENTLY, fileURI);
+                } else {
+                    commands.executeCommand(Commands.ORGANIZE_IMPORTS, { textDocument: { uri: fileURI } });
+                }
             }
         });
-	}));
+    }));
 
-	pasteSubscriptionIndex = length - 1;
-	languageClient.info(`Registered 'java.${ORGANIZE_IMPORTS_ON_PASTE}' command.`);
+    pasteSubscriptionIndex = length - 1;
+    languageClient.info(`Registered 'java.${ORGANIZE_IMPORTS_ON_PASTE}' command.`);
 }
 
 export function unregisterOverridePasteCommand(languageClient: LanguageClient, context: ExtensionContext) {