summaryrefslogtreecommitdiff
path: root/scene/gui
diff options
context:
space:
mode:
authorPaul Batty <Paulb23@users.noreply.github.com>2016-04-02 20:46:42 +0100
committerRĂ©mi Verschelde <remi@verschelde.fr>2016-04-02 21:46:42 +0200
commit50aa78210c0e31ea8a348bdd8a2432159dc61879 (patch)
tree9898dcd8631ec6d6658b31d2a5667f4604c59f24 /scene/gui
parent0a5472e697dee57956c2583a50bc5cf5faada5d8 (diff)
Function syntax highlighting
Diffstat (limited to 'scene/gui')
-rw-r--r--scene/gui/text_edit.cpp19
-rw-r--r--scene/gui/text_edit.h1
2 files changed, 20 insertions, 0 deletions
diff --git a/scene/gui/text_edit.cpp b/scene/gui/text_edit.cpp
index ff9adc6bed..d6575481c2 100644
--- a/scene/gui/text_edit.cpp
+++ b/scene/gui/text_edit.cpp
@@ -671,6 +671,7 @@ void TextEdit::_notification(int p_what) {
bool prev_is_number = false;
bool in_keyword=false;
bool in_word = false;
+ bool in_function_name = false;
Color keyword_color;
// check if line contains highlighted word
@@ -790,11 +791,28 @@ void TextEdit::_notification(int p_what) {
}
}
+ if (!in_function_name && in_word && !in_keyword) {
+
+ int k = j;
+ while(k < str.length() && !_is_symbol(str[k]) && str[k] != '\t' && str[k] != ' ') {
+ k++;
+ }
+
+ if (str[k] == '(') {
+ in_function_name = true;
+ }
+ }
+
+ if (is_symbol) {
+ in_function_name = false;
+ }
if (in_region>=0)
color=color_regions[in_region].color;
else if (in_keyword)
color=keyword_color;
+ else if (in_function_name)
+ color=cache.function_color;
else if (is_symbol)
color=symbol_color;
else if (is_number)
@@ -3008,6 +3026,7 @@ void TextEdit::_update_caches() {
cache.font_color=get_color("font_color");
cache.font_selected_color=get_color("font_selected_color");
cache.keyword_color=get_color("keyword_color");
+ cache.function_color=get_color("function_color");
cache.number_color=get_color("number_color");
cache.selection_color=get_color("selection_color");
cache.mark_color=get_color("mark_color");
diff --git a/scene/gui/text_edit.h b/scene/gui/text_edit.h
index a268cca90f..22071640a2 100644
--- a/scene/gui/text_edit.h
+++ b/scene/gui/text_edit.h
@@ -77,6 +77,7 @@ class TextEdit : public Control {
Color font_selected_color;
Color keyword_color;
Color number_color;
+ Color function_color;
Color selection_color;
Color mark_color;
Color breakpoint_color;