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

Cleanup of namespace special indentation case

merge-requests/389/head
eidheim 8 years ago
parent
12d1400d80
commit
3f79911d2f
2 changed files with 184 additions and 47 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. 102
      src/source.cc
  2. 103
      tests/source_key_test.cc

102
src/source.cc
Unescape View File

@ -1343,7 +1343,7 @@ bool Source::View::find_open_curly_bracket_backward(Gtk::TextIter iter, Gtk::Tex
bool Source::View::find_close_symbol_forward(Gtk::TextIter iter, Gtk::TextIter &found_iter, unsigned int positive_char, unsigned int negative_char) { bool Source::View::find_close_symbol_forward(Gtk::TextIter iter, Gtk::TextIter &found_iter, unsigned int positive_char, unsigned int negative_char) {
long count=0; long count=0;
if(positive_char=='{' && negative_char=='}') {
do { do {
if(*iter==negative_char && is_code_iter(iter)) { if(*iter==negative_char && is_code_iter(iter)) {
if(count==0) { if(count==0) {
@ -1354,12 +1354,32 @@ bool Source::View::find_close_symbol_forward(Gtk::TextIter iter, Gtk::TextIter &
} }
else if(*iter==positive_char && is_code_iter(iter)) else if(*iter==positive_char && is_code_iter(iter))
count++; count++;
// Stop when reaching new code block: } while(iter.forward_char());
if(iter.starts_line() && !iter.ends_line() && *iter!=' ' && *iter!='\t' && *iter!='#')
return false; return false;
}
else {
long curly_count=0;
do {
if(*iter==positive_char && is_code_iter(iter))
count++;
else if(*iter==negative_char && is_code_iter(iter)) {
if(count==0) {
found_iter=iter;
return true;
}
count--;
}
else if(*iter=='{' && is_code_iter(iter))
curly_count++;
else if(*iter=='}' && is_code_iter(iter)) {
if(curly_count==0)
return false;
curly_count--;
}
} while(iter.forward_char()); } while(iter.forward_char());
return false; return false;
} }
}
long Source::View::symbol_count(Gtk::TextIter iter, unsigned int positive_char, unsigned int negative_char) { long Source::View::symbol_count(Gtk::TextIter iter, unsigned int positive_char, unsigned int negative_char) {
auto iter_stored=iter; auto iter_stored=iter;
@ -1398,8 +1418,14 @@ long Source::View::symbol_count(Gtk::TextIter iter, unsigned int positive_char,
++symbol_count; ++symbol_count;
else if(*iter=='}' && is_code_iter(iter)) else if(*iter=='}' && is_code_iter(iter))
--symbol_count; --symbol_count;
if(iter.starts_line() && !iter.ends_line() && *iter!='#' && *iter!=' ' && *iter!='\t') if(iter.starts_line() && !iter.ends_line() && *iter!='#' && *iter!=' ' && *iter!='\t') {
if(*iter=='p') {
auto token=get_token(iter);
if(token=="public" || token=="protected" || token=="private")
continue;
}
break; break;
}
} while(iter.forward_char()); } while(iter.forward_char());
return symbol_count; return symbol_count;
} }
@ -1415,8 +1441,11 @@ long Source::View::symbol_count(Gtk::TextIter iter, unsigned int positive_char,
symbol_count++; symbol_count++;
else if(*iter==negative_char && is_code_iter(iter)) else if(*iter==negative_char && is_code_iter(iter))
symbol_count--; symbol_count--;
else if(*iter=='{' && is_code_iter(iter)) else if(*iter=='{' && is_code_iter(iter)) {
if(curly_count==0)
break;
curly_count++; curly_count++;
}
else if(*iter=='}' && is_code_iter(iter)) else if(*iter=='}' && is_code_iter(iter))
curly_count--; curly_count--;
else if(check_if_next_iter_is_code_iter) { else if(check_if_next_iter_is_code_iter) {
@ -1427,9 +1456,6 @@ long Source::View::symbol_count(Gtk::TextIter iter, unsigned int positive_char,
else if(*iter==negative_char && is_code_iter(next_iter)) else if(*iter==negative_char && is_code_iter(next_iter))
symbol_count--; symbol_count--;
} }
if(curly_count>0)
break;
} while(iter.backward_char()); } while(iter.backward_char());
iter=iter_stored; iter=iter_stored;
@ -1444,8 +1470,11 @@ long Source::View::symbol_count(Gtk::TextIter iter, unsigned int positive_char,
symbol_count--; symbol_count--;
else if(*iter=='{' && is_code_iter(iter)) else if(*iter=='{' && is_code_iter(iter))
curly_count++; curly_count++;
else if(*iter=='}' && is_code_iter(iter)) else if(*iter=='}' && is_code_iter(iter)) {
if(curly_count==0)
break;
curly_count--; curly_count--;
}
else if(check_if_next_iter_is_code_iter) { else if(check_if_next_iter_is_code_iter) {
auto next_iter=iter; auto next_iter=iter;
next_iter.forward_char(); next_iter.forward_char();
@ -1454,9 +1483,6 @@ long Source::View::symbol_count(Gtk::TextIter iter, unsigned int positive_char,
else if(*iter==negative_char && is_code_iter(next_iter)) else if(*iter==negative_char && is_code_iter(next_iter))
symbol_count--; symbol_count--;
} }
if(curly_count<0)
break;
} while(iter.forward_char()); } while(iter.forward_char());
return symbol_count; return symbol_count;
@ -2026,22 +2052,27 @@ bool Source::View::on_key_press_event_bracket_language(GdkEventKey* key) {
} }
else { else {
if(*condition_iter=='{' && is_code_iter(condition_iter)) { if(*condition_iter=='{' && is_code_iter(condition_iter)) {
Gtk::TextIter found_iter; Gtk::TextIter close_iter;
// Check if an '}' is needed // Check if an '}' is needed
bool has_right_curly_bracket=false; bool has_right_curly_bracket=false;
if(find_close_symbol_forward(iter, found_iter, '{', '}')) { if(find_close_symbol_forward(iter, close_iter, '{', '}')) {
auto found_tabs_end_iter=get_tabs_end_iter(found_iter); auto found_tabs_end_iter=get_tabs_end_iter(close_iter);
if(found_tabs_end_iter.get_line_offset()==tabs_end_iter.get_line_offset()) { if(found_tabs_end_iter.get_line_offset()==tabs_end_iter.get_line_offset()) {
// Special case for functions and classes with no indentation after: namespace {
if(tabs_end_iter.starts_line())
has_right_curly_bracket=symbol_count(tabs_end_iter, '{', '}')<=0;
else
has_right_curly_bracket=true; has_right_curly_bracket=true;
// Special case for functions and classes with no indentation after: namespace {
if(tabs_end_iter.starts_line()) {
auto iter=condition_iter;
Gtk::TextIter open_iter;
if(iter.backward_char() && find_open_curly_bracket_backward(iter, open_iter)) {
if(open_iter.starts_line()) // in case of: namespace test\n{
open_iter.backward_char();
auto iter=get_buffer()->get_iter_at_line(open_iter.get_line());
if(get_token(iter)=="namespace")
has_right_curly_bracket=close_iter.forward_char() && find_close_symbol_forward(close_iter, close_iter, '{', '}');
}
}
} }
} }
// Special case for functions and classes with no indentation after: namespace {
else if(tabs_end_iter.starts_line())
has_right_curly_bracket=symbol_count(tabs_end_iter, '{', '}')<=0;
// Check if one should add semicolon after '}' // Check if one should add semicolon after '}'
bool add_semicolon=false; bool add_semicolon=false;
@ -2523,22 +2554,29 @@ bool Source::View::on_key_press_event_smart_inserts(GdkEventKey *key) {
return false; return false;
} }
Gtk::TextIter found_iter; Gtk::TextIter close_iter;
bool has_right_curly_bracket=false; bool has_right_curly_bracket=false;
auto tabs_end_iter=get_tabs_end_iter(start_iter); auto tabs_end_iter=get_tabs_end_iter(start_iter);
if(find_close_symbol_forward(iter, found_iter, '{', '}')) { if(find_close_symbol_forward(iter, close_iter, '{', '}')) {
auto found_tabs_end_iter=get_tabs_end_iter(found_iter); auto found_tabs_end_iter=get_tabs_end_iter(close_iter);
if(found_tabs_end_iter.get_line_offset()==tabs_end_iter.get_line_offset()) { if(found_tabs_end_iter.get_line_offset()==tabs_end_iter.get_line_offset()) {
// Special case for functions and classes with no indentation after: namespace {, and inside for example {}:
if(tabs_end_iter.starts_line() || found_tabs_end_iter.get_line()==tabs_end_iter.get_line())
has_right_curly_bracket=symbol_count(tabs_end_iter, '{', '}')<0;
else
has_right_curly_bracket=true; has_right_curly_bracket=true;
// Special case for functions and classes with no indentation after: namespace {:
if(tabs_end_iter.starts_line()) {
Gtk::TextIter open_iter;
if(find_open_curly_bracket_backward(iter, open_iter)) {
if(open_iter.starts_line()) // in case of: namespace test\n{
open_iter.backward_char();
auto iter=get_buffer()->get_iter_at_line(open_iter.get_line());
if(get_token(iter)=="namespace")
has_right_curly_bracket=close_iter.forward_char() && find_close_symbol_forward(close_iter, close_iter, '{', '}');
}
}
// Inside for example {}:
else if(found_tabs_end_iter.get_line()==tabs_end_iter.get_line())
has_right_curly_bracket=symbol_count(iter, '{', '}')<0;
} }
} }
// Special case for functions and classes with no indentation after: namespace {, and inside for example {}:
else if(tabs_end_iter.starts_line())
has_right_curly_bracket=symbol_count(tabs_end_iter, '{', '}')<0;
if(!has_right_curly_bracket) { if(!has_right_curly_bracket) {
get_buffer()->insert_at_cursor("}"); get_buffer()->insert_at_cursor("}");
auto iter=get_buffer()->get_insert()->get_iter(); auto iter=get_buffer()->get_insert()->get_iter();

103
tests/source_key_test.cc
Unescape View File

@ -109,6 +109,22 @@ int main() {
iter.forward_char(); iter.forward_char();
buffer->place_cursor(iter); buffer->place_cursor(iter);
view.on_key_press_event(&event); view.on_key_press_event(&event);
g_assert(buffer->get_text() == "{\n"
"{\n"
" \n"
"}");
g_assert(buffer->get_insert()->get_iter().get_line() == 2);
g_assert(buffer->get_insert()->get_iter().get_line_offset() == 2);
}
{
buffer->set_text("{\n"
"{\n"
"}\n"
"}");
auto iter = buffer->get_iter_at_line(1);
iter.forward_char();
buffer->place_cursor(iter);
view.on_key_press_event(&event);
g_assert(buffer->get_text() == "{\n" g_assert(buffer->get_text() == "{\n"
"{\n" "{\n"
" \n" " \n"
@ -117,6 +133,55 @@ int main() {
g_assert(buffer->get_insert()->get_iter().get_line() == 2); g_assert(buffer->get_insert()->get_iter().get_line() == 2);
g_assert(buffer->get_insert()->get_iter().get_line_offset() == 2); g_assert(buffer->get_insert()->get_iter().get_line_offset() == 2);
} }
{
buffer->set_text("namespace test {\n"
"{\n"
"}");
auto iter = buffer->get_iter_at_line(1);
iter.forward_char();
buffer->place_cursor(iter);
view.on_key_press_event(&event);
g_assert(buffer->get_text() == "namespace test {\n"
"{\n"
" \n"
"}\n"
"}");
g_assert(buffer->get_insert()->get_iter().get_line() == 2);
g_assert(buffer->get_insert()->get_iter().get_line_offset() == 2);
}
{
buffer->set_text("namespace test {\n"
"{\n"
"}\n");
auto iter = buffer->get_iter_at_line(1);
iter.forward_char();
buffer->place_cursor(iter);
view.on_key_press_event(&event);
g_assert(buffer->get_text() == "namespace test {\n"
"{\n"
" \n"
"}\n"
"}\n");
g_assert(buffer->get_insert()->get_iter().get_line() == 2);
g_assert(buffer->get_insert()->get_iter().get_line_offset() == 2);
}
{
buffer->set_text("namespace test {\n"
"{\n"
"}\n"
"}\n");
auto iter = buffer->get_iter_at_line(1);
iter.forward_char();
buffer->place_cursor(iter);
view.on_key_press_event(&event);
g_assert(buffer->get_text() == "namespace test {\n"
"{\n"
" \n"
"}\n"
"}\n");
g_assert(buffer->get_insert()->get_iter().get_line() == 2);
g_assert(buffer->get_insert()->get_iter().get_line_offset() == 2);
}
{ {
buffer->set_text("{\n" buffer->set_text("{\n"
"{\n" "{\n"
@ -1196,19 +1261,35 @@ int main() {
g_assert(buffer->get_insert()->get_iter() == iter); g_assert(buffer->get_insert()->get_iter() == iter);
} }
{ {
buffer->set_text("{\n" buffer->set_text("namespace test {\n"
"\n" "\n"
"}"); "}");
auto iter = buffer->get_iter_at_line(1); auto iter = buffer->get_iter_at_line(1);
buffer->place_cursor(iter); buffer->place_cursor(iter);
view.on_key_press_event(&event); view.on_key_press_event(&event);
g_assert(buffer->get_text() == "{\n" g_assert(buffer->get_text() == "namespace test {\n"
"{}\n" "{}\n"
"}"); "}");
iter = buffer->get_iter_at_line(1); iter = buffer->get_iter_at_line(1);
iter.forward_char(); iter.forward_char();
g_assert(buffer->get_insert()->get_iter() == iter); g_assert(buffer->get_insert()->get_iter() == iter);
} }
{
buffer->set_text("namespace test {\n"
"\n"
"}\n"
"}");
auto iter = buffer->get_iter_at_line(1);
buffer->place_cursor(iter);
view.on_key_press_event(&event);
g_assert(buffer->get_text() == "namespace test {\n"
"{\n"
"}\n"
"}");
iter = buffer->get_iter_at_line(1);
iter.forward_char();
g_assert(buffer->get_insert()->get_iter() == iter);
}
{ {
buffer->set_text("{\n" buffer->set_text("{\n"
"}\n" "}\n"
@ -1535,6 +1616,24 @@ int main() {
iter.backward_char(); iter.backward_char();
g_assert(buffer->get_insert()->get_iter() == iter); g_assert(buffer->get_insert()->get_iter() == iter);
} }
{
buffer->set_text("class C {\n"
" {}\n"
"public:\n"
"}\n");
auto iter = buffer->get_iter_at_line(1);
iter.forward_to_line_end();
iter.backward_char();
buffer->place_cursor(iter);
view.on_key_press_event(&event);
g_assert(buffer->get_text() == "class C {\n"
" \n"
"public:\n"
"}\n");
iter = buffer->get_iter_at_line(1);
iter.forward_to_line_end();
g_assert(buffer->get_insert()->get_iter() == iter);
}
Config::get().source.smart_inserts = false; Config::get().source.smart_inserts = false;

Write Preview
Loading…
Cancel
Save