Add some features for writing code

breandan · breandan · commit f7293811480b · 2016-03-09T06:53:14.000-05:00
diff --git a/src/main/java/com/jetbrains/idear/GoogleHelper.java b/src/main/java/com/jetbrains/idear/GoogleHelper.java
@@ -74,6 +74,11 @@ public static Pair<String, Double> getBestTextForUtterance(File file) {
 
     private static List<Pair<String, Double>> parseGSAPIResponse(String r) throws JSONException {
         List<Pair<String, Double>> res = new ArrayList<>();
+        logger.log(Level.INFO, r);
+        if (r.length() < 13) {
+            logger.log(Level.WARNING, "No result!");
+            return res;
+        }
 
         JSONObject o = new JSONObject(r.substring(13));
         JSONArray results = o.getJSONArray("result");
diff --git a/src/main/java/com/jetbrains/idear/asr/ASRControlLoop.java b/src/main/java/com/jetbrains/idear/asr/ASRControlLoop.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.ApplicationInfo;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.components.ServiceManager;
 import com.intellij.openapi.util.Pair;
@@ -16,22 +17,20 @@
 import com.jetbrains.idear.recognizer.CustomMicrophone;
 import com.jetbrains.idear.tts.TTSService;
 import edu.cmu.sphinx.api.SpeechResult;
-
-import com.intellij.openapi.application.ApplicationInfo;
+import org.jetbrains.annotations.Nullable;
 
 import javax.sound.sampled.AudioInputStream;
 import javax.sound.sampled.AudioSystem;
 import javax.sound.sampled.Clip;
 import java.awt.*;
 import java.io.IOException;
 import java.text.SimpleDateFormat;
-import java.time.format.DateTimeFormatter;
 import java.util.Calendar;
 import java.util.Collection;
-import java.util.Locale;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
+import static com.jetbrains.idear.GoogleHelper.getBestTextForUtterance;
 import static java.awt.event.KeyEvent.*;
 
 /**
@@ -152,8 +151,13 @@ private void applyAction(String c) {
             } else if (c.endsWith("symbols")) {
                 ideService.invokeAction("AceJumpAction").doWhenDone((Consumer<DataContext>) dataContext -> {
                     ideService.type(VK_SPACE);
-                    ideService.type(("" + recognizeNumber()).toCharArray());
                 });
+                try {
+                    Thread.sleep(500);
+                } catch (InterruptedException e) {
+                    e.printStackTrace();
+                }
+                ideService.type(("" + recognizeNumber()).toCharArray());
             }
         } else if (c.startsWith(GOTO)) {
             if (c.startsWith("goto line")) {
@@ -223,7 +227,6 @@ private void applyAction(String c) {
             beep();
             fireVoiceCommand();
         } else if (c.startsWith(OKAY_GOOGLE) || c.startsWith(OK_GOOGLE)) {
-            beep();
             fireGoogleSearch();
         } else if (c.contains("break point")) {
             if (c.startsWith("toggle")) {
@@ -258,11 +261,28 @@ private void applyAction(String c) {
             Calendar cal = ai.getBuildDate();
             SimpleDateFormat df = new SimpleDateFormat("EEEE, MMMM dd, yyyy");
 
-
             say("My name is " + ai.getVersionName() + ", I was built on " + df.format(cal.getTime()) + ", I am running version " + ai.getApiVersion() + " of the IntelliJ Platform, and I am registered to " + ai.getCompanyName());
+        } else if(c.contains("add new class")) {
+            ideService.invokeAction("NewElement");
+            pressKeystroke(VK_ENTER);
+            String className = getWebSpeechResult().first;
+            if(className != null) {
+                String camelCase = convertToCamelCase(className);
+                logger.log(Level.INFO, "Class name: "+ camelCase);
+                ideService.type(camelCase);
+                pressKeystroke(VK_ENTER);
+            }
+        } else if(c.contains("print line")) {
+            ideService.type("sout");
+            pressKeystroke(VK_TAB);
         }
     }
 
+    private String convertToCamelCase(String s) {
+        String noSpaces = s.replaceAll("([\\W_]+)([a-zA-Z0-9])", "$2".toUpperCase());
+        return noSpaces.substring(0, 1).toUpperCase() + noSpaces.substring(1);
+    }
+
     private void pressKeystroke(final int... keys) {
         ServiceManager.getService(IDEService.class)
                 .type(keys);
@@ -314,7 +334,7 @@ private void tellJoke() {
 
     private void fireVoiceCommand() {
         try {
-            Pair<String, Double> commandTuple = GoogleHelper.getBestTextForUtterance(CustomMicrophone.recordFromMic(COMMAND_DURATION));
+            Pair<String, Double> commandTuple = getBestTextForUtterance(CustomMicrophone.recordFromMic(COMMAND_DURATION));
 
             if (commandTuple == null || commandTuple.first.isEmpty() /* || searchQuery.second < CONFIDENCE_LEVEL_THRESHOLD */)
                 return;
@@ -343,21 +363,31 @@ private void fireVoiceCommand() {
 
     private void fireGoogleSearch() {
 
-        try {
-            Pair<String, Double> searchQueryTuple = GoogleHelper.getBestTextForUtterance(CustomMicrophone.recordFromMic(GOOGLE_QUERY_DURATION));
-
-            if (searchQueryTuple == null || searchQueryTuple.first.isEmpty() /* || searchQuery.second < CONFIDENCE_LEVEL_THRESHOLD */)
-                return;
+            Pair<String, Double> searchQueryTuple = getWebSpeechResult();
+            if (searchQueryTuple == null) return;
 
             ServiceManager
                     .getService(TTSService.class)
                     .say("I think you said " + searchQueryTuple.first + ", searching Google now");
 
             GoogleHelper.searchGoogle(searchQueryTuple.first);
+    }
 
+    @Nullable
+    private Pair<String, Double> getWebSpeechResult() {
+        Pair<String, Double> searchQueryTuple = null;
+        beep();
+        try {
+                searchQueryTuple = GoogleHelper.getBestTextForUtterance(CustomMicrophone.recordFromMic(GOOGLE_QUERY_DURATION));
         } catch (IOException e) {
             logger.log(Level.SEVERE, "Panic! Failed to dump WAV", e);
         }
+
+        if (searchQueryTuple == null || searchQueryTuple.first.isEmpty() /* || searchQuery.second < CONFIDENCE_LEVEL_THRESHOLD */)
+            return null;
+
+        beep();
+        return searchQueryTuple;
     }
 
     private void pauseSpeech() {
@@ -372,10 +402,14 @@ private void pauseSpeech() {
 
     private int recognizeNumber() {
         String result;
+        logger.info("Recognizing number...");
         while (true) {
             result = getResultFromRecognizer();
-            if (result.startsWith("jump "))
-                return WordToNumberConverter.getNumber(result.substring(5));
+            if (result.startsWith("jump ")) {
+                int number = WordToNumberConverter.getNumber(result.substring(5));
+                logger.info("Recognized number: " + number);
+                return number;
+            }
         }
     }
 
diff --git a/src/main/java/com/jetbrains/idear/ide/IDEService.java b/src/main/java/com/jetbrains/idear/ide/IDEService.java
@@ -6,7 +6,6 @@
 import com.intellij.util.Consumer;
 
 import java.awt.*;
-import java.lang.reflect.InvocationTargetException;
 import java.util.function.Function;
 import java.util.logging.Logger;
 
@@ -76,4 +75,12 @@ public void type(final char... keys) {
             robot.keyRelease(key);
         }
     }
+
+    public void type(final String string) {
+        char[] charArray = string.toCharArray();
+        for (char key: charArray) {
+            robot.keyPress(key);
+            robot.keyRelease(key);
+        }
+    }
 }
diff --git a/src/main/java/com/johnlindquist/acejump/AceJumpAction.kt b/src/main/java/com/johnlindquist/acejump/AceJumpAction.kt
@@ -32,6 +32,7 @@ import javax.swing.event.ChangeListener
 
 open class AceJumpAction() : DumbAwareAction() {
 
+
     override fun update(e: AnActionEvent?) {
         e?.presentation?.isEnabled = (e?.getData(CommonDataKeys.EDITOR)) != null
     }
diff --git a/src/main/resources/com.jetbrains.idear/grammars/command.gram b/src/main/resources/com.jetbrains.idear/grammars/command.gram
@@ -39,7 +39,7 @@ grammar dialog;
 
 <keyboard_command> = press [return | escape | tab | undo | delete] key;
 
-<next_command> = [following | previous] [line | method | error | tab | page];
+<next_command> = [following | previous] [line | method | error | tab | page | word];
 
 <check_not_null> = check not null;
 
@@ -49,6 +49,11 @@ grammar dialog;
 
 <jump_command> = jump <number>;
 
+<search_command> = okay google;
+
+<code_command> = add new class | public static void main | print line | new string;
+
+
 <number> = <hundreds> | <tens> | <teens> | <ones>;
 <hundreds> = <ones> hundred [<tens> | <teens> | <ones>];
 <tens> = (twenty | thirty | forty | fifty | sixty | seventy | eighty | ninety) [<ones>];
@@ -65,4 +70,6 @@ public <command> =  <init_command>          |
                     <joke_command>          |
                     <check_not_null>        |
                     <keyboard_command>      |
-                    <about_command>;
+                    <about_command>         |
+                    <search_command>        |
+                    <code_command>;

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,6 @@`
`6`	`6`	`import com.intellij.util.Consumer;`
`7`	`7`
`8`	`8`	`import java.awt.*;`
`9`		`-import java.lang.reflect.InvocationTargetException;`
`10`	`9`	`import java.util.function.Function;`
`11`	`10`	`import java.util.logging.Logger;`
`12`	`11`
`@@ -76,4 +75,12 @@ public void type(final char... keys) {`
`76`	`75`	`robot.keyRelease(key);`
`77`	`76`	`}`
`78`	`77`	`}`
	`78`	`+`
	`79`	`+ public void type(final String string) {`
	`80`	`+ char[] charArray = string.toCharArray();`
	`81`	`+ for (char key: charArray) {`
	`82`	`+ robot.keyPress(key);`
	`83`	`+ robot.keyRelease(key);`
	`84`	`+ }`
	`85`	`+ }`
`79`	`86`	`}`
Original file line number	Diff line number	Diff line change
`@@ -32,6 +32,7 @@ import javax.swing.event.ChangeListener`
`32`	`32`
`33`	`33`	`open class AceJumpAction() : DumbAwareAction() {`
`34`	`34`
	`35`	`+`
`35`	`36`	`override fun update(e: AnActionEvent?) {`
`36`	`37`	`e?.presentation?.isEnabled = (e?.getData(CommonDataKeys.EDITOR)) != null`
`37`	`38`	`}`