2 files changed, 11 insertions, 13 deletions

diff --git a/src/plugins/clangcodemodel/clangdfollowsymbol.cpp b/src/plugins/clangcodemodel/clangdfollowsymbol.cpp
index 102e49acf4..6ffff7b90d 100644
--- a/src/plugins/clangcodemodel/clangdfollowsymbol.cpp
+++ b/src/plugins/clangcodemodel/clangdfollowsymbol.cpp
@@ -146,14 +146,14 @@ ClangdFollowSymbol::ClangdFollowSymbol(ClangdClient *client, const QTextCursor &
                     openInSplit))
 {
     // Abort if the user does something else with the document in the meantime.
-    connect(document, &TextDocument::contentsChanged, this, &ClangdFollowSymbol::emitDone,
+    connect(document, &TextDocument::contentsChanged, this, [this] { emitDone(); },
             Qt::QueuedConnection);
     if (editorWidget) {
         connect(editorWidget, &CppEditorWidget::cursorPositionChanged,
-                this, &ClangdFollowSymbol::emitDone, Qt::QueuedConnection);
+                this, [this] { emitDone(); }, Qt::QueuedConnection);
     }
     d->focusChangedConnection = connect(qApp, &QApplication::focusChanged,
-                                        this, &ClangdFollowSymbol::emitDone, Qt::QueuedConnection);
+                                        this, [this] { emitDone(); }, Qt::QueuedConnection);
 
     // Step 1: Follow the symbol via "Go to Definition". At the same time, request the
     //         AST node corresponding to the cursor position, so we can find out whether
@@ -205,12 +205,14 @@ void ClangdFollowSymbol::clear()
     d->pendingGotoDefRequests.clear();
 }
 
-void ClangdFollowSymbol::emitDone()
+void ClangdFollowSymbol::emitDone(const Link &link)
 {
     if (d->done)
         return;
 
     d->done = true;
+    if (link.hasValidTarget())
+        d->callback(link);
     emit done();
 }
 
@@ -246,14 +248,12 @@ void ClangdFollowSymbol::Private::handleDocumentInfoResults()
 
     // If something went wrong, we just follow the original link.
     if (symbolsToDisplay.isEmpty()) {
-        callback(defLink);
-        q->emitDone();
+        q->emitDone(defLink);
         return;
     }
 
     if (symbolsToDisplay.size() == 1) {
-        callback(symbolsToDisplay.first().second);
-        q->emitDone();
+        q->emitDone(symbolsToDisplay.first().second);
         return;
     }
 
@@ -382,8 +382,7 @@ void ClangdFollowSymbol::Private::handleGotoDefinitionResult()
 
     // No dis-ambiguation necessary. Call back with the link and finish.
     if (!defLinkIsAmbiguous()) {
-        callback(defLink);
-        q->emitDone();
+        q->emitDone(defLink);
         return;
     }
 
@@ -416,8 +415,7 @@ void ClangdFollowSymbol::Private::handleGotoImplementationResult(
 
     // We didn't find any further candidates, so jump to the original definition link.
     if (allLinks.size() == 1 && pendingGotoImplRequests.isEmpty()) {
-        callback(allLinks.first());
-        q->emitDone();
+        q->emitDone(allLinks.first());
         return;
     }
 
diff --git a/src/plugins/clangcodemodel/clangdfollowsymbol.h b/src/plugins/clangcodemodel/clangdfollowsymbol.h
index fffe2c42b9..09094bbed5 100644
--- a/src/plugins/clangcodemodel/clangdfollowsymbol.h
+++ b/src/plugins/clangcodemodel/clangdfollowsymbol.h
@@ -55,7 +55,7 @@ signals:
     void done();
 
 private:
-    void emitDone();
+    void emitDone(const Utils::Link &link = {});
     class VirtualFunctionAssistProcessor;
     class VirtualFunctionAssistProvider;