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

ClangCodeModel: Retrieve all kinds of clangd tweaks

Browse Source 
Contrary to our expectation, the "quickfix" tweaks are not part of the
inline code actions after all.
User-observable effect: "Populate switch" becomes available.
Amends 8b63dfccc6.

Change-Id: I4f7fa25a58bb54dbdb470d7db064b4d804c34d26
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
Christian Kandeler
2022-02-04 11:04:52 +01:00
parent 3a6dff6743
commit 0e7de92319
3 changed files with 0 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/clangcodemodel/clangdclient.cpp
View File

@@ -1264,8 +1264,6 @@ public:
ClangdQuickFixProcessor(LanguageClient::Client *client) ClangdQuickFixProcessor(LanguageClient::Client *client)
: LanguageClientQuickFixAssistProcessor(client) : LanguageClientQuickFixAssistProcessor(client)
{ {
// Fixes are already provided inline with the diagnostics.
setOnlyKinds({CodeActionKinds::Refactor});
} }
private: private:

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

@@ -92,8 +92,6 @@ IAssistProposal *LanguageClientQuickFixAssistProcessor::perform(const AssistInte
auto uri = DocumentUri::fromFilePath(interface->filePath()); auto uri = DocumentUri::fromFilePath(interface->filePath());
params.setTextDocument(TextDocumentIdentifier(uri)); params.setTextDocument(TextDocumentIdentifier(uri));
CodeActionParams::CodeActionContext context; CodeActionParams::CodeActionContext context;
if (!m_onlyKinds.isEmpty())
context.setOnly(m_onlyKinds);
context.setDiagnostics(m_client->diagnosticsAt(uri, cursor)); context.setDiagnostics(m_client->diagnosticsAt(uri, cursor));
params.setContext(context); params.setContext(context);
@@ -116,11 +114,6 @@ void LanguageClientQuickFixAssistProcessor::cancel()
} }
} }
void LanguageClientQuickFixAssistProcessor::setOnlyKinds(const QList<CodeActionKind> &only)
{
m_onlyKinds = only;
}
void LanguageClientQuickFixAssistProcessor::handleCodeActionResponse(const CodeActionRequest::Response &response) void LanguageClientQuickFixAssistProcessor::handleCodeActionResponse(const CodeActionRequest::Response &response)
{ {
m_currentRequest.reset(); m_currentRequest.reset();

2
src/plugins/languageclient/languageclientquickfix.h
View File

@@ -85,8 +85,6 @@ private:
QSharedPointer<const TextEditor::AssistInterface> m_assistInterface; QSharedPointer<const TextEditor::AssistInterface> m_assistInterface;
Client *m_client = nullptr; // not owned Client *m_client = nullptr; // not owned
Utils::optional<LanguageServerProtocol::MessageId> m_currentRequest; Utils::optional<LanguageServerProtocol::MessageId> m_currentRequest;
QList<LanguageServerProtocol::CodeActionKind> m_onlyKinds;
}; };
} // namespace LanguageClient } // namespace LanguageClient