Browse Source

Now parsing should always start after autocomplete is finished.

merge-requests/365/head
eidheim 10 years ago
parent
commit
75edbd4b7c
  1. 13
      src/source.cc

13
src/source.cc

@ -1287,17 +1287,13 @@ Source::ClangViewParse(file_path, project_path), autocomplete_cancel_starting(fa
get_buffer()->signal_mark_set().connect([this](const Gtk::TextBuffer::iterator& iterator, const Glib::RefPtr<Gtk::TextBuffer::Mark>& mark){ get_buffer()->signal_mark_set().connect([this](const Gtk::TextBuffer::iterator& iterator, const Glib::RefPtr<Gtk::TextBuffer::Mark>& mark){
if(mark->get_name()=="insert") { if(mark->get_name()=="insert") {
autocomplete_cancel_starting=true; autocomplete_cancel_starting=true;
if(completion_dialog_shown) { if(completion_dialog_shown)
completion_dialog->hide(); completion_dialog->hide();
start_reparse();
}
} }
}); });
signal_scroll_event().connect([this](GdkEventScroll* event){ signal_scroll_event().connect([this](GdkEventScroll* event){
if(completion_dialog_shown) { if(completion_dialog_shown)
completion_dialog->hide(); completion_dialog->hide();
start_reparse();
}
return false; return false;
}, false); }, false);
signal_key_release_event().connect([this](GdkEventKey* key){ signal_key_release_event().connect([this](GdkEventKey* key){
@ -1311,10 +1307,8 @@ Source::ClangViewParse(file_path, project_path), autocomplete_cancel_starting(fa
signal_focus_out_event().connect([this](GdkEventFocus* event) { signal_focus_out_event().connect([this](GdkEventFocus* event) {
autocomplete_cancel_starting=true; autocomplete_cancel_starting=true;
if(completion_dialog_shown) { if(completion_dialog_shown)
completion_dialog->hide(); completion_dialog->hide();
start_reparse();
}
return false; return false;
}); });
@ -1439,6 +1433,7 @@ void Source::ClangViewAutocomplete::autocomplete() {
} }
else { else {
set_status(""); set_status("");
start_reparse();
start_autocomplete(); start_autocomplete();
} }
}); });

Loading…
Cancel
Save