summaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authorPaulb23 <p_batty@hotmail.co.uk>2020-09-13 21:14:20 +0100
committerPaulb23 <p_batty@hotmail.co.uk>2021-06-01 15:38:45 +0100
commit1c166737986a4c30fa5327f5f5eb97906dfa8abf (patch)
treeb572b8346d8e847bba3bc9134cb108ef78adbf45 /core
parent680dc9e81a79761f733db5ce7f3fa0c05b8e1ff6 (diff)
Move and expose AutoComplete in CodeEdit
Diffstat (limited to 'core')
-rw-r--r--core/input/input_map.cpp6
-rw-r--r--core/object/script_language.h2
2 files changed, 7 insertions, 1 deletions
diff --git a/core/input/input_map.cpp b/core/input/input_map.cpp
index a43ad4ed7d..878ce820fb 100644
--- a/core/input/input_map.cpp
+++ b/core/input/input_map.cpp
@@ -474,10 +474,14 @@ const OrderedHashMap<String, List<Ref<InputEvent>>> &InputMap::get_builtins() {
default_builtin_cache.insert("ui_text_completion_query", inputs);
inputs = List<Ref<InputEvent>>();
- inputs.push_back(InputEventKey::create_reference(KEY_TAB));
inputs.push_back(InputEventKey::create_reference(KEY_ENTER));
+ inputs.push_back(InputEventKey::create_reference(KEY_KP_ENTER));
default_builtin_cache.insert("ui_text_completion_accept", inputs);
+ inputs = List<Ref<InputEvent>>();
+ inputs.push_back(InputEventKey::create_reference(KEY_TAB));
+ default_builtin_cache.insert("ui_text_completion_replace", inputs);
+
// Newlines
inputs = List<Ref<InputEvent>>();
inputs.push_back(InputEventKey::create_reference(KEY_ENTER));
diff --git a/core/object/script_language.h b/core/object/script_language.h
index bb46c718b2..9ed3c7e80f 100644
--- a/core/object/script_language.h
+++ b/core/object/script_language.h
@@ -242,6 +242,8 @@ public:
};
struct ScriptCodeCompletionOption {
+ /* Keep enum in Sync with: */
+ /* /scene/gui/code_edit.h - CodeEdit::CodeCompletionKind */
enum Kind {
KIND_CLASS,
KIND_FUNCTION,