godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-04 12:00:25 +00:00
Code Releases Wiki Activity

Merge pull request #110942 from KoBeWi/the_what_array

Browse Source 
Fix Script editor state types
This commit is contained in:
Thaddeus Crews
2025-10-21 15:11:05 -05:00
parent fe9cdea92c e68b171aaa
commit e9d4b259fb
4 changed files with 26 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
editor/gui/code_editor.cpp
View File

@@ -1466,23 +1466,23 @@ void CodeTextEditor::set_edit_state(const Variant &p_state) {
}
if (state.has("folded_lines")) {
Vector<int> folded_lines = state["folded_lines"];
for (int i = 0; i < folded_lines.size(); i++) {
text_editor->fold_line(folded_lines[i]);
const PackedInt32Array folded_lines = state["folded_lines"];
for (const int &line : folded_lines) {
text_editor->fold_line(line);
}
}
if (state.has("breakpoints")) {
Array breakpoints = state["breakpoints"];
for (int i = 0; i < breakpoints.size(); i++) {
text_editor->set_line_as_breakpoint(breakpoints[i], true);
const PackedInt32Array breakpoints = state["breakpoints"];
for (const int &line : breakpoints) {
text_editor->set_line_as_breakpoint(line, true);
}
}
if (state.has("bookmarks")) {
Array bookmarks = state["bookmarks"];
for (int i = 0; i < bookmarks.size(); i++) {
text_editor->set_line_as_bookmarked(bookmarks[i], true);
const PackedInt32Array bookmarks = state["bookmarks"];
for (const int &line : bookmarks) {
text_editor->set_line_as_bookmarked(line, true);
}
}

14
scene/gui/code_edit.cpp
View File

@@ -1871,7 +1871,7 @@ bool CodeEdit::is_line_folded(int p_line) const {
return p_line + 1 < get_line_count() && !_is_line_hidden(p_line) && _is_line_hidden(p_line + 1);
}
TypedArray<int> CodeEdit::get_folded_lines() const {
TypedArray<int> CodeEdit::get_folded_lines_bind() const {
TypedArray<int> folded_lines;
for (int i = 0; i < get_line_count(); i++) {
if (is_line_folded(i)) {
@@ -1881,6 +1881,16 @@ TypedArray<int> CodeEdit::get_folded_lines() const {
return folded_lines;
}
PackedInt32Array CodeEdit::get_folded_lines() const {
PackedInt32Array folded_lines;
for (int i = 0; i < get_line_count(); i++) {
if (is_line_folded(i)) {
folded_lines.push_back(i);
}
}
return folded_lines;
}
/* Code region */
void CodeEdit::create_code_region() {
// Abort if there is no selected text.
@@ -2809,7 +2819,7 @@ void CodeEdit::_bind_methods() {
ClassDB::bind_method(D_METHOD("toggle_foldable_lines_at_carets"), &CodeEdit::toggle_foldable_lines_at_carets);
ClassDB::bind_method(D_METHOD("is_line_folded", "line"), &CodeEdit::is_line_folded);
ClassDB::bind_method(D_METHOD("get_folded_lines"), &CodeEdit::get_folded_lines);
ClassDB::bind_method(D_METHOD("get_folded_lines"), &CodeEdit::get_folded_lines_bind);
/* Code region */
ClassDB::bind_method(D_METHOD("create_code_region"), &CodeEdit::create_code_region);

3
scene/gui/code_edit.h
View File

@@ -433,7 +433,8 @@ public:
int get_folded_line_header(int p_line) const;
bool is_line_folded(int p_line) const;
TypedArray<int> get_folded_lines() const;
TypedArray<int> get_folded_lines_bind() const;
PackedInt32Array get_folded_lines() const;
/* Code region */
void create_code_region();

3
tests/scene/test_code_edit.h
View File

@@ -2974,7 +2974,9 @@ TEST_CASE("[SceneTree][CodeEdit] folding") {
// Check metadata.
CHECK(code_edit->get_folded_lines().size() == 1);
CHECK(code_edit->get_folded_lines_bind().size() == 1);
CHECK((int)code_edit->get_folded_lines()[0] == 0);
CHECK((int)code_edit->get_folded_lines_bind()[0] == 0);
// Cannot unfold nested.
code_edit->unfold_line(1);
@@ -2990,6 +2992,7 @@ TEST_CASE("[SceneTree][CodeEdit] folding") {
// Check metadata.
CHECK(code_edit->get_folded_lines().size() == 0);
CHECK(code_edit->get_folded_lines_bind().size() == 0);
code_edit->fold_all_lines();
CHECK(code_edit->is_line_folded(0));