From e5f8fe311d6a2e8e5873e78f3ab2a9fb97a263c9 Mon Sep 17 00:00:00 2001
From: Christian Kandeler <christian.kandeler@qt.io>
Date: Mon, 14 Feb 2022 09:25:29 +0100
Subject: [PATCH] ClangCodeModel: Remove fallback code for clangd < 13

Amends 4dfdbf91f6.

Change-Id: Ie8657329380e83aeb76503e360afa5ebf0e60fbb
Reviewed-by: David Schulz <david.schulz@qt.io>
---
 src/plugins/clangcodemodel/clangdclient.cpp      | 8 +-------
 src/plugins/clangcodemodel/clangfollowsymbol.cpp | 2 +-
 src/plugins/clangcodemodel/test/clangdtests.cpp  | 5 -----
 3 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/src/plugins/clangcodemodel/clangdclient.cpp b/src/plugins/clangcodemodel/clangdclient.cpp
index f2824230977..89d89c75a41 100644
--- a/src/plugins/clangcodemodel/clangdclient.cpp
+++ b/src/plugins/clangcodemodel/clangdclient.cpp
@@ -1708,8 +1708,7 @@ void ClangdClient::Private::handleFindUsagesResult(quint64 key, const QList<Loca
     }
 
     qCDebug(clangdLog) << "document count is" << refData->fileData.size();
-    if (refData->replacementData || q->versionNumber() < QVersionNumber(13)
-            || !refData->categorize) {
+    if (refData->replacementData || !refData->categorize) {
         qCDebug(clangdLog) << "skipping AST retrieval";
         reportAllSearchResultsAndFinish(*refData);
         return;
@@ -1879,11 +1878,6 @@ void ClangdClient::followSymbol(TextDocument *document,
     };
     symbolSupport().findLinkAt(document, adjustedCursor, std::move(gotoDefCallback), true);
 
-    if (versionNumber() < QVersionNumber(12)) {
-        d->followSymbolData->cursorNode.emplace(AstNode());
-        return;
-    }
-
     const auto astHandler = [this, id = d->followSymbolData->id]
             (const AstNode &ast, const MessageId &) {
         qCDebug(clangdLog) << "received ast response for cursor";
diff --git a/src/plugins/clangcodemodel/clangfollowsymbol.cpp b/src/plugins/clangcodemodel/clangfollowsymbol.cpp
index bb107285567..c81bbe12688 100644
--- a/src/plugins/clangcodemodel/clangfollowsymbol.cpp
+++ b/src/plugins/clangcodemodel/clangfollowsymbol.cpp
@@ -260,7 +260,7 @@ void ClangFollowSymbol::switchDeclDef(const CppEditor::CursorInEditor &data,
 {
     ClangdClient * const client
             = ClangModelManagerSupport::instance()->clientForFile(data.filePath());
-    if (client && client->isFullyIndexed() && client->versionNumber() >= QVersionNumber(13)) {
+    if (client && client->isFullyIndexed()) {
         client->switchDeclDef(data.textDocument(), data.cursor(), data.editorWidget(),
                               std::move(processLinkCallback));
         return;
diff --git a/src/plugins/clangcodemodel/test/clangdtests.cpp b/src/plugins/clangcodemodel/test/clangdtests.cpp
index 36eb57ed55b..a3b295f4b6a 100644
--- a/src/plugins/clangcodemodel/test/clangdtests.cpp
+++ b/src/plugins/clangcodemodel/test/clangdtests.cpp
@@ -179,7 +179,6 @@ ClangdTestFindReferences::ClangdTestFindReferences()
 {
     setProjectFileName("find-usages.pro");
     setSourceFileNames({"defs.h", "main.cpp"});
-    setMinimumVersion(13);
 }
 
 void ClangdTestFindReferences::initTestCase()
@@ -322,7 +321,6 @@ ClangdTestFollowSymbol::ClangdTestFollowSymbol()
 {
     setProjectFileName("follow-symbol.pro");
     setSourceFileNames({"main.cpp", "header.h"});
-    setMinimumVersion(12);
 }
 
 void ClangdTestFollowSymbol::test_data()
@@ -409,7 +407,6 @@ ClangdTestLocalReferences::ClangdTestLocalReferences()
 {
     setProjectFileName("local-references.pro");
     setSourceFileNames({"references.cpp"});
-    setMinimumVersion(13);
 }
 
 // We currently only support local variables, but if and when clangd implements
@@ -525,7 +522,6 @@ ClangdTestTooltips::ClangdTestTooltips()
 {
     setProjectFileName("tooltips.pro");
     setSourceFileNames({"tooltips.cpp"});
-    setMinimumVersion(13);
 }
 
 void ClangdTestTooltips::test_data()
@@ -668,7 +664,6 @@ ClangdTestHighlighting::ClangdTestHighlighting()
 {
     setProjectFileName("highlighting.pro");
     setSourceFileNames({"highlighting.cpp"});
-    setMinimumVersion(13);
 }
 
 void ClangdTestHighlighting::initTestCase()