Fixed slow-mo on check not null in presentation.

Yaroslav Lepenkin · Yaroslav Lepenkin · commit 08c1a0b8005e · 2015-07-13T16:35:45.000+03:00
diff --git a/META-INF/plugin.xml b/META-INF/plugin.xml
@@ -50,7 +50,6 @@
         <actionRecognizer implementation="com.jetbrains.idear.actions.recognition.RunActionRecognizer"/>
         <actionRecognizer implementation="com.jetbrains.idear.actions.recognition.DebugActionRecognizer"/>
         <actionRecognizer implementation="com.jetbrains.idear.actions.recognition.FindUsagesActionRecognizer"/>
-        <actionRecognizer implementation="com.jetbrains.idear.actions.recognition.NavigateToDeclarationRecognizer"/>
         <actionRecognizer implementation="com.jetbrains.idear.actions.recognition.RenameActionRecognizer"/>
         <actionRecognizer implementation="com.jetbrains.idear.actions.recognition.SurroundWithNoNullCheckRecognizer"/>
     </extensions>
diff --git a/src/com/jetbrains/idear/GoogleHelper.java b/src/com/jetbrains/idear/GoogleHelper.java
@@ -24,11 +24,11 @@ public class GoogleHelper {
 
     private static Logger logger = Logger.getLogger(GoogleHelper.class.getSimpleName());
 
-    private static final String API_KEY = "AIzaSyB0DS1X9_qkZw2keZWw9p9EwUb9cV2bYsw";
+//    private static final String API_KEY = "AIzaSyB0DS1X9_qkZw2keZWw9p9EwUb9cV2bYsw";
     private static final String URL_PRE = "https://www.google.com/speech-api/v2/recognize";
     private static final String URL_SEARCH = "https://www.google.com/search?q=";
 
-    private static final String ONE_MORE_API_KEY = "AIzaSyDhaglUIfPFvtYqKKpmhLQfkeiBBzgT2XE";
+    private static final String API_KEY = "AIzaSyDhaglUIfPFvtYqKKpmhLQfkeiBBzgT2XE";
 
     private static List<Pair<String, Double>> getRecognizedTextForUtteranceInternal(File utterance) {
         try {
diff --git a/src/com/jetbrains/idear/asr/ASRServiceImpl.java b/src/com/jetbrains/idear/asr/ASRServiceImpl.java
@@ -3,6 +3,7 @@
 import com.intellij.ide.DataManager;
 import com.intellij.openapi.actionSystem.*;
 import com.intellij.openapi.actionSystem.impl.SimpleDataContext;
+import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.components.ServiceManager;
 import com.intellij.openapi.util.Pair;
 import com.intellij.util.Consumer;
@@ -143,6 +144,7 @@ private class ASRControlLoop implements Runnable {
         public static final String HI_IDEA = "hi idea";
         public static final String WHERE_AM_I = "where am i";
         public static final String NAVIGATE = "navigate";
+        public static final String EXECUTE = "execute";
 
 
         @Override
@@ -180,49 +182,35 @@ private void applyAction(String c) {
             if (c.equals(HI_IDEA)) {
                 // Greet some more
                 say("Hi, again!");
-            }
-
-            else if (c.equals(FUCK)) {
+            } else if (c.equals(FUCK)) {
                 pressKeystroke(KeyEvent.VK_CONTROL, KeyEvent.VK_Z);
                 //invokeAction(IdeActions.ACTION_UNDO);
-            }
-
-            else if (c.startsWith(OPEN)) {
+            } else if (c.startsWith(OPEN)) {
                 if (c.endsWith(SETTINGS)) {
                     invokeAction(IdeActions.ACTION_SHOW_SETTINGS);
                 } else if (c.endsWith(RECENT)) {
                     invokeAction(IdeActions.ACTION_RECENT_FILES);
                 } else if (c.endsWith(TERMINAL)) {
                     pressKeystroke(KeyEvent.VK_ALT, KeyEvent.VK_F12);
                 }
-            }
-
-            else if (c.startsWith(NAVIGATE)) {
+            } else if (c.startsWith(NAVIGATE)) {
                 invokeAction("GotoDeclaration");
-            }
-
-            else if (c.equals(WHERE_AM_I)) {
-                 // TODO(kudinkin): extract to action
+            } else if (c.startsWith(EXECUTE)) {
+                invokeAction("Run");
+            } else if (c.equals(WHERE_AM_I)) {
+                // TODO(kudinkin): extract to action
                 invokeAction("Idear.WhereAmI");
-            }
-
-            else if (c.startsWith("focus")) {
+            } else if (c.startsWith("focus")) {
                 if (c.endsWith("editor")) {
                     pressKeystroke(KeyEvent.VK_ESCAPE);
                 } else if (c.endsWith("project")) {
                     pressKeystroke(KeyEvent.VK_ALT, KeyEvent.VK_1);
                 }
-            }
-
-            else if (c.startsWith("expand")) {
+            } 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")) {
+            } else if (c.startsWith("press")) {
                 if (c.contains("delete")) {
                     pressKeystroke(KeyEvent.VK_DELETE);
                 } else if (c.contains("return")) {
@@ -234,80 +222,62 @@ else if (c.startsWith("press")) {
                 } else if (c.contains("undo")) {
                     pressKeystroke(KeyEvent.VK_CONTROL, KeyEvent.VK_Z);
                 }
-            }
-
-            else if (c.startsWith("following")) {
+            } else if (c.startsWith("following")) {
                 if (c.endsWith("line")) {
                     pressKeystroke(KeyEvent.VK_DOWN);
                 } else if (c.endsWith("page")) {
                     pressKeystroke(KeyEvent.VK_PAGE_DOWN);
                 } else if (c.endsWith("method")) {
                     pressKeystroke(KeyEvent.VK_ALT, KeyEvent.VK_DOWN);
                 }
-            }
-
-            else if (c.startsWith("previous")) {
+            } else if (c.startsWith("previous")) {
                 if (c.endsWith("line")) {
                     pressKeystroke(KeyEvent.VK_UP);
                 } else if (c.endsWith("page")) {
                     pressKeystroke(KeyEvent.VK_PAGE_UP);
                 } else if (c.endsWith("method")) {
                     pressKeystroke(KeyEvent.VK_ALT, KeyEvent.VK_UP);
                 }
-            }
-
-            else if (c.startsWith("extract this")) {
+            } else if (c.startsWith("extract this")) {
                 if (c.endsWith("method")) {
                     pressKeystroke(KeyEvent.VK_CONTROL, KeyEvent.VK_ALT, KeyEvent.VK_M);
                 } else if (c.endsWith("parameter")) {
                     pressKeystroke(KeyEvent.VK_CONTROL, KeyEvent.VK_ALT, KeyEvent.VK_P);
                 }
-            }
-
-            else if (c.startsWith("inspect code")) {
+            } else if (c.startsWith("inspect code")) {
                 pressKeystroke(KeyEvent.VK_ALT, KeyEvent.VK_SHIFT, KeyEvent.VK_I);
-            }
-
-            else if (c.startsWith("speech pause")) {
+            } else if (c.startsWith("speech pause")) {
                 pauseSpeech();
-            }
-
-            else if (c.startsWith(OK_IDEA) || c.startsWith(OKAY_IDEA)) {
+            } else if (c.startsWith(OK_IDEA) || c.startsWith(OKAY_IDEA)) {
                 beep();
                 fireVoiceCommand();
-            }
-
-            else if (c.startsWith(OKAY_GOOGLE) || c.startsWith(OK_GOOGLE)) {
+            } else if (c.startsWith(OKAY_GOOGLE) || c.startsWith(OK_GOOGLE)) {
                 beep();
                 fireGoogleSearch();
-            }
-
-            else if(c.contains("break point")) {
+            } else if (c.contains("break point")) {
                 if (c.startsWith("toggle")) {
                     pressKeystroke(KeyEvent.VK_CONTROL, KeyEvent.VK_F8);
-                } else if(c.startsWith("view")) {
+                } else if (c.startsWith("view")) {
                     pressKeystroke(KeyEvent.VK_CONTROL, KeyEvent.VK_SHIFT, KeyEvent.VK_F8);
                 }
-            }
-
-            else if (c.startsWith("step")) {
+            } else if (c.startsWith("step")) {
                 if (c.endsWith("over")) {
                     pressKeystroke(KeyEvent.VK_F8);
                 } else if (c.endsWith("into")) {
                     pressKeystroke(KeyEvent.VK_F7);
                 }
-            }
-
-            else if (c.startsWith("tell me a joke")) {
+            } else if (c.startsWith("tell me a joke")) {
                 tellJoke();
-            }
-
-            else if (c.contains("check")) {
+            } else if (c.contains("check")) {
                 SurroundWithNoNullCheckRecognizer r = new SurroundWithNoNullCheckRecognizer();
                 if (r.isMatching(c)) {
-                    DataManager.getInstance().getDataContextFromFocus().doWhenDone((Consumer<DataContext>) dataContext -> {
-                        r.getActionInfo(c, dataContext);
-                    });
+                    DataManager.getInstance()
+                            .getDataContextFromFocus()
+                            .doWhenDone((Consumer<DataContext>) dataContext -> ApplicationManager
+                                    .getApplication()
+                                    .runWriteAction(() -> {
+                                        r.getActionInfo(c, dataContext);
+                                    }));
                 }
             }
         }
@@ -359,15 +329,15 @@ private void fireVoiceCommand() {
                 beep();
 
                 invokeAction(
-                    "Idear.VoiceAction",
-                    dataContext -> new AnActionEvent(
-                                            null,
-                                            SimpleDataContext.getSimpleContext(ExecuteVoiceCommandAction.KEY.getName(), commandTuple.first, dataContext),
-                                            ActionPlaces.UNKNOWN,
-                                            new Presentation(),
-                                            ActionManager.getInstance(),
-                                            0
-                                        )
+                        "Idear.VoiceAction",
+                        dataContext -> new AnActionEvent(
+                                null,
+                                SimpleDataContext.getSimpleContext(ExecuteVoiceCommandAction.KEY.getName(), commandTuple.first, dataContext),
+                                ActionPlaces.UNKNOWN,
+                                new Presentation(),
+                                ActionManager.getInstance(),
+                                0
+                        )
                 );
 
             } catch (IOException e) {
@@ -387,8 +357,8 @@ private void fireGoogleSearch() {
                     return;
 
                 ServiceManager
-                    .getService(TTSService.class)
-                    .say("I think you said " + searchQueryTuple.first + ", searching Google now");
+                        .getService(TTSService.class)
+                        .say("I think you said " + searchQueryTuple.first + ", searching Google now");
 
                 GoogleHelper.searchGoogle(searchQueryTuple.first);
 
@@ -432,40 +402,40 @@ private void pressKeystroke(final int... keys) {
 
     private void invokeAction(final String action) {
         invokeAction(
-            action,
-            dataContext ->
-                new AnActionEvent(null,
-                    dataContext,
-                    ActionPlaces.UNKNOWN,
-                    new Presentation(),
-                    ActionManager.getInstance(),
-                    0
-                )
+                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));
-            })
+                (Consumer<DataContext>) dataContext -> EventQueue.invokeLater(() -> {
+                    AnAction anAction = ActionManager.getInstance().getAction(action);
+                    anAction.actionPerformed(actionFactory.apply(dataContext));
+                })
         );
     }
 
     // Helpers
 
     public static synchronized void say(String something) {
-        ServiceManager  .getService(TTSService.class)
-                        .say(something);
+        ServiceManager.getService(TTSService.class)
+                .say(something);
     }
 
     public static synchronized void beep() {
         Thread t = new Thread(() -> {
             try {
                 Clip clip = AudioSystem.getClip();
                 AudioInputStream inputStream = AudioSystem.getAudioInputStream(
-                    ASRServiceImpl.class.getResourceAsStream("/com.jetbrains.idear/sounds/beep.wav"));
+                        ASRServiceImpl.class.getResourceAsStream("/com.jetbrains.idear/sounds/beep.wav"));
                 clip.open(inputStream);
                 clip.start();
             } catch (Exception e) {
@@ -477,7 +447,8 @@ public static synchronized void beep() {
 
         try {
             t.join();
-        } catch (InterruptedException _) {}
+        } catch (InterruptedException _) {
+        }
     }
 
     // This is for testing purposes solely
diff --git a/src/resources/com.jetbrains.idear/grammars/command.gram b/src/resources/com.jetbrains.idear/grammars/command.gram
@@ -44,7 +44,7 @@ grammar dialog;
 
 <focus_command> = focus (editor | project);
 
-<run_command> = run;
+<run_command> = execute;
 
 <speech_command> = speech <speech_action>;
 
