zalox
/
jucipp
mirror of https://gitlab.com/cppit/jucipp
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Indentation fix for multiline expressions with comments after {

merge-requests/365/head
eidheim 8 years ago
parent
7516d1d9b0
commit
babd2950cb
2 changed files with 34 additions and 7 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 15
      src/source.cc
  2. 26
      tests/source_key_test.cc

15
src/source.cc
Unescape View File

@ -1204,7 +1204,6 @@ Gtk::TextIter Source::View::find_start_of_sentence(Gtk::TextIter iter) {
if(iter.starts_line()) if(iter.starts_line())
return iter; return iter;
iter.backward_char();
bool stream_operator_test=false; bool stream_operator_test=false;
bool colon_test=false; bool colon_test=false;
@ -1868,7 +1867,7 @@ bool Source::View::on_key_press_event_bracket_language(GdkEventKey* key) {
start_iter=get_tabs_end_iter(get_buffer()->get_iter_at_line(open_non_curly_bracket_iter.get_line())); start_iter=get_tabs_end_iter(get_buffer()->get_iter_at_line(open_non_curly_bracket_iter.get_line()));
} }
else else
start_iter=get_tabs_end_iter(get_buffer()->get_iter_at_line(find_start_of_sentence(iter).get_line())); start_iter=get_tabs_end_iter(get_buffer()->get_iter_at_line(find_start_of_sentence(condition_iter).get_line()));
auto tabs=get_line_before(start_iter); auto tabs=get_line_before(start_iter);
/* /*
@ -2006,9 +2005,10 @@ bool Source::View::on_key_press_event_bracket_language(GdkEventKey* key) {
else if(*condition_iter==';' && condition_iter.get_line()>0) { else if(*condition_iter==';' && condition_iter.get_line()>0) {
auto previous_end_iter=start_iter; auto previous_end_iter=start_iter;
while(previous_end_iter.backward_char() && !previous_end_iter.ends_line()) {} while(previous_end_iter.backward_char() && !previous_end_iter.ends_line()) {}
auto previous_start_iter=get_tabs_end_iter(get_buffer()->get_iter_at_line(find_start_of_sentence(previous_end_iter).get_line())); auto condition_iter=get_condition_iter(previous_end_iter);
auto previous_start_iter=get_tabs_end_iter(get_buffer()->get_iter_at_line(find_start_of_sentence(condition_iter).get_line()));
auto previous_tabs=get_line_before(previous_start_iter); auto previous_tabs=get_line_before(previous_start_iter);
auto after_condition_iter=get_condition_iter(previous_end_iter); auto after_condition_iter=condition_iter;
after_condition_iter.forward_char(); after_condition_iter.forward_char();
std::string previous_sentence=get_buffer()->get_text(previous_start_iter, after_condition_iter); std::string previous_sentence=get_buffer()->get_text(previous_start_iter, after_condition_iter);
std::smatch sm2; std::smatch sm2;
@ -2082,10 +2082,11 @@ bool Source::View::on_key_press_event_bracket_language(GdkEventKey* key) {
if(line_nr>0 && tabs.size()>=tab_size && iter==tabs_end_iter) { if(line_nr>0 && tabs.size()>=tab_size && iter==tabs_end_iter) {
auto previous_end_iter=iter; auto previous_end_iter=iter;
while(previous_end_iter.backward_char() && !previous_end_iter.ends_line()) {} while(previous_end_iter.backward_char() && !previous_end_iter.ends_line()) {}
auto previous_start_iter=get_tabs_end_iter(get_buffer()->get_iter_at_line(find_start_of_sentence(previous_end_iter).get_line())); auto condition_iter=get_condition_iter(previous_end_iter);
auto after_condition_iter=get_condition_iter(previous_end_iter); auto previous_start_iter=get_tabs_end_iter(get_buffer()->get_iter_at_line(find_start_of_sentence(condition_iter).get_line()));
after_condition_iter.forward_char();
auto previous_tabs=get_line_before(previous_start_iter); auto previous_tabs=get_line_before(previous_start_iter);
auto after_condition_iter=condition_iter;
after_condition_iter.forward_char();
if((tabs.size()-tab_size)==previous_tabs.size()) { if((tabs.size()-tab_size)==previous_tabs.size()) {
std::string previous_sentence=get_buffer()->get_text(previous_start_iter, after_condition_iter); std::string previous_sentence=get_buffer()->get_text(previous_start_iter, after_condition_iter);
std::smatch sm; std::smatch sm;

26
tests/source_key_test.cc
Unescape View File

@ -386,6 +386,32 @@ int main() {
" "); " ");
g_assert(view.get_buffer()->get_insert()->get_iter() == view.get_buffer()->end()); g_assert(view.get_buffer()->get_insert()->get_iter() == view.get_buffer()->end());
} }
{
view.get_buffer()->set_text(" if(true &&\n"
" false) {");
view.on_key_press_event(&event);
g_assert(view.get_buffer()->get_text() == " if(true &&\n"
" false) {\n"
" \n"
" }");
auto iter = view.get_buffer()->end();
iter.backward_chars(4);
g_assert(view.get_buffer()->get_insert()->get_iter() == iter);
}
{
view.get_buffer()->set_text(" if(true && // comment\n"
" false) { // comment");
while(Gtk::Main::events_pending())
Gtk::Main::iteration(false);
view.on_key_press_event(&event);
g_assert(view.get_buffer()->get_text() == " if(true && // comment\n"
" false) { // comment\n"
" \n"
" }");
auto iter = view.get_buffer()->end();
iter.backward_chars(4);
g_assert(view.get_buffer()->get_insert()->get_iter() == iter);
}
{ {
view.get_buffer()->set_text(" if(true &&\n" view.get_buffer()->set_text(" if(true &&\n"
" false)\n" " false)\n"

Write Preview
Loading…
Cancel
Save