maxmustermann/godot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #17978 from Paulb23/rename_gd_highlighter

Browse source 
Renamed GDSyntaxHighlighter to GDScriptSyntaxHighlighter
This commit is contained in:
Rémi Verschelde 2018-04-04 21:31:13 +02:00 committed by GitHub
parent 7ca2e73dea 63c8d0f455
commit 90574a394a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
modules/gdscript/gdscript_highlighter.cpp
View file

@ -58,7 +58,7 @@ static bool _is_hex_symbol(CharType c) {
return ((c >= 'a' && c <= 'f') || (c >= 'A' && c <= 'F')); return ((c >= 'a' && c <= 'f') || (c >= 'A' && c <= 'F'));
} }
Map<int, TextEdit::HighlighterInfo> GDSyntaxHighlighter::_get_line_syntax_highlighting(int p_line) { Map<int, TextEdit::HighlighterInfo> GDScriptSyntaxHighlighter::_get_line_syntax_highlighting(int p_line) {
Map<int, TextEdit::HighlighterInfo> color_map; Map<int, TextEdit::HighlighterInfo> color_map;
bool prev_is_char = false; bool prev_is_char = false;
@ -255,17 +255,17 @@ Map<int, TextEdit::HighlighterInfo> GDSyntaxHighlighter::_get_line_syntax_highli
return color_map; return color_map;
} }
String GDSyntaxHighlighter::get_name() { String GDScriptSyntaxHighlighter::get_name() {
return "GDScript"; return "GDScript";
} }
List<String> GDSyntaxHighlighter::get_supported_languages() { List<String> GDScriptSyntaxHighlighter::get_supported_languages() {
List<String> languages; List<String> languages;
languages.push_back("GDScript"); languages.push_back("GDScript");
return languages; return languages;
} }
void GDSyntaxHighlighter::_update_cache() { void GDScriptSyntaxHighlighter::_update_cache() {
font_color = text_editor->get_color("font_color"); font_color = text_editor->get_color("font_color");
symbol_color = text_editor->get_color("symbol_color"); symbol_color = text_editor->get_color("symbol_color");
function_color = text_editor->get_color("function_color"); function_color = text_editor->get_color("function_color");
@ -273,6 +273,6 @@ void GDSyntaxHighlighter::_update_cache() {
member_color = text_editor->get_color("member_variable_color"); member_color = text_editor->get_color("member_variable_color");
} }
SyntaxHighlighter *GDSyntaxHighlighter::create() { SyntaxHighlighter *GDScriptSyntaxHighlighter::create() {
return memnew(GDSyntaxHighlighter); return memnew(GDScriptSyntaxHighlighter);
} }

2
modules/gdscript/gdscript_highlighter.h
View file

@ -33,7 +33,7 @@
#include "scene/gui/text_edit.h" #include "scene/gui/text_edit.h"
class GDSyntaxHighlighter : public SyntaxHighlighter { class GDScriptSyntaxHighlighter : public SyntaxHighlighter {
private: private:
// colours // colours
Color font_color; Color font_color;

2
modules/gdscript/register_types.cpp
View file

@ -93,7 +93,7 @@ void register_gdscript_types() {
ResourceSaver::add_resource_format_saver(resource_saver_gd); ResourceSaver::add_resource_format_saver(resource_saver_gd);
#ifdef TOOLS_ENABLED #ifdef TOOLS_ENABLED
ScriptEditor::register_create_syntax_highlighter_function(GDSyntaxHighlighter::create); ScriptEditor::register_create_syntax_highlighter_function(GDScriptSyntaxHighlighter::create);
EditorNode::add_init_callback(_editor_init); EditorNode::add_init_callback(_editor_init);
#endif #endif
} }