Zengtudor/ccls
1
0
Fork 0
mirror of https://github.com/MaskRay/ccls.git synced 2024-12-01 11:57:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix completion issue where completing dropped completion session.

Browse Source
This commit is contained in:
Jacob Dufault 2017-10-23 08:38:01 -07:00
parent f0e9434163
commit d145bcebc5
1 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/clang_complete.cc
View File

@ -314,6 +314,11 @@ void TryEnsureDocumentParsed(ClangCompleteManager* manager,
// If we're emitting diagnostics, do an immediate reparse, otherwise we will // If we're emitting diagnostics, do an immediate reparse, otherwise we will
// emit stale/bad diagnostics. // emit stale/bad diagnostics.
*tu = clang::TranslationUnit::Reparse(std::move(*tu), unsaved); *tu = clang::TranslationUnit::Reparse(std::move(*tu), unsaved);
if (!*tu) {
LOG_S(ERROR) << "Reparsing translation unit for diagnostics failed for "
<< session->file.filename;
return;
}
NonElidedVector<lsDiagnostic> ls_diagnostics; NonElidedVector<lsDiagnostic> ls_diagnostics;
unsigned num_diagnostics = clang_getNumDiagnostics((*tu)->cx_tu); unsigned num_diagnostics = clang_getNumDiagnostics((*tu)->cx_tu);
@ -649,14 +654,17 @@ void ClangCompleteManager::NotifyClose(const std::string& filename) {
bool ClangCompleteManager::EnsureCompletionOrCreatePreloadSession( bool ClangCompleteManager::EnsureCompletionOrCreatePreloadSession(
const std::string& filename) { const std::string& filename) {
std::lock_guard<std::mutex> lock(sessions_lock_); std::lock_guard<std::mutex> lock(sessions_lock_);
if (!preloaded_sessions_.TryGetEntry(filename) &&
!completion_sessions_.TryGetEntry(filename)) { // Check for an existing CompletionSession.
if (preloaded_sessions_.TryGetEntry(filename) ||
completion_sessions_.TryGetEntry(filename))
return false;
// No CompletionSession, create new one.
auto session = std::make_shared<CompletionSession>( auto session = std::make_shared<CompletionSession>(
project_->FindCompilationEntryForFile(filename), working_files_); project_->FindCompilationEntryForFile(filename), working_files_);
preloaded_sessions_.InsertEntry(session); preloaded_sessions_.InsertEntry(session);
return true; return true;
}
return false;
} }
std::shared_ptr<CompletionSession> ClangCompleteManager::TryGetSession( std::shared_ptr<CompletionSession> ClangCompleteManager::TryGetSession(
@ -683,7 +691,7 @@ std::shared_ptr<CompletionSession> ClangCompleteManager::TryGetSession(
// Try to find a completion session. If none create one. // Try to find a completion session. If none create one.
std::shared_ptr<CompletionSession> completion_session = std::shared_ptr<CompletionSession> completion_session =
completion_sessions_.TryTakeEntry(filename); completion_sessions_.TryGetEntry(filename);
if (!completion_session && create_if_needed) { if (!completion_session && create_if_needed) {
completion_session = std::make_shared<CompletionSession>( completion_session = std::make_shared<CompletionSession>(
project_->FindCompilationEntryForFile(filename), working_files_); project_->FindCompilationEntryForFile(filename), working_files_);