LanguageClient: export FunctionHint code assist

Change-Id: I57a819b11bb2eb44662c98862643146a686a8c06
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
David Schulz
2021-09-17 11:52:32 +02:00
parent 2d22dbe612
commit 6bbbaca696
2 changed files with 31 additions and 20 deletions

View File

@@ -81,25 +81,10 @@ QString FunctionHintProposalModel::text(int index) const
+ label.mid(end).toHtmlEscaped(); + label.mid(end).toHtmlEscaped();
} }
class FunctionHintProcessor : public IAssistProcessor FunctionHintProcessor::FunctionHintProcessor(Client *client, const ProposalHandler &proposalHandler)
{ : m_client(client)
public: , m_proposalHandler(proposalHandler)
explicit FunctionHintProcessor(Client *client, const ProposalHandler &proposalHandler) {}
: m_client(client), m_proposalHandler(proposalHandler) {}
IAssistProposal *perform(const AssistInterface *interface) override;
bool running() override { return m_currentRequest.has_value(); }
bool needsRestart() const override { return true; }
void cancel() override;
private:
void handleSignatureResponse(const SignatureHelpRequest::Response &response);
void processProposal(TextEditor::IAssistProposal *proposal);
QPointer<Client> m_client;
const ProposalHandler m_proposalHandler;
Utils::optional<MessageId> m_currentRequest;
int m_pos = -1;
};
IAssistProposal *FunctionHintProcessor::perform(const AssistInterface *interface) IAssistProposal *FunctionHintProcessor::perform(const AssistInterface *interface)
{ {

View File

@@ -25,9 +25,15 @@
#pragma once #pragma once
#include "languageclient_global.h"
#include <languageserverprotocol/languagefeatures.h>
#include <texteditor/codeassist/completionassistprovider.h> #include <texteditor/codeassist/completionassistprovider.h>
#include <texteditor/codeassist/iassistprocessor.h>
#include <utils/optional.h> #include <utils/optional.h>
#include <QPointer>
namespace TextEditor { class IAssistProposal; } namespace TextEditor { class IAssistProposal; }
namespace LanguageClient { namespace LanguageClient {
@@ -36,7 +42,7 @@ class Client;
using ProposalHandler = std::function<void(TextEditor::IAssistProposal *)>; using ProposalHandler = std::function<void(TextEditor::IAssistProposal *)>;
class FunctionHintAssistProvider : public TextEditor::CompletionAssistProvider class LANGUAGECLIENT_EXPORT FunctionHintAssistProvider : public TextEditor::CompletionAssistProvider
{ {
Q_OBJECT Q_OBJECT
@@ -61,4 +67,24 @@ private:
Client *m_client = nullptr; // not owned Client *m_client = nullptr; // not owned
}; };
class LANGUAGECLIENT_EXPORT FunctionHintProcessor : public TextEditor::IAssistProcessor
{
public:
explicit FunctionHintProcessor(Client *client, const ProposalHandler &proposalHandler);
TextEditor::IAssistProposal *perform(const TextEditor::AssistInterface *interface) override;
bool running() override { return m_currentRequest.has_value(); }
bool needsRestart() const override { return true; }
void cancel() override;
private:
void handleSignatureResponse(
const LanguageServerProtocol::SignatureHelpRequest::Response &response);
void processProposal(TextEditor::IAssistProposal *proposal);
QPointer<Client> m_client;
const ProposalHandler m_proposalHandler;
Utils::optional<LanguageServerProtocol::MessageId> m_currentRequest;
int m_pos = -1;
};
} // namespace LanguageClient } // namespace LanguageClient