Add more features to IDEService API contract

Author: breandan

src/com/jetbrains/idear/asr/ASRControlLoop.java

@@ -22,19 +22,21 @@
 import java.awt.*;
 import java.awt.event.KeyEvent;
 import java.io.IOException;
-import java.util.function.Function;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
 /**
  * Created by breandan on 10/23/2015.
  */
 public class ASRControlLoop implements Runnable {
+    private final IDEService ideService;
     private CustomLiveSpeechRecognizer recognizer;
 
     public ASRControlLoop(CustomLiveSpeechRecognizer recognizer) {
         // Start-up recognition facilities
         this.recognizer = recognizer;
+
+        this.ideService = ServiceManager.getService(IDEService.class);
     }
 
     private static final Logger logger = Logger.getLogger(ASRControlLoop.class.getSimpleName());
@@ -81,7 +83,7 @@ public void run() {
                 if (result.equals(HI_IDEA)) {
                     // Greet invoker
                     say("Hi");
-                    invokeAction("Idear.Start");
+                    ideService.invokeAction("Idear.Start");
                 }
             } else if (ListeningState.isActive()) {
                 logger.log(Level.INFO, "Recognized: " + result);
@@ -112,19 +114,19 @@ private void applyAction(String c) {
             say("Hi, again!");
         } else if (c.startsWith(OPEN)) {
             if (c.endsWith(SETTINGS)) {
-                invokeAction(IdeActions.ACTION_SHOW_SETTINGS);
+                ideService.invokeAction(IdeActions.ACTION_SHOW_SETTINGS);
             } else if (c.endsWith(RECENT)) {
-                invokeAction(IdeActions.ACTION_RECENT_FILES);
+                ideService.invokeAction(IdeActions.ACTION_RECENT_FILES);
             } else if (c.endsWith(TERMINAL)) {
                 pressKeystroke(KeyEvent.VK_ALT, KeyEvent.VK_F12);
             }
         } else if (c.startsWith(NAVIGATE)) {
-            invokeAction("GotoDeclaration");
+            ideService.invokeAction("GotoDeclaration");
         } else if (c.startsWith(EXECUTE)) {
-            invokeAction("Run");
+            ideService.invokeAction("Run");
         } else if (c.equals(WHERE_AM_I)) {
             // TODO(kudinkin): extract to action
-            invokeAction("Idear.WhereAmI");
+            ideService.invokeAction("Idear.WhereAmI");
         } else if (c.startsWith("focus")) {
             if (c.endsWith("editor")) {
                 pressKeystroke(KeyEvent.VK_ESCAPE);
@@ -205,7 +207,7 @@ private void applyAction(String c) {
 
     private void pressKeystroke(final int... keys) {
         ServiceManager.getService(IDEService.class)
-                .pressKeystroke();
+                .pressKeystroke(keys);
     }
 
     private void run(SurroundWithNoNullCheckRecognizer rec, String c, DataContext dataContext) {
@@ -262,7 +264,7 @@ private void fireVoiceCommand() {
             // Notify of successful proceed
             beep();
 
-            invokeAction(
+            ideService.invokeAction(
                     "Idear.VoiceAction",
                     dataContext -> new AnActionEvent(
                             null,
@@ -311,30 +313,6 @@ private void pauseSpeech() {
         }
     }
 
-
-    private void invokeAction(final String action) {
-        invokeAction(
-                action,
-                dataContext ->
-                        new AnActionEvent(null,
-                                dataContext,
-                                ActionPlaces.UNKNOWN,
-                                new Presentation(),
-                                ActionManager.getInstance(),
-                                0
-                        )
-        );
-    }
-
-    private void invokeAction(String action, Function<DataContext, AnActionEvent> actionFactory) {
-        DataManager.getInstance().getDataContextFromFocus().doWhenDone(
-                (Consumer<DataContext>) dataContext -> EventQueue.invokeLater(() -> {
-                    AnAction anAction = ActionManager.getInstance().getAction(action);
-                    anAction.actionPerformed(actionFactory.apply(dataContext));
-                })
-        );
-    }
-
     // Helpers
 
     public synchronized void say(String something) {

src/com/jetbrains/idear/ide/IDEService.java

@@ -11,12 +11,22 @@
 import com.intellij.util.Consumer;
  */
 
+import com.intellij.openapi.actionSystem.AnActionEvent;
+import com.intellij.openapi.actionSystem.DataContext;
+
+import java.util.function.Function;
+
 /**
  * Created by breandan on 10/23/2015.
  */
 public interface IDEService {
     void init();
+
     void dispose();
+
     void pressKeystroke(final int... keys);
 
+    void invokeAction(final String action);
+
+    void invokeAction(String action, Function<DataContext, AnActionEvent> actionFactory);
 }

src/com/jetbrains/idear/ide/IDEServiceImpl.java

@@ -1,6 +1,11 @@
 package com.jetbrains.idear.ide;
 
+import com.intellij.ide.DataManager;
+import com.intellij.openapi.actionSystem.*;
+import com.intellij.util.Consumer;
+
 import java.awt.*;
+import java.util.function.Function;
 import java.util.logging.Logger;
 
 /**
@@ -12,20 +17,41 @@ public class IDEServiceImpl implements IDEService {
     private Robot robot;
 
     public void init() {
-
         try {
             robot = new Robot();
         } catch (AWTException e) {
             e.printStackTrace();
         }
-
     }
 
     @Override
     public void dispose() {
 
     }
 
+    public void invokeAction(final String action) {
+        invokeAction(
+                action,
+                dataContext ->
+                        new AnActionEvent(null,
+                                dataContext,
+                                ActionPlaces.UNKNOWN,
+                                new Presentation(),
+                                ActionManager.getInstance(),
+                                0
+                        )
+        );
+    }
+
+    public void invokeAction(String action, Function<DataContext, AnActionEvent> actionFactory) {
+        DataManager.getInstance().getDataContextFromFocus().doWhenDone(
+                (Consumer<DataContext>) dataContext -> EventQueue.invokeLater(() -> {
+                    AnAction anAction = ActionManager.getInstance().getAction(action);
+                    anAction.actionPerformed(actionFactory.apply(dataContext));
+                })
+        );
+    }
+
     public void pressKeystroke(final int... keys) {
         for (int key : keys) {
             robot.keyPress(key);

src/com/johnlindquist/acejump/AceFinder.kt

@@ -144,42 +144,6 @@ public class AceFinder(val project: Project, val document: DocumentImpl, val edi
         });
     }
 
-    fun findAllVisible(): List<Int> {
-        //System.out.println("----- findAllVisible");
-        val visualLineAtTopOfScreen = EditorHelper.getVisualLineAtTopOfScreen(editor)
-        val firstLine = EditorHelper.visualLineToLogicalLine(editor, visualLineAtTopOfScreen)
-        var offset = EditorHelper.getLineStartOffset(editor, firstLine)
-
-        val height = EditorHelper.getScreenHeight(editor)
-        val top = EditorHelper.getVisualLineAtTopOfScreen(editor)
-
-        var lastLine = top + height
-        lastLine = EditorHelper.visualLineToLogicalLine(editor, lastLine)
-
-        var endOffset = EditorHelper.normalizeOffset(editor, lastLine, EditorHelper.getLineEndOffset(editor, lastLine, true), true)
-        var text = document.getCharsSequence().toString().get(offset, endOffset)
-        var offsets = ArrayList<Int>()
-
-        var foundOffset = 0
-        while (0 < text.length) {
-            var result = findManager.findString(text, foundOffset, findModel, virtualFile);
-            if (!result.isStringFound()) {
-                //System.out.println(findModel.getStringToFind() + ": not found");
-                break;
-            }
-            var resultOffset: Int
-            if (getEndOffset) {
-                resultOffset = result.getEndOffset() - 1;
-            } else {
-                resultOffset = result.getStartOffset();
-            }
-            offsets.add(resultOffset + offset + customOffset);
-            foundOffset = result.getEndOffset();
-        }
-
-        return offsets;
-    }
-
     public fun expandResults() {
         startResult += allowedCount
         endResult += allowedCount