godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #82326 from adeneve/gdscript_dict_highlighter_fix 

Fix for GDScriptHighlighter dictionaries as function arguments
This commit is contained in:
Rémi Verschelde 2023-10-05 22:49:47 +02:00
parent 68926d5919 978fcaf1b4
commit 1edf0f35b1
No known key found for this signature in database
GPG Key ID: C3336907360768E1
1 changed files with 25 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
modules/gdscript/editor/gdscript_highlighter.cpp
View File

@ -63,11 +63,13 @@ Dictionary GDScriptSyntaxHighlighter::_get_line_syntax_highlighting_impl(int p_l
bool in_lambda = false;
bool in_function_name = false;
bool in_function_args = false;
bool in_variable_declaration = false;
bool in_signal_declaration = false;
bool expect_type = false;
int in_function_args = 0;
int in_function_arg_dicts = 0;
Color keyword_color;
Color color;
@ -472,12 +474,24 @@ Dictionary GDScriptSyntaxHighlighter::_get_line_syntax_highlighting_impl(int p_l
}
if (is_a_symbol) {
if (in_function_name) {
in_function_args = true;
}
if (in_function_args && str[j] == ')') {
in_function_args = false;
if (in_function_args > 0) {
switch (str[j]) {
case '(':
in_function_args += 1;
break;
case ')':
in_function_args -= 1;
break;
case '{':
in_function_arg_dicts += 1;
break;
case '}':
in_function_arg_dicts -= 1;
break;
}
} else if (in_function_name && str[j] == '(') {
in_function_args = 1;
in_function_arg_dicts = 0;
}
if (expect_type && (prev_is_char || str[j] == '=') && str[j] != '[' && str[j] != '.') {
@ -488,15 +502,15 @@ Dictionary GDScriptSyntaxHighlighter::_get_line_syntax_highlighting_impl(int p_l
expect_type = true;
}
if (in_variable_declaration || in_function_args) {
if (in_variable_declaration || in_function_args > 0) {
int k = j;
// Skip space
// Skip space.
while (k < line_length && is_whitespace(str[k])) {
k++;
}
if (str[k] == ':') {
// has type hint
if (str[k] == ':' && in_function_arg_dicts == 0) {
// Has type hint.
expect_type = true;
}
}