Zengtudor/ccls
1
0
Fork 0
mirror of https://github.com/MaskRay/ccls.git synced 2025-02-21 16:09:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Try to only ever have one completion session per file.

Browse Source
This commit is contained in:
Jacob Dufault 2017-10-22 21:49:17 -07:00
parent a155f5b686
commit 9429dff63a
2 changed files with 44 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
src/clang_complete.cc
View File

@ -313,9 +313,8 @@ void EnsureDocumentParsed(ClangCompleteManager* manager,
if (manager->config_->diagnosticsOnParse && !(*tu)->did_fail) { if (manager->config_->diagnosticsOnParse && !(*tu)->did_fail) {
// If we're emitting diagnostics, do an immedaite reparse, otherwise we will // If we're emitting diagnostics, do an immedaite reparse, otherwise we will
// emit stale/bad diagnostics. // emit stale/bad diagnostics.
clang_reparseTranslationUnit( clang_reparseTranslationUnit((*tu)->cx_tu, unsaved.size(), unsaved.data(),
(*tu)->cx_tu, unsaved.size(), unsaved.data(), clang_defaultReparseOptions((*tu)->cx_tu));
clang_defaultReparseOptions((*tu)->cx_tu));
NonElidedVector<lsDiagnostic> ls_diagnostics; NonElidedVector<lsDiagnostic> ls_diagnostics;
unsigned num_diagnostics = clang_getNumDiagnostics((*tu)->cx_tu); unsigned num_diagnostics = clang_getNumDiagnostics((*tu)->cx_tu);
@ -338,8 +337,8 @@ void CompletionParseMain(ClangCompleteManager* completion_manager) {
// If we don't get a session then that means we don't care about the file // If we don't get a session then that means we don't care about the file
// anymore - abandon the request. // anymore - abandon the request.
std::shared_ptr<CompletionSession> session = std::shared_ptr<CompletionSession> session =
completion_manager->TryGetSession(request.path, completion_manager->TryGetEditSession(request.path,
false /*create_if_needed*/); false /*create_if_needed*/);
if (!session) if (!session)
continue; continue;
@ -371,7 +370,7 @@ void CompletionQueryMain(ClangCompleteManager* completion_manager) {
std::string path = request->document.uri.GetPath(); std::string path = request->document.uri.GetPath();
std::shared_ptr<CompletionSession> session = std::shared_ptr<CompletionSession> session =
completion_manager->TryGetSession(path, true /*create_if_needed*/); completion_manager->TryGetEditSession(path, true /*create_if_needed*/);
std::lock_guard<std::mutex> lock(session->tu_lock); std::lock_guard<std::mutex> lock(session->tu_lock);
Timer timer; Timer timer;
@ -595,9 +594,11 @@ void ClangCompleteManager::NotifyView(const std::string& filename) {
std::lock_guard<std::mutex> lock(sessions_lock_); std::lock_guard<std::mutex> lock(sessions_lock_);
// Already a view session, do nothing. // Already a view or edit session, do nothing.
if (view_sessions_.TryGetEntry(filename)) if (view_sessions_.TryGetEntry(filename) ||
edit_sessions_.TryGetEntry(filename)) {
return; return;
}
// Create new view session. // Create new view session.
view_sessions_.InsertEntry(std::make_shared<CompletionSession>( view_sessions_.InsertEntry(std::make_shared<CompletionSession>(
@ -638,6 +639,15 @@ void ClangCompleteManager::NotifySave(const std::string& filename) {
std::lock_guard<std::mutex> lock(sessions_lock_); std::lock_guard<std::mutex> lock(sessions_lock_);
// If for whatever reason we have a view session and not an edit session,
// move the session from view to edit.
std::shared_ptr<CompletionSession> view_session =
view_sessions_.TryTakeEntry(filename);
if (view_session) {
edit_sessions_.InsertEntry(view_session);
}
// If no edit session create one.
if (!edit_sessions_.TryGetEntry(filename)) { if (!edit_sessions_.TryGetEntry(filename)) {
edit_sessions_.InsertEntry(std::make_shared<CompletionSession>( edit_sessions_.InsertEntry(std::make_shared<CompletionSession>(
project_->FindCompilationEntryForFile(filename), working_files_)); project_->FindCompilationEntryForFile(filename), working_files_));
@ -661,26 +671,33 @@ void ClangCompleteManager::NotifyClose(const std::string& filename) {
auto edit_ptr = edit_sessions_.TryTakeEntry(filename); auto edit_ptr = edit_sessions_.TryTakeEntry(filename);
LOG_IF_S(INFO, !!edit_ptr) LOG_IF_S(INFO, !!edit_ptr)
<< "Dropped edit-based code completion session for " << filename; << "Dropped edit-based code completion session for " << filename;
// We should never have both a view and edit session.
assert((view_ptr && edit_ptr) == false);
} }
std::shared_ptr<CompletionSession> ClangCompleteManager::TryGetSession( std::shared_ptr<CompletionSession> ClangCompleteManager::TryGetEditSession(
const std::string& filename, const std::string& filename,
bool create_if_needed) { bool create_if_needed) {
std::lock_guard<std::mutex> lock(sessions_lock_); std::lock_guard<std::mutex> lock(sessions_lock_);
std::shared_ptr<CompletionSession> session = // Try to find a view session. If found move it to |edit_sessions_|.
edit_sessions_.TryGetEntry(filename); std::shared_ptr<CompletionSession> view_session =
view_sessions_.TryTakeEntry(filename);
if (!session) if (view_session) {
session = view_sessions_.TryGetEntry(filename); assert(!edit_sessions_.TryGetEntry(filename));
edit_sessions_.InsertEntry(view_session);
if (!session && create_if_needed) { return view_session;
// Create new session. Default to edited_sessions_ since invoking code
// completion almost certainly implies an edit.
edit_sessions_.InsertEntry(std::make_shared<CompletionSession>(
project_->FindCompilationEntryForFile(filename), working_files_));
session = edit_sessions_.TryGetEntry(filename);
} }
return session; // Try to find an edit session. If none create if requested.
std::shared_ptr<CompletionSession> edit_session =
edit_sessions_.TryTakeEntry(filename);
if (!edit_session && create_if_needed) {
edit_session = std::make_shared<CompletionSession>(
project_->FindCompilationEntryForFile(filename), working_files_);
edit_sessions_.InsertEntry(edit_session);
}
return edit_session;
} }

7
src/clang_complete.h
View File

@ -99,8 +99,11 @@ struct ClangCompleteManager {
// completion session will be dropped. // completion session will be dropped.
void NotifyClose(const std::string& filename); void NotifyClose(const std::string& filename);
std::shared_ptr<CompletionSession> TryGetSession(const std::string& filename, // Tries to find an edit session for |filename|. This will move the session
bool create_if_needed); // from view to edit.
std::shared_ptr<CompletionSession> TryGetEditSession(
const std::string& filename,
bool create_if_needed);
// TODO: make these configurable. // TODO: make these configurable.
const int kMaxViewSessions = 10; const int kMaxViewSessions = 10;