From 71fa2d950c938bcda279a5e5d8d0c64635030906 Mon Sep 17 00:00:00 2001
From: David Schulz <david.schulz@qt.io>
Date: Thu, 18 Jul 2019 13:26:34 +0200
Subject: [PATCH] LSP: update colorProvider entry of ServerCapabilities

Since version 3.8.0 of the lsp the server can provide the information
whether it supports colors also via an boolean value. The newly added
ColorProviderOptions are currently completely empty, so we ignore them.

Fixes: QTCREATORBUG-22691
Change-Id: I76232d160f4abed7b07574dc1b5413cead26b9f0
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
---
 .../servercapabilities.cpp                    | 21 ++++++++++++++++++-
 .../servercapabilities.h                      |  6 ++----
 2 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/src/libs/languageserverprotocol/servercapabilities.cpp b/src/libs/languageserverprotocol/servercapabilities.cpp
index 3d2721f4a69..1b2c0bd9cc0 100644
--- a/src/libs/languageserverprotocol/servercapabilities.cpp
+++ b/src/libs/languageserverprotocol/servercapabilities.cpp
@@ -130,6 +130,25 @@ void ServerCapabilities::setRenameProvider(Utils::variant<ServerCapabilities::Re
         insert(renameProviderKey, Utils::get<RenameOptions>(renameProvider));
 }
 
+Utils::optional<Utils::variant<bool, JsonObject>> ServerCapabilities::colorProvider() const
+{
+    using RetType = Utils::variant<bool, JsonObject>;
+    const QJsonValue &localValue = value(colorProviderKey);
+    if (localValue.isBool())
+        return RetType(localValue.toBool());
+    if (localValue.isObject())
+        return RetType(JsonObject(localValue.toObject()));
+    return Utils::nullopt;
+}
+
+void ServerCapabilities::setColorProvider(Utils::variant<bool, JsonObject> colorProvider)
+{
+    if (Utils::holds_alternative<bool>(colorProvider))
+        insert(renameProviderKey, Utils::get<bool>(colorProvider));
+    else if (Utils::holds_alternative<JsonObject>(colorProvider))
+        insert(renameProviderKey, Utils::get<JsonObject>(colorProvider));
+}
+
 bool ServerCapabilities::isValid(QStringList *error) const
 {
     return checkOptional<TextDocumentSyncOptions, int>(error, textDocumentSyncKey)
@@ -149,7 +168,7 @@ bool ServerCapabilities::isValid(QStringList *error) const
             && checkOptional<bool>(error, documentRangeFormattingProviderKey)
             && checkOptional<bool, RenameOptions>(error, renameProviderKey)
             && checkOptional<DocumentLinkOptions>(error, documentLinkProviderKey)
-            && checkOptional<TextDocumentRegistrationOptions>(error, colorProviderKey)
+            && checkOptional<bool, JsonObject>(error, colorProviderKey)
             && checkOptional<ExecuteCommandOptions>(error, executeCommandProviderKey)
             && checkOptional<WorkspaceServerCapabilities>(error, workspaceKey);
 }
diff --git a/src/libs/languageserverprotocol/servercapabilities.h b/src/libs/languageserverprotocol/servercapabilities.h
index 0cbc7facf87..4c8011378f4 100644
--- a/src/libs/languageserverprotocol/servercapabilities.h
+++ b/src/libs/languageserverprotocol/servercapabilities.h
@@ -373,10 +373,8 @@ public:
     void clearDocumentLinkProvider() { remove(documentLinkProviderKey); }
 
     // The server provides color provider support.
-    Utils::optional<TextDocumentRegistrationOptions> colorProvider() const
-    { return optionalValue<TextDocumentRegistrationOptions>(colorProviderKey); }
-    void setColorProvider(TextDocumentRegistrationOptions colorProvider)
-    { insert(colorProviderKey, colorProvider); }
+    Utils::optional<Utils::variant<bool, JsonObject>> colorProvider() const;
+    void setColorProvider(Utils::variant<bool, JsonObject> colorProvider);
     void clearColorProvider() { remove(colorProviderKey); }
 
     // The server provides execute command support.