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

Merge pull request #65163 from MewPurPur/reuse-function-logic-for-global-funcs

Browse source 
Fix a case in global function highlighting
This commit is contained in:
Rémi Verschelde 2022-09-01 09:18:39 +02:00 committed by GitHub
commit 73021d491a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -318,8 +318,18 @@ Dictionary GDScriptSyntaxHighlighter::_get_line_syntax_highlighting_impl(int p_l
Color col = Color(); Color col = Color();
if (global_functions.has(word)) { if (global_functions.has(word)) {
// "assert" and "preload" are reserved, so highlight even if not followed by a bracket. // "assert" and "preload" are reserved, so highlight even if not followed by a bracket.
if (word == "assert" || word == "preload" || str[to] == '(') { if (word == "assert" || word == "preload") {
col = global_function_color; col = global_function_color;
} else {
// For other global functions, check if followed by bracket.
int k = to;
while (k < line_length && is_whitespace(str[k])) {
k++;
}
if (str[k] == '(') {
col = global_function_color;
}
} }
} else if (keywords.has(word)) { } else if (keywords.has(word)) {
col = keywords[word]; col = keywords[word];
@ -668,14 +678,14 @@ void GDScriptSyntaxHighlighter::_update_cache() {
if (godot_2_theme || EditorSettings::get_singleton()->is_dark_theme()) { if (godot_2_theme || EditorSettings::get_singleton()->is_dark_theme()) {
function_definition_color = Color(0.4, 0.9, 1.0); function_definition_color = Color(0.4, 0.9, 1.0);
global_function_color = Color(0.6, 0.6, 0.9); global_function_color = Color(0.64, 0.64, 0.96);
node_path_color = Color(0.72, 0.77, 0.49); node_path_color = Color(0.72, 0.77, 0.49);
node_ref_color = Color(0.39, 0.76, 0.35); node_ref_color = Color(0.39, 0.76, 0.35);
annotation_color = Color(1.0, 0.7, 0.45); annotation_color = Color(1.0, 0.7, 0.45);
string_name_color = Color(1.0, 0.76, 0.65); string_name_color = Color(1.0, 0.76, 0.65);
} else { } else {
function_definition_color = Color(0, 0.6, 0.6); function_definition_color = Color(0, 0.6, 0.6);
global_function_color = Color(0.4, 0.2, 0.8); global_function_color = Color(0.36, 0.18, 0.72);
node_path_color = Color(0.18, 0.55, 0); node_path_color = Color(0.18, 0.55, 0);
node_ref_color = Color(0.0, 0.5, 0); node_ref_color = Color(0.0, 0.5, 0);
annotation_color = Color(0.8, 0.37, 0); annotation_color = Color(0.8, 0.37, 0);