Browse Source

Removed redundant newline checks

merge-requests/399/head
eidheim 6 years ago
parent
commit
d7e26a524a
  1. 12
      src/source.cc
  2. 2
      src/tooltips.cc

12
src/source.cc

@ -1723,13 +1723,13 @@ void Source::View::place_cursor_at_next_diagnostic() {
} }
bool Source::View::backward_to_code(Gtk::TextIter &iter) { bool Source::View::backward_to_code(Gtk::TextIter &iter) {
while((*iter == ' ' || *iter == '\t' || *iter == '\n' || iter.ends_line() || !is_code_iter(iter)) && iter.backward_char()) { while((*iter == ' ' || *iter == '\t' || iter.ends_line() || !is_code_iter(iter)) && iter.backward_char()) {
} }
return !iter.is_start() || is_code_iter(iter); return !iter.is_start() || is_code_iter(iter);
} }
bool Source::View::forward_to_code(Gtk::TextIter &iter) { bool Source::View::forward_to_code(Gtk::TextIter &iter) {
while((*iter == ' ' || *iter == '\t' || *iter == '\n' || iter.ends_line() || !is_code_iter(iter)) && iter.forward_char()) { while((*iter == ' ' || *iter == '\t' || iter.ends_line() || !is_code_iter(iter)) && iter.forward_char()) {
} }
return !iter.is_end(); return !iter.is_end();
} }
@ -2103,9 +2103,9 @@ bool Source::View::on_key_press_event(GdkEventKey *key) {
break; break;
if(iter.starts_line()) if(iter.starts_line())
empty_line = true; empty_line = true;
if(empty_line && !iter.ends_line() && *iter != '\n' && *iter != ' ' && *iter != '\t') if(empty_line && !iter.ends_line() && *iter != ' ' && *iter != '\t')
empty_line = false; empty_line = false;
if(!text_found && !iter.ends_line() && *iter != '\n' && *iter != ' ' && *iter != '\t') if(!text_found && !iter.ends_line() && *iter != ' ' && *iter != '\t')
text_found = true; text_found = true;
if(empty_line && text_found && iter.ends_line()) if(empty_line && text_found && iter.ends_line())
break; break;
@ -2132,9 +2132,9 @@ bool Source::View::on_key_press_event(GdkEventKey *key) {
break; break;
if(iter.ends_line()) if(iter.ends_line())
empty_line = true; empty_line = true;
if(empty_line && !iter.ends_line() && *iter != '\n' && *iter != ' ' && *iter != '\t') if(empty_line && !iter.ends_line() && *iter != ' ' && *iter != '\t')
empty_line = false; empty_line = false;
if(!text_found && !iter.ends_line() && *iter != '\n' && *iter != ' ' && *iter != '\t') if(!text_found && !iter.ends_line() && *iter != ' ' && *iter != '\t')
text_found = true; text_found = true;
if(empty_line && text_found && iter.starts_line()) if(empty_line && text_found && iter.starts_line())
break; break;

2
src/tooltips.cc

@ -268,7 +268,7 @@ void Tooltip::wrap_lines() {
} }
if(*iter == ' ') if(*iter == ' ')
last_space = iter; last_space = iter;
if(*iter == '\n') { if(iter.ends_line()) {
end = true; end = true;
iter.forward_char(); iter.forward_char();
break; break;

Loading…
Cancel
Save