From 1d7e05e6a9d9b87b15a6379235258b0a15a87c62 Mon Sep 17 00:00:00 2001
From: David Schulz <david.schulz@qt.io>
Date: Wed, 21 Apr 2021 10:22:29 +0200
Subject: [PATCH] LanguageClient: remove unneeded document actions blocker

Change-Id: Id1f07dbf83fcf7d75aaba6d860fb1556761bbd4b
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
---
 src/plugins/clangcodemodel/clangdclient.cpp |  1 -
 src/plugins/languageclient/client.cpp       | 15 ---------------
 src/plugins/languageclient/client.h         |  2 --
 3 files changed, 18 deletions(-)

diff --git a/src/plugins/clangcodemodel/clangdclient.cpp b/src/plugins/clangcodemodel/clangdclient.cpp
index 7ea9fd03d96..201095a20c7 100644
--- a/src/plugins/clangcodemodel/clangdclient.cpp
+++ b/src/plugins/clangcodemodel/clangdclient.cpp
@@ -65,7 +65,6 @@ ClangdClient::ClangdClient(ProjectExplorer::Project *project, const Utils::FileP
     caps.clearTextDocument();
     setClientCapabilities(caps);
     setLocatorsEnabled(false);
-    setDocumentActionsEnabled(false);
     setProgressTitleForToken(indexingToken(), tr("Parsing C/C++ Files (clangd)"));
     setCurrentProject(project);
     connect(this, &Client::workDone, this, [this](const ProgressToken &token) {
diff --git a/src/plugins/languageclient/client.cpp b/src/plugins/languageclient/client.cpp
index aa66b0310d9..2ea0af4551e 100644
--- a/src/plugins/languageclient/client.cpp
+++ b/src/plugins/languageclient/client.cpp
@@ -542,9 +542,6 @@ void Client::requestDocumentHighlights(TextEditor::TextEditorWidget *widget)
 
 void Client::activateDocument(TextEditor::TextDocument *document)
 {
-    if (!m_documentActionsEnabled)
-        return;
-
     auto uri = DocumentUri::fromFilePath(document->filePath());
     m_diagnosticManager.showDiagnostics(uri);
     SemanticHighligtingSupport::applyHighlight(document, m_highlights.value(uri), capabilities());
@@ -571,9 +568,6 @@ void Client::activateDocument(TextEditor::TextDocument *document)
 
 void Client::deactivateDocument(TextEditor::TextDocument *document)
 {
-    if (!m_documentActionsEnabled)
-        return;
-
     m_diagnosticManager.hideDiagnostics(document);
     resetAssistProviders(document);
     document->setFormatter(nullptr);
@@ -1265,9 +1259,6 @@ void Client::handleMethod(const QString &method, const MessageId &id, const ICon
 
 void Client::handleDiagnostics(const PublishDiagnosticsParams &params)
 {
-    if (!m_documentActionsEnabled)
-        return;
-
     const DocumentUri &uri = params.uri();
 
     const QList<Diagnostic> &diagnostics = params.diagnostics();
@@ -1280,9 +1271,6 @@ void Client::handleDiagnostics(const PublishDiagnosticsParams &params)
 
 void Client::handleSemanticHighlight(const SemanticHighlightingParams &params)
 {
-    if (!m_documentActionsEnabled)
-        return;
-
     DocumentUri uri;
     LanguageClientValue<int> version;
     auto textDocument = params.textDocument();
@@ -1313,9 +1301,6 @@ void Client::handleSemanticHighlight(const SemanticHighlightingParams &params)
 
 void Client::rehighlight()
 {
-    if (!m_documentActionsEnabled)
-        return;
-
     using namespace TextEditor;
     for (auto it = m_highlights.begin(), end = m_highlights.end(); it != end; ++it) {
         if (TextDocument *doc = TextDocument::textDocumentForFilePath(it.key().toFilePath())) {
diff --git a/src/plugins/languageclient/client.h b/src/plugins/languageclient/client.h
index e91c59151db..131337ad2b8 100644
--- a/src/plugins/languageclient/client.h
+++ b/src/plugins/languageclient/client.h
@@ -122,7 +122,6 @@ public:
 
     void setLocatorsEnabled(bool enabled) { m_locatorsEnabled = enabled; }
     bool locatorsEnabled() const { return m_locatorsEnabled; }
-    void setDocumentActionsEnabled(bool enabled) { m_documentActionsEnabled = enabled; }
 
     // document synchronization
     void setSupportedLanguage(const LanguageFilter &filter);
@@ -261,7 +260,6 @@ private:
     bool m_activateDocAutomatically = false;
     SemanticTokenSupport m_tokentSupport;
     bool m_locatorsEnabled = true;
-    bool m_documentActionsEnabled = true;
 };
 
 } // namespace LanguageClient