From 01471e4c096c95d90288e9acb03b9b800436ad8f Mon Sep 17 00:00:00 2001
From: Paul Batty <Paulb23@users.noreply.github.com>
Date: Sat, 2 Apr 2016 20:46:42 +0100
Subject: [PATCH] Function syntax highlighting (cherry picked from commit
 50aa78210c0e31ea8a348bdd8a2432159dc61879)

---
 scene/gui/text_edit.cpp                       | 19 +++++++++++++++++++
 scene/gui/text_edit.h                         |  1 +
 tools/editor/editor_settings.cpp              |  1 +
 tools/editor/plugins/script_editor_plugin.cpp |  1 +
 4 files changed, 22 insertions(+)

diff --git a/scene/gui/text_edit.cpp b/scene/gui/text_edit.cpp
index 9f1aad9c287..99efce42c85 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)
@@ -2958,6 +2976,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 e7e67603797..39ed367a1cc 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;
diff --git a/tools/editor/editor_settings.cpp b/tools/editor/editor_settings.cpp
index 2d83f65cd26..106193ac78a 100644
--- a/tools/editor/editor_settings.cpp
+++ b/tools/editor/editor_settings.cpp
@@ -475,6 +475,7 @@ void EditorSettings::_load_defaults(Ref<ConfigFile> p_extra_config) {
 	set("text_editor/keyword_color",Color::html("ffffb3"));
 	set("text_editor/base_type_color",Color::html("a4ffd4"));
 	set("text_editor/engine_type_color",Color::html("83d3ff"));
+	set("text_editor/function_color",Color::html("66a2ce"));
 	set("text_editor/comment_color",Color::html("983d1b"));
 	set("text_editor/string_color",Color::html("ef6ebe"));
 	set("text_editor/number_color",Color::html("EB9532"));
diff --git a/tools/editor/plugins/script_editor_plugin.cpp b/tools/editor/plugins/script_editor_plugin.cpp
index 7ead5b8eb37..f8aa8367017 100644
--- a/tools/editor/plugins/script_editor_plugin.cpp
+++ b/tools/editor/plugins/script_editor_plugin.cpp
@@ -294,6 +294,7 @@ void ScriptTextEditor::_load_theme_settings() {
 	get_text_edit()->add_color_override("current_line_color",EDITOR_DEF("text_editor/current_line_color",Color(0.3,0.5,0.8,0.15)));
 	get_text_edit()->add_color_override("word_highlighted_color",EDITOR_DEF("text_editor/word_highlighted_color",Color(0.8,0.9,0.9,0.15)));
 	get_text_edit()->add_color_override("number_color",EDITOR_DEF("text_editor/number_color",Color(0.9,0.6,0.0,2)));
+	get_text_edit()->add_color_override("function_color",EDITOR_DEF("text_editor/function_color",Color(0.4,0.6,0.8)));
 
 	Color keyword_color= EDITOR_DEF("text_editor/keyword_color",Color(0.5,0.0,0.2));