godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-07 12:30:27 +00:00
Code Releases Wiki Activity

Merge pull request #65074 from MewPurPur/booleans-highlighting-fix

Browse Source 
Fix highlighting after value keywords
This commit is contained in:
Rémi Verschelde
2022-09-27 09:58:58 +02:00
parent b8870b91b5 ff362f8586
commit cb39d7d08b
1 changed files with 25 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -39,10 +39,10 @@ Dictionary GDScriptSyntaxHighlighter::_get_line_syntax_highlighting_impl(int p_l
Type next_type = NONE; Type next_type = NONE;
Type current_type = NONE; Type current_type = NONE;
Type previous_type = NONE; Type prev_type = NONE;
String previous_text = ""; String prev_text = "";
int previous_column = 0; int prev_column = 0;
bool prev_is_char = false; bool prev_is_char = false;
bool prev_is_digit = false; bool prev_is_digit = false;
@@ -224,9 +224,9 @@ Dictionary GDScriptSyntaxHighlighter::_get_line_syntax_highlighting_impl(int p_l
} }
} }
previous_type = REGION; prev_type = REGION;
previous_text = ""; prev_text = "";
previous_column = j; prev_column = j;
j = from + (end_key_length - 1); j = from + (end_key_length - 1);
if (region_end_index == -1) { if (region_end_index == -1) {
color_region_cache[p_line] = in_region; color_region_cache[p_line] = in_region;
@@ -243,17 +243,15 @@ Dictionary GDScriptSyntaxHighlighter::_get_line_syntax_highlighting_impl(int p_l
// A bit of a hack, but couldn't come up with anything better. // A bit of a hack, but couldn't come up with anything better.
if (j > 0 && (str[j] == '&' || str[j] == '^' || str[j] == '%' || str[j] == '+' || str[j] == '-' || str[j] == '~' || str[j] == '.')) { if (j > 0 && (str[j] == '&' || str[j] == '^' || str[j] == '%' || str[j] == '+' || str[j] == '-' || str[j] == '~' || str[j] == '.')) {
if (!keywords.has(previous_text)) { if (prev_text == "true" || prev_text == "false" || prev_text == "self" || prev_text == "null" || prev_text == "PI" || prev_text == "TAU" || prev_text == "INF" || prev_text == "NAN") {
if (previous_text == "PI" || previous_text == "TAU" || previous_text == "INF" || previous_text == "NAN") { is_binary_op = true;
} else if (!keywords.has(prev_text)) {
int k = j - 1;
while (k > 0 && is_whitespace(str[k])) {
k--;
}
if (!is_symbol(str[k]) || str[k] == '"' || str[k] == '\'' || str[k] == ')' || str[k] == ']' || str[k] == '}') {
is_binary_op = true; is_binary_op = true;
} else {
int k = j - 1;
while (k > 0 && is_whitespace(str[k])) {
k--;
}
if (!is_symbol(str[k]) || str[k] == '"' || str[k] == '\'' || str[k] == ')' || str[k] == ']' || str[k] == '}') {
is_binary_op = true;
}
} }
} }
} }
@@ -355,7 +353,7 @@ Dictionary GDScriptSyntaxHighlighter::_get_line_syntax_highlighting_impl(int p_l
} }
if (!in_function_name && in_word && !in_keyword) { if (!in_function_name && in_word && !in_keyword) {
if (previous_text == GDScriptTokenizer::get_token_name(GDScriptTokenizer::Token::SIGNAL)) { if (prev_text == GDScriptTokenizer::get_token_name(GDScriptTokenizer::Token::SIGNAL)) {
in_signal_declaration = true; in_signal_declaration = true;
} else { } else {
int k = j; int k = j;
@@ -370,12 +368,12 @@ Dictionary GDScriptSyntaxHighlighter::_get_line_syntax_highlighting_impl(int p_l
if (str[k] == '(') { if (str[k] == '(') {
in_function_name = true; in_function_name = true;
} else if (previous_text == GDScriptTokenizer::get_token_name(GDScriptTokenizer::Token::VAR)) { } else if (prev_text == GDScriptTokenizer::get_token_name(GDScriptTokenizer::Token::VAR)) {
in_variable_declaration = true; in_variable_declaration = true;
} }
// Check for lambda. // Check for lambda.
if (in_function_name && previous_text == GDScriptTokenizer::get_token_name(GDScriptTokenizer::Token::FUNC)) { if (in_function_name && prev_text == GDScriptTokenizer::get_token_name(GDScriptTokenizer::Token::FUNC)) {
k = j - 1; k = j - 1;
while (k > 0 && is_whitespace(str[k])) { while (k > 0 && is_whitespace(str[k])) {
k--; k--;
@@ -491,7 +489,7 @@ Dictionary GDScriptSyntaxHighlighter::_get_line_syntax_highlighting_impl(int p_l
} else if (in_function_name) { } else if (in_function_name) {
next_type = FUNCTION; next_type = FUNCTION;
if (!in_lambda && previous_text == GDScriptTokenizer::get_token_name(GDScriptTokenizer::Token::FUNC)) { if (!in_lambda && prev_text == GDScriptTokenizer::get_token_name(GDScriptTokenizer::Token::FUNC)) {
color = function_definition_color; color = function_definition_color;
} else { } else {
color = function_color; color = function_color;
@@ -513,20 +511,20 @@ Dictionary GDScriptSyntaxHighlighter::_get_line_syntax_highlighting_impl(int p_l
if (current_type == NONE) { if (current_type == NONE) {
current_type = next_type; current_type = next_type;
} else { } else {
previous_type = current_type; prev_type = current_type;
current_type = next_type; current_type = next_type;
// no need to store regions... // no need to store regions...
if (previous_type == REGION) { if (prev_type == REGION) {
previous_text = ""; prev_text = "";
previous_column = j; prev_column = j;
} else { } else {
String text = str.substr(previous_column, j - previous_column).strip_edges(); String text = str.substr(prev_column, j - prev_column).strip_edges();
previous_column = j; prev_column = j;
// ignore if just whitespace // ignore if just whitespace
if (!text.is_empty()) { if (!text.is_empty()) {
previous_text = text; prev_text = text;
} }
} }
} }