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

Merge pull request #48396 from YeldhamDev/script_thumbnail_comment

Browse Source 
Add comment highlighting to script thumbnails
This commit is contained in:
Rémi Verschelde 2021-05-03 10:33:20 +02:00 committed by GitHub
commit a4afa05efe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 34 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
editor/plugins/editor_preview_plugins.cpp
View File

@ -504,6 +504,7 @@ Ref<Texture2D> EditorScriptPreviewPlugin::generate(const RES &p_from, const Size
Color keyword_color = EditorSettings::get_singleton()->get("text_editor/highlighting/keyword_color"); Color keyword_color = EditorSettings::get_singleton()->get("text_editor/highlighting/keyword_color");
Color text_color = EditorSettings::get_singleton()->get("text_editor/highlighting/text_color"); Color text_color = EditorSettings::get_singleton()->get("text_editor/highlighting/text_color");
Color symbol_color = EditorSettings::get_singleton()->get("text_editor/highlighting/symbol_color"); Color symbol_color = EditorSettings::get_singleton()->get("text_editor/highlighting/symbol_color");
Color comment_color = EditorSettings::get_singleton()->get("text_editor/highlighting/comment_color");
if (bg_color.a == 0) { if (bg_color.a == 0) {
bg_color = Color(0, 0, 0, 0); bg_color = Color(0, 0, 0, 0);
@ -523,33 +524,42 @@ Ref<Texture2D> EditorScriptPreviewPlugin::generate(const RES &p_from, const Size
bool prev_is_text = false; bool prev_is_text = false;
bool in_keyword = false; bool in_keyword = false;
bool in_comment = false;
for (int i = 0; i < code.length(); i++) { for (int i = 0; i < code.length(); i++) {
char32_t c = code[i]; char32_t c = code[i];
if (c > 32) { if (c > 32) {
if (col < thumbnail_size) { if (col < thumbnail_size) {
Color color = text_color; Color color = text_color;
if (c != '_' && ((c >= '!' && c <= '/') || (c >= ':' && c <= '@') || (c >= '[' && c <= '`') || (c >= '{' && c <= '~') || c == '\t')) { if (c == '#') {
//make symbol a little visible in_comment = true;
color = symbol_color;
in_keyword = false;
} else if (!prev_is_text && _is_text_char(c)) {
int pos = i;
while (_is_text_char(code[pos])) {
pos++;
}
String word = code.substr(i, pos - i);
if (keywords.has(word)) {
in_keyword = true;
}
} else if (!_is_text_char(c)) {
in_keyword = false;
} }
if (in_keyword) { if (in_comment) {
color = keyword_color; color = comment_color;
} else {
if (c != '_' && ((c >= '!' && c <= '/') || (c >= ':' && c <= '@') || (c >= '[' && c <= '`') || (c >= '{' && c <= '~') || c == '\t')) {
//make symbol a little visible
color = symbol_color;
in_keyword = false;
} else if (!prev_is_text && _is_text_char(c)) {
int pos = i;
while (_is_text_char(code[pos])) {
pos++;
}
String word = code.substr(i, pos - i);
if (keywords.has(word)) {
in_keyword = true;
}
} else if (!_is_text_char(c)) {
in_keyword = false;
}
if (in_keyword) {
color = keyword_color;
}
} }
Color ul = color; Color ul = color;
@ -559,11 +569,14 @@ Ref<Texture2D> EditorScriptPreviewPlugin::generate(const RES &p_from, const Size
prev_is_text = _is_text_char(c); prev_is_text = _is_text_char(c);
} }
col++;
} else { } else {
prev_is_text = false; prev_is_text = false;
in_keyword = false; in_keyword = false;
if (c == '\n') { if (c == '\n') {
in_comment = false;
col = x0; col = x0;
line++; line++;
if (line >= available_height / 2) { if (line >= available_height / 2) {
@ -571,9 +584,10 @@ Ref<Texture2D> EditorScriptPreviewPlugin::generate(const RES &p_from, const Size
} }
} else if (c == '\t') { } else if (c == '\t') {
col += 3; col += 3;
} else {
col++;
} }
} }
col++;
} }
post_process_preview(img); post_process_preview(img);