diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-07-14 09:49:02 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-14 09:49:02 +0200 |
| commit | ca5958d1806d96e2d54e8b3336a96f0a02381a86 (patch) | |
| tree | c738df29c03b2f056d7d15aea9fe7b5a4ad46cd4 /core | |
| parent | 28e8347d6cb1e5e8945ba62b9678849046038bb6 (diff) | |
| parent | bc4cee44582d2a90d0792d6b213f00be1043000b (diff) | |
| download | redot-engine-ca5958d1806d96e2d54e8b3336a96f0a02381a86.tar.gz | |
Merge pull request #38440 from Paulb23/syntax_highlighter_refactor
Syntax highlighter refactor
Diffstat (limited to 'core')
| -rw-r--r-- | core/script_language.cpp | 33 | ||||
| -rw-r--r-- | core/script_language.h | 2 |
2 files changed, 35 insertions, 0 deletions
diff --git a/core/script_language.cpp b/core/script_language.cpp index 38a970f3c6..420a560782 100644 --- a/core/script_language.cpp +++ b/core/script_language.cpp @@ -352,6 +352,39 @@ ScriptCodeCompletionCache::ScriptCodeCompletionCache() { singleton = this; } +void ScriptLanguage::get_core_type_words(List<String> *p_core_type_words) const { + p_core_type_words->push_back("String"); + p_core_type_words->push_back("Vector2"); + p_core_type_words->push_back("Vector2i"); + p_core_type_words->push_back("Rect2"); + p_core_type_words->push_back("Rect2i"); + p_core_type_words->push_back("Vector3"); + p_core_type_words->push_back("Vector3i"); + p_core_type_words->push_back("Transform2D"); + p_core_type_words->push_back("Plane"); + p_core_type_words->push_back("Quat"); + p_core_type_words->push_back("AABB"); + p_core_type_words->push_back("Basis"); + p_core_type_words->push_back("Transform"); + p_core_type_words->push_back("Color"); + p_core_type_words->push_back("StringName"); + p_core_type_words->push_back("NodePath"); + p_core_type_words->push_back("RID"); + p_core_type_words->push_back("Callable"); + p_core_type_words->push_back("Signal"); + p_core_type_words->push_back("Dictionary"); + p_core_type_words->push_back("Array"); + p_core_type_words->push_back("PackedByteArray"); + p_core_type_words->push_back("PackedInt32Array"); + p_core_type_words->push_back("PackedInt64Array"); + p_core_type_words->push_back("PackedFloat32Array"); + p_core_type_words->push_back("PackedFloat64Array"); + p_core_type_words->push_back("PackedStringArray"); + p_core_type_words->push_back("PackedVector2Array"); + p_core_type_words->push_back("PackedVector3Array"); + p_core_type_words->push_back("PackedColorArray"); +} + void ScriptLanguage::frame() { } diff --git a/core/script_language.h b/core/script_language.h index 96c49e9c42..314b047027 100644 --- a/core/script_language.h +++ b/core/script_language.h @@ -256,6 +256,7 @@ struct ScriptCodeCompletionOption { Kind kind = KIND_PLAIN_TEXT; String display; String insert_text; + Color font_color; RES icon; ScriptCodeCompletionOption() {} @@ -299,6 +300,7 @@ public: String message; }; + void get_core_type_words(List<String> *p_core_type_words) const; virtual void get_reserved_words(List<String> *p_words) const = 0; virtual void get_comment_delimiters(List<String> *p_delimiters) const = 0; virtual void get_string_delimiters(List<String> *p_delimiters) const = 0; |