Merge branch 'master' of https://github.com/breandan/idear

Author: alexeykudinkin

META-INF/plugin.xml

@@ -52,6 +52,7 @@
         <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>
 
 

src/com/jetbrains/idear/actions/ExecuteActionByCommandText.java

@@ -19,7 +19,7 @@ public void actionPerformed(AnActionEvent e) {
 //        String text = "idea extract to variable name";
 //        String text = "idea inline";
 
-        String text = "idra debug";
+        String text = "surround with not null check";
 
         TextToActionConverter provider = new TextToActionConverter(e.getDataContext());
         ActionCallInfo info = provider.extractAction(text);

src/com/jetbrains/idear/actions/recognition/SurroundWithNoNullCheckRecognizer.java

@@ -0,0 +1,75 @@
+package com.jetbrains.idear.actions.recognition;
+
+import com.intellij.codeInsight.daemon.impl.HighlightInfo;
+import com.intellij.codeInsight.daemon.impl.ShowIntentionsPass;
+import com.intellij.ide.DataManager;
+import com.intellij.ide.actions.ApplyIntentionAction;
+import com.intellij.openapi.actionSystem.*;
+import com.intellij.openapi.application.ApplicationManager;
+import com.intellij.openapi.editor.Editor;
+import com.intellij.openapi.project.Project;
+import com.intellij.openapi.util.Computable;
+import com.intellij.psi.PsiDocumentManager;
+import com.intellij.psi.PsiFile;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class SurroundWithNoNullCheckRecognizer implements ActionRecognizer {
+
+    @Override
+    public boolean isMatching(@NotNull String sentence) {
+        return sentence.contains("check") && sentence.contains("not");
+    }
+
+    @Override
+    public ActionCallInfo getActionInfo(@NotNull String sentence, DataContext dataContext) {
+        final Editor editor     = CommonDataKeys.EDITOR.getData(dataContext);
+        final Project project   = CommonDataKeys.PROJECT.getData(dataContext);
+
+        if (project == null || editor == null) return null;
+
+        PsiFile file = PsiDocumentManager.getInstance(project).getPsiFile(editor.getDocument());
+
+        if (file == null) return null;
+
+
+        final ShowIntentionsPass.IntentionsInfo info = new ShowIntentionsPass.IntentionsInfo();
+        ApplicationManager.getApplication().runReadAction(() -> {
+            ShowIntentionsPass.getActionsToShow(editor, file, info, -1);
+        });
+        if (info.isEmpty()) return null;
+
+        final List<HighlightInfo.IntentionActionDescriptor> actions = new ArrayList<>();
+        actions.addAll(info.errorFixesToShow);
+        actions.addAll(info.inspectionFixesToShow);
+        actions.addAll(info.intentionsToShow);
+
+        final ApplyIntentionAction[] result = new ApplyIntentionAction[actions.size()];
+        for (int i = 0; i < result.length; i++) {
+            final HighlightInfo.IntentionActionDescriptor descriptor = actions.get(i);
+            final String actionText = ApplicationManager.getApplication().runReadAction((Computable<String>) () -> descriptor.getAction().getText());
+            result[i] = new ApplyIntentionAction(descriptor, actionText, editor, file);
+        }
+
+
+        ApplyIntentionAction nNull = result[1];
+
+        DataManager manager = DataManager.getInstance();
+        if (manager != null) {
+            DataContext context = manager.getDataContext(editor.getContentComponent());
+
+            nNull.actionPerformed(new AnActionEvent(
+                    null, context, "",
+                    new Presentation("surround with not null"),
+                    ActionManager.getInstance(),
+                    0)
+            );
+        }
+
+        return null;
+    }
+}
+
+

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

@@ -8,6 +8,7 @@
 import com.intellij.util.Consumer;
 import com.jetbrains.idear.GoogleHelper;
 import com.jetbrains.idear.actions.ExecuteVoiceCommandAction;
+import com.jetbrains.idear.actions.recognition.SurroundWithNoNullCheckRecognizer;
 import com.jetbrains.idear.recognizer.CustomLiveSpeechRecognizer;
 import com.jetbrains.idear.recognizer.CustomMicrophone;
 import com.jetbrains.idear.tts.TTSService;
@@ -300,6 +301,15 @@ else if (c.startsWith("step")) {
             else if (c.startsWith("tell me a joke")) {
                 tellJoke();
             }
+
+            else if (c.contains("check")) {
+                SurroundWithNoNullCheckRecognizer r = new SurroundWithNoNullCheckRecognizer();
+                if (r.isMatching(c)) {
+                    DataManager.getInstance().getDataContextFromFocus().doWhenDone((Consumer<DataContext>) dataContext -> {
+                        r.getActionInfo(c, dataContext);
+                    });
+                }
+            }
         }
 
         private void tellJoke() {

src/resources/com.jetbrains.idear/grammars/command.gram

@@ -56,6 +56,8 @@ grammar dialog;
 
 <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;
@@ -69,4 +71,5 @@ public <command> =  <init_command>          |
                     <google_command>        |
                     <debug_command>         |
                     <joke_command>          |
+                    <check_not_null>        |
                     <keyboard_command>;