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

LSP: fix capitalization of workspaceFolders

Browse Source 
Task-number: QTCREATORBUG-24452
Change-Id: I6ab042972314de45d98034c361b7a11f8fa0024b
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
David Schulz
2020-08-12 12:54:42 +02:00
parent 24ca17f714
commit 5eb9054a35
3 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -147,8 +147,8 @@ bool InitializeParams::isValid(ErrorHierarchy *error) const
&& checkOptional<QString, std::nullptr_t>(error, rootUriKey) && checkOptional<QString, std::nullptr_t>(error, rootUriKey)
&& check<ClientCapabilities>(error, capabilitiesKey) && check<ClientCapabilities>(error, capabilitiesKey)
&& checkOptional<int>(error, traceKey) && checkOptional<int>(error, traceKey)
&& (checkOptional<std::nullptr_t>(error, workSpaceFoldersKey) && (checkOptional<std::nullptr_t>(error, workspaceFoldersKey)
|| checkOptionalArray<WorkSpaceFolder>(error, workSpaceFoldersKey)); || checkOptionalArray<WorkSpaceFolder>(error, workspaceFoldersKey));
} }
InitializeRequest::InitializeRequest(const InitializeParams &params) InitializeRequest::InitializeRequest(const InitializeParams &params)

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

@@ -115,11 +115,11 @@ public:
* *
* Since 3.6.0 * Since 3.6.0
*/ */
Utils::optional<LanguageClientArray<WorkSpaceFolder>> workSpaceFolders() const Utils::optional<LanguageClientArray<WorkSpaceFolder>> workspaceFolders() const
{ return optionalClientArray<WorkSpaceFolder>(workSpaceFoldersKey); } { return optionalClientArray<WorkSpaceFolder>(workspaceFoldersKey); }
void setWorkSpaceFolders(const LanguageClientArray<WorkSpaceFolder> &folders) void setWorkSpaceFolders(const LanguageClientArray<WorkSpaceFolder> &folders)
{ insert(workSpaceFoldersKey, folders.toJson()); } { insert(workspaceFoldersKey, folders.toJson()); }
void clearWorkSpaceFolders() { remove(workSpaceFoldersKey); } void clearWorkSpaceFolders() { remove(workspaceFoldersKey); }
bool isValid(ErrorHierarchy *error) const override; bool isValid(ErrorHierarchy *error) const override;
}; };

1
src/libs/languageserverprotocol/jsonkeys.h
View File

@@ -212,7 +212,6 @@ constexpr char valueSetKey[] = "valueSet";
constexpr char versionKey[] = "version"; constexpr char versionKey[] = "version";
constexpr char willSaveKey[] = "willSave"; constexpr char willSaveKey[] = "willSave";
constexpr char willSaveWaitUntilKey[] = "willSaveWaitUntil"; constexpr char willSaveWaitUntilKey[] = "willSaveWaitUntil";
constexpr char workSpaceFoldersKey[] = "workSpaceFolders";
constexpr char workspaceEditKey[] = "workspaceEdit"; constexpr char workspaceEditKey[] = "workspaceEdit";
constexpr char workspaceFoldersKey[] = "workspaceFolders"; constexpr char workspaceFoldersKey[] = "workspaceFolders";
constexpr char workspaceKey[] = "workspace"; constexpr char workspaceKey[] = "workspace";