Add option for Ctrl+Space triggering auto-completion

As per scijava/script-editor-jython#8
scijava · ctrueden · Feb 24, 2022 · Feb 19, 2022 · Feb 21, 2022 · Feb 21, 2022
commit ea605e3b82f5dfce473137425aefe7821cd01d77
diff --git a/src/main/java/org/scijava/ui/swing/script/EditorPane.java b/src/main/java/org/scijava/ui/swing/script/EditorPane.java
@@ -523,6 +523,14 @@ public void setAutoCompletionEnabled(boolean value) {
 		setLanguage(currentLanguage);
 	}
 
+	private boolean autoCompletionKeyRequired = false;
+	void setAutoCompletionKeyRequired(boolean value) {
+		autoCompletionKeyRequired = value;
+	}
+	public boolean getAutoCompletionKeyRequired() {
+		return autoCompletionKeyRequired;
+	}
+
 	/**
 	 * Get file currently open in this {@link EditorPane}.
 	 *

diff --git a/src/main/java/org/scijava/ui/swing/script/TextEditor.java b/src/main/java/org/scijava/ui/swing/script/TextEditor.java
@@ -218,7 +218,8 @@ public class TextEditor extends JFrame implements ActionListener,
 			openMacroFunctions, decreaseFontSize, increaseFontSize, chooseFontSize,
 			chooseTabSize, gitGrep, replaceTabsWithSpaces,
 			replaceSpacesWithTabs, toggleWhiteSpaceLabeling, zapGremlins,
-			savePreferences, toggleAutoCompletionMenu, openClassOrPackageHelp;
+			savePreferences, toggleAutoCompletionMenu, toggleAutoCompletionKeyRequired,
+			openClassOrPackageHelp;
 	private RecentFilesMenuItem openRecent;
 	private JMenu gitMenu, tabsMenu, fontSizeMenu, tabSizeMenu, toolsMenu,
 			runMenu, whiteSpaceMenu;
@@ -605,6 +606,10 @@ public TextEditor(final Context context) {
 		toggleAutoCompletionMenu.setSelected(prefService.getBoolean(TextEditor.class, "autoComplete", true));
 		toggleAutoCompletionMenu.addChangeListener(e -> toggleAutoCompletion());
 		options.add(toggleAutoCompletionMenu);
+		toggleAutoCompletionKeyRequired = new JCheckBoxMenuItem("Auto-completion Requires Ctrl+Space");
+		toggleAutoCompletionKeyRequired.setSelected(prefService.getBoolean(TextEditor.class, "autoCompleteKeyRequired", true));
+		toggleAutoCompletionKeyRequired.addChangeListener(e -> toggleAutoCompletionKeyRequired());
+		options.add(toggleAutoCompletionKeyRequired);
 
 		options.addSeparator();
 		savePreferences = addToMenu(options, "Save Preferences", 0, 0);
@@ -1468,6 +1473,14 @@ private void toggleAutoCompletion() {
 		prefService.put(TextEditor.class, "autoComplete", toggleAutoCompletionMenu.isSelected());
 	}
 
+	private void toggleAutoCompletionKeyRequired() {
+		for (int i = 0; i < tabbed.getTabCount(); i++) {
+			final EditorPane editorPane = getEditorPane(i);
+			editorPane.setAutoCompletionEnabled(toggleAutoCompletionKeyRequired.isSelected());
+		}
+		prefService.put(TextEditor.class, "autoCompleteKeyRequired", toggleAutoCompletionKeyRequired.isSelected());
+	}
+
 	protected boolean handleTabsMenu(final Object source) {
 		if (!(source instanceof JMenuItem)) return false;
 		final JMenuItem item = (JMenuItem) source;