feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

ClangCodeModel: Make clangd refactoring actions available

Browse Source 
Introduce an assist processor that merges our built-in quickfixes with
refactoring actions from clangd ("tweaks").
For now, we make it clear which ones are coming from clangd, and we do
not filter duplicate functionality. In the future, we might want to
disable redundant built-in actions if clangd is enabled for the
respective file.

Change-Id: I04842132798c8635dfddf8cfc98cc7a6313fac09
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
Christian Kandeler
2022-01-31 13:10:28 +01:00
parent 116b498b34
commit 8b63dfccc6
10 changed files with 124 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/plugins/languageclient/languageclientquickfix.cpp
View File

@@ -30,7 +30,6 @@
#include <texteditor/codeassist/assistinterface.h>
#include <texteditor/codeassist/genericproposal.h>
#include <texteditor/codeassist/iassistprocessor.h>
#include <texteditor/quickfix.h>
@@ -74,22 +73,6 @@ private:
QPointer<Client> m_client;
};
class LanguageClientQuickFixAssistProcessor : public IAssistProcessor
{
public:
explicit LanguageClientQuickFixAssistProcessor(Client *client) : m_client(client) {}
bool running() override { return m_currentRequest.has_value(); }
IAssistProposal *perform(const AssistInterface *interface) override;
void cancel() override;
private:
void handleCodeActionResponse(const CodeActionRequest::Response &response);
QSharedPointer<const AssistInterface> m_assistInterface;
Client *m_client = nullptr; // not owned
Utils::optional<MessageId> m_currentRequest;
};
IAssistProposal *LanguageClientQuickFixAssistProcessor::perform(const AssistInterface *interface)
{
m_assistInterface = QSharedPointer<const AssistInterface>(interface);
@@ -109,6 +92,8 @@ IAssistProposal *LanguageClientQuickFixAssistProcessor::perform(const AssistInte
auto uri = DocumentUri::fromFilePath(interface->filePath());
params.setTextDocument(TextDocumentIdentifier(uri));
CodeActionParams::CodeActionContext context;
if (!m_onlyKinds.isEmpty())
context.setOnly(m_onlyKinds);
context.setDiagnostics(m_client->diagnosticsAt(uri, cursor));
params.setContext(context);
@@ -131,8 +116,12 @@ void LanguageClientQuickFixAssistProcessor::cancel()
}
}
void LanguageClientQuickFixAssistProcessor::handleCodeActionResponse(
const CodeActionRequest::Response &response)
void LanguageClientQuickFixAssistProcessor::setOnlyKinds(const QList<CodeActionKind> &only)
{
m_onlyKinds = only;
}
void LanguageClientQuickFixAssistProcessor::handleCodeActionResponse(const CodeActionRequest::Response &response)
{
m_currentRequest.reset();
if (const Utils::optional<CodeActionRequest::Response::Error> &error = response.error())
@@ -150,6 +139,11 @@ void LanguageClientQuickFixAssistProcessor::handleCodeActionResponse(
}
}
m_client->removeAssistProcessor(this);
handleProposalReady(ops);
}
void LanguageClientQuickFixAssistProcessor::handleProposalReady(const QuickFixOperations &ops)
{
setAsyncProposalAvailable(GenericProposal::createProposal(m_assistInterface.data(), ops));
}