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

get_buffer/get_source_buffer cleanup

merge-requests/365/head
eidheim 10 years ago
parent
6e226501e9
commit
c7e369a960
2 changed files with 79 additions and 79 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. 144
      src/source.cc
  2. 14
      src/source_clang.cc

144
src/source.cc
Unescape View File

@ -262,10 +262,10 @@ Source::View::View(const boost::filesystem::path &file_path, Glib::RefPtr<Gsv::L
for(auto &suggestion: suggestions) for(auto &suggestion: suggestions)
spellcheck_suggestions_dialog->add_row(suggestion); spellcheck_suggestions_dialog->add_row(suggestion);
spellcheck_suggestions_dialog->on_select=[this, word](const std::string& selected, bool hide_window) { spellcheck_suggestions_dialog->on_select=[this, word](const std::string& selected, bool hide_window) {
get_source_buffer()->begin_user_action(); get_buffer()->begin_user_action();
get_buffer()->erase(word.first, word.second); get_buffer()->erase(word.first, word.second);
get_buffer()->insert(get_buffer()->get_insert()->get_iter(), selected); get_buffer()->insert(get_buffer()->get_insert()->get_iter(), selected);
get_source_buffer()->end_user_action(); get_buffer()->end_user_action();
delayed_tooltips_connection.disconnect(); delayed_tooltips_connection.disconnect();
}; };
spellcheck_suggestions_dialog->show(); spellcheck_suggestions_dialog->show();
@ -327,13 +327,13 @@ Source::View::View(const boost::filesystem::path &file_path, Glib::RefPtr<Gsv::L
auto exit_status=Terminal::get().process(stdin_stream, stdout_stream, command, this->file_path.parent_path()); auto exit_status=Terminal::get().process(stdin_stream, stdout_stream, command, this->file_path.parent_path());
if(exit_status==0) { if(exit_status==0) {
get_source_buffer()->begin_user_action(); get_buffer()->begin_user_action();
auto iter=get_buffer()->get_insert()->get_iter(); auto iter=get_buffer()->get_insert()->get_iter();
auto cursor_line_nr=iter.get_line(); auto cursor_line_nr=iter.get_line();
auto cursor_line_offset=iter.get_line_offset(); auto cursor_line_offset=iter.get_line_offset();
get_buffer()->set_text(stdout_stream.str()); get_buffer()->set_text(stdout_stream.str());
get_source_buffer()->end_user_action(); get_buffer()->end_user_action();
place_cursor_at_line_offset(cursor_line_nr, cursor_line_offset); place_cursor_at_line_offset(cursor_line_nr, cursor_line_offset);
scroll_to_cursor_delayed(this, true, false); scroll_to_cursor_delayed(this, true, false);
@ -769,7 +769,7 @@ void Source::View::paste() {
end_line=0; end_line=0;
paste_line=false; paste_line=false;
first_paste_line=true; first_paste_line=true;
get_source_buffer()->begin_user_action(); get_buffer()->begin_user_action();
for(size_t c=0;c<text.size();c++) { for(size_t c=0;c<text.size();c++) {
if(text[c]=='\n') { if(text[c]=='\n') {
end_line=c; end_line=c;
@ -807,7 +807,7 @@ void Source::View::paste() {
} }
} }
get_buffer()->place_cursor(get_buffer()->get_insert()->get_iter()); get_buffer()->place_cursor(get_buffer()->get_insert()->get_iter());
get_source_buffer()->end_user_action(); get_buffer()->end_user_action();
scroll_to_cursor_delayed(this, false, false); scroll_to_cursor_delayed(this, false, false);
} }
else { else {
@ -956,7 +956,7 @@ std::string Source::View::get_line(const Gtk::TextIter &iter) {
auto line_start_it = get_buffer()->get_iter_at_line(iter.get_line()); auto line_start_it = get_buffer()->get_iter_at_line(iter.get_line());
auto line_end_it = iter; auto line_end_it = iter;
while(!line_end_it.ends_line() && line_end_it.forward_char()) {} while(!line_end_it.ends_line() && line_end_it.forward_char()) {}
std::string line(get_source_buffer()->get_text(line_start_it, line_end_it)); std::string line(get_buffer()->get_text(line_start_it, line_end_it));
return line; return line;
} }
std::string Source::View::get_line(Glib::RefPtr<Gtk::TextBuffer::Mark> mark) { std::string Source::View::get_line(Glib::RefPtr<Gtk::TextBuffer::Mark> mark) {
@ -970,8 +970,8 @@ std::string Source::View::get_line() {
} }
std::string Source::View::get_line_before(const Gtk::TextIter &iter) { std::string Source::View::get_line_before(const Gtk::TextIter &iter) {
auto line_it = get_source_buffer()->get_iter_at_line(iter.get_line()); auto line_it = get_buffer()->get_iter_at_line(iter.get_line());
std::string line(get_source_buffer()->get_text(line_it, iter)); std::string line(get_buffer()->get_text(line_it, iter));
return line; return line;
} }
std::string Source::View::get_line_before(Glib::RefPtr<Gtk::TextBuffer::Mark> mark) { std::string Source::View::get_line_before(Glib::RefPtr<Gtk::TextBuffer::Mark> mark) {
@ -988,7 +988,7 @@ Gtk::TextIter Source::View::get_tabs_end_iter(Glib::RefPtr<Gtk::TextBuffer::Mark
return get_tabs_end_iter(mark->get_iter()); return get_tabs_end_iter(mark->get_iter());
} }
Gtk::TextIter Source::View::get_tabs_end_iter(int line_nr) { Gtk::TextIter Source::View::get_tabs_end_iter(int line_nr) {
auto sentence_iter = get_source_buffer()->get_iter_at_line(line_nr); auto sentence_iter = get_buffer()->get_iter_at_line(line_nr);
while((*sentence_iter==' ' || *sentence_iter=='\t') && !sentence_iter.ends_line() && sentence_iter.forward_char()) {} while((*sentence_iter==' ' || *sentence_iter=='\t') && !sentence_iter.ends_line() && sentence_iter.forward_char()) {}
return sentence_iter; return sentence_iter;
} }
@ -1178,7 +1178,7 @@ bool Source::View::on_key_press_event(GdkEventKey* key) {
//Basic indentation //Basic indentation
bool Source::View::on_key_press_event_basic(GdkEventKey* key) { bool Source::View::on_key_press_event_basic(GdkEventKey* key) {
get_source_buffer()->begin_user_action(); get_buffer()->begin_user_action();
auto iter=get_buffer()->get_insert()->get_iter(); auto iter=get_buffer()->get_insert()->get_iter();
//Indent as in next or previous line //Indent as in next or previous line
if(key->keyval==GDK_KEY_Return && !get_buffer()->get_has_selection() && !iter.starts_line()) { if(key->keyval==GDK_KEY_Return && !get_buffer()->get_has_selection() && !iter.starts_line()) {
@ -1206,15 +1206,15 @@ bool Source::View::on_key_press_event_basic(GdkEventKey* key) {
auto next_line_tabs_end_iter=get_tabs_end_iter(line_nr+1); auto next_line_tabs_end_iter=get_tabs_end_iter(line_nr+1);
auto next_line_tabs=get_line_before(next_line_tabs_end_iter); auto next_line_tabs=get_line_before(next_line_tabs_end_iter);
if(iter.ends_line() && next_line_tabs.size()>line_tabs.size()) { if(iter.ends_line() && next_line_tabs.size()>line_tabs.size()) {
get_source_buffer()->insert_at_cursor("\n"+next_line_tabs); get_buffer()->insert_at_cursor("\n"+next_line_tabs);
scroll_to(get_source_buffer()->get_insert()); scroll_to(get_buffer()->get_insert());
get_source_buffer()->end_user_action(); get_buffer()->end_user_action();
return true; return true;
} }
} }
get_source_buffer()->insert_at_cursor("\n"+line_tabs); get_buffer()->insert_at_cursor("\n"+line_tabs);
scroll_to(get_source_buffer()->get_insert()); scroll_to(get_buffer()->get_insert());
get_source_buffer()->end_user_action(); get_buffer()->end_user_action();
return true; return true;
} }
//Indent right when clicking tab, no matter where in the line the cursor is. Also works on selected text. //Indent right when clicking tab, no matter where in the line the cursor is. Also works on selected text.
@ -1238,34 +1238,34 @@ bool Source::View::on_key_press_event_basic(GdkEventKey* key) {
tabs=next_line_tabs; tabs=next_line_tabs;
if(tabs.size()>=tab_size) { if(tabs.size()>=tab_size) {
get_buffer()->insert_at_cursor(tabs); get_buffer()->insert_at_cursor(tabs);
get_source_buffer()->end_user_action(); get_buffer()->end_user_action();
return true; return true;
} }
} }
Gtk::TextIter selection_start, selection_end; Gtk::TextIter selection_start, selection_end;
get_source_buffer()->get_selection_bounds(selection_start, selection_end); get_buffer()->get_selection_bounds(selection_start, selection_end);
int line_start=selection_start.get_line(); int line_start=selection_start.get_line();
int line_end=selection_end.get_line(); int line_end=selection_end.get_line();
for(int line=line_start;line<=line_end;line++) { for(int line=line_start;line<=line_end;line++) {
Gtk::TextIter line_it = get_source_buffer()->get_iter_at_line(line); Gtk::TextIter line_it = get_buffer()->get_iter_at_line(line);
if(!get_buffer()->get_has_selection() || line_it!=selection_end) if(!get_buffer()->get_has_selection() || line_it!=selection_end)
get_source_buffer()->insert(line_it, tab); get_buffer()->insert(line_it, tab);
} }
get_source_buffer()->end_user_action(); get_buffer()->end_user_action();
return true; return true;
} }
//Indent left when clicking shift-tab, no matter where in the line the cursor is. Also works on selected text. //Indent left when clicking shift-tab, no matter where in the line the cursor is. Also works on selected text.
else if((key->keyval==GDK_KEY_ISO_Left_Tab || key->keyval==GDK_KEY_Tab) && (key->state&GDK_SHIFT_MASK)>0) { else if((key->keyval==GDK_KEY_ISO_Left_Tab || key->keyval==GDK_KEY_Tab) && (key->state&GDK_SHIFT_MASK)>0) {
Gtk::TextIter selection_start, selection_end; Gtk::TextIter selection_start, selection_end;
get_source_buffer()->get_selection_bounds(selection_start, selection_end); get_buffer()->get_selection_bounds(selection_start, selection_end);
int line_start=selection_start.get_line(); int line_start=selection_start.get_line();
int line_end=selection_end.get_line(); int line_end=selection_end.get_line();
unsigned indent_left_steps=tab_size; unsigned indent_left_steps=tab_size;
std::vector<bool> ignore_line; std::vector<bool> ignore_line;
for(int line_nr=line_start;line_nr<=line_end;line_nr++) { for(int line_nr=line_start;line_nr<=line_end;line_nr++) {
auto line_it = get_source_buffer()->get_iter_at_line(line_nr); auto line_it = get_buffer()->get_iter_at_line(line_nr);
if(!get_buffer()->get_has_selection() || line_it!=selection_end) { if(!get_buffer()->get_has_selection() || line_it!=selection_end) {
auto tabs_end_iter=get_tabs_end_iter(line_nr); auto tabs_end_iter=get_tabs_end_iter(line_nr);
if(tabs_end_iter.starts_line() && tabs_end_iter.ends_line()) if(tabs_end_iter.starts_line() && tabs_end_iter.ends_line())
@ -1278,7 +1278,7 @@ bool Source::View::on_key_press_event_basic(GdkEventKey* key) {
ignore_line.push_back(false); ignore_line.push_back(false);
} }
else { else {
get_source_buffer()->end_user_action(); get_buffer()->end_user_action();
return true; return true;
} }
} }
@ -1286,15 +1286,15 @@ bool Source::View::on_key_press_event_basic(GdkEventKey* key) {
} }
for(int line_nr=line_start;line_nr<=line_end;line_nr++) { for(int line_nr=line_start;line_nr<=line_end;line_nr++) {
Gtk::TextIter line_it = get_source_buffer()->get_iter_at_line(line_nr); Gtk::TextIter line_it = get_buffer()->get_iter_at_line(line_nr);
Gtk::TextIter line_plus_it=line_it; Gtk::TextIter line_plus_it=line_it;
if(!get_buffer()->get_has_selection() || line_it!=selection_end) { if(!get_buffer()->get_has_selection() || line_it!=selection_end) {
line_plus_it.forward_chars(indent_left_steps); line_plus_it.forward_chars(indent_left_steps);
if(!ignore_line.at(line_nr-line_start)) if(!ignore_line.at(line_nr-line_start))
get_source_buffer()->erase(line_it, line_plus_it); get_buffer()->erase(line_it, line_plus_it);
} }
} }
get_source_buffer()->end_user_action(); get_buffer()->end_user_action();
return true; return true;
} }
//"Smart" backspace key //"Smart" backspace key
@ -1359,7 +1359,7 @@ bool Source::View::on_key_press_event_basic(GdkEventKey* key) {
get_buffer()->place_cursor(end_line_iter); get_buffer()->place_cursor(end_line_iter);
} }
scroll_to(get_buffer()->get_insert()); scroll_to(get_buffer()->get_insert());
get_source_buffer()->end_user_action(); get_buffer()->end_user_action();
return true; return true;
} }
else if(key->keyval==GDK_KEY_Home && (key->state&GDK_CONTROL_MASK)==0) { else if(key->keyval==GDK_KEY_Home && (key->state&GDK_CONTROL_MASK)==0) {
@ -1382,7 +1382,7 @@ bool Source::View::on_key_press_event_basic(GdkEventKey* key) {
get_buffer()->place_cursor(start_line_iter); get_buffer()->place_cursor(start_line_iter);
} }
scroll_to(get_buffer()->get_insert()); scroll_to(get_buffer()->get_insert());
get_source_buffer()->end_user_action(); get_buffer()->end_user_action();
return true; return true;
} }
@ -1399,7 +1399,7 @@ bool Source::View::on_key_press_event_basic(GdkEventKey* key) {
get_buffer()->erase(selection_start, selection_end); get_buffer()->erase(selection_start, selection_end);
} }
get_buffer()->insert_at_cursor(Glib::ustring(1, unicode)); get_buffer()->insert_at_cursor(Glib::ustring(1, unicode));
get_source_buffer()->end_user_action(); get_buffer()->end_user_action();
scroll_to(get_buffer()->get_insert()); scroll_to(get_buffer()->get_insert());
//Trick to make the cursor visible right after insertion: //Trick to make the cursor visible right after insertion:
@ -1410,13 +1410,13 @@ bool Source::View::on_key_press_event_basic(GdkEventKey* key) {
} }
auto stop=Gsv::View::on_key_press_event(key); auto stop=Gsv::View::on_key_press_event(key);
get_source_buffer()->end_user_action(); get_buffer()->end_user_action();
return stop; return stop;
} }
//Bracket language indentation //Bracket language indentation
bool Source::View::on_key_press_event_bracket_language(GdkEventKey* key) { bool Source::View::on_key_press_event_bracket_language(GdkEventKey* key) {
get_source_buffer()->begin_user_action(); get_buffer()->begin_user_action();
auto iter=get_buffer()->get_insert()->get_iter(); auto iter=get_buffer()->get_insert()->get_iter();
//Indent depending on if/else/etc and brackets //Indent depending on if/else/etc and brackets
if(key->keyval==GDK_KEY_Return && !iter.starts_line()) { if(key->keyval==GDK_KEY_Return && !iter.starts_line()) {
@ -1454,13 +1454,13 @@ bool Source::View::on_key_press_event_bracket_language(GdkEventKey* key) {
has_bracket=true; has_bracket=true;
} }
if(*get_buffer()->get_insert()->get_iter()=='}') { if(*get_buffer()->get_insert()->get_iter()=='}') {
get_source_buffer()->insert_at_cursor("\n"+tabs+tab+"\n"+tabs); get_buffer()->insert_at_cursor("\n"+tabs+tab+"\n"+tabs);
auto insert_it = get_source_buffer()->get_insert()->get_iter(); auto insert_it = get_buffer()->get_insert()->get_iter();
if(insert_it.backward_chars(tabs.size()+1)) { if(insert_it.backward_chars(tabs.size()+1)) {
scroll_to(get_source_buffer()->get_insert()); scroll_to(get_buffer()->get_insert());
get_source_buffer()->place_cursor(insert_it); get_buffer()->place_cursor(insert_it);
} }
get_source_buffer()->end_user_action(); get_buffer()->end_user_action();
return true; return true;
} }
else if(!has_bracket) { else if(!has_bracket) {
@ -1478,19 +1478,19 @@ bool Source::View::on_key_press_event_bracket_language(GdkEventKey* key) {
if(token=="class" || token=="struct") if(token=="class" || token=="struct")
add_semicolon=true; add_semicolon=true;
} }
get_source_buffer()->insert_at_cursor("\n"+tabs+tab+"\n"+tabs+(add_semicolon?"};":"}")); get_buffer()->insert_at_cursor("\n"+tabs+tab+"\n"+tabs+(add_semicolon?"};":"}"));
auto insert_it = get_source_buffer()->get_insert()->get_iter(); auto insert_it = get_buffer()->get_insert()->get_iter();
if(insert_it.backward_chars(tabs.size()+(add_semicolon?3:2))) { if(insert_it.backward_chars(tabs.size()+(add_semicolon?3:2))) {
scroll_to(get_source_buffer()->get_insert()); scroll_to(get_buffer()->get_insert());
get_source_buffer()->place_cursor(insert_it); get_buffer()->place_cursor(insert_it);
} }
get_source_buffer()->end_user_action(); get_buffer()->end_user_action();
return true; return true;
} }
else { else {
get_source_buffer()->insert_at_cursor("\n"+tabs+tab); get_buffer()->insert_at_cursor("\n"+tabs+tab);
scroll_to(get_buffer()->get_insert()); scroll_to(get_buffer()->get_insert());
get_source_buffer()->end_user_action(); get_buffer()->end_user_action();
return true; return true;
} }
} }
@ -1507,34 +1507,34 @@ bool Source::View::on_key_press_event_bracket_language(GdkEventKey* key) {
} }
} }
else if(REGEX_NS::regex_match(line, sm, no_bracket_statement_regex)) { else if(REGEX_NS::regex_match(line, sm, no_bracket_statement_regex)) {
get_source_buffer()->insert_at_cursor("\n"+tabs+tab); get_buffer()->insert_at_cursor("\n"+tabs+tab);
scroll_to(get_source_buffer()->get_insert()); scroll_to(get_buffer()->get_insert());
get_source_buffer()->end_user_action(); get_buffer()->end_user_action();
return true; return true;
} }
else if(REGEX_NS::regex_match(line, sm, no_bracket_no_para_statement_regex)) { else if(REGEX_NS::regex_match(line, sm, no_bracket_no_para_statement_regex)) {
get_source_buffer()->insert_at_cursor("\n"+tabs+tab); get_buffer()->insert_at_cursor("\n"+tabs+tab);
scroll_to(get_source_buffer()->get_insert()); scroll_to(get_buffer()->get_insert());
get_source_buffer()->end_user_action(); get_buffer()->end_user_action();
return true; return true;
} }
//Indenting after for instance if(...)\n...;\n //Indenting after for instance if(...)\n...;\n
else if(iter.backward_char() && *iter==';') { else if(iter.backward_char() && *iter==';') {
REGEX_NS::smatch sm2; REGEX_NS::smatch sm2;
size_t line_nr=get_source_buffer()->get_insert()->get_iter().get_line(); size_t line_nr=get_buffer()->get_insert()->get_iter().get_line();
if(line_nr>0 && tabs.size()>=tab_size) { if(line_nr>0 && tabs.size()>=tab_size) {
std::string previous_line=get_line(line_nr-1); std::string previous_line=get_line(line_nr-1);
if(!REGEX_NS::regex_match(previous_line, sm2, bracket_regex)) { if(!REGEX_NS::regex_match(previous_line, sm2, bracket_regex)) {
if(REGEX_NS::regex_match(previous_line, sm2, no_bracket_statement_regex)) { if(REGEX_NS::regex_match(previous_line, sm2, no_bracket_statement_regex)) {
get_source_buffer()->insert_at_cursor("\n"+sm2[1].str()); get_buffer()->insert_at_cursor("\n"+sm2[1].str());
scroll_to(get_source_buffer()->get_insert()); scroll_to(get_buffer()->get_insert());
get_source_buffer()->end_user_action(); get_buffer()->end_user_action();
return true; return true;
} }
else if(REGEX_NS::regex_match(previous_line, sm2, no_bracket_no_para_statement_regex)) { else if(REGEX_NS::regex_match(previous_line, sm2, no_bracket_no_para_statement_regex)) {
get_source_buffer()->insert_at_cursor("\n"+sm2[1].str()); get_buffer()->insert_at_cursor("\n"+sm2[1].str());
scroll_to(get_source_buffer()->get_insert()); scroll_to(get_buffer()->get_insert());
get_source_buffer()->end_user_action(); get_buffer()->end_user_action();
return true; return true;
} }
} }
@ -1559,17 +1559,17 @@ bool Source::View::on_key_press_event_bracket_language(GdkEventKey* key) {
get_buffer()->erase(start_line_iter, start_line_plus_tab_size); get_buffer()->erase(start_line_iter, start_line_plus_tab_size);
} }
else { else {
get_source_buffer()->insert_at_cursor("\n"+tabs+tab); get_buffer()->insert_at_cursor("\n"+tabs+tab);
scroll_to(get_source_buffer()->get_insert()); scroll_to(get_buffer()->get_insert());
get_source_buffer()->end_user_action(); get_buffer()->end_user_action();
return true; return true;
} }
} }
} }
} }
get_source_buffer()->insert_at_cursor("\n"+tabs); get_buffer()->insert_at_cursor("\n"+tabs);
scroll_to(get_source_buffer()->get_insert()); scroll_to(get_buffer()->get_insert());
get_source_buffer()->end_user_action(); get_buffer()->end_user_action();
return true; return true;
} }
} }
@ -1579,19 +1579,19 @@ bool Source::View::on_key_press_event_bracket_language(GdkEventKey* key) {
if(line.size()>=tab_size) { if(line.size()>=tab_size) {
for(auto c: line) { for(auto c: line) {
if(c!=tab_char) { if(c!=tab_char) {
get_source_buffer()->insert_at_cursor("}"); get_buffer()->insert_at_cursor("}");
get_source_buffer()->end_user_action(); get_buffer()->end_user_action();
return true; return true;
} }
} }
Gtk::TextIter insert_it = get_source_buffer()->get_insert()->get_iter(); Gtk::TextIter insert_it = get_buffer()->get_insert()->get_iter();
Gtk::TextIter line_it = get_source_buffer()->get_iter_at_line(insert_it.get_line()); Gtk::TextIter line_it = get_buffer()->get_iter_at_line(insert_it.get_line());
Gtk::TextIter line_plus_it=line_it; Gtk::TextIter line_plus_it=line_it;
line_plus_it.forward_chars(tab_size); line_plus_it.forward_chars(tab_size);
get_source_buffer()->erase(line_it, line_plus_it); get_buffer()->erase(line_it, line_plus_it);
} }
get_source_buffer()->insert_at_cursor("}"); get_buffer()->insert_at_cursor("}");
get_source_buffer()->end_user_action(); get_buffer()->end_user_action();
return true; return true;
} }
//Indent left when writing { on a new line after for instance if(...)\n... //Indent left when writing { on a new line after for instance if(...)\n...
@ -1620,7 +1620,7 @@ bool Source::View::on_key_press_event_bracket_language(GdkEventKey* key) {
} }
} }
get_source_buffer()->end_user_action(); get_buffer()->end_user_action();
return on_key_press_event_basic(key); return on_key_press_event_basic(key);
} }

14
src/source_clang.cc
Unescape View File

@ -255,7 +255,7 @@ void Source::ClangViewParse::update_syntax() {
} }
if (ranges.empty()) if (ranges.empty())
return; return;
auto buffer = get_source_buffer(); auto buffer = get_buffer();
for(auto &tag: last_syntax_tags) for(auto &tag: last_syntax_tags)
buffer->remove_tag_by_name(tag, buffer->begin(), buffer->end()); buffer->remove_tag_by_name(tag, buffer->begin(), buffer->end());
last_syntax_tags.clear(); last_syntax_tags.clear();
@ -554,7 +554,7 @@ void Source::ClangViewAutocomplete::autocomplete_dialog_setup() {
autocomplete_dialog=std::unique_ptr<CompletionDialog>(new CompletionDialog(*this, get_buffer()->create_mark(start_iter))); autocomplete_dialog=std::unique_ptr<CompletionDialog>(new CompletionDialog(*this, get_buffer()->create_mark(start_iter)));
autocomplete_dialog_rows.clear(); autocomplete_dialog_rows.clear();
autocomplete_dialog->on_hide=[this](){ autocomplete_dialog->on_hide=[this](){
get_source_buffer()->end_user_action(); get_buffer()->end_user_action();
autocomplete_tooltips.hide(); autocomplete_tooltips.hide();
autocomplete_tooltips.clear(); autocomplete_tooltips.clear();
parsed=false; parsed=false;
@ -745,7 +745,7 @@ void Source::ClangViewAutocomplete::autocomplete() {
set_status(""); set_status("");
autocomplete_state=AutocompleteState::IDLE; autocomplete_state=AutocompleteState::IDLE;
if (!autocomplete_dialog_rows.empty()) { if (!autocomplete_dialog_rows.empty()) {
get_source_buffer()->begin_user_action(); get_buffer()->begin_user_action();
autocomplete_dialog->show(); autocomplete_dialog->show();
} }
else else
@ -933,14 +933,14 @@ Source::ClangViewAutocomplete(file_path, language) {
} }
if(!marks.empty()) { if(!marks.empty()) {
clang_view->renaming=true; clang_view->renaming=true;
clang_view->get_source_buffer()->begin_user_action(); clang_view->get_buffer()->begin_user_action();
for(auto &mark: marks) { for(auto &mark: marks) {
clang_view->get_buffer()->erase(mark.first->get_iter(), mark.second->get_iter()); clang_view->get_buffer()->erase(mark.first->get_iter(), mark.second->get_iter());
clang_view->get_buffer()->insert(mark.first->get_iter(), text); clang_view->get_buffer()->insert(mark.first->get_iter(), text);
clang_view->get_buffer()->delete_mark(mark.first); clang_view->get_buffer()->delete_mark(mark.first);
clang_view->get_buffer()->delete_mark(mark.second); clang_view->get_buffer()->delete_mark(mark.second);
} }
clang_view->get_source_buffer()->end_user_action(); clang_view->get_buffer()->end_user_action();
clang_view->renaming=false; clang_view->renaming=false;
clang_view->save(views); clang_view->save(views);
renamed_views.emplace_back(clang_view); renamed_views.emplace_back(clang_view);
@ -1272,7 +1272,7 @@ Source::ClangViewAutocomplete(file_path, language) {
fix_it_marks.emplace_back(get_buffer()->create_mark(start_iter), get_buffer()->create_mark(end_iter)); fix_it_marks.emplace_back(get_buffer()->create_mark(start_iter), get_buffer()->create_mark(end_iter));
} }
size_t c=0; size_t c=0;
get_source_buffer()->begin_user_action(); get_buffer()->begin_user_action();
for(auto &fix_it: fix_its) { for(auto &fix_it: fix_its) {
if(fix_it.type==FixIt::Type::INSERT) { if(fix_it.type==FixIt::Type::INSERT) {
get_buffer()->insert(fix_it_marks[c].first->get_iter(), fix_it.source); get_buffer()->insert(fix_it_marks[c].first->get_iter(), fix_it.source);
@ -1290,7 +1290,7 @@ Source::ClangViewAutocomplete(file_path, language) {
get_buffer()->delete_mark(mark_pair.first); get_buffer()->delete_mark(mark_pair.first);
get_buffer()->delete_mark(mark_pair.second); get_buffer()->delete_mark(mark_pair.second);
} }
get_source_buffer()->end_user_action(); get_buffer()->end_user_action();
}; };
} }

Write Preview
Loading…
Cancel
Save