From b571a29df563133e9dfde738c6020c9111729ef6 Mon Sep 17 00:00:00 2001 From: Paulb23 Date: Sat, 7 Apr 2018 14:14:19 +0100 Subject: Fixed color regions and added local color region cache --- modules/gdscript/gdscript_highlighter.cpp | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) (limited to 'modules') diff --git a/modules/gdscript/gdscript_highlighter.cpp b/modules/gdscript/gdscript_highlighter.cpp index 5b8b652c29..4e89851bf2 100644 --- a/modules/gdscript/gdscript_highlighter.cpp +++ b/modules/gdscript/gdscript_highlighter.cpp @@ -71,24 +71,8 @@ Map GDScriptSyntaxHighlighter::_get_line_syntax_ Color keyword_color; Color color; - int in_region = -1; + int in_region = text_editor->_is_line_in_region(p_line); int deregion = 0; - for (int i = 0; i < p_line; i++) { - int ending_color_region = text_editor->_get_line_ending_color_region(i); - if (in_region == -1) { - in_region = ending_color_region; - } else if (in_region == ending_color_region) { - in_region = -1; - } else { - const Map &cri_map = text_editor->_get_line_color_region_info(i); - for (const Map::Element *E = cri_map.front(); E; E = E->next()) { - const TextEdit::Text::ColorRegionInfo &cri = E->get(); - if (cri.region == in_region) { - in_region = -1; - } - } - } - } const Map cri_map = text_editor->_get_line_color_region_info(p_line); const String &str = text_editor->get_line(p_line); -- cgit v1.2.3