From 557bae9e4f22a093c76a9f0e9d376e6203531121 Mon Sep 17 00:00:00 2001
From: Ben Fry <ben@fathom.info>
Date: Mon, 21 Sep 2015 19:35:21 -0400
Subject: [PATCH] don't insert a space when typing ctrl-space (fixes #3847)

---
 .../mode/java/JavaInputHandler.java           |  5 ++++
 .../mode/java/pdex/JavaTextArea.java          | 28 ++++++++-----------
 2 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/java/src/processing/mode/java/JavaInputHandler.java b/java/src/processing/mode/java/JavaInputHandler.java
index 9b5dec864..3e823f16b 100644
--- a/java/src/processing/mode/java/JavaInputHandler.java
+++ b/java/src/processing/mode/java/JavaInputHandler.java
@@ -324,6 +324,11 @@ public class JavaInputHandler extends PdeInputHandler {
         event.consume();
         return true;
       }
+      // https://github.com/processing/processing/issues/3847
+      if (c == KeyEvent.VK_SPACE) {
+        event.consume();
+        return true;
+      }
     }
     return false;
   }
diff --git a/java/src/processing/mode/java/pdex/JavaTextArea.java b/java/src/processing/mode/java/pdex/JavaTextArea.java
index d91c172c4..7134df9f1 100644
--- a/java/src/processing/mode/java/pdex/JavaTextArea.java
+++ b/java/src/processing/mode/java/pdex/JavaTextArea.java
@@ -269,28 +269,22 @@ public class JavaTextArea extends JEditTextArea {
     } else if (keyChar == ' ') { // Trigger on Ctrl-Space
       if (!Platform.isMacOS() && JavaMode.codeCompletionsEnabled &&
           (event.isControlDown() || event.isMetaDown())) {
-        //SwingWorker<Object, Object> worker = new SwingWorker<Object, Object>() {
-        //  protected Object doInBackground() throws Exception {
-            // Provide completions only if it's enabled
-            if (JavaMode.codeCompletionsEnabled) {
-              try {
-                getDocument().remove(getCaretPosition() - 1, 1); // Remove the typed space
-                Messages.log("[KeyEvent]" + event.getKeyChar() + "  |Prediction started");
-                fetchPhrase();
-              } catch (BadLocationException e) {
-                e.printStackTrace();
-              }
-            }
-        //    return null;
-        //  }
-        //};
-        //worker.execute();
+        // Provide completions only if it's enabled
+        if (JavaMode.codeCompletionsEnabled) {
+          // Removed for https://github.com/processing/processing/issues/3847
+          //try {
+          //  getDocument().remove(getCaretPosition() - 1, 1); // Remove the typed space
+          Messages.log("[KeyEvent]" + event.getKeyChar() + "  |Prediction started");
+          fetchPhrase();
+          //} catch (BadLocationException e) {
+          //  e.printStackTrace();
+          //}
+        }
       } else {
         hideSuggestion(); // hide on spacebar
       }
     } else {
       if (JavaMode.codeCompletionsEnabled) {
-        //fetchPhrase();
         prepareSuggestions(event);
       }
     }