godotengine
/
godot
mirror of https://github.com/godotengine/godot
1
0
Fork 0
Code

Merge 05e274c77a into 15ff450680

This commit is contained in:
Aaron Pagano 2025-02-28 01:36:40 +01:00 committed by GitHub
parent 15ff450680 05e274c77a
commit eb4b0e2e29
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 42 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -78,8 +78,10 @@ Dictionary GDScriptSyntaxHighlighter::_get_line_syntax_highlighting_impl(int p_l
Color keyword_color; Color keyword_color;
Color color; Color color;
color_region_cache[p_line] = -1; int &cached_region = color_region_cache[p_line];
cached_region = -1;
int in_region = -1; int in_region = -1;
if (p_line != 0) { if (p_line != 0) {
int prev_region_line = p_line - 1; int prev_region_line = p_line - 1;
while (prev_region_line > 0 && !color_region_cache.has(prev_region_line)) { while (prev_region_line > 0 && !color_region_cache.has(prev_region_line)) {
@ -92,6 +94,18 @@ Dictionary GDScriptSyntaxHighlighter::_get_line_syntax_highlighting_impl(int p_l
get_line_syntax_highlighting(p_line - 1); get_line_syntax_highlighting(p_line - 1);
} }
in_region = color_region_cache[p_line - 1]; in_region = color_region_cache[p_line - 1];
if (in_region != -1 && color_regions[in_region].type == ColorRegion::TYPE_STRING) {
StringType *string_type = unterminated_string_cache.getptr(p_line - 1);
if (string_type) {
if (*string_type == StringType::TYPE_STRING_NAME) {
in_string_name = true;
} else if (*string_type == StringType::TYPE_NODE_PATH) {
in_node_path = true;
} else if (*string_type == StringType::TYPE_NODE_REF) {
in_node_ref = true;
}
}
}
} }
const String &str = text_edit->get_line_with_ime(p_line); const String &str = text_edit->get_line_with_ime(p_line);
@ -99,7 +113,7 @@ Dictionary GDScriptSyntaxHighlighter::_get_line_syntax_highlighting_impl(int p_l
Color prev_color; Color prev_color;
if (in_region != -1 && line_length == 0) { if (in_region != -1 && line_length == 0) {
color_region_cache[p_line] = in_region; cached_region = in_region;
} }
for (int j = 0; j < line_length; j++) { for (int j = 0; j < line_length; j++) {
Dictionary highlighter_info; Dictionary highlighter_info;
@ -174,7 +188,7 @@ Dictionary GDScriptSyntaxHighlighter::_get_line_syntax_highlighting_impl(int p_l
j = line_length; j = line_length;
if (!color_regions[c].line_only) { if (!color_regions[c].line_only) {
color_region_cache[p_line] = c; cached_region = c;
} }
} }
break; break;
@ -291,7 +305,7 @@ Dictionary GDScriptSyntaxHighlighter::_get_line_syntax_highlighting_impl(int p_l
} }
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; cached_region = in_region;
} }
} }
@ -675,6 +689,21 @@ Dictionary GDScriptSyntaxHighlighter::_get_line_syntax_highlighting_impl(int p_l
color_map[j] = highlighter_info; color_map[j] = highlighter_info;
} }
} }
if (cached_region != -1 && color_regions[cached_region].type == ColorRegion::TYPE_STRING) {
if (in_string_name) {
unterminated_string_cache[p_line] = StringType::TYPE_STRING_NAME;
} else if (in_node_path) {
unterminated_string_cache[p_line] = StringType::TYPE_NODE_PATH;
} else if (in_node_ref) {
unterminated_string_cache[p_line] = StringType::TYPE_NODE_REF;
} else {
unterminated_string_cache[p_line] = StringType::TYPE_STRING;
}
} else {
unterminated_string_cache[p_line] = StringType::TYPE_NONE;
}
return color_map; return color_map;
} }

9
modules/gdscript/editor/gdscript_highlighter.h
View File

@ -58,6 +58,15 @@ private:
Vector<ColorRegion> color_regions; Vector<ColorRegion> color_regions;
HashMap<int, int> color_region_cache; HashMap<int, int> color_region_cache;
enum StringType {
TYPE_NONE,
TYPE_STRING,
TYPE_STRING_NAME,
TYPE_NODE_PATH,
TYPE_NODE_REF,
};
HashMap<int, StringType> unterminated_string_cache;
HashMap<StringName, Color> class_names; HashMap<StringName, Color> class_names;
HashMap<StringName, Color> reserved_keywords; HashMap<StringName, Color> reserved_keywords;
HashMap<StringName, Color> member_keywords; HashMap<StringName, Color> member_keywords;