Browse Source

Fixed autocomplete error handling

merge-requests/365/head
eidheim 10 years ago
parent
commit
a136eed3cb
  1. 5
      src/source_clang.cc

5
src/source_clang.cc

@ -664,7 +664,7 @@ Source::ClangViewParse(file_path, project_path, language), autocomplete_state(Au
return false; return false;
}); });
autocomplete_error_connection=autocomplete_done.connect([this](){ autocomplete_done_connection=autocomplete_done.connect([this](){
if(autocomplete_state==AutocompleteState::CANCELED) { if(autocomplete_state==AutocompleteState::CANCELED) {
set_status(""); set_status("");
soft_reparse(); soft_reparse();
@ -932,6 +932,7 @@ bool Source::ClangViewAutocomplete::full_reparse() {
if(!parse_state.compare_exchange_strong(expected, ParseState::RESTARTING)) if(!parse_state.compare_exchange_strong(expected, ParseState::RESTARTING))
return false; return false;
} }
autocomplete_state=AutocompleteState::IDLE;
soft_reparse_needed=false; soft_reparse_needed=false;
full_reparse_running=true; full_reparse_running=true;
if(full_reparse_thread.joinable()) if(full_reparse_thread.joinable())
@ -1397,7 +1398,7 @@ void Source::ClangView::async_delete() {
parse_postprocess_connection.disconnect(); parse_postprocess_connection.disconnect();
parse_preprocess_connection.disconnect(); parse_preprocess_connection.disconnect();
parse_error_connection.disconnect(); parse_error_connection.disconnect();
autocomplete_error_connection.disconnect(); autocomplete_done_connection.disconnect();
autocomplete_restart_connection.disconnect(); autocomplete_restart_connection.disconnect();
autocomplete_error_connection.disconnect(); autocomplete_error_connection.disconnect();
do_restart_parse_connection.disconnect(); do_restart_parse_connection.disconnect();

Loading…
Cancel
Save