Skip to content

Commit dbd8305

Browse files
Manindra29Manindra29
committed
completion behavior toggled, see preferences
1 parent 5eadfaf commit dbd8305

4 files changed

Lines changed: 33 additions & 32 deletions

File tree

‎app/src/processing/app/PreferencesFrame.java‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ public class PreferencesFrame {
7171
JCheckBox warningsCheckerBox;
7272
JCheckBox codeCompletionBox;
7373
JCheckBox importSuggestionsBox;
74-
JCheckBox codeCompletionTriggerBox;
74+
//JCheckBox codeCompletionTriggerBox;
7575

7676
JComboBox<String> displaySelectionBox;
7777
JComboBox<String> languageSelectionBox;
@@ -398,29 +398,29 @@ public void mouseClicked(MouseEvent e) {
398398
// [ ] Enable Code Completion - PDE X
399399

400400
codeCompletionBox =
401-
new JCheckBox(Language.text("preferences.code_completion"));
401+
new JCheckBox(Language.text("preferences.code_completion") + " Ctrl-" + Language.text("preferences.cmd_space"));
402402
pain.add(codeCompletionBox);
403403
d = codeCompletionBox.getPreferredSize();
404404
codeCompletionBox.setBounds(left, top, d.width + 10, d.height);
405-
codeCompletionBox.addActionListener(new ActionListener() {
406-
407-
@Override
408-
public void actionPerformed(ActionEvent e) {
409-
// Disble code completion trigger option if completion is disabled
410-
codeCompletionTriggerBox.setEnabled(codeCompletionBox.isSelected());
411-
}
412-
});
413-
414-
int toggleLeft = left + d.width;
415-
416-
// [ ] Toggle Code Completion Trigger - PDE X
417-
418-
codeCompletionTriggerBox =
419-
new JCheckBox(Language.text("preferences.trigger_with")+" Ctrl-"+Language.text("preferences.cmd_space"));
420-
pain.add(codeCompletionTriggerBox);
421-
d = codeCompletionTriggerBox.getPreferredSize();
422-
codeCompletionTriggerBox.setBounds(toggleLeft, top, d.width + 10, d.height);
423-
right = Math.max(right, toggleLeft + d.width);
405+
// codeCompletionBox.addActionListener(new ActionListener() {
406+
//
407+
// @Override
408+
// public void actionPerformed(ActionEvent e) {
409+
// // Disble code completion trigger option if completion is disabled
410+
// codeCompletionTriggerBox.setEnabled(codeCompletionBox.isSelected());
411+
// }
412+
// });
413+
414+
// int toggleLeft = left + d.width;
415+
416+
// [ ] Toggle Code Completion Trigger - PDE X. No longer needed (Manindra)
417+
418+
// codeCompletionTriggerBox =
419+
// new JCheckBox(Language.text("preferences.trigger_with")+" Ctrl-"+Language.text("preferences.cmd_space"));
420+
// pain.add(codeCompletionTriggerBox);
421+
// d = codeCompletionTriggerBox.getPreferredSize();
422+
// codeCompletionTriggerBox.setBounds(toggleLeft, top, d.width + 10, d.height);
423+
// right = Math.max(right, toggleLeft + d.width);
424424
top += d.height + GUI_BETWEEN;
425425

426426
// [ ] Show import suggestions - PDE X
@@ -764,7 +764,7 @@ protected void applyFrame() {
764764
Preferences.setBoolean("pdex.errorCheckEnabled", errorCheckerBox.isSelected());
765765
Preferences.setBoolean("pdex.warningsEnabled", warningsCheckerBox.isSelected());
766766
Preferences.setBoolean("pdex.completion", codeCompletionBox.isSelected());
767-
Preferences.setBoolean("pdex.completion.trigger", codeCompletionTriggerBox.isSelected());
767+
//Preferences.setBoolean("pdex.completion.trigger", codeCompletionTriggerBox.isSelected());
768768
Preferences.setBoolean("pdex.importSuggestEnabled", importSuggestionsBox.isSelected());
769769

770770
for (Editor editor : base.getEditors()) {
@@ -779,8 +779,8 @@ protected void showFrame() {
779779
errorCheckerBox.setSelected(Preferences.getBoolean("pdex.errorCheckEnabled"));
780780
warningsCheckerBox.setSelected(Preferences.getBoolean("pdex.warningsEnabled"));
781781
codeCompletionBox.setSelected(Preferences.getBoolean("pdex.completion"));
782-
codeCompletionTriggerBox.setSelected(Preferences.getBoolean("pdex.completion.trigger"));
783-
codeCompletionTriggerBox.setEnabled(codeCompletionBox.isSelected());
782+
//codeCompletionTriggerBox.setSelected(Preferences.getBoolean("pdex.completion.trigger"));
783+
//codeCompletionTriggerBox.setEnabled(codeCompletionBox.isSelected());
784784
importSuggestionsBox.setSelected(Preferences.getBoolean("pdex.importSuggestEnabled"));
785785
deletePreviousBox.
786786
setSelected(Preferences.getBoolean("export.delete_target_folder")); //$NON-NLS-1$

‎build/shared/lib/languages/PDE.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ preferences.enable_complex_text_input = Enable complex text input
167167
preferences.enable_complex_text_input_example = i.e. Japanese
168168
preferences.continuously_check = Continuously check for errors
169169
preferences.show_warnings = Show warnings
170-
preferences.code_completion = Code completion
170+
preferences.code_completion = Code completion with
171171
preferences.trigger_with = Trigger with
172172
preferences.cmd_space = space
173173
preferences.suggest_imports = Suggest import statements

‎pdex/src/processing/mode/experimental/ExperimentalMode.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ public File getContentFile(String path) {
140140
debugOutputEnabled = false, errorLogsEnabled = false,
141141
autoSaveEnabled = true, autoSavePromptEnabled = true,
142142
defaultAutoSaveEnabled = true, // ,untitledAutoSaveEnabled;
143-
ccTriggerEnabled = true, importSuggestEnabled = true;
143+
ccTriggerEnabled = false, importSuggestEnabled = true;
144144
public static int autoSaveInterval = 3; //in minutes
145145

146146
/**

‎pdex/src/processing/mode/experimental/TextArea.java‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -228,12 +228,12 @@ else if (keyChar == ')') {
228228
final KeyEvent evt2 = evt;
229229

230230
if (keyChar == '.') {
231-
if (ExperimentalMode.codeCompletionsEnabled && ExperimentalMode.ccTriggerEnabled) {
231+
if (ExperimentalMode.codeCompletionsEnabled) {
232232
log("[KeyEvent]" + KeyEvent.getKeyText(evt2.getKeyCode()) + " |Prediction started");
233233
log("Typing: " + fetchPhrase(evt2));
234234
}
235235
} else if (keyChar == ' ') { // Trigger on Ctrl-Space
236-
if (!Base.isMacOS() && ExperimentalMode.ccTriggerEnabled &&
236+
if (!Base.isMacOS() && ExperimentalMode.codeCompletionsEnabled &&
237237
(evt.isControlDown() || evt.isMetaDown())) {
238238
SwingWorker<Object, Object> worker = new SwingWorker<Object, Object>() {
239239
protected Object doInBackground() throws Exception {
@@ -252,7 +252,9 @@ protected Object doInBackground() throws Exception {
252252
hideSuggestion(); // hide on spacebar
253253
}
254254
} else {
255-
prepareSuggestions(evt2);
255+
if(ExperimentalMode.codeCompletionsEnabled) {
256+
prepareSuggestions(evt2);
257+
}
256258
}
257259
}
258260
// #2699 - Special case for OS X, where Ctrl-Space is not detected as Key_Typed -_-
@@ -262,8 +264,7 @@ else if (Base.isMacOS() && evt.getID() == KeyEvent.KEY_RELEASED
262264
SwingWorker<Object, Object> worker = new SwingWorker<Object, Object>() {
263265
protected Object doInBackground() throws Exception {
264266
// Provide completions only if it's enabled
265-
if (ExperimentalMode.codeCompletionsEnabled
266-
&& ExperimentalMode.ccTriggerEnabled) {
267+
if (ExperimentalMode.codeCompletionsEnabled) {
267268
log("[KeyEvent]" + KeyEvent.getKeyText(evt2.getKeyCode()) + " |Prediction started");
268269
log("Typing: " + fetchPhrase(evt2));
269270
}
@@ -283,7 +284,7 @@ private void prepareSuggestions(final KeyEvent evt){
283284
protected Object doInBackground() throws Exception {
284285
// Provide completions only if it's enabled
285286
if (ExperimentalMode.codeCompletionsEnabled
286-
&& (!ExperimentalMode.ccTriggerEnabled || suggestion.isVisible())) {
287+
&& (ExperimentalMode.ccTriggerEnabled || suggestion.isVisible())) {
287288
log("[KeyEvent]" + evt.getKeyChar() + " |Prediction started");
288289
log("Typing: " + fetchPhrase(evt));
289290
}

0 commit comments

Comments
 (0)