Update packages, switch to LSP Version 3.17

Author: d-biehl

package-lock.json

@@ -766,7 +766,7 @@
   "dependencies": {
     "ansi-colors": "^4.1.1",
     "@vscode/debugadapter": "^1.55.1",
-    "vscode-languageclient": "^8.0.0-next"
+    "vscode-languageclient": "^8.0.0"
   },
   "devDependencies": {
     "@types/glob": "^7.2.0",
@@ -777,20 +777,20 @@
     "@typescript-eslint/parser": "^5.19.0",
     "@vscode/debugadapter-testsupport": "^1.55.1",
     "@vscode/test-electron": "^2.1.3",
-    "eslint": "^8.13.0",
+    "eslint": "^8.15.0",
     "eslint-config-prettier": "^8.5.0",
     "eslint-plugin-import": "^2.26.0",
     "eslint-plugin-jsx-a11y": "^6.5.1",
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-prettier": "^4.0.0",
     "glob": "^8.0.1",
-    "mocha": "^9.2.2",
+    "mocha": "^10.0.0",
     "ovsx": "^0.3.0",
     "prettier": "^2.6.2",
-    "ts-loader": "^9.2.8",
-    "typescript": "^4.6.3",
+    "ts-loader": "^9.3.0",
+    "typescript": "^4.6.4",
     "vsce": "^2.7.0",
-    "webpack": "^5.72.0",
+    "webpack": "^5.72.1",
     "webpack-cli": "^4.9.2"
   }
 }

package.json

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 import asyncio
-from typing import Any, Optional, cast
+from typing import Any, Optional
 
 from ..jsonrpc2.server import TcpParams
 from ..utils.logging import LoggingDescriptor
@@ -60,7 +60,7 @@ async def wait() -> None:
                         port=self.tcp_params.port,
                     )
 
-                    self._protocol = cast(DAPClientProtocol, protocol)
+                    self._protocol = protocol
                     self._protocol.on_connection_lost.add(self.on_connection_lost)
                 except (asyncio.CancelledError, KeyboardInterrupt, SystemExit):
                     raise

poetry.lock

@@ -12,6 +12,7 @@
 from typing import (
     Any,
     Callable,
+    Coroutine,
     Dict,
     Generic,
     Iterator,
@@ -722,7 +723,7 @@ def handle_notification(self, message: JsonRPCNotification) -> None:
             params = self._convert_params(e.method, e.param_type, message.params)
             result = e.method(*params[0], **params[1])
             if inspect.isawaitable(result):
-                create_sub_task(result)
+                create_sub_task(cast(Coroutine[Any, Any, Any], result))
 
         except asyncio.CancelledError:
             pass

robotcode/debugger/client.py

@@ -30,12 +30,9 @@ def __repr__(self) -> str:
             for f in dataclasses.fields(self)
             if f.repr
             and (
-                (f.default == dataclasses.MISSING and f.default_factory == dataclasses.MISSING)  # type: ignore
+                (f.default == dataclasses.MISSING and f.default_factory == dataclasses.MISSING)
                 or (f.default != dataclasses.MISSING and f.default != getattr(self, f.name))
-                or (
-                    f.default_factory != dataclasses.MISSING  # type: ignore
-                    and getattr(self, f.name) != f.default_factory()
-                )
+                or (f.default_factory != dataclasses.MISSING and getattr(self, f.name) != f.default_factory())
             )
         )
         return f"{self.__class__.__qualname__}({args})"

robotcode/jsonrpc2/protocol.py

@@ -682,7 +682,7 @@ def get_current_future_info() -> Optional[FutureInfo]:
 
 
 def create_sub_task(
-    coro: Awaitable[_T], *, name: Optional[str] = None, loop: Optional[asyncio.AbstractEventLoop] = None
+    coro: Coroutine[Any, Any, _T], *, name: Optional[str] = None, loop: Optional[asyncio.AbstractEventLoop] = None
 ) -> asyncio.Task[_T]:
 
     ct = get_current_future_info()

robotcode/language_server/common/lsp_types.py

@@ -430,12 +430,17 @@ export class LanguageClientsManager {
       result = new LanguageClient(`$robotCode:${workspaceFolder.uri.toString()}`, name, serverOptions, clientOptions);
 
       this.outputChannel.appendLine(`trying to start Language client: ${name}`);
-      result.start();
 
       result.onDidChangeState((e) => {
         if (e.newState == State.Running) {
+          this.outputChannel.appendLine(
+            `client for ${result?.clientOptions.workspaceFolder?.uri ?? "unknown"} running.`
+          );
           closeHandlerAction = CloseAction.Restart;
         } else if (e.newState == State.Stopped) {
+          this.outputChannel.appendLine(
+            `client for ${result?.clientOptions.workspaceFolder?.uri ?? "unknown"} stopped.`
+          );
           if (workspaceFolder && this.clients.get(workspaceFolder.uri.toString()) !== result)
             closeHandlerAction = CloseAction.DoNotRestart;
         }
@@ -451,35 +456,27 @@ export class LanguageClientsManager {
         });
       });
 
-      result = await result.onReady().then(
-        async (_) => {
-          this.outputChannel.appendLine(`client  ${result?.clientOptions.workspaceFolder?.uri ?? "unknown"} ready.`);
-          let counter = 0;
-          try {
-            while (!result?.initializeResult && counter < 1000) {
-              await sleep(10);
-              counter++;
-            }
-          } catch {
-            // do nothing
-            this.outputChannel.appendLine(
-              `client  ${result?.clientOptions.workspaceFolder?.uri ?? "unknown"} did not initialize correctly`
-            );
-            return undefined;
-          }
-          return result;
+      const started = await result.start().then(
+        (_) => {
+          this.outputChannel.appendLine(
+            `client for ${result?.clientOptions.workspaceFolder?.uri ?? "unknown"} started.`
+          );
+          return true;
         },
         (reason) => {
           this.outputChannel.appendLine(
             `client  ${result?.clientOptions.workspaceFolder?.uri ?? "unknown"} error: ${reason}`
           );
-          return undefined;
+          return false;
         }
       );
 
-      if (result) this.clients.set(workspaceFolder.uri.toString(), result);
+      if (started) {
+        this.clients.set(workspaceFolder.uri.toString(), result);
+        return result;
+      }
 
-      return result;
+      return undefined;
     });
   }