forks
/
dlangide
mirror of https://github.com/buggins/dlangide.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add autocompletion on each key press

This commit is contained in:
Grim Maple 2022-04-22 23:35:54 +03:00
parent daeb6f58af
commit 0dee6cb1f1
5 changed files with 77 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/dlangide/ui/dsourceedit.d
View File

@ -49,7 +49,7 @@ class DSourceEdit : SourceEdit, EditableContentMarksChangeListener {
onThemeChanged(); onThemeChanged();
//setTokenHightlightColor(TokenCategory.Identifier, 0x206000); // no colors //setTokenHightlightColor(TokenCategory.Identifier, 0x206000); // no colors
MenuItem editPopupItem = new MenuItem(null); 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_EDIT_REDO, ACTION_EDIT_INDENT, ACTION_EDIT_UNINDENT, ACTION_EDIT_TOGGLE_LINE_COMMENT,
ACTION_GET_COMPLETIONS, ACTION_GO_TO_DEFINITION, ACTION_DEBUG_TOGGLE_BREAKPOINT); ACTION_GET_COMPLETIONS, ACTION_GO_TO_DEFINITION, ACTION_DEBUG_TOGGLE_BREAKPOINT);
popupMenu = editPopupItem; popupMenu = editPopupItem;
@ -125,12 +125,12 @@ class DSourceEdit : SourceEdit, EditableContentMarksChangeListener {
protected EditorTool _editorTool; protected EditorTool _editorTool;
@property EditorTool editorTool() { return _editorTool; } @property EditorTool editorTool() { return _editorTool; }
@property EditorTool editorTool(EditorTool tool) { @property EditorTool editorTool(EditorTool tool) {
if (_editorTool && _editorTool !is tool) { if (_editorTool && _editorTool !is tool) {
destroy(_editorTool); destroy(_editorTool);
_editorTool = null; _editorTool = null;
} }
return _editorTool = tool; return _editorTool = tool;
}; };
protected ProjectSourceFile _projectSourceFile; protected ProjectSourceFile _projectSourceFile;
@ -585,7 +585,7 @@ class DSourceEdit : SourceEdit, EditableContentMarksChangeListener {
_docsPopup.popupClosed = delegate(PopupWidget source) { _docsPopup.popupClosed = delegate(PopupWidget source) {
Log.d("Closed Docs popup"); Log.d("Closed Docs popup");
_docsPopup = null; _docsPopup = null;
//setFocus(); //setFocus();
}; };
_docsPopup.flags = PopupFlags.CloseOnClickOutside | PopupFlags.CloseOnMouseMoveOutside; _docsPopup.flags = PopupFlags.CloseOnClickOutside | PopupFlags.CloseOnMouseMoveOutside;
invalidate(); invalidate();
@ -641,7 +641,8 @@ class DSourceEdit : SourceEdit, EditableContentMarksChangeListener {
return; return;
} }
if (suggestions.length == 1) { // Only insert singular autocompletion if automatic autocomplete is turned off!
if (!_settings.autoAutoComplete && suggestions.length == 1) {
insertCompletion(suggestions[0]); insertCompletion(suggestions[0]);
return; return;
} }
@ -680,7 +681,7 @@ class DSourceEdit : SourceEdit, EditableContentMarksChangeListener {
popupPositionX, popupPositionX,
popupPositionY + yOffset); popupPositionY + yOffset);
_completionPopup.setFocus(); _completionPopup.setFocus();
_completionPopup.popupClosed = delegate(PopupWidget source) { _completionPopup.popupClosed = delegate(PopupWidget source) {
setFocus(); setFocus();
_completionPopup = null; _completionPopup = null;
}; };
@ -721,13 +722,23 @@ class DSourceEdit : SourceEdit, EditableContentMarksChangeListener {
super.handleFocusChange(focused, receivedFocusFromKeyboard); 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 _lastKeyDownCode;
protected uint _periodKeyCode; protected uint _periodKeyCode;
/// handle keys: support autocompletion after . press with delay /// handle keys: support autocompletion after . press with delay
override bool onKeyEvent(KeyEvent event) { override bool onKeyEvent(KeyEvent event) {
if (event.action == KeyAction.KeyDown) if (event.action == KeyAction.KeyDown)
_lastKeyDownCode = event.keyCode; _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; _periodKeyCode = _lastKeyDownCode;
startCompletionTimer(); startCompletionTimer();
} else { } else {
@ -775,7 +786,7 @@ class CompletionPopupMenu : PopupMenu {
//maxHeight(400); //maxHeight(400);
selectItem(0); selectItem(0);
} }
Point fullContentSizeWithBorders() { Point fullContentSizeWithBorders() {
measure(2000.pointsToPixels, 2000.pointsToPixels); measure(2000.pointsToPixels, 2000.pointsToPixels);
Point sz; Point sz;

83
src/dlangide/ui/settings.d
View File

@ -69,36 +69,36 @@ SettingsPage createSettingsPages() {
// UI settings page // UI settings page
SettingsPage ui = res.addChild("interface", UIString.fromId("OPTION_INTERFACE"c)); SettingsPage ui = res.addChild("interface", UIString.fromId("OPTION_INTERFACE"c));
ui.addStringComboBox("interface/theme", UIString.fromId("OPTION_THEME"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)]); StringListValue("ide_theme_dark", "OPTION_DARK"c)]);
ui.addStringComboBox("interface/language", UIString.fromId("OPTION_LANGUAGE"c), [ ui.addStringComboBox("interface/language", UIString.fromId("OPTION_LANGUAGE"c), [
StringListValue("en", "MENU_VIEW_LANGUAGE_EN"c), StringListValue("en", "MENU_VIEW_LANGUAGE_EN"c),
StringListValue("ru", "MENU_VIEW_LANGUAGE_RU"c), StringListValue("ru", "MENU_VIEW_LANGUAGE_RU"c),
StringListValue("es", "MENU_VIEW_LANGUAGE_ES"c), StringListValue("es", "MENU_VIEW_LANGUAGE_ES"c),
StringListValue("de", "MENU_VIEW_LANGUAGE_DE"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 font faces
ui.addStringComboBox("interface/uiFontFace", UIString.fromId("OPTION_FONT_FACE"c), ui.addStringComboBox("interface/uiFontFace", UIString.fromId("OPTION_FONT_FACE"c),
createFaceList(false)); 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])); 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), 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(1, "OPTION_FONT_HINTING_FORCE"c),
StringListValue(2, "OPTION_FONT_HINTING_DISABLED"c), StringListValue(3, "OPTION_FONT_HINTING_LIGHT"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), ui.addIntComboBox("interface/minAntialiasedFontSize", UIString.fromId("OPTION_FONT_ANTIALIASING"c),
[StringListValue(0, "OPTION_FONT_ANTIALIASING_ALWAYS_ON"c), [StringListValue(0, "OPTION_FONT_ANTIALIASING_ALWAYS_ON"c),
StringListValue(12, "12"d), StringListValue(12, "12"d),
StringListValue(14, "14"d), StringListValue(14, "14"d),
StringListValue(16, "16"d), StringListValue(16, "16"d),
StringListValue(20, "20"d), StringListValue(20, "20"d),
StringListValue(24, "24"d), StringListValue(24, "24"d),
StringListValue(32, "32"d), StringListValue(32, "32"d),
StringListValue(48, "48"d), StringListValue(48, "48"d),
StringListValue(255, "OPTION_FONT_ANTIALIASING_ALWAYS_OFF"c)]); 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(500, "0.5 "d),
StringListValue(600, "0.6 "d), StringListValue(600, "0.6 "d),
@ -109,25 +109,25 @@ SettingsPage createSettingsPages() {
StringListValue(950, "0.95 "d), StringListValue(950, "0.95 "d),
StringListValue(1000, "1.0 "d), StringListValue(1000, "1.0 "d),
StringListValue(1050, "1.05 "d), StringListValue(1050, "1.05 "d),
StringListValue(1100, "1.1 "d), StringListValue(1100, "1.1 "d),
StringListValue(1150, "1.15 "d), StringListValue(1150, "1.15 "d),
StringListValue(1200, "1.2 "d), StringListValue(1200, "1.2 "d),
StringListValue(1250, "1.25 "d), StringListValue(1250, "1.25 "d),
StringListValue(1300, "1.3 "d), StringListValue(1300, "1.3 "d),
StringListValue(1400, "1.4 "d), StringListValue(1400, "1.4 "d),
StringListValue(1500, "1.5 "d), StringListValue(1500, "1.5 "d),
StringListValue(1700, "1.7 "d), StringListValue(1700, "1.7 "d),
StringListValue(2000, "2.0 "d)]); StringListValue(2000, "2.0 "d)]);
ui.addIntComboBox("interface/screenDpiOverride", UIString.fromId("OPTION_SCREEN_DPI_OVERRIDE"c), 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(0, UIString.fromId("OPTION_SCREEN_DPI_OVERRIDE_NONE"c).value ~ " ("d ~ to!dstring(systemScreenDPI) ~ ")"d),
StringListValue(72, "72"d), StringListValue(72, "72"d),
StringListValue(96, "96"d), StringListValue(96, "96"d),
StringListValue(120, "120"d), StringListValue(120, "120"d),
StringListValue(140, "140"d), StringListValue(140, "140"d),
StringListValue(150, "150"d), StringListValue(150, "150"d),
StringListValue(300, "300"d), StringListValue(300, "300"d),
StringListValue(400, "400"d), StringListValue(400, "400"d),
StringListValue(600, "600"d)]); StringListValue(600, "600"d)]);
SettingsPage ed = res.addChild("editors", UIString.fromId("OPTION_EDITORS"c)); 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/smartIndentsAfterPaste", UIString.fromId("OPTION_SMART_INDENTS_PASTE"c));
texted.addCheckbox("editors/textEditor/showWhiteSpaceMarks", UIString.fromId("OPTION_SHOW_SPACES"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/showTabPositionMarks", UIString.fromId("OPTION_SHOW_TABS"c));
texted.addCheckbox("editors/textEditor/autoAutoComplete", UIString.fromId("OPTION_AUTO_AUTOCOMPLETE"c));
// Common page // Common page
SettingsPage common = res.addChild("common", UIString.fromId("OPTION_COMMON"c)); 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)); SettingsPage build = res.addChild("build", UIString.fromId("OPTION_BUILD"c));
build.addStringComboBox("build/toolchain", UIString.fromId("OPTION_TOOLCHAIN"c), [ build.addStringComboBox("build/toolchain", UIString.fromId("OPTION_TOOLCHAIN"c), [
StringListValue("default", UIString.fromId("OPTION_DEFAULT"c)), StringListValue("default", UIString.fromId("OPTION_DEFAULT"c)),
StringListValue("dmd", "DMD"d), StringListValue("dmd", "DMD"d),
StringListValue("ldc", "LDC"d), StringListValue("ldc", "LDC"d),
StringListValue("ldmd", "LDMD"d), StringListValue("ldmd", "LDMD"d),
StringListValue("gdc", "GDC"d)]); StringListValue("gdc", "GDC"d)]);
build.addStringComboBox("build/arch", UIString.fromId("OPTION_ARCHITECTURE"c), [ build.addStringComboBox("build/arch", UIString.fromId("OPTION_ARCHITECTURE"c), [
StringListValue("default", UIString.fromId("OPTION_DEFAULT"c)), StringListValue("default", UIString.fromId("OPTION_DEFAULT"c)),
StringListValue("x86", "x86"d), StringListValue("x86", "x86"d),
StringListValue("x86_64", "x86_64"d), StringListValue("x86_64", "x86_64"d),
StringListValue("arm", "arm"d), StringListValue("arm", "arm"d),
StringListValue("arm64", "arm64"d), StringListValue("arm64", "arm64"d),

15
src/dlangide/workspace/idesettings.d
View File

@ -23,6 +23,7 @@ class IDESettings : SettingsFile {
ed.setBooleanDef("smartIndentsAfterPaste", true); ed.setBooleanDef("smartIndentsAfterPaste", true);
ed.setBooleanDef("showWhiteSpaceMarks", true); ed.setBooleanDef("showWhiteSpaceMarks", true);
ed.setBooleanDef("showTabPositionMarks", true); ed.setBooleanDef("showTabPositionMarks", true);
ed.setBooleanDef("autoAutoComplete", true);
ed.setStringDef("fontFace", "Default"); ed.setStringDef("fontFace", "Default");
ed.setIntegerDef("fontSize", 11); ed.setIntegerDef("fontSize", 11);
Setting ui = uiSettings(); Setting ui = uiSettings();
@ -59,7 +60,7 @@ class IDESettings : SettingsFile {
/// override to do something after loading - e.g. set defaults /// override to do something after loading - e.g. set defaults
override void afterLoad() { override void afterLoad() {
} }
@property Setting editorSettings() { @property Setting editorSettings() {
Setting res = _setting.objectByPath("editors/textEditor", true); Setting res = _setting.objectByPath("editors/textEditor", true);
return res; return res;
@ -171,6 +172,16 @@ class IDESettings : SettingsFile {
return this; 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 /// true if smart indents are enabled
@property bool smartIndents() { return editorSettings.getBoolean("smartIndents", true); } @property bool smartIndents() { return editorSettings.getBoolean("smartIndents", true); }
/// set smart indents enabled flag /// set smart indents enabled flag
@ -317,7 +328,7 @@ class IDESettings : SettingsFile {
obj["recentWorkspaces"] = list; obj["recentWorkspaces"] = list;
save(); save();
} }
@property bool autoOpenLastProject() { @property bool autoOpenLastProject() {
Setting obj =_setting.objectByPath("common", true); Setting obj =_setting.objectByPath("common", true);
return obj.getBoolean("autoOpenLastProject", false); return obj.getBoolean("autoOpenLastProject", false);

3
views/res/i18n/en.ini
View File

@ -34,7 +34,7 @@ NAME=Name
MENU_FILE=&File MENU_FILE=&File
MENU_FILE_NEW=&Create MENU_FILE_NEW=&Create
MENU_FILE_NEW_SOURCE_FILE=New file 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_PROJECT=New project
MENU_FILE_NEW_WORKSPACE=New workspace MENU_FILE_NEW_WORKSPACE=New workspace
MENU_FILE_OPEN=&Open file... MENU_FILE_OPEN=&Open file...
@ -227,6 +227,7 @@ OPTION_VERBOSE=Verbose
OPTION_WORKING_DIR=Working directory OPTION_WORKING_DIR=Working directory
OPTION_WORKSPACE_NAME=Workspace name OPTION_WORKSPACE_NAME=Workspace name
OPTION_USE_SPACES=Use spaces for tabs OPTION_USE_SPACES=Use spaces for tabs
OPTION_AUTO_AUTOCOMPLETE=Automatically suggest auto completion
ERROR=Error ERROR=Error
ERROR_CANNOT_CREATE_PROJECT=Cannot create project ERROR_CANNOT_CREATE_PROJECT=Cannot create project

1
views/res/i18n/ru.ini
View File

@ -221,6 +221,7 @@ OPTION_VERBOSE=Показать подробности
OPTION_WORKING_DIR=Рабочий каталог OPTION_WORKING_DIR=Рабочий каталог
OPTION_WORKSPACE_NAME=Имя рабочего пространства OPTION_WORKSPACE_NAME=Имя рабочего пространства
OPTION_USE_SPACES=Использовать пробелы вместо табуляции OPTION_USE_SPACES=Использовать пробелы вместо табуляции
OPTION_AUTO_AUTOCOMPLETE=Автоматически предлагать дополнение кода
ERROR=Ошибка ERROR=Ошибка
ERROR_CANNOT_CREATE_PROJECT=Не могу создать проект ERROR_CANNOT_CREATE_PROJECT=Не могу создать проект