From 0dee6cb1f1cc320ab47bd245150b6ac643eefe95 Mon Sep 17 00:00:00 2001 From: Grim Maple Date: Fri, 22 Apr 2022 23:35:54 +0300 Subject: [PATCH] Add autocompletion on each key press --- src/dlangide/ui/dsourceedit.d | 27 ++++++--- src/dlangide/ui/settings.d | 83 ++++++++++++++-------------- src/dlangide/workspace/idesettings.d | 15 ++++- views/res/i18n/en.ini | 3 +- views/res/i18n/ru.ini | 1 + 5 files changed, 77 insertions(+), 52 deletions(-) diff --git a/src/dlangide/ui/dsourceedit.d b/src/dlangide/ui/dsourceedit.d index 4269dd6..134ebb4 100644 --- a/src/dlangide/ui/dsourceedit.d +++ b/src/dlangide/ui/dsourceedit.d @@ -49,7 +49,7 @@ class DSourceEdit : SourceEdit, EditableContentMarksChangeListener { onThemeChanged(); //setTokenHightlightColor(TokenCategory.Identifier, 0x206000); // no colors MenuItem editPopupItem = new MenuItem(null); - editPopupItem.add(ACTION_EDIT_COPY, ACTION_EDIT_PASTE, ACTION_EDIT_CUT, ACTION_EDIT_UNDO, + editPopupItem.add(ACTION_EDIT_COPY, ACTION_EDIT_PASTE, ACTION_EDIT_CUT, ACTION_EDIT_UNDO, ACTION_EDIT_REDO, ACTION_EDIT_INDENT, ACTION_EDIT_UNINDENT, ACTION_EDIT_TOGGLE_LINE_COMMENT, ACTION_GET_COMPLETIONS, ACTION_GO_TO_DEFINITION, ACTION_DEBUG_TOGGLE_BREAKPOINT); popupMenu = editPopupItem; @@ -125,12 +125,12 @@ class DSourceEdit : SourceEdit, EditableContentMarksChangeListener { protected EditorTool _editorTool; @property EditorTool editorTool() { return _editorTool; } - @property EditorTool editorTool(EditorTool tool) { + @property EditorTool editorTool(EditorTool tool) { if (_editorTool && _editorTool !is tool) { destroy(_editorTool); _editorTool = null; } - return _editorTool = tool; + return _editorTool = tool; }; protected ProjectSourceFile _projectSourceFile; @@ -585,7 +585,7 @@ class DSourceEdit : SourceEdit, EditableContentMarksChangeListener { _docsPopup.popupClosed = delegate(PopupWidget source) { Log.d("Closed Docs popup"); _docsPopup = null; - //setFocus(); + //setFocus(); }; _docsPopup.flags = PopupFlags.CloseOnClickOutside | PopupFlags.CloseOnMouseMoveOutside; invalidate(); @@ -641,7 +641,8 @@ class DSourceEdit : SourceEdit, EditableContentMarksChangeListener { return; } - if (suggestions.length == 1) { + // Only insert singular autocompletion if automatic autocomplete is turned off! + if (!_settings.autoAutoComplete && suggestions.length == 1) { insertCompletion(suggestions[0]); return; } @@ -680,7 +681,7 @@ class DSourceEdit : SourceEdit, EditableContentMarksChangeListener { popupPositionX, popupPositionY + yOffset); _completionPopup.setFocus(); - _completionPopup.popupClosed = delegate(PopupWidget source) { + _completionPopup.popupClosed = delegate(PopupWidget source) { setFocus(); _completionPopup = null; }; @@ -721,13 +722,23 @@ class DSourceEdit : SourceEdit, EditableContentMarksChangeListener { super.handleFocusChange(focused, receivedFocusFromKeyboard); } + private bool isAutoCompleteKey(ref KeyEvent event) { + if((event.keyCode >= KeyCode.KEY_0 && event.keyCode <= KeyCode.KEY_Z) || + event.keyCode == KeyCode.KEY_PERIOD) + return true; + return false; + } + protected uint _lastKeyDownCode; protected uint _periodKeyCode; /// handle keys: support autocompletion after . press with delay override bool onKeyEvent(KeyEvent event) { if (event.action == KeyAction.KeyDown) _lastKeyDownCode = event.keyCode; - if (event.action == KeyAction.Text && event.noModifiers && event.text==".") { + if(_settings.autoAutoComplete && !_completionPopup) { + window.dispatchAction(ACTION_GET_COMPLETIONS, this); + } + else if (event.action == KeyAction.Text && event.noModifiers && event.text==".") { _periodKeyCode = _lastKeyDownCode; startCompletionTimer(); } else { @@ -775,7 +786,7 @@ class CompletionPopupMenu : PopupMenu { //maxHeight(400); selectItem(0); } - + Point fullContentSizeWithBorders() { measure(2000.pointsToPixels, 2000.pointsToPixels); Point sz; diff --git a/src/dlangide/ui/settings.d b/src/dlangide/ui/settings.d index cec4fb8..0460edf 100644 --- a/src/dlangide/ui/settings.d +++ b/src/dlangide/ui/settings.d @@ -69,36 +69,36 @@ SettingsPage createSettingsPages() { // UI settings page SettingsPage ui = res.addChild("interface", UIString.fromId("OPTION_INTERFACE"c)); ui.addStringComboBox("interface/theme", UIString.fromId("OPTION_THEME"c), [ - StringListValue("ide_theme_default", "OPTION_DEFAULT"c), + StringListValue("ide_theme_default", "OPTION_DEFAULT"c), StringListValue("ide_theme_dark", "OPTION_DARK"c)]); ui.addStringComboBox("interface/language", UIString.fromId("OPTION_LANGUAGE"c), [ - StringListValue("en", "MENU_VIEW_LANGUAGE_EN"c), - StringListValue("ru", "MENU_VIEW_LANGUAGE_RU"c), + StringListValue("en", "MENU_VIEW_LANGUAGE_EN"c), + StringListValue("ru", "MENU_VIEW_LANGUAGE_RU"c), StringListValue("es", "MENU_VIEW_LANGUAGE_ES"c), StringListValue("de", "MENU_VIEW_LANGUAGE_DE"c), - StringListValue("cs", "MENU_VIEW_LANGUAGE_CS"c)]); + StringListValue("cs", "MENU_VIEW_LANGUAGE_CS"c)]); // UI font faces - ui.addStringComboBox("interface/uiFontFace", UIString.fromId("OPTION_FONT_FACE"c), + ui.addStringComboBox("interface/uiFontFace", UIString.fromId("OPTION_FONT_FACE"c), createFaceList(false)); - ui.addIntComboBox("interface/uiFontSize", UIString.fromId("OPTION_FONT_SIZE"c), + ui.addIntComboBox("interface/uiFontSize", UIString.fromId("OPTION_FONT_SIZE"c), createIntValueList([6,7,8,9,10,11,12,14,16,18,20,22,24,26,28,30,32])); - ui.addIntComboBox("interface/hintingMode", UIString.fromId("OPTION_FONT_HINTING"c), [StringListValue(0, "OPTION_FONT_HINTING_NORMAL"c), - StringListValue(1, "OPTION_FONT_HINTING_FORCE"c), + ui.addIntComboBox("interface/hintingMode", UIString.fromId("OPTION_FONT_HINTING"c), [StringListValue(0, "OPTION_FONT_HINTING_NORMAL"c), + StringListValue(1, "OPTION_FONT_HINTING_FORCE"c), StringListValue(2, "OPTION_FONT_HINTING_DISABLED"c), StringListValue(3, "OPTION_FONT_HINTING_LIGHT"c)]); - ui.addIntComboBox("interface/minAntialiasedFontSize", UIString.fromId("OPTION_FONT_ANTIALIASING"c), - [StringListValue(0, "OPTION_FONT_ANTIALIASING_ALWAYS_ON"c), - StringListValue(12, "12"d), - StringListValue(14, "14"d), - StringListValue(16, "16"d), - StringListValue(20, "20"d), - StringListValue(24, "24"d), - StringListValue(32, "32"d), - StringListValue(48, "48"d), + ui.addIntComboBox("interface/minAntialiasedFontSize", UIString.fromId("OPTION_FONT_ANTIALIASING"c), + [StringListValue(0, "OPTION_FONT_ANTIALIASING_ALWAYS_ON"c), + StringListValue(12, "12"d), + StringListValue(14, "14"d), + StringListValue(16, "16"d), + StringListValue(20, "20"d), + StringListValue(24, "24"d), + StringListValue(32, "32"d), + StringListValue(48, "48"d), StringListValue(255, "OPTION_FONT_ANTIALIASING_ALWAYS_OFF"c)]); - ui.addFloatComboBox("interface/fontGamma", UIString.fromId("OPTION_FONT_GAMMA"c), + ui.addFloatComboBox("interface/fontGamma", UIString.fromId("OPTION_FONT_GAMMA"c), [ StringListValue(500, "0.5 "d), StringListValue(600, "0.6 "d), @@ -109,25 +109,25 @@ SettingsPage createSettingsPages() { StringListValue(950, "0.95 "d), StringListValue(1000, "1.0 "d), StringListValue(1050, "1.05 "d), - StringListValue(1100, "1.1 "d), - StringListValue(1150, "1.15 "d), - StringListValue(1200, "1.2 "d), - StringListValue(1250, "1.25 "d), - StringListValue(1300, "1.3 "d), - StringListValue(1400, "1.4 "d), - StringListValue(1500, "1.5 "d), - StringListValue(1700, "1.7 "d), + StringListValue(1100, "1.1 "d), + StringListValue(1150, "1.15 "d), + StringListValue(1200, "1.2 "d), + StringListValue(1250, "1.25 "d), + StringListValue(1300, "1.3 "d), + StringListValue(1400, "1.4 "d), + StringListValue(1500, "1.5 "d), + StringListValue(1700, "1.7 "d), StringListValue(2000, "2.0 "d)]); - ui.addIntComboBox("interface/screenDpiOverride", UIString.fromId("OPTION_SCREEN_DPI_OVERRIDE"c), - [StringListValue(0, UIString.fromId("OPTION_SCREEN_DPI_OVERRIDE_NONE"c).value ~ " ("d ~ to!dstring(systemScreenDPI) ~ ")"d), - StringListValue(72, "72"d), - StringListValue(96, "96"d), - StringListValue(120, "120"d), - StringListValue(140, "140"d), - StringListValue(150, "150"d), - StringListValue(300, "300"d), - StringListValue(400, "400"d), + ui.addIntComboBox("interface/screenDpiOverride", UIString.fromId("OPTION_SCREEN_DPI_OVERRIDE"c), + [StringListValue(0, UIString.fromId("OPTION_SCREEN_DPI_OVERRIDE_NONE"c).value ~ " ("d ~ to!dstring(systemScreenDPI) ~ ")"d), + StringListValue(72, "72"d), + StringListValue(96, "96"d), + StringListValue(120, "120"d), + StringListValue(140, "140"d), + StringListValue(150, "150"d), + StringListValue(300, "300"d), + StringListValue(400, "400"d), StringListValue(600, "600"d)]); SettingsPage ed = res.addChild("editors", UIString.fromId("OPTION_EDITORS"c)); @@ -144,6 +144,7 @@ SettingsPage createSettingsPages() { texted.addCheckbox("editors/textEditor/smartIndentsAfterPaste", UIString.fromId("OPTION_SMART_INDENTS_PASTE"c)); texted.addCheckbox("editors/textEditor/showWhiteSpaceMarks", UIString.fromId("OPTION_SHOW_SPACES"c)); texted.addCheckbox("editors/textEditor/showTabPositionMarks", UIString.fromId("OPTION_SHOW_TABS"c)); + texted.addCheckbox("editors/textEditor/autoAutoComplete", UIString.fromId("OPTION_AUTO_AUTOCOMPLETE"c)); // Common page SettingsPage common = res.addChild("common", UIString.fromId("OPTION_COMMON"c)); @@ -189,14 +190,14 @@ SettingsPage createProjectSettingsPages() { SettingsPage build = res.addChild("build", UIString.fromId("OPTION_BUILD"c)); build.addStringComboBox("build/toolchain", UIString.fromId("OPTION_TOOLCHAIN"c), [ - StringListValue("default", UIString.fromId("OPTION_DEFAULT"c)), - StringListValue("dmd", "DMD"d), - StringListValue("ldc", "LDC"d), - StringListValue("ldmd", "LDMD"d), + StringListValue("default", UIString.fromId("OPTION_DEFAULT"c)), + StringListValue("dmd", "DMD"d), + StringListValue("ldc", "LDC"d), + StringListValue("ldmd", "LDMD"d), StringListValue("gdc", "GDC"d)]); build.addStringComboBox("build/arch", UIString.fromId("OPTION_ARCHITECTURE"c), [ - StringListValue("default", UIString.fromId("OPTION_DEFAULT"c)), - StringListValue("x86", "x86"d), + StringListValue("default", UIString.fromId("OPTION_DEFAULT"c)), + StringListValue("x86", "x86"d), StringListValue("x86_64", "x86_64"d), StringListValue("arm", "arm"d), StringListValue("arm64", "arm64"d), diff --git a/src/dlangide/workspace/idesettings.d b/src/dlangide/workspace/idesettings.d index 96509cd..5919c9d 100644 --- a/src/dlangide/workspace/idesettings.d +++ b/src/dlangide/workspace/idesettings.d @@ -23,6 +23,7 @@ class IDESettings : SettingsFile { ed.setBooleanDef("smartIndentsAfterPaste", true); ed.setBooleanDef("showWhiteSpaceMarks", true); ed.setBooleanDef("showTabPositionMarks", true); + ed.setBooleanDef("autoAutoComplete", true); ed.setStringDef("fontFace", "Default"); ed.setIntegerDef("fontSize", 11); Setting ui = uiSettings(); @@ -59,7 +60,7 @@ class IDESettings : SettingsFile { /// override to do something after loading - e.g. set defaults override void afterLoad() { } - + @property Setting editorSettings() { Setting res = _setting.objectByPath("editors/textEditor", true); return res; @@ -171,6 +172,16 @@ class IDESettings : SettingsFile { return this; } + /// Text editor setting, true if auto-complete is triggered on each key press + @property bool autoAutoComplete() { + return editorSettings.getBoolean("autoAutoComplete", true); + } + /// + @property IDESettings autoAutoComplete(bool v) { + editorSettings.setBoolean("autoAutoComplete", v); + return this; + } + /// true if smart indents are enabled @property bool smartIndents() { return editorSettings.getBoolean("smartIndents", true); } /// set smart indents enabled flag @@ -317,7 +328,7 @@ class IDESettings : SettingsFile { obj["recentWorkspaces"] = list; save(); } - + @property bool autoOpenLastProject() { Setting obj =_setting.objectByPath("common", true); return obj.getBoolean("autoOpenLastProject", false); diff --git a/views/res/i18n/en.ini b/views/res/i18n/en.ini index fa3144b..56561dd 100644 --- a/views/res/i18n/en.ini +++ b/views/res/i18n/en.ini @@ -34,7 +34,7 @@ NAME=Name MENU_FILE=&File MENU_FILE_NEW=&Create MENU_FILE_NEW_SOURCE_FILE=New file -MENU_FILE_NEW_DIRECTORY=New directory +MENU_FILE_NEW_DIRECTORY=New directory MENU_FILE_NEW_PROJECT=New project MENU_FILE_NEW_WORKSPACE=New workspace MENU_FILE_OPEN=&Open file... @@ -227,6 +227,7 @@ OPTION_VERBOSE=Verbose OPTION_WORKING_DIR=Working directory OPTION_WORKSPACE_NAME=Workspace name OPTION_USE_SPACES=Use spaces for tabs +OPTION_AUTO_AUTOCOMPLETE=Automatically suggest auto completion ERROR=Error ERROR_CANNOT_CREATE_PROJECT=Cannot create project diff --git a/views/res/i18n/ru.ini b/views/res/i18n/ru.ini index be9bbd5..d86c348 100644 --- a/views/res/i18n/ru.ini +++ b/views/res/i18n/ru.ini @@ -221,6 +221,7 @@ OPTION_VERBOSE=Показать подробности OPTION_WORKING_DIR=Рабочий каталог OPTION_WORKSPACE_NAME=Имя рабочего пространства OPTION_USE_SPACES=Использовать пробелы вместо табуляции +OPTION_AUTO_AUTOCOMPLETE=Автоматически предлагать дополнение кода ERROR=Ошибка ERROR_CANNOT_CREATE_PROJECT=Не могу создать проект