summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <rverschelde@gmail.com>2018-04-04 21:31:13 +0200
committerGitHub <noreply@github.com>2018-04-04 21:31:13 +0200
commit90574a394a307eb61c0ca23d71a183d540031a4c (patch)
treeb9dfb45a2967d7d602c5251f4eba7d592e9e329e
parent7ca2e73dea59a2e0683253e73b9b549d749e12f9 (diff)
parent63c8d0f455bab2bb5652ca6f8ffc1f1e2bbc9389 (diff)
Merge pull request #17978 from Paulb23/rename_gd_highlighter
Renamed GDSyntaxHighlighter to GDScriptSyntaxHighlighter
-rw-r--r--modules/gdscript/gdscript_highlighter.cpp12
-rw-r--r--modules/gdscript/gdscript_highlighter.h2
-rw-r--r--modules/gdscript/register_types.cpp2
3 files changed, 8 insertions, 8 deletions
diff --git a/modules/gdscript/gdscript_highlighter.cpp b/modules/gdscript/gdscript_highlighter.cpp
index 1e9f602d86..5b8b652c29 100644
--- a/modules/gdscript/gdscript_highlighter.cpp
+++ b/modules/gdscript/gdscript_highlighter.cpp
@@ -58,7 +58,7 @@ static bool _is_hex_symbol(CharType c) {
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;
bool prev_is_char = false;
@@ -255,17 +255,17 @@ Map<int, TextEdit::HighlighterInfo> GDSyntaxHighlighter::_get_line_syntax_highli
return color_map;
}
-String GDSyntaxHighlighter::get_name() {
+String GDScriptSyntaxHighlighter::get_name() {
return "GDScript";
}
-List<String> GDSyntaxHighlighter::get_supported_languages() {
+List<String> GDScriptSyntaxHighlighter::get_supported_languages() {
List<String> languages;
languages.push_back("GDScript");
return languages;
}
-void GDSyntaxHighlighter::_update_cache() {
+void GDScriptSyntaxHighlighter::_update_cache() {
font_color = text_editor->get_color("font_color");
symbol_color = text_editor->get_color("symbol_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");
}
-SyntaxHighlighter *GDSyntaxHighlighter::create() {
- return memnew(GDSyntaxHighlighter);
+SyntaxHighlighter *GDScriptSyntaxHighlighter::create() {
+ return memnew(GDScriptSyntaxHighlighter);
}
diff --git a/modules/gdscript/gdscript_highlighter.h b/modules/gdscript/gdscript_highlighter.h
index 0148e6ac1b..ef1bdd4103 100644
--- a/modules/gdscript/gdscript_highlighter.h
+++ b/modules/gdscript/gdscript_highlighter.h
@@ -33,7 +33,7 @@
#include "scene/gui/text_edit.h"
-class GDSyntaxHighlighter : public SyntaxHighlighter {
+class GDScriptSyntaxHighlighter : public SyntaxHighlighter {
private:
// colours
Color font_color;
diff --git a/modules/gdscript/register_types.cpp b/modules/gdscript/register_types.cpp
index 4cf13e3b71..85c94c3596 100644
--- a/modules/gdscript/register_types.cpp
+++ b/modules/gdscript/register_types.cpp
@@ -93,7 +93,7 @@ void register_gdscript_types() {
ResourceSaver::add_resource_format_saver(resource_saver_gd);
#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);
#endif
}