Skip to content

Commit e68b171

Browse files
committed
Fix Script editor state types
1 parent 9283328 commit e68b171

File tree

4 files changed

+26
-12
lines changed

4 files changed

+26
-12
lines changed

editor/gui/code_editor.cpp

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1466,23 +1466,23 @@ void CodeTextEditor::set_edit_state(const Variant &p_state) {
14661466
}
14671467

14681468
if (state.has("folded_lines")) {
1469-
Vector<int> folded_lines = state["folded_lines"];
1470-
for (int i = 0; i < folded_lines.size(); i++) {
1471-
text_editor->fold_line(folded_lines[i]);
1469+
const PackedInt32Array folded_lines = state["folded_lines"];
1470+
for (const int &line : folded_lines) {
1471+
text_editor->fold_line(line);
14721472
}
14731473
}
14741474

14751475
if (state.has("breakpoints")) {
1476-
Array breakpoints = state["breakpoints"];
1477-
for (int i = 0; i < breakpoints.size(); i++) {
1478-
text_editor->set_line_as_breakpoint(breakpoints[i], true);
1476+
const PackedInt32Array breakpoints = state["breakpoints"];
1477+
for (const int &line : breakpoints) {
1478+
text_editor->set_line_as_breakpoint(line, true);
14791479
}
14801480
}
14811481

14821482
if (state.has("bookmarks")) {
1483-
Array bookmarks = state["bookmarks"];
1484-
for (int i = 0; i < bookmarks.size(); i++) {
1485-
text_editor->set_line_as_bookmarked(bookmarks[i], true);
1483+
const PackedInt32Array bookmarks = state["bookmarks"];
1484+
for (const int &line : bookmarks) {
1485+
text_editor->set_line_as_bookmarked(line, true);
14861486
}
14871487
}
14881488

scene/gui/code_edit.cpp

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1868,7 +1868,7 @@ bool CodeEdit::is_line_folded(int p_line) const {
18681868
return p_line + 1 < get_line_count() && !_is_line_hidden(p_line) && _is_line_hidden(p_line + 1);
18691869
}
18701870

1871-
TypedArray<int> CodeEdit::get_folded_lines() const {
1871+
TypedArray<int> CodeEdit::get_folded_lines_bind() const {
18721872
TypedArray<int> folded_lines;
18731873
for (int i = 0; i < get_line_count(); i++) {
18741874
if (is_line_folded(i)) {
@@ -1878,6 +1878,16 @@ TypedArray<int> CodeEdit::get_folded_lines() const {
18781878
return folded_lines;
18791879
}
18801880

1881+
PackedInt32Array CodeEdit::get_folded_lines() const {
1882+
PackedInt32Array folded_lines;
1883+
for (int i = 0; i < get_line_count(); i++) {
1884+
if (is_line_folded(i)) {
1885+
folded_lines.push_back(i);
1886+
}
1887+
}
1888+
return folded_lines;
1889+
}
1890+
18811891
/* Code region */
18821892
void CodeEdit::create_code_region() {
18831893
// Abort if there is no selected text.
@@ -2805,7 +2815,7 @@ void CodeEdit::_bind_methods() {
28052815
ClassDB::bind_method(D_METHOD("toggle_foldable_lines_at_carets"), &CodeEdit::toggle_foldable_lines_at_carets);
28062816

28072817
ClassDB::bind_method(D_METHOD("is_line_folded", "line"), &CodeEdit::is_line_folded);
2808-
ClassDB::bind_method(D_METHOD("get_folded_lines"), &CodeEdit::get_folded_lines);
2818+
ClassDB::bind_method(D_METHOD("get_folded_lines"), &CodeEdit::get_folded_lines_bind);
28092819

28102820
/* Code region */
28112821
ClassDB::bind_method(D_METHOD("create_code_region"), &CodeEdit::create_code_region);

scene/gui/code_edit.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -432,7 +432,8 @@ class CodeEdit : public TextEdit {
432432

433433
int get_folded_line_header(int p_line) const;
434434
bool is_line_folded(int p_line) const;
435-
TypedArray<int> get_folded_lines() const;
435+
TypedArray<int> get_folded_lines_bind() const;
436+
PackedInt32Array get_folded_lines() const;
436437

437438
/* Code region */
438439
void create_code_region();

tests/scene/test_code_edit.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2974,7 +2974,9 @@ TEST_CASE("[SceneTree][CodeEdit] folding") {
29742974

29752975
// Check metadata.
29762976
CHECK(code_edit->get_folded_lines().size() == 1);
2977+
CHECK(code_edit->get_folded_lines_bind().size() == 1);
29772978
CHECK((int)code_edit->get_folded_lines()[0] == 0);
2979+
CHECK((int)code_edit->get_folded_lines_bind()[0] == 0);
29782980

29792981
// Cannot unfold nested.
29802982
code_edit->unfold_line(1);
@@ -2990,6 +2992,7 @@ TEST_CASE("[SceneTree][CodeEdit] folding") {
29902992

29912993
// Check metadata.
29922994
CHECK(code_edit->get_folded_lines().size() == 0);
2995+
CHECK(code_edit->get_folded_lines_bind().size() == 0);
29932996

29942997
code_edit->fold_all_lines();
29952998
CHECK(code_edit->is_line_folded(0));

0 commit comments

Comments
 (0)