qmlls qlanguageserver: clientInfo and serverInfo locking fixes

correct and more concise double locking or clientInfo and serverInfo.

Change-Id: Ib168fc4fd3d5d5b9b8dbc0ff318b1abaaa23517c
Reviewed-by: Andrei Golubev <andrei.golubev@qt.io>
(cherry picked from commit ee05e35ad3c2866c8fe3bb7d0c6b886813ee0b88)

1 files changed, 4 insertions, 26 deletions

diff --git a/tools/qmlls/qlanguageserver.cpp b/tools/qmlls/qlanguageserver.cpp
index 7ebc4faad1..898d1b0666 100644
--- a/tools/qmlls/qlanguageserver.cpp
+++ b/tools/qmlls/qlanguageserver.cpp
@@ -234,39 +234,17 @@ void QLanguageServer::setupCapabilities(const QLspSpecification::InitializeParam
 const QLspSpecification::InitializeParams &QLanguageServer::clientInfo() const
 {
     const Q_D(QLanguageServer);
-    switch (d->runStatus) {
-    case RunStatus::NotSetup:
-    case RunStatus::SettingUp:
-    case RunStatus::DidSetup:
-    case RunStatus::Initializing:
-        if (int(runStatus()) < int(RunStatus::DidInitialize))
-            qCWarning(lspServerLog) << "asked for Language Server clientInfo before initialization";
-        break;
-    case RunStatus::DidInitialize:
-    case RunStatus::WaitPending:
-    case RunStatus::Stopping:
-    case RunStatus::Stopped:
-        break;
-    }
+
+    if (int(runStatus()) < int(RunStatus::DidInitialize))
+        qCWarning(lspServerLog) << "asked for Language Server clientInfo before initialization";
     return d->clientInfo;
 }
 
 const QLspSpecification::InitializeResult &QLanguageServer::serverInfo() const
 {
     const Q_D(QLanguageServer);
-    switch (d->runStatus) {
-    case RunStatus::NotSetup:
-    case RunStatus::SettingUp:
-    case RunStatus::DidSetup:
-    case RunStatus::Initializing:
+    if (int(runStatus()) < int(RunStatus::DidInitialize))
         qCWarning(lspServerLog) << "asked for Language Server serverInfo before initialization";
-        break;
-    case RunStatus::DidInitialize:
-    case RunStatus::WaitPending:
-    case RunStatus::Stopping:
-    case RunStatus::Stopped:
-        break;
-    }
     return d->serverInfo;
 }