asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Merge pull request #67295 from rune-scape/rune-gdscript-highlighter-keywords

Browse source 
GDScript: fix highlighting '.' after global class name
This commit is contained in:
Rémi Verschelde 2022-10-12 14:44:27 +02:00
commit 3e653c884c
2 changed files with 15 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
modules/gdscript/editor/gdscript_highlighter.cpp
View file

@ -256,7 +256,7 @@ Dictionary GDScriptSyntaxHighlighter::_get_line_syntax_highlighting_impl(int p_l
} }
String word = str.substr(from + 1, to - from); String word = str.substr(from + 1, to - from);
// Keywords need to be exceptions, except for keywords that represent a value. // Keywords need to be exceptions, except for keywords that represent a value.
if (word == "true" || word == "false" || word == "null" || word == "PI" || word == "TAU" || word == "INF" || word == "NAN" || word == "self" || word == "super" || !keywords.has(word)) { if (word == "true" || word == "false" || word == "null" || word == "PI" || word == "TAU" || word == "INF" || word == "NAN" || word == "self" || word == "super" || !reserved_keywords.has(word)) {
if (!is_symbol(str[to]) || str[to] == '"' || str[to] == '\'' || str[to] == ')' || str[to] == ']' || str[to] == '}') { if (!is_symbol(str[to]) || str[to] == '"' || str[to] == '\'' || str[to] == ')' || str[to] == ']' || str[to] == '}') {
is_binary_op = true; is_binary_op = true;
} }
@ -338,8 +338,10 @@ Dictionary GDScriptSyntaxHighlighter::_get_line_syntax_highlighting_impl(int p_l
col = global_function_color; col = global_function_color;
} }
} }
} else if (keywords.has(word)) { } else if (class_names.has(word)) {
col = keywords[word]; col = class_names[word];
} else if (reserved_keywords.has(word)) {
col = reserved_keywords[word];
} else if (member_keywords.has(word)) { } else if (member_keywords.has(word)) {
col = member_keywords[word]; col = member_keywords[word];
} }
@ -563,7 +565,8 @@ PackedStringArray GDScriptSyntaxHighlighter::_get_supported_languages() const {
} }
void GDScriptSyntaxHighlighter::_update_cache() { void GDScriptSyntaxHighlighter::_update_cache() {
keywords.clear(); class_names.clear();
reserved_keywords.clear();
member_keywords.clear(); member_keywords.clear();
global_functions.clear(); global_functions.clear();
color_regions.clear(); color_regions.clear();
@ -580,7 +583,7 @@ void GDScriptSyntaxHighlighter::_update_cache() {
List<StringName> types; List<StringName> types;
ClassDB::get_class_list(&types); ClassDB::get_class_list(&types);
for (const StringName &E : types) { for (const StringName &E : types) {
keywords[E] = types_color; class_names[E] = types_color;
} }
/* User types. */ /* User types. */
@ -588,14 +591,14 @@ void GDScriptSyntaxHighlighter::_update_cache() {
List<StringName> global_classes; List<StringName> global_classes;
ScriptServer::get_global_class_list(&global_classes); ScriptServer::get_global_class_list(&global_classes);
for (const StringName &E : global_classes) { for (const StringName &E : global_classes) {
keywords[E] = usertype_color; class_names[E] = usertype_color;
} }
/* Autoloads. */ /* Autoloads. */
for (const KeyValue<StringName, ProjectSettings::AutoloadInfo> &E : ProjectSettings::get_singleton()->get_autoload_list()) { for (const KeyValue<StringName, ProjectSettings::AutoloadInfo> &E : ProjectSettings::get_singleton()->get_autoload_list()) {
const ProjectSettings::AutoloadInfo &info = E.value; const ProjectSettings::AutoloadInfo &info = E.value;
if (info.is_singleton) { if (info.is_singleton) {
keywords[info.name] = usertype_color; class_names[info.name] = usertype_color;
} }
} }
@ -606,7 +609,7 @@ void GDScriptSyntaxHighlighter::_update_cache() {
List<String> core_types; List<String> core_types;
gdscript->get_core_type_words(&core_types); gdscript->get_core_type_words(&core_types);
for (const String &E : core_types) { for (const String &E : core_types) {
keywords[StringName(E)] = basetype_color; class_names[StringName(E)] = basetype_color;
} }
/* Reserved words. */ /* Reserved words. */
@ -616,9 +619,9 @@ void GDScriptSyntaxHighlighter::_update_cache() {
gdscript->get_reserved_words(&keyword_list); gdscript->get_reserved_words(&keyword_list);
for (const String &E : keyword_list) { for (const String &E : keyword_list) {
if (gdscript->is_control_flow_keyword(E)) { if (gdscript->is_control_flow_keyword(E)) {
keywords[StringName(E)] = control_flow_keyword_color; reserved_keywords[StringName(E)] = control_flow_keyword_color;
} else { } else {
keywords[StringName(E)] = keyword_color; reserved_keywords[StringName(E)] = keyword_color;
} }
} }

3
modules/gdscript/editor/gdscript_highlighter.h
View file

@ -47,7 +47,8 @@ private:
Vector<ColorRegion> color_regions; Vector<ColorRegion> color_regions;
HashMap<int, int> color_region_cache; HashMap<int, int> color_region_cache;
HashMap<StringName, Color> keywords; HashMap<StringName, Color> class_names;
HashMap<StringName, Color> reserved_keywords;
HashMap<StringName, Color> member_keywords; HashMap<StringName, Color> member_keywords;
HashSet<StringName> global_functions; HashSet<StringName> global_functions;