Browse Source

Smart brackets: added exception where a single ' did not count as a comment character

merge-requests/365/head
eidheim 9 years ago
parent
commit
0d5f6f4bc0
  1. 27
      src/source.cc

27
src/source.cc

@ -1021,18 +1021,23 @@ long Source::View::open_close_bracket_count(Gtk::TextIter iter, unsigned int lef
long bracket_count=0; long bracket_count=0;
long curly_count=0; long curly_count=0;
Gtk::TextIter previous_iter;
do { do {
if(*iter==left_bracket && is_code_iter(iter)) previous_iter=iter;
bracket_count++; previous_iter.backward_char();
else if(*iter==right_bracket && is_code_iter(iter)) if(!(*previous_iter=='\'' && is_code_iter(previous_iter))) {
bracket_count--; if(*iter==left_bracket && is_code_iter(iter))
else if(*iter=='{' && is_code_iter(iter)) bracket_count++;
curly_count++; else if(*iter==right_bracket && is_code_iter(iter))
else if(*iter=='}' && is_code_iter(iter)) bracket_count--;
curly_count--; else if(*iter=='{' && is_code_iter(iter))
curly_count++;
if(curly_count>0) else if(*iter=='}' && is_code_iter(iter))
break; curly_count--;
if(curly_count>0)
break;
}
} while(iter.backward_char()); } while(iter.backward_char());
iter=iter_stored; iter=iter_stored;

Loading…
Cancel
Save