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

Merge pull request #65052 from MewPurPur/fix-number-highlighting-followup

Browse Source
This commit is contained in:
Rémi Verschelde 2022-08-30 09:17:41 +02:00 committed by GitHub
commit 2a4c1bd7c1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -279,23 +279,24 @@ Dictionary GDScriptSyntaxHighlighter::_get_line_syntax_highlighting_impl(int p_l
in_number = true; in_number = true;
} }
// Special cases for numbers: Unary operators, separator '_', decimal point '.', literals '0x' and '0b', and scientific notation 'e'. // Special cases for numbers
if (in_number && !is_a_digit) { if (in_number && !is_a_digit) {
if ((str[j] == '+' || str[j] == '-') && j > 0 && str[j - 1] == 'e' && !prev_is_digit) { if (str[j] == 'b' && str[j - 1] == '0') {
in_number = true; is_bin_notation = true;
} else if ((str[j] == 'e' || str[j] == '_' || str[j] == '.') && prev_is_digit) { } else if (str[j] == 'x' && str[j - 1] == '0') {
in_number = true; is_hex_notation = true;
} else if ((str[j] == 'b' || str[j] == 'x') && (j > 0 && str[j - 1] == '0')) { } else if (!((str[j] == '-' || str[j] == '+') && str[j - 1] == 'e' && !prev_is_digit) &&
in_number = true; !(str[j] == '_' && (prev_is_digit || str[j - 1] == 'b' || str[j - 1] == 'x' || str[j - 1] == '.')) &&
if (str[j] == 'b') { !((str[j] == 'e' || str[j] == '.') && (prev_is_digit || str[j - 1] == '_')) &&
is_bin_notation = true; !((str[j] == '-' || str[j] == '+' || str[j] == '~') && !prev_is_binary_op && str[j - 1] != 'e')) {
} else if (str[j] == 'x') { /* 1st row of condition: '+' or '-' after scientific notation;
is_hex_notation = true; 2nd row of condition: '_' as a numeric separator;
} 3rd row of condition: Scientific notation 'e' and floating points;
} else { 4th row of condition: Multiple unary operators. */
in_number = false; in_number = false;
} }
} else if ((str[j] == '.' || str[j] == '+' || str[j] == '-' || str[j] == '~') && !is_binary_op) { } else if ((str[j] == '-' || str[j] == '+' || str[j] == '~' || (str[j] == '.' && str[j + 1] != '.' && (j == 0 || (j > 0 && str[j - 1] != '.')))) && !is_binary_op) {
// Start a number from unary mathematical operators and floating points, except for '..'
in_number = true; in_number = true;
} }