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

Fix autocompletion crash; autocompletion cancel

This commit is contained in:
Grim Maple 2022-04-26 19:29:15 +03:00
parent 0dee6cb1f1
commit 8c072de2af
1 changed files with 12 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -724,7 +724,9 @@ class DSourceEdit : SourceEdit, EditableContentMarksChangeListener {
private bool isAutoCompleteKey(ref KeyEvent event) { private bool isAutoCompleteKey(ref KeyEvent event) {
if((event.keyCode >= KeyCode.KEY_0 && event.keyCode <= KeyCode.KEY_Z) || if((event.keyCode >= KeyCode.KEY_0 && event.keyCode <= KeyCode.KEY_Z) ||
event.keyCode == KeyCode.KEY_PERIOD) event.keyCode == KeyCode.KEY_PERIOD ||
event.keyCode == KeyCode.BACK ||
event.text == "_")
return true; return true;
return false; return false;
} }
@ -735,7 +737,7 @@ class DSourceEdit : SourceEdit, EditableContentMarksChangeListener {
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(_settings.autoAutoComplete && !_completionPopup) { if(_settings.autoAutoComplete && isAutoCompleteKey(event) && !_completionPopup) {
window.dispatchAction(ACTION_GET_COMPLETIONS, this); window.dispatchAction(ACTION_GET_COMPLETIONS, this);
} }
else if (event.action == KeyAction.Text && event.noModifiers && event.text==".") { else if (event.action == KeyAction.Text && event.noModifiers && event.text==".") {
@ -817,19 +819,12 @@ class CompletionPopupMenu : PopupMenu {
/// handle keys /// handle keys
override bool onKeyEvent(KeyEvent event) { override bool onKeyEvent(KeyEvent event) {
if (event.action == KeyAction.Text) { if (event.action == KeyAction.Text) {
_prefix ~= event.text; _editor.onKeyEvent(event);
MenuItem newItems = updateItems(); _editor.closeCompletionPopup(this);
if (newItems.subitemCount == 0) { return true;
// no matches anymore } else if (event.keyCode == KeyCode.ESCAPE) {
_editor.onKeyEvent(event); _editor.closeCompletionPopup(this);
_editor.closeCompletionPopup(this); return true;
return true;
} else {
_editor.onKeyEvent(event);
menuItems = newItems;
selectItem(0);
return true;
}
} else if (event.action == KeyAction.KeyDown && event.keyCode == KeyCode.BACK && event.noModifiers) { } else if (event.action == KeyAction.KeyDown && event.keyCode == KeyCode.BACK && event.noModifiers) {
if (_prefix.length > _initialPrefix.length) { if (_prefix.length > _initialPrefix.length) {
_prefix.length = _prefix.length - 1; _prefix.length = _prefix.length - 1;
@ -842,8 +837,8 @@ class CompletionPopupMenu : PopupMenu {
_editor.closeCompletionPopup(this); _editor.closeCompletionPopup(this);
} }
return true; return true;
} else if (event.action == KeyAction.KeyDown && event.keyCode == KeyCode.RETURN) { } else if ((event.action == KeyAction.KeyDown && event.keyCode == KeyCode.RETURN) ||
} else if (event.action == KeyAction.KeyDown && event.keyCode == KeyCode.SPACE) { (event.action == KeyAction.KeyDown && event.keyCode == KeyCode.SPACE)) {
} }
return super.onKeyEvent(event); return super.onKeyEvent(event);
} }