Team-Immerse-Yourself/YouDunIt
6
0
Fork 0
Code Issues Pull requests Projects 2 Releases Packages Wiki Activity Actions

feat: modules moved and engine moved to submodule

Browse source
This commit is contained in:
Jan van der Weide 2025-04-12 18:40:44 +02:00
parent dfb5e645cd
commit c33d2130cc
5136 changed files with 225275 additions and 64485 deletions
Download patch file Download diff file Expand all files Collapse all files

49
engine/scene/gui/code_edit.cpp
View file

@ -137,7 +137,7 @@ void CodeEdit::_notification(int p_what) {
Point2 round_ofs = hint_ofs + theme_cache.code_hint_style->get_offset() + Vector2(0, theme_cache.font->get_ascent(theme_cache.font_size) + font_height * i + yofs);
round_ofs = round_ofs.round();
draw_string(theme_cache.font, round_ofs, line.replace(String::chr(0xFFFF), ""), HORIZONTAL_ALIGNMENT_LEFT, -1, theme_cache.font_size, theme_cache.code_hint_color);
draw_string(theme_cache.font, round_ofs, line.remove_char(0xFFFF), HORIZONTAL_ALIGNMENT_LEFT, -1, theme_cache.font_size, theme_cache.code_hint_color);
if (end > 0) {
// Draw an underline for the currently edited function parameter.
const Vector2 b = hint_ofs + theme_cache.code_hint_style->get_offset() + Vector2(begin, font_height + font_height * i + yofs);
@ -963,7 +963,7 @@ void CodeEdit::indent_lines() {
for (Point2i line_range : line_ranges) {
for (int i = line_range.x; i <= line_range.y; i++) {
const String line_text = get_line(i);
if (line_text.size() == 0) {
if (line_text.is_empty()) {
// Ignore empty lines.
continue;
}
@ -1247,9 +1247,8 @@ void CodeEdit::add_auto_brace_completion_pair(const String &p_open_key, const St
void CodeEdit::set_auto_brace_completion_pairs(const Dictionary &p_auto_brace_completion_pairs) {
auto_brace_completion_pairs.clear();
Array keys = p_auto_brace_completion_pairs.keys();
for (int i = 0; i < keys.size(); i++) {
add_auto_brace_completion_pair(keys[i], p_auto_brace_completion_pairs[keys[i]]);
for (const KeyValue<Variant, Variant> &kv : p_auto_brace_completion_pairs) {
add_auto_brace_completion_pair(kv.key, kv.value);
}
}
@ -1599,7 +1598,7 @@ bool CodeEdit::can_fold_line(int p_line) const {
return false;
}
if (p_line + 1 >= get_line_count() || get_line(p_line).strip_edges().size() == 0) {
if (p_line + 1 >= get_line_count() || get_line(p_line).strip_edges().is_empty()) {
return false;
}
@ -1645,12 +1644,12 @@ bool CodeEdit::can_fold_line(int p_line) const {
if (delimiter_end_line == p_line) {
/* Check we are the start of the block. */
if (p_line - 1 >= 0) {
if ((in_string != -1 && is_in_string(p_line - 1) != -1) || (in_comment != -1 && is_in_comment(p_line - 1) != -1)) {
if ((in_string != -1 && is_in_string(p_line - 1) != -1) || (in_comment != -1 && is_in_comment(p_line - 1) != -1 && !is_line_code_region_start(p_line - 1) && !is_line_code_region_end(p_line - 1))) {
return false;
}
}
/* Check it continues for at least one line. */
return ((in_string != -1 && is_in_string(p_line + 1) != -1) || (in_comment != -1 && is_in_comment(p_line + 1) != -1));
return ((in_string != -1 && is_in_string(p_line + 1) != -1) || (in_comment != -1 && is_in_comment(p_line + 1) != -1 && !is_line_code_region_start(p_line + 1) && !is_line_code_region_end(p_line + 1)));
}
return ((in_string != -1 && is_in_string(delimiter_end_line) != -1) || (in_comment != -1 && is_in_comment(delimiter_end_line) != -1));
}
@ -1658,7 +1657,7 @@ bool CodeEdit::can_fold_line(int p_line) const {
/* Otherwise check indent levels. */
int start_indent = get_indent_level(p_line);
for (int i = p_line + 1; i < get_line_count(); i++) {
if (is_in_string(i) != -1 || is_in_comment(i) != -1 || get_line(i).strip_edges().size() == 0) {
if (is_in_string(i) != -1 || is_in_comment(i) != -1 || get_line(i).strip_edges().is_empty()) {
continue;
}
return (get_indent_level(i) > start_indent);
@ -1705,13 +1704,17 @@ void CodeEdit::fold_line(int p_line) {
if ((in_string != -1 && is_in_string(i) == -1) || (in_comment != -1 && is_in_comment(i) == -1)) {
break;
}
if (in_comment != -1 && (is_line_code_region_start(i) || is_line_code_region_end(i))) {
// A code region tag should split a comment block, ending it early.
break;
}
end_line = i;
}
}
} else {
int start_indent = get_indent_level(p_line);
for (int i = p_line + 1; i <= line_count; i++) {
if (get_line(i).strip_edges().size() == 0) {
if (get_line(i).strip_edges().is_empty()) {
continue;
}
if (get_indent_level(i) > start_indent) {
@ -1872,7 +1875,8 @@ bool CodeEdit::is_line_code_region_start(int p_line) const {
if (is_in_string(p_line) != -1) {
return false;
}
return get_line(p_line).strip_edges().begins_with(code_region_start_string);
Vector<String> split = get_line(p_line).strip_edges().split_spaces(1);
return split.size() > 0 && split[0] == code_region_start_string;
}
bool CodeEdit::is_line_code_region_end(int p_line) const {
@ -1883,7 +1887,8 @@ bool CodeEdit::is_line_code_region_end(int p_line) const {
if (is_in_string(p_line) != -1) {
return false;
}
return get_line(p_line).strip_edges().begins_with(code_region_end_string);
Vector<String> split = get_line(p_line).strip_edges().split_spaces(1);
return split.size() > 0 && split[0] == code_region_end_string;
}
/* Delimiters */
@ -1956,7 +1961,7 @@ String CodeEdit::get_delimiter_end_key(int p_delimiter_idx) const {
}
Point2 CodeEdit::get_delimiter_start_position(int p_line, int p_column) const {
if (delimiters.size() == 0) {
if (delimiters.is_empty()) {
return Point2(-1, -1);
}
ERR_FAIL_INDEX_V(p_line, get_line_count(), Point2(-1, -1));
@ -2007,7 +2012,7 @@ Point2 CodeEdit::get_delimiter_start_position(int p_line, int p_column) const {
}
Point2 CodeEdit::get_delimiter_end_position(int p_line, int p_column) const {
if (delimiters.size() == 0) {
if (delimiters.is_empty()) {
return Point2(-1, -1);
}
ERR_FAIL_INDEX_V(p_line, get_line_count(), Point2(-1, -1));
@ -2112,7 +2117,7 @@ String CodeEdit::get_text_for_code_completion() const {
completion_text += line.substr(0, get_caret_column());
/* Not unicode, represents the caret. */
completion_text += String::chr(0xFFFF);
completion_text += line.substr(get_caret_column(), line.size());
completion_text += line.substr(get_caret_column());
} else {
completion_text += line;
}
@ -2411,7 +2416,7 @@ String CodeEdit::get_text_with_cursor_char(int p_line, int p_column) const {
result += line_text.substr(0, p_column);
/* Not unicode, represents the cursor. */
result += String::chr(0xFFFF);
result += line_text.substr(p_column, line_text.size());
result += line_text.substr(p_column);
} else {
result += line_text;
}
@ -3058,7 +3063,7 @@ void CodeEdit::_update_code_region_tags() {
/* Delimiters */
void CodeEdit::_update_delimiter_cache(int p_from_line, int p_to_line) {
if (delimiters.size() == 0) {
if (delimiters.is_empty()) {
return;
}
@ -3208,7 +3213,7 @@ void CodeEdit::_update_delimiter_cache(int p_from_line, int p_to_line) {
}
int CodeEdit::_is_in_delimiter(int p_line, int p_column, DelimiterType p_type) const {
if (delimiters.size() == 0 || p_line >= delimiter_cache.size()) {
if (delimiters.is_empty() || p_line >= delimiter_cache.size()) {
return -1;
}
ERR_FAIL_INDEX_V(p_line, get_line_count(), 0);
@ -3348,8 +3353,8 @@ void CodeEdit::_set_delimiters(const TypedArray<String> &p_delimiters, Delimiter
continue;
}
const String start_key = key.get_slice(" ", 0);
const String end_key = key.get_slice_count(" ") > 1 ? key.get_slice(" ", 1) : String();
const String start_key = key.get_slicec(' ', 0);
const String end_key = key.get_slice_count(" ") > 1 ? key.get_slicec(' ', 1) : String();
_add_delimiter(start_key, end_key, end_key.is_empty(), p_type);
}
@ -3422,7 +3427,7 @@ void CodeEdit::_filter_code_completion_candidates_impl() {
GDVIRTUAL_CALL(_filter_code_completion_candidates, completion_options_sources, completion_options);
/* No options to complete, cancel. */
if (completion_options.size() == 0) {
if (completion_options.is_empty()) {
cancel_code_completion();
return;
}
@ -3654,7 +3659,7 @@ void CodeEdit::_filter_code_completion_candidates_impl() {
}
/* No options to complete, cancel. */
if (code_completion_options_new.size() == 0) {
if (code_completion_options_new.is_empty()) {
cancel_code_completion();
return;
}