summaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
authorPaulb23 <p_batty@hotmail.co.uk>2018-04-07 14:14:19 +0100
committerPaulb23 <p_batty@hotmail.co.uk>2018-04-07 14:14:19 +0100
commitb571a29df563133e9dfde738c6020c9111729ef6 (patch)
treef82655642f350d2f4e620cd34fa567cee1ed725a /modules
parenteaa5dfbdbd1217d62902f966496658770638c3d1 (diff)
Fixed color regions and added local color region cache
Diffstat (limited to 'modules')
-rw-r--r--modules/gdscript/gdscript_highlighter.cpp18
1 files changed, 1 insertions, 17 deletions
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<int, TextEdit::HighlighterInfo> 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<int, TextEdit::Text::ColorRegionInfo> &cri_map = text_editor->_get_line_color_region_info(i);
- for (const Map<int, TextEdit::Text::ColorRegionInfo>::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<int, TextEdit::Text::ColorRegionInfo> cri_map = text_editor->_get_line_color_region_info(p_line);
const String &str = text_editor->get_line(p_line);