From 5eb9054a350671e500d003ab6bb2e77161002127 Mon Sep 17 00:00:00 2001
From: David Schulz <david.schulz@qt.io>
Date: Wed, 12 Aug 2020 12:54:42 +0200
Subject: [PATCH] LSP: fix capitalization of workspaceFolders

Task-number: QTCREATORBUG-24452
Change-Id: I6ab042972314de45d98034c361b7a11f8fa0024b
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
---
 src/libs/languageserverprotocol/initializemessages.cpp | 4 ++--
 src/libs/languageserverprotocol/initializemessages.h   | 8 ++++----
 src/libs/languageserverprotocol/jsonkeys.h             | 1 -
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/libs/languageserverprotocol/initializemessages.cpp b/src/libs/languageserverprotocol/initializemessages.cpp
index 66e3407fe11..60eca93cec4 100644
--- a/src/libs/languageserverprotocol/initializemessages.cpp
+++ b/src/libs/languageserverprotocol/initializemessages.cpp
@@ -147,8 +147,8 @@ bool InitializeParams::isValid(ErrorHierarchy *error) const
             && checkOptional<QString, std::nullptr_t>(error, rootUriKey)
             && check<ClientCapabilities>(error, capabilitiesKey)
             && checkOptional<int>(error, traceKey)
-            && (checkOptional<std::nullptr_t>(error, workSpaceFoldersKey)
-                || checkOptionalArray<WorkSpaceFolder>(error, workSpaceFoldersKey));
+            && (checkOptional<std::nullptr_t>(error, workspaceFoldersKey)
+                || checkOptionalArray<WorkSpaceFolder>(error, workspaceFoldersKey));
 }
 
 InitializeRequest::InitializeRequest(const InitializeParams &params)
diff --git a/src/libs/languageserverprotocol/initializemessages.h b/src/libs/languageserverprotocol/initializemessages.h
index a79d6e067a2..f92ccf1831a 100644
--- a/src/libs/languageserverprotocol/initializemessages.h
+++ b/src/libs/languageserverprotocol/initializemessages.h
@@ -115,11 +115,11 @@ public:
      *
      * Since 3.6.0
      */
-    Utils::optional<LanguageClientArray<WorkSpaceFolder>> workSpaceFolders() const
-    { return optionalClientArray<WorkSpaceFolder>(workSpaceFoldersKey); }
+    Utils::optional<LanguageClientArray<WorkSpaceFolder>> workspaceFolders() const
+    { return optionalClientArray<WorkSpaceFolder>(workspaceFoldersKey); }
     void setWorkSpaceFolders(const LanguageClientArray<WorkSpaceFolder> &folders)
-    { insert(workSpaceFoldersKey, folders.toJson()); }
-    void clearWorkSpaceFolders() { remove(workSpaceFoldersKey); }
+    { insert(workspaceFoldersKey, folders.toJson()); }
+    void clearWorkSpaceFolders() { remove(workspaceFoldersKey); }
 
     bool isValid(ErrorHierarchy *error) const override;
 };
diff --git a/src/libs/languageserverprotocol/jsonkeys.h b/src/libs/languageserverprotocol/jsonkeys.h
index d8f2b13117e..0cdfaf1d34a 100644
--- a/src/libs/languageserverprotocol/jsonkeys.h
+++ b/src/libs/languageserverprotocol/jsonkeys.h
@@ -212,7 +212,6 @@ constexpr char valueSetKey[] = "valueSet";
 constexpr char versionKey[] = "version";
 constexpr char willSaveKey[] = "willSave";
 constexpr char willSaveWaitUntilKey[] = "willSaveWaitUntil";
-constexpr char workSpaceFoldersKey[] = "workSpaceFolders";
 constexpr char workspaceEditKey[] = "workspaceEdit";
 constexpr char workspaceFoldersKey[] = "workspaceFolders";
 constexpr char workspaceKey[] = "workspace";