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

Fixes folding of blank lines

Browse Source
This commit is contained in:
Gilles Roudiere 2017-11-28 20:03:46 +09:00
parent a26b36bec2
commit e13ff74c09
2 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
scene/gui/text_edit.cpp
View File

@ -4491,16 +4491,17 @@ int TextEdit::num_lines_from(int p_line_from, int unhidden_amount) const {
return num_total; return num_total;
} }
int TextEdit::get_whitespace_level(int p_line) const { int TextEdit::get_indent_level(int p_line) const {
ERR_FAIL_INDEX_V(p_line, text.size(), 0); ERR_FAIL_INDEX_V(p_line, text.size(), 0);
// counts number of tabs and spaces before line starts // counts number of tabs and spaces before line starts
int tab_count = 0;
int whitespace_count = 0; int whitespace_count = 0;
int line_length = text[p_line].size(); int line_length = text[p_line].size();
for (int i = 0; i < line_length - 1; i++) { for (int i = 0; i < line_length - 1; i++) {
if (text[p_line][i] == '\t') { if (text[p_line][i] == '\t') {
whitespace_count++; tab_count++;
} else if (text[p_line][i] == ' ') { } else if (text[p_line][i] == ' ') {
whitespace_count++; whitespace_count++;
} else if (text[p_line][i] == '#') { } else if (text[p_line][i] == '#') {
@ -4509,7 +4510,7 @@ int TextEdit::get_whitespace_level(int p_line) const {
break; break;
} }
} }
return whitespace_count; return tab_count + whitespace_count / indent_size;
} }
bool TextEdit::can_fold(int p_line) const { bool TextEdit::can_fold(int p_line) const {
@ -4526,12 +4527,12 @@ bool TextEdit::can_fold(int p_line) const {
if (is_line_hidden(p_line)) if (is_line_hidden(p_line))
return false; return false;
int start_indent = get_whitespace_level(p_line); int start_indent = get_indent_level(p_line);
for (int i = p_line + 1; i < text.size(); i++) { for (int i = p_line + 1; i < text.size(); i++) {
if (text[i].size() == 0) if (text[i].size() == 0)
continue; continue;
int next_indent = get_whitespace_level(i); int next_indent = get_indent_level(i);
if (next_indent > start_indent) if (next_indent > start_indent)
return true; return true;
else else
@ -4560,22 +4561,20 @@ void TextEdit::fold_line(int p_line) {
return; return;
// hide lines below this one // hide lines below this one
int start_indent = get_whitespace_level(p_line); int start_indent = get_indent_level(p_line);
int last_line = start_indent;
for (int i = p_line + 1; i < text.size(); i++) { for (int i = p_line + 1; i < text.size(); i++) {
int cur_indent = get_whitespace_level(i); if (text[i].strip_edges().size() != 0) {
if (text[i].size() == 0 || cur_indent > start_indent) { if (get_indent_level(i) > start_indent) {
set_line_as_hidden(i, true); last_line = i;
} else { } else {
// exclude trailing empty lines break;
for (int trail_i = i - 1; trail_i > p_line; trail_i--) {
if (text[trail_i].size() == 0)
set_line_as_hidden(trail_i, false);
else
break;
} }
break;
} }
} }
for (int i = p_line + 1; i <= last_line; i++) {
set_line_as_hidden(i, true);
}
// fix selection // fix selection
if (is_selection_active()) { if (is_selection_active()) {

2
scene/gui/text_edit.h
View File

@ -430,7 +430,6 @@ public:
void fold_all_lines(); void fold_all_lines();
void unhide_all_lines(); void unhide_all_lines();
int num_lines_from(int p_line_from, int unhidden_amount) const; int num_lines_from(int p_line_from, int unhidden_amount) const;
int get_whitespace_level(int p_line) const;
bool can_fold(int p_line) const; bool can_fold(int p_line) const;
bool is_folded(int p_line) const; bool is_folded(int p_line) const;
void fold_line(int p_line); void fold_line(int p_line);
@ -443,6 +442,7 @@ public:
void indent_selection_left(); void indent_selection_left();
void indent_selection_right(); void indent_selection_right();
int get_indent_level(int p_line) const;
inline void set_scroll_pass_end_of_file(bool p_enabled) { inline void set_scroll_pass_end_of_file(bool p_enabled) {
scroll_past_end_of_file_enabled = p_enabled; scroll_past_end_of_file_enabled = p_enabled;