Implement "Organize Imports"

Everlaw · Jul 11, 2018 · 55ab608 · 55ab608
1 parent 3423d04
commit 55ab608
Show file tree

Hide file tree

Showing 4 changed files with 74 additions and 5 deletions.
diff --git a/server/main.ts b/server/main.ts
@@ -607,6 +607,13 @@ class Program {
         return this.service.getEditsForRefactor(fileName, formatOptions, pos === end ? pos : { pos, end },
                 refactorName, actionName, void 0);
     }
+    organizeImports(fileName: string, formatOptions: ts.FormatCodeSettings) {
+        if (! this.fileInProject(fileName)) return null;
+        if (! this.service.organizeImports) {
+            return "organizeImports requires TypeScript 2.9\nCurrent version: " + ts.version;
+        }
+        return this.service.organizeImports({ type: "file", fileName }, formatOptions, void 0);
+    }
 }
 
 var programCache: {[path: string]: Program};

diff --git a/src/netbeanstypescript/Bundle.properties b/src/netbeanstypescript/Bundle.properties
@@ -1,2 +1,3 @@
 OpenIDE-Module-Display-Category=JavaScript
 OpenIDE-Module-Name=TypeScript Editor
+organize-imports=Organize Imports
diff --git a/src/netbeanstypescript/OrganizeImportsAction.java b/src/netbeanstypescript/OrganizeImportsAction.java
@@ -0,0 +1,60 @@
+package netbeanstypescript;
+
+import java.awt.event.ActionEvent;
+import java.util.Collections;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicBoolean;
+import javax.swing.text.JTextComponent;
+import org.json.simple.JSONObject;
+import org.netbeans.api.editor.EditorActionNames;
+import org.netbeans.api.editor.EditorActionRegistration;
+import org.netbeans.api.progress.ProgressUtils;
+import org.netbeans.editor.BaseAction;
+import org.netbeans.editor.BaseDocument;
+import org.netbeans.editor.Utilities;
+import org.netbeans.modules.parsing.api.ParserManager;
+import org.netbeans.modules.parsing.api.ResultIterator;
+import org.netbeans.modules.parsing.api.Source;
+import org.netbeans.modules.parsing.api.UserTask;
+import org.netbeans.modules.parsing.spi.ParseException;
+import org.openide.filesystems.FileObject;
+import org.openide.util.Exceptions;
+
+/**
+ *
+ * @author jeffrey
+ */
+@EditorActionRegistration(name=EditorActionNames.organizeImports, mimeType="text/typescript")
+public class OrganizeImportsAction extends BaseAction {
+
+    @Override
+    public void actionPerformed(ActionEvent e, JTextComponent target) {
+        final BaseDocument doc = Utilities.getDocument(target);
+        if (doc == null) return;
+        final AtomicBoolean cancel = new AtomicBoolean();
+        class OrganizeImportsTask extends UserTask implements Runnable {
+            @Override
+            public void run() {
+                try {
+                    ParserManager.parse(Collections.singleton(Source.create(doc)), this);
+                } catch (ParseException e) {
+                    Exceptions.printStackTrace(e);
+                }
+            }
+            @Override
+            public void run(ResultIterator ri) throws ParseException {
+                FileObject fileObj = ri.getParserResult().getSnapshot().getSource().getFileObject();
+                try {
+                    Object changes = TSService.callEx("organizeImports", fileObj,
+                           TSFormatter.getFormattingSettings(doc));
+                    if (changes == null || cancel.get()) return;
+                    TSHintsProvider.doFixes(doc, fileObj, (List<JSONObject>) changes);
+                } catch (TSService.TSException e) {
+                    e.notifyLater();
+                }
+            }
+        }
+        ProgressUtils.runOffEventDispatchThread(new OrganizeImportsTask(),
+                "Organize Imports", cancel, false);
+    }
+}
diff --git a/src/netbeanstypescript/TSHintsProvider.java b/src/netbeanstypescript/TSHintsProvider.java
@@ -43,6 +43,7 @@
 import java.util.List;
 import javax.swing.text.BadLocationException;
 import org.json.simple.JSONObject;
+import org.netbeans.editor.BaseDocument;
 import org.netbeans.modules.csl.api.*;
 import org.netbeans.modules.csl.api.Error;
 import org.openide.DialogDisplayer;
@@ -59,7 +60,7 @@ public class TSHintsProvider implements HintsProvider {
     @Override
     public void computeHints(HintsManager manager, RuleContext context, List<Hint> hints) {}
 
-    private void doFixes(final RuleContext context, FileObject fileObj, final List<JSONObject> changes) {
+    public static void doFixes(final BaseDocument doc, FileObject fileObj, final List<JSONObject> changes) {
         for (JSONObject change: changes) {
             Object fileName = change.get("fileName");
             if (! fileName.equals(fileObj.getPath())) {
@@ -69,12 +70,12 @@ private void doFixes(final RuleContext context, FileObject fileObj, final List<J
                 return;
             }
         }
-        context.doc.runAtomic(new Runnable() {
+        doc.runAtomic(new Runnable() {
             @Override
             public void run() {
                 try {
                     for (JSONObject change: changes) {
-                        TSFormatter.applyEdits(context.doc, change.get("textChanges"));
+                        TSFormatter.applyEdits(doc, change.get("textChanges"));
                     }
                 } catch (BadLocationException ex) {
                     Exceptions.printStackTrace(ex);
@@ -115,7 +116,7 @@ public String getDescription() {
                     }
                     @Override
                     public void implement() {
-                        doFixes(context, fileObj, (List<JSONObject>) fix.get("changes"));
+                        doFixes(context.doc, fileObj, (List<JSONObject>) fix.get("changes"));
                     }
                     @Override
                     public boolean isSafe() { return false; }
@@ -163,7 +164,7 @@ public void implement() {
                                     new NotifyDescriptor.Message(error, NotifyDescriptor.ERROR_MESSAGE));
                             return;
                         }
-                        doFixes(context, fileObj, (List<JSONObject>) edits.get("edits"));
+                        doFixes(context.doc, fileObj, (List<JSONObject>) edits.get("edits"));
                     }
                     @Override
                     public boolean isSafe() { return false; }