Handle removal of compile_commands.json better

Andersbakken · May 24, 2019 · a66e5c7 · a66e5c7
1 parent a422b1f
commit a66e5c7
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 12 deletions.
diff --git a/src/IndexParseData.h b/src/IndexParseData.h
@@ -60,6 +60,12 @@ class IndexParseData
             return *this;
         }
 
+        void clearSources()
+        {
+            lastModifiedMs = 0;
+            sources.clear();
+        }
+
         uint64_t lastModifiedMs;
         Sources sources;
         List<String> environment;

diff --git a/src/Project.cpp b/src/Project.cpp
@@ -980,7 +980,7 @@ void Project::onFileAdded(const Path &path)
 
 void Project::onFileAddedOrModified(const Path &file, uint32_t fileId)
 {
-    // error() << file.fileName() << mCompileCommandsInfos.dir << file;
+    // error() << file.fileName() << fileId << mIndexParseData.compileCommands.keys();
     if (mIndexParseData.compileCommands.contains(fileId)) {
         mCheckTimer.restart(CheckExplicitTimeout);
         return;
@@ -2543,23 +2543,21 @@ void Project::reloadCompileCommands()
         data.project = mPath;
         data.environment = mIndexParseData.environment;
         bool found = false;
-        auto it = mIndexParseData.compileCommands.begin();
-        while (it != mIndexParseData.compileCommands.end()) {
+
+        for (auto it = mIndexParseData.compileCommands.begin(); it != mIndexParseData.compileCommands.end(); ++it) {
             const Path file = Location::path(it->first);
             const uint64_t lastModified = file.lastModifiedMs();
             if (!lastModified) {
                 for (auto src : it->second.sources) {
                     removed[src.first] = it->first;
                 }
-                mIndexParseData.compileCommands.erase(it++);
-                continue;
-            }
-
-            if (lastModified != it->second.lastModifiedMs
-                && Server::instance()->loadCompileCommands(data, file, it->second.environment, &cache)) {
-                found = true;
+                it->second.clearSources();
+            } else {
+                if (lastModified != it->second.lastModifiedMs
+                    && Server::instance()->loadCompileCommands(data, file, it->second.environment, &cache)) {
+                    found = true;
+                }
             }
-            ++it;
         }
         removeSources(removed);
         if (found)

diff --git a/src/Server.cpp b/src/Server.cpp
@@ -2593,7 +2593,6 @@ void Server::sourceFileModified(const std::shared_ptr<Project> &project, uint32_
     // error() << Location::path(fileId) << "modified" << (mCompletionThread ? (mCompletionThread->isCached(project, fileId) ? 1 : 0) : -1);
     if (mCompletionThread && mCompletionThread->isCached(project, fileId)) {
         mCompletionThread->reparse(project, fileId);
-
     }
 }