ClangCodeModel: Prefer clangd's switch header/source

It's more reliable than the built-in code model with non-trivial
directory layouts.

Fixes: QTCREATORBUG-28878
Change-Id: I02a058e7efb54e6af0998948a20d990e10293f03
Reviewed-by: Christian Stenger <christian.stenger@qt.io>

1 files changed, 4 insertions, 10 deletions

diff --git a/src/plugins/clangcodemodel/clangmodelmanagersupport.cpp b/src/plugins/clangcodemodel/clangmodelmanagersupport.cpp
index 64a8dac7bd..5cc123ac91 100644
--- a/src/plugins/clangcodemodel/clangmodelmanagersupport.cpp
+++ b/src/plugins/clangcodemodel/clangmodelmanagersupport.cpp
@@ -341,16 +341,10 @@ void ClangModelManagerSupport::findUsages(const CppEditor::CursorInEditor &curso
 
 void ClangModelManagerSupport::switchHeaderSource(const FilePath &filePath, bool inNextSplit)
 {
-    if (ClangdClient * const client = clientForFile(filePath)) {
-        // The fast, synchronous approach works most of the time, so let's try that one first.
-        const FilePath otherFile = correspondingHeaderOrSource(filePath);
-        if (!otherFile.isEmpty())
-            openEditor(otherFile, inNextSplit);
-        else
-            client->switchHeaderSource(filePath, inNextSplit);
-        return;
-    }
-    CppModelManager::switchHeaderSource(inNextSplit, CppModelManager::Backend::Builtin);
+    if (ClangdClient * const client = clientForFile(filePath))
+        client->switchHeaderSource(filePath, inNextSplit);
+    else
+        CppModelManager::switchHeaderSource(inNextSplit, CppModelManager::Backend::Builtin);
 }
 
 void ClangModelManagerSupport::checkUnused(const Link &link, Core::SearchResult *search,