add focus symbols and jump commands

breandan · breandan · commit 733025db4930 · 2015-10-25T11:26:08.000-04:00
diff --git a/src/com/jetbrains/idear/WordToNumberConverter.java b/src/com/jetbrains/idear/WordToNumberConverter.java
@@ -0,0 +1,111 @@
+package com.jetbrains.idear;
+
+/**
+ * Created by breandan on 10/25/2015.
+ */
+public class WordToNumberConverter {
+    public static int getNumber(String input) {
+        int accumulator = 0;
+        int total = 0;
+        String[] words = input.trim().split("\\s+");
+
+        for (String word : words) {
+            switch (word) {
+                case "zero":
+                    accumulator += 0;
+                    break;
+                case "one":
+                    accumulator += 1;
+                    break;
+                case "two":
+                    accumulator += 2;
+                    break;
+                case "three":
+                    accumulator += 3;
+                    break;
+                case "four":
+                    accumulator += 4;
+                    break;
+                case "five":
+                    accumulator += 5;
+                    break;
+                case "six":
+                    accumulator += 6;
+                    break;
+                case "seven":
+                    accumulator += 7;
+                    break;
+                case "eight":
+                    accumulator += 8;
+                    break;
+                case "nine":
+                    accumulator += 9;
+                    break;
+                case "ten":
+                    accumulator += 10;
+                    break;
+                case "eleven":
+                    accumulator += 11;
+                    break;
+                case "twelve":
+                    accumulator += 12;
+                    break;
+                case "thirteen":
+                    accumulator += 13;
+                    break;
+                case "fourteen":
+                    accumulator += 14;
+                    break;
+                case "fifteen":
+                    accumulator += 15;
+                    break;
+                case "sixteen":
+                    accumulator += 16;
+                    break;
+                case "seventeen":
+                    accumulator += 17;
+                    break;
+                case "eighteen":
+                    accumulator += 18;
+                    break;
+                case "nineteen":
+                    accumulator += 19;
+                    break;
+                case "twenty":
+                    accumulator += 20;
+                    break;
+                case "thirty":
+                    accumulator += 30;
+                    break;
+                case "forty":
+                    accumulator += 40;
+                    break;
+                case "fifty":
+                    accumulator += 50;
+                    break;
+                case "sixty":
+                    accumulator += 60;
+                    break;
+                case "seventy":
+                    accumulator += 70;
+                    break;
+                case "eighty":
+                    accumulator += 80;
+                    break;
+                case "ninety":
+                    accumulator += 90;
+                    break;
+                case "hundred":
+                    accumulator *= 100;
+                    break;
+                case "thousand":
+                    accumulator *= 1000;
+                    total += accumulator;
+                    accumulator = 0;
+                    break;
+            }
+        }
+
+        return total + accumulator;
+    }
+}
diff --git a/src/com/jetbrains/idear/asr/ASRControlLoop.java b/src/com/jetbrains/idear/asr/ASRControlLoop.java
@@ -8,6 +8,7 @@
 import com.intellij.openapi.util.Pair;
 import com.intellij.util.Consumer;
 import com.jetbrains.idear.GoogleHelper;
+import com.jetbrains.idear.WordToNumberConverter;
 import com.jetbrains.idear.actions.ExecuteVoiceCommandAction;
 import com.jetbrains.idear.actions.recognition.SurroundWithNoNullCheckRecognizer;
 import com.jetbrains.idear.ide.IDEService;
@@ -49,7 +50,7 @@ public ASRControlLoop(CustomLiveSpeechRecognizer recognizer) {
     public static final String EDITOR = "editor";
     public static final String PROJECT = "project";
     public static final String SELECTION = "selection";
-    public static final String EXPAND = "expand";
+    public static final String EXPAND = "grow";
     public static final String SHRINK = "shrink";
     public static final String PRESS = "press";
     public static final String DELETE = "delete";
@@ -128,25 +129,28 @@ private void applyAction(String c) {
             // TODO(kudinkin): extract to action
             ideService.invokeAction("Idear.WhereAmI");
         } else if (c.startsWith("focus")) {
-            if (c.endsWith("editor")) {
+            if (c.endsWith(EDITOR)) {
                 pressKeystroke(KeyEvent.VK_ESCAPE);
-            } else if (c.endsWith("project")) {
+            } else if (c.endsWith(PROJECT)) {
                 pressKeystroke(KeyEvent.VK_ALT, KeyEvent.VK_1);
+            } else if(c.endsWith("symbols")) {
+                ideService.invokeAction("AceJumpAction");
+                ideService.type(("" + recognizeNumber()).toCharArray());
             }
-        } else if (c.startsWith("grow")) {
+        } else if (c.startsWith(EXPAND)) {
             pressKeystroke(KeyEvent.VK_CONTROL, KeyEvent.VK_W);
-        } else if (c.startsWith("shrink")) {
+        } else if (c.startsWith(SHRINK)) {
             pressKeystroke(KeyEvent.VK_CONTROL, KeyEvent.VK_SHIFT, KeyEvent.VK_W);
         } else if (c.startsWith("press")) {
             if (c.contains("delete")) {
                 pressKeystroke(KeyEvent.VK_DELETE);
             } else if (c.contains("return")) {
                 pressKeystroke(KeyEvent.VK_ENTER);
-            } else if (c.contains("escape")) {
+            } else if (c.contains(ESCAPE)) {
                 pressKeystroke(KeyEvent.VK_ESCAPE);
-            } else if (c.contains("tab")) {
+            } else if (c.contains(TAB)) {
                 pressKeystroke(KeyEvent.VK_TAB);
-            } else if (c.contains("undo")) {
+            } else if (c.contains(UNDO)) {
                 pressKeystroke(KeyEvent.VK_CONTROL, KeyEvent.VK_Z);
             }
         } else if (c.startsWith("following")) {
@@ -207,7 +211,7 @@ private void applyAction(String c) {
 
     private void pressKeystroke(final int... keys) {
         ServiceManager.getService(IDEService.class)
-                .pressKeystroke(keys);
+                .type(keys);
     }
 
     private void run(SurroundWithNoNullCheckRecognizer rec, String c, DataContext dataContext) {
@@ -313,6 +317,15 @@ private void pauseSpeech() {
         }
     }
 
+    private int recognizeNumber() {
+        String result;
+        while(true) {
+            result = getResultFromRecognizer();
+            if(result.startsWith("jump "))
+                return WordToNumberConverter.getNumber(result.substring(5));
+        }
+    }
+
     // Helpers
 
     public synchronized void say(String something) {
diff --git a/src/com/jetbrains/idear/ide/IDEService.java b/src/com/jetbrains/idear/ide/IDEService.java
@@ -24,7 +24,9 @@ public interface IDEService {
 
     void dispose();
 
-    void pressKeystroke(final int... keys);
+    void type(final int... keys);
+    void type(final char... keys);
+
 
     void invokeAction(final String action);
 
diff --git a/src/com/jetbrains/idear/ide/IDEServiceImpl.java b/src/com/jetbrains/idear/ide/IDEServiceImpl.java
@@ -16,14 +16,19 @@ public class IDEServiceImpl implements IDEService {
 
     private Robot robot;
 
-    public void init() {
+    public IDEServiceImpl() {
         try {
             robot = new Robot();
         } catch (AWTException e) {
             e.printStackTrace();
         }
     }
 
+    @Override
+    public void init() {
+
+    }
+
     @Override
     public void dispose() {
 
@@ -52,7 +57,17 @@ public void invokeAction(String action, Function<DataContext, AnActionEvent> act
         );
     }
 
-    public void pressKeystroke(final int... keys) {
+    public void type(final int... keys) {
+        for (int key : keys) {
+            robot.keyPress(key);
+        }
+
+        for (int key : keys) {
+            robot.keyRelease(key);
+        }
+    }
+
+    public void type(final char... keys) {
         for (int key : keys) {
             robot.keyPress(key);
         }
diff --git a/src/com/johnlindquist/acejump/AceFinder.kt b/src/com/johnlindquist/acejump/AceFinder.kt
@@ -18,7 +18,7 @@ import javax.swing.event.ChangeListener
 
 public class AceFinder(val project: Project, val document: DocumentImpl, val editor: EditorImpl, val virtualFile: VirtualFile) {
     companion object AceFinder {
-        val ALLOWED_CHARACTERS = "abcdefghijklmnopqrstuvwxyz";
+        val ALLOWED_CHARACTERS = "1234567890";
         val END_OF_LINE = "\\n";
         val BEGINNING_OF_LINE = "^.|\\n(?<!.\\n)";
         val CODE_INDENTS = "^\\s*\\S";
diff --git a/src/com/johnlindquist/acejump/AceJumpAction.kt b/src/com/johnlindquist/acejump/AceJumpAction.kt
@@ -49,6 +49,8 @@ public open class AceJumpAction() : DumbAwareAction() {
         val aceJumper = AceJumper(editor, document)
         val aceCanvas = AceCanvas()
         val searchBox = SearchBox()
+        aceFinder.findAllVisibleSymbols();
+        searchBox.disableSearch();
         val textAndOffsetHash = HashMap<String, Int>()
 
         fun showJumpers(textPointPairs: List<Pair<String, Point>>?) {
diff --git a/src/com/johnlindquist/acejump/ui/SearchBox.kt b/src/com/johnlindquist/acejump/ui/SearchBox.kt
@@ -28,7 +28,6 @@ public class SearchBox: JTextField() {
     override fun paintBorder(p0: Graphics?) {
     }
 
-
     //todo: I need to really rethink this entire approach
     override fun processKeyEvent(p0: KeyEvent) {
         if (getText()?.length() == 0) {
diff --git a/src/resources/com.jetbrains.idear/grammars/command.gram b/src/resources/com.jetbrains.idear/grammars/command.gram
@@ -40,7 +40,7 @@ grammar dialog;
 
 <selection_command> = grow | shrink;
 
-<focus_command> = focus (editor | project);
+<focus_command> = focus (editor | project | symbols);
 
 <run_command> = execute;
 
@@ -54,23 +54,29 @@ grammar dialog;
 
 <next_command> = [following | previous] [line | method | error];
 
-<google_command> = (okay | ok) google;
-
 <check_not_null> = check not null;
 
 <joke_command> = tell me a joke | who is there | wait who | who are you;
 
 <navigate_command> = navigate;
 
+<jump_command> = jump <number>;
+
+<number> = <hundreds> | <tens> | <teens> | <ones>;
+<hundreds> = <ones> hundred [<tens> | <teens> | <ones>];
+<tens> = (twenty | thirty | forty | fifty | sixty | seventy | eighty | ninety) [<ones>];
+<teens> = ten | eleven | twelve | thirteen | fourteen | fifteen | sixteen | seventeen | eighteen | nineteen;
+<ones> = one | two | three | four | five | six | seven | eight | nine;
+
 public <command> =  <init_command>          |
                     <activation_command>    |
                     <menu_command>          |
                     <editor_command>        |
                     <focus_command>         |
                     <speech_command>        |
-                    <google_command>        |
                     <run_command>           |
                     <debug_command>         |
                     <joke_command>          |
                     <check_not_null>        |
-                    <keyboard_command>      ;
+                    <keyboard_command>      |
+                    <jump_command>;

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,6 @@ public class SearchBox: JTextField() {`
`28`	`28`	`override fun paintBorder(p0: Graphics?) {`
`29`	`29`	`}`
`30`	`30`
`31`		`-`
`32`	`31`	`//todo: I need to really rethink this entire approach`
`33`	`32`	`override fun processKeyEvent(p0: KeyEvent) {`
`34`	`33`	`if (getText()?.length() == 0) {`