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

LSP: workaround msvc 2017 bug

Browse Source 
Change-Id: I6a6fbfc1a582d83df3f3cf489236c7ca4c6626f7
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
David Schulz
2020-07-13 13:52:27 +02:00
parent c2f51b7797
commit ca0f504c0e
16 changed files with 41 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/libs/languageserverprotocol/client.cpp
View File

@@ -31,7 +31,7 @@ constexpr const char RegisterCapabilityRequest::methodName[];
constexpr const char UnregisterCapabilityRequest::methodName[];
RegisterCapabilityRequest::RegisterCapabilityRequest(const RegistrationParams &params)
: RegisterCapabilityRequest(methodName, params) { }
: Request(methodName, params) { }
UnregisterCapabilityRequest::UnregisterCapabilityRequest(const UnregistrationParams &params)
: UnregisterCapabilityRequest(methodName, params) { }

4
src/libs/languageserverprotocol/client.h
View File

@@ -73,7 +73,7 @@ class LANGUAGESERVERPROTOCOL_EXPORT RegisterCapabilityRequest : public Request<
std::nullptr_t, std::nullptr_t, RegistrationParams>
{
public:
RegisterCapabilityRequest(const RegistrationParams &params = RegistrationParams());
RegisterCapabilityRequest(const RegistrationParams &params);
using Request::Request;
constexpr static const char methodName[] = "client/registerCapability";
};
@@ -111,7 +111,7 @@ class LANGUAGESERVERPROTOCOL_EXPORT UnregisterCapabilityRequest : public Request
std::nullptr_t, std::nullptr_t, UnregistrationParams>
{
public:
UnregisterCapabilityRequest(const UnregistrationParams &params = UnregistrationParams());
UnregisterCapabilityRequest(const UnregistrationParams &params);
using Request::Request;
constexpr static const char methodName[] = "client/unregisterCapability";
};

4
src/libs/languageserverprotocol/completion.h
View File

@@ -256,7 +256,7 @@ class LANGUAGESERVERPROTOCOL_EXPORT CompletionRequest : public Request<
CompletionResult, std::nullptr_t, CompletionParams>
{
public:
CompletionRequest(const CompletionParams &params = CompletionParams());
CompletionRequest(const CompletionParams &params);
using Request::Request;
constexpr static const char methodName[] = "textDocument/completion";
};
@@ -265,7 +265,7 @@ class LANGUAGESERVERPROTOCOL_EXPORT CompletionItemResolveRequest : public Reques
CompletionItem, std::nullptr_t, CompletionItem>
{
public:
CompletionItemResolveRequest(const CompletionItem &params = CompletionItem());
CompletionItemResolveRequest(const CompletionItem &params);
using Request::Request;
constexpr static const char methodName[] = "completionItem/resolve";
};

3
src/libs/languageserverprotocol/diagnostics.h
View File

@@ -49,8 +49,7 @@ public:
class LANGUAGESERVERPROTOCOL_EXPORT PublishDiagnosticsNotification : public Notification<PublishDiagnosticsParams>
{
public:
PublishDiagnosticsNotification(
const PublishDiagnosticsParams &params = PublishDiagnosticsParams());
PublishDiagnosticsNotification(const PublishDiagnosticsParams &params);
using Notification::Notification;
constexpr static const char methodName[] = "textDocument/publishDiagnostics";
};

4
src/libs/languageserverprotocol/initializemessages.cpp
View File

@@ -155,8 +155,8 @@ InitializeRequest::InitializeRequest(const InitializeParams &params)
: Request(methodName, params)
{ }
InitializeNotification::InitializeNotification()
: Notification(methodName)
InitializeNotification::InitializeNotification(const InitializedParams &params)
: Notification(methodName, params)
{ }
} // namespace LanguageServerProtocol

2
src/libs/languageserverprotocol/initializemessages.h
View File

@@ -129,7 +129,7 @@ using InitializedParams = JsonObject;
class LANGUAGESERVERPROTOCOL_EXPORT InitializeNotification : public Notification<InitializedParams>
{
public:
InitializeNotification();
InitializeNotification(const InitializedParams &params);
using Notification::Notification;
constexpr static const char methodName[] = "initialized";

12
src/libs/languageserverprotocol/jsonrpcmessages.h
View File

@@ -88,13 +88,14 @@ template <typename Params>
class Notification : public JsonRpcMessage
{
public:
Notification() : Notification(QString()) {}
Notification(const QString &methodName, const Params &params = Params())
Notification(const QString &methodName, const Params &params)
{
setMethod(methodName);
setParams(params);
}
using JsonRpcMessage::JsonRpcMessage;
Notification(const QJsonObject &jsonObject) : JsonRpcMessage(jsonObject) {}
Notification(QJsonObject &&jsonObject) : JsonRpcMessage(std::move(jsonObject)) {}
QString method() const
{ return fromJsonValue<QString>(m_jsonObject.value(methodKey)); }
@@ -267,8 +268,7 @@ template <typename Result, typename ErrorDataType, typename Params>
class Request : public Notification<Params>
{
public:
Request() : Notification<Params>() { setId(QUuid::createUuid().toString()); }
Request(const QString &methodName, const Params &params = Params())
Request(const QString &methodName, const Params &params)
: Notification<Params>(methodName, params)
{ setId(QUuid::createUuid().toString()); }
Request(const QJsonObject &jsonObject) : Notification<Params>(jsonObject) { }
@@ -343,7 +343,7 @@ public:
class LANGUAGESERVERPROTOCOL_EXPORT CancelRequest : public Notification<CancelParameter>
{
public:
CancelRequest(const CancelParameter &params = CancelParameter());
CancelRequest(const CancelParameter &params);
using Notification::Notification;
constexpr static const char methodName[] = "$/cancelRequest";
};

3
src/libs/languageserverprotocol/languagefeatures.h
View File

@@ -898,8 +898,7 @@ class LANGUAGESERVERPROTOCOL_EXPORT SemanticHighlightNotification
: public Notification<SemanticHighlightingParams>
{
public:
SemanticHighlightNotification(
const SemanticHighlightingParams &params = SemanticHighlightingParams());
SemanticHighlightNotification(const SemanticHighlightingParams &params);
using Notification::Notification;
constexpr static const char methodName[] = "textDocument/semanticHighlighting";
};

8
src/libs/languageserverprotocol/messages.cpp
View File

@@ -42,12 +42,12 @@ ShowMessageRequest::ShowMessageRequest(const ShowMessageRequestParams &params)
: Request(methodName, params)
{ }
LogMessageNotification::LogMessageNotification()
: Notification(methodName)
LogMessageNotification::LogMessageNotification(const LogMessageParams &params)
: Notification(methodName, params)
{ }
TelemetryNotification::TelemetryNotification()
: Notification(methodName)
TelemetryNotification::TelemetryNotification(const JsonObject &params)
: Notification(methodName, params)
{ }
bool ShowMessageRequestParams::isValid(ErrorHierarchy *error) const

8
src/libs/languageserverprotocol/messages.h
View File

@@ -56,7 +56,7 @@ public:
class LANGUAGESERVERPROTOCOL_EXPORT ShowMessageNotification : public Notification<ShowMessageParams>
{
public:
ShowMessageNotification(const ShowMessageParams &params = ShowMessageParams());
ShowMessageNotification(const ShowMessageParams &params);
using Notification::Notification;
constexpr static const char methodName[] = "window/showMessage";
};
@@ -90,7 +90,7 @@ class LANGUAGESERVERPROTOCOL_EXPORT ShowMessageRequest : public Request<
LanguageClientValue<MessageActionItem>, std::nullptr_t, ShowMessageRequestParams>
{
public:
ShowMessageRequest(const ShowMessageRequestParams &params = ShowMessageRequestParams());
ShowMessageRequest(const ShowMessageRequestParams &params);
using Request::Request;
constexpr static const char methodName[] = "window/showMessageRequest";
};
@@ -100,7 +100,7 @@ using LogMessageParams = ShowMessageParams;
class LANGUAGESERVERPROTOCOL_EXPORT LogMessageNotification : public Notification<LogMessageParams>
{
public:
LogMessageNotification();
LogMessageNotification(const LogMessageParams &params);
using Notification::Notification;
constexpr static const char methodName[] = "window/logMessage";
};
@@ -108,7 +108,7 @@ public:
class LANGUAGESERVERPROTOCOL_EXPORT TelemetryNotification : public Notification<JsonObject>
{
public:
TelemetryNotification();
TelemetryNotification(const JsonObject &params);
using Notification::Notification;
constexpr static const char methodName[] = "telemetry/event";

2
src/libs/languageserverprotocol/shutdownmessages.cpp
View File

@@ -29,7 +29,7 @@ namespace LanguageServerProtocol {
constexpr const char ShutdownRequest::methodName[];
constexpr const char ExitNotification::methodName[];
ShutdownRequest::ShutdownRequest() : Request(methodName) { }
ShutdownRequest::ShutdownRequest() : Request(methodName, nullptr) { }
ExitNotification::ExitNotification() : Notification(methodName) { }
} // namespace LanguageServerProtocol

17
src/libs/languageserverprotocol/textsynchronization.h
View File

@@ -49,8 +49,7 @@ class LANGUAGESERVERPROTOCOL_EXPORT DidOpenTextDocumentNotification : public Not
DidOpenTextDocumentParams>
{
public:
DidOpenTextDocumentNotification(
const DidOpenTextDocumentParams &params = DidOpenTextDocumentParams());
DidOpenTextDocumentNotification(const DidOpenTextDocumentParams &params);
using Notification::Notification;
constexpr static const char methodName[] = "textDocument/didOpen";
};
@@ -123,7 +122,7 @@ class LANGUAGESERVERPROTOCOL_EXPORT DidChangeTextDocumentNotification : public N
DidChangeTextDocumentParams>
{
public:
DidChangeTextDocumentNotification(const DidChangeTextDocumentParams &params = DidChangeTextDocumentParams());
DidChangeTextDocumentNotification(const DidChangeTextDocumentParams &params);
using Notification::Notification;
constexpr static const char methodName[] = "textDocument/didChange";
};
@@ -158,8 +157,7 @@ class LANGUAGESERVERPROTOCOL_EXPORT WillSaveTextDocumentNotification : public No
WillSaveTextDocumentParams>
{
public:
WillSaveTextDocumentNotification(
const WillSaveTextDocumentParams &params = WillSaveTextDocumentParams());
WillSaveTextDocumentNotification(const WillSaveTextDocumentParams &params);
using Notification::Notification;
constexpr static const char methodName[] = "textDocument/willSave";
};
@@ -168,8 +166,7 @@ class LANGUAGESERVERPROTOCOL_EXPORT WillSaveWaitUntilTextDocumentRequest : publi
LanguageClientArray<TextEdit>, std::nullptr_t, WillSaveTextDocumentParams>
{
public:
WillSaveWaitUntilTextDocumentRequest(
const WillSaveTextDocumentParams &params = WillSaveTextDocumentParams());
WillSaveWaitUntilTextDocumentRequest(const WillSaveTextDocumentParams &params);
using Request::Request;
constexpr static const char methodName[] = "textDocument/willSaveWaitUntil";
};
@@ -210,8 +207,7 @@ class LANGUAGESERVERPROTOCOL_EXPORT DidSaveTextDocumentNotification : public Not
DidSaveTextDocumentParams>
{
public:
DidSaveTextDocumentNotification(
const DidSaveTextDocumentParams &params = DidSaveTextDocumentParams());
DidSaveTextDocumentNotification(const DidSaveTextDocumentParams &params);
using Notification::Notification;
constexpr static const char methodName[] = "textDocument/didSave";
};
@@ -236,8 +232,7 @@ class LANGUAGESERVERPROTOCOL_EXPORT DidCloseTextDocumentNotification : public No
DidCloseTextDocumentParams>
{
public:
DidCloseTextDocumentNotification(
const DidCloseTextDocumentParams &params = DidCloseTextDocumentParams());
DidCloseTextDocumentNotification(const DidCloseTextDocumentParams &params);
using Notification::Notification;
constexpr static const char methodName[] = "textDocument/didClose";
};

2
src/libs/languageserverprotocol/workspace.cpp
View File

@@ -37,7 +37,7 @@ constexpr const char ApplyWorkspaceEditRequest::methodName[];
constexpr const char DidChangeWatchedFilesNotification::methodName[];
WorkSpaceFolderRequest::WorkSpaceFolderRequest()
: Request(methodName)
: Request(methodName, nullptr)
{ }
DidChangeWorkspaceFoldersNotification::DidChangeWorkspaceFoldersNotification(

14
src/libs/languageserverprotocol/workspace.h
View File

@@ -80,8 +80,7 @@ class LANGUAGESERVERPROTOCOL_EXPORT DidChangeWorkspaceFoldersNotification : publ
DidChangeWorkspaceFoldersParams>
{
public:
DidChangeWorkspaceFoldersNotification(
const DidChangeWorkspaceFoldersParams &params = DidChangeWorkspaceFoldersParams());
DidChangeWorkspaceFoldersNotification(const DidChangeWorkspaceFoldersParams &params);
constexpr static const char methodName[] = "workspace/didChangeWorkspaceFolders";
using Notification::Notification;
};
@@ -101,8 +100,7 @@ class LANGUAGESERVERPROTOCOL_EXPORT DidChangeConfigurationNotification : public
DidChangeConfigurationParams>
{
public:
DidChangeConfigurationNotification(
const DidChangeConfigurationParams &params = DidChangeConfigurationParams());
DidChangeConfigurationNotification(const DidChangeConfigurationParams &params);
using Notification::Notification;
constexpr static const char methodName[] = "workspace/didChangeConfiguration";
};
@@ -138,7 +136,7 @@ class LANGUAGESERVERPROTOCOL_EXPORT ConfigurationRequest : public Request<
LanguageClientArray<QJsonValue>, std::nullptr_t, ConfigurationParams>
{
public:
ConfigurationRequest(const ConfigurationParams &params = ConfigurationParams());
ConfigurationRequest(const ConfigurationParams &params);
using Request::Request;
constexpr static const char methodName[] = "workspace/configuration";
};
@@ -180,7 +178,7 @@ class LANGUAGESERVERPROTOCOL_EXPORT DidChangeWatchedFilesNotification : public N
DidChangeWatchedFilesParams>
{
public:
DidChangeWatchedFilesNotification(const DidChangeWatchedFilesParams &params = DidChangeWatchedFilesParams());
DidChangeWatchedFilesNotification(const DidChangeWatchedFilesParams &params);
using Notification::Notification;
constexpr static const char methodName[] = "workspace/didChangeWatchedFiles";
};
@@ -200,7 +198,7 @@ class LANGUAGESERVERPROTOCOL_EXPORT WorkspaceSymbolRequest : public Request<
LanguageClientArray<SymbolInformation>, std::nullptr_t, WorkspaceSymbolParams>
{
public:
WorkspaceSymbolRequest(const WorkspaceSymbolParams &params = WorkspaceSymbolParams());
WorkspaceSymbolRequest(const WorkspaceSymbolParams &params);
using Request::Request;
constexpr static const char methodName[] = "workspace/symbol";
};
@@ -231,7 +229,7 @@ class LANGUAGESERVERPROTOCOL_EXPORT ExecuteCommandRequest : public Request<
QJsonValue, std::nullptr_t, ExecuteCommandParams>
{
public:
ExecuteCommandRequest(const ExecuteCommandParams &params = ExecuteCommandParams());
ExecuteCommandRequest(const ExecuteCommandParams &params);
using Request::Request;
constexpr static const char methodName[] = "workspace/executeCommand";
};

2
src/plugins/languageclient/client.cpp
View File

@@ -1367,7 +1367,7 @@ void Client::initializeCallback(const InitializeRequest::Response &initResponse)
qCDebug(LOGLSPCLIENT) << "language server " << m_displayName << " initialized";
m_state = Initialized;
sendContent(InitializeNotification());
sendContent(InitializeNotification(InitializedParams()));
if (m_dynamicCapabilities.isRegistered(DocumentSymbolsRequest::methodName)
.value_or(capabilities().documentSymbolProvider().value_or(false))) {
TextEditor::IOutlineWidgetFactory::updateOutline();

5
src/plugins/languageclient/languageclientcompletionassist.cpp
View File

@@ -336,7 +336,6 @@ IAssistProposal *LanguageClientCompletionAssistProcessor::perform(const AssistIn
}
if (m_postponedUpdateConnection)
QObject::disconnect(m_postponedUpdateConnection);
CompletionRequest completionRequest;
CompletionParams::CompletionContext context;
if (interface->reason() == ActivationCharacter) {
context.setTriggerKind(CompletionParams::TriggerCharacter);
@@ -346,7 +345,7 @@ IAssistProposal *LanguageClientCompletionAssistProcessor::perform(const AssistIn
} else {
context.setTriggerKind(CompletionParams::Invoked);
}
auto params = completionRequest.params().value_or(CompletionParams());
CompletionParams params;
int line;
int column;
if (!Utils::Text::convertPosition(interface->textDocument(), m_pos, &line, &column))
@@ -357,10 +356,10 @@ IAssistProposal *LanguageClientCompletionAssistProcessor::perform(const AssistIn
params.setContext(context);
params.setTextDocument(
DocumentUri::fromFilePath(Utils::FilePath::fromString(interface->fileName())));
CompletionRequest completionRequest(params);
completionRequest.setResponseCallback([this](auto response) {
this->handleCompletionResponse(response);
});
completionRequest.setParams(params);
m_client->sendContent(completionRequest);
m_client->addAssistProcessor(this);
m_currentRequest = completionRequest.id();