godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Member variable syntax highlighting 

(cherry picked from commit fc9f9adcb2)
This commit is contained in:
Paulb23 2016-04-05 15:50:54 +01:00 committed by Rémi Verschelde
parent d7e4fb4365
commit 86c0438f9d
4 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
scene/gui/text_edit.cpp
View File

@ -672,6 +672,7 @@ void TextEdit::_notification(int p_what) {
bool in_keyword=false; bool in_keyword=false;
bool in_word = false; bool in_word = false;
bool in_function_name = false; bool in_function_name = false;
bool in_member_variable = false;
Color keyword_color; Color keyword_color;
// check if line contains highlighted word // check if line contains highlighted word
@ -801,14 +802,28 @@ void TextEdit::_notification(int p_what) {
} }
} }
if (!in_function_name && !in_member_variable && !in_keyword && !is_number && in_word) {
int k = j;
while(k > 0 && !_is_symbol(str[k]) && str[k] != '\t' && str[k] != ' ') {
k--;
}
if (str[k] == '.') {
in_member_variable = true;
}
}
if (is_symbol) { if (is_symbol) {
in_function_name = false; in_function_name = false;
in_member_variable = false;
} }
if (in_region>=0) if (in_region>=0)
color=color_regions[in_region].color; color=color_regions[in_region].color;
else if (in_keyword) else if (in_keyword)
color=keyword_color; color=keyword_color;
else if (in_member_variable)
color=cache.member_variable_color;
else if (in_function_name) else if (in_function_name)
color=cache.function_color; color=cache.function_color;
else if (is_symbol) else if (is_symbol)
@ -3151,6 +3166,7 @@ void TextEdit::_update_caches() {
cache.font_selected_color=get_color("font_selected_color"); cache.font_selected_color=get_color("font_selected_color");
cache.keyword_color=get_color("keyword_color"); cache.keyword_color=get_color("keyword_color");
cache.function_color=get_color("function_color"); cache.function_color=get_color("function_color");
cache.member_variable_color=get_color("member_variable_color");
cache.number_color=get_color("number_color"); cache.number_color=get_color("number_color");
cache.selection_color=get_color("selection_color"); cache.selection_color=get_color("selection_color");
cache.mark_color=get_color("mark_color"); cache.mark_color=get_color("mark_color");

1
scene/gui/text_edit.h
View File

@ -80,6 +80,7 @@ class TextEdit : public Control {
Color keyword_color; Color keyword_color;
Color number_color; Color number_color;
Color function_color; Color function_color;
Color member_variable_color;
Color selection_color; Color selection_color;
Color mark_color; Color mark_color;
Color breakpoint_color; Color breakpoint_color;

1
tools/editor/editor_settings.cpp
View File

@ -478,6 +478,7 @@ void EditorSettings::_load_defaults(Ref<ConfigFile> p_extra_config) {
set("text_editor/base_type_color",Color::html("a4ffd4")); set("text_editor/base_type_color",Color::html("a4ffd4"));
set("text_editor/engine_type_color",Color::html("83d3ff")); set("text_editor/engine_type_color",Color::html("83d3ff"));
set("text_editor/function_color",Color::html("66a2ce")); set("text_editor/function_color",Color::html("66a2ce"));
set("text_editor/member_variable_color",Color::html("e64e59"));
set("text_editor/comment_color",Color::html("983d1b")); set("text_editor/comment_color",Color::html("983d1b"));
set("text_editor/string_color",Color::html("ef6ebe")); set("text_editor/string_color",Color::html("ef6ebe"));
set("text_editor/number_color",Color::html("EB9532")); set("text_editor/number_color",Color::html("EB9532"));

1
tools/editor/plugins/script_editor_plugin.cpp
View File

@ -297,6 +297,7 @@ void ScriptTextEditor::_load_theme_settings() {
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("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("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))); get_text_edit()->add_color_override("function_color",EDITOR_DEF("text_editor/function_color",Color(0.4,0.6,0.8)));
get_text_edit()->add_color_override("member_variable_color",EDITOR_DEF("text_editor/member_variable_color",Color(0.9,0.3,0.3)));
Color keyword_color= EDITOR_DEF("text_editor/keyword_color",Color(0.5,0.0,0.2)); Color keyword_color= EDITOR_DEF("text_editor/keyword_color",Color(0.5,0.0,0.2));