completion: don't reuse cache if the buffer line has changed

Fix emacs-ccls#54

src/messages/textDocument_completion.cc

@@ -565,13 +565,14 @@ void MessageHandler::textDocument_completion(CompletionParam &param,
         if (!consumer->from_cache) {
           cache.withLock([&]() {
             cache.path = path;
+            cache.line = buffer_line;
             cache.position = begin_pos;
             cache.result = consumer->ls_items;
           });
         }
       };
 
-  if (cache.isCacheValid(path, begin_pos)) {
+  if (cache.isCacheValid(path, buffer_line, begin_pos)) {
     CompletionConsumer consumer(ccOpts, true);
     cache.withLock([&]() { consumer.ls_items = cache.result; });
     callback(&consumer);

src/messages/textDocument_signatureHelp.cc

@@ -151,21 +151,25 @@ void MessageHandler::textDocument_signatureHelp(
     reply.notOpened(path);
     return;
   }
+  std::string buffer_line;
+  if (param.position.line >= 0 && param.position.line < wf->buffer_lines.size())
+    buffer_line = wf->buffer_lines[param.position.line];
   {
     std::string filter;
     Position end_pos;
     begin_pos = wf->getCompletionPosition(param.position, &filter, &end_pos);
   }
 
   SemaManager::OnComplete callback =
-      [reply, path, begin_pos](CodeCompleteConsumer *optConsumer) {
+      [reply, path, begin_pos, buffer_line](CodeCompleteConsumer *optConsumer) {
         if (!optConsumer)
           return;
         auto *consumer = static_cast<SignatureHelpConsumer *>(optConsumer);
         reply(consumer->ls_sighelp);
         if (!consumer->from_cache) {
           cache.withLock([&]() {
             cache.path = path;
+            cache.line = buffer_line;
             cache.position = begin_pos;
             cache.result = consumer->ls_sighelp;
           });
@@ -176,7 +180,7 @@ void MessageHandler::textDocument_signatureHelp(
   ccOpts.IncludeGlobals = false;
   ccOpts.IncludeMacros = false;
   ccOpts.IncludeBriefComments = true;
-  if (cache.isCacheValid(path, begin_pos)) {
+  if (cache.isCacheValid(path, buffer_line, begin_pos)) {
     SignatureHelpConsumer consumer(ccOpts, true);
     cache.withLock([&]() { consumer.ls_sighelp = cache.result; });
     callback(&consumer);

src/sema_manager.hh

@@ -164,16 +164,20 @@ struct SemaManager {
 template <typename T> struct CompleteConsumerCache {
   std::mutex mutex;
   std::string path;
+  std::string line;
   Position position;
   T result;
 
   template <typename Fn> void withLock(Fn &&fn) {
     std::lock_guard lock(mutex);
     fn();
   }
-  bool isCacheValid(const std::string path, Position position) {
+  bool isCacheValid(const std::string &path, const std::string &line,
+                    Position position) {
     std::lock_guard lock(mutex);
-    return this->path == path && this->position == position;
+    return this->position == position && this->path == path &&
+           this->line.compare(0, position.character, line, 0,
+                              position.character) == 0;
   }
 };
 } // namespace ccls