some smaller corrections

Author: d-biehl

package.json

@@ -508,8 +508,7 @@
     "devDependencies": {
         "@types/glob": "^7.1.4",
         "@types/mocha": "^8.2.3",
-        "@types/node": "^16.0.0",
-        "@types/open": "^6.2.1",
+        "@types/node": "^16.0.0",       
         "@types/vscode": "^1.57.1",
         "@typescript-eslint/eslint-plugin": "^4.28.2",
         "@typescript-eslint/parser": "^4.28.2",

robotcode/jsonrpc2/protocol.py

@@ -689,6 +689,11 @@ async def cancel_received_request(self, id: Union[int, str, None]) -> None:
         if future is not None and not future.cancelled():
             future.cancel()
 
+    async def cancel_all_received_request(self) -> None:
+        for future in self._received_request.values():
+            if future is not None and not future.cancelled():
+                future.cancel()
+
     async def handle_notification(self, message: JsonRPCNotification) -> None:
         e = self.registry.get_entry(message.method)
 

robotcode/jsonrpc2/server.py

@@ -63,7 +63,7 @@ def __init__(
         self._run_func: Optional[Callable[[], None]] = None
         self._server: Optional[asyncio.AbstractServer] = None
 
-        self._stop_event: Optional[asyncio.Event] = None
+        self._stdio_stop_event: Optional[asyncio.Event] = None
 
         self.loop = asyncio.get_event_loop()
 
@@ -81,8 +81,8 @@ def start(self) -> None:
 
     @_logger.call
     def close(self) -> None:
-        if self._stop_event is not None:
-            self._stop_event.set()
+        if self._stdio_stop_event is not None:
+            self._stdio_stop_event.set()
 
         if self._server and self._server.is_serving:
             self._server.close()
@@ -104,9 +104,9 @@ def __exit__(
     def create_protocol(self) -> TProtocol:
         ...
 
-    def close_protocol(self, protocol: TProtocol) -> None:
-        if self.mode == JsonRpcServerMode.STDIO and self._stop_event is not None:
-            self._stop_event.set()
+    def shutdown_protocol(self, protocol: TProtocol) -> None:
+        if self.mode == JsonRpcServerMode.STDIO and self._stdio_stop_event is not None:
+            self._stdio_stop_event.set()
 
     @_logger.call
     def start_stdio(self) -> None:
@@ -119,10 +119,10 @@ def start_stdio(self) -> None:
         protocol.connection_made(transport)
 
         def run_io_nonblocking() -> None:
-            self._stop_event = asyncio.Event()
+            self._stdio_stop_event = asyncio.Event()
 
             async def aio_readline(rfile: BinaryIO, protocol: asyncio.Protocol) -> None:
-                while self._stop_event is not None and not self._stop_event.is_set() and not rfile.closed:
+                while self._stdio_stop_event is not None and not self._stdio_stop_event.is_set() and not rfile.closed:
                     data = await self.loop.run_in_executor(None, cast(io.BufferedReader, rfile).read1, 1000)
                     protocol.data_received(data)
 

robotcode/language_server/common/parts/workspace.py

@@ -286,12 +286,15 @@ async def get_configuration(
     ) -> Union[_TConfig, Any]:
 
         if isinstance(section, (ConfigBase, HasConfigSection)):
-            return section.parse_obj(
+            config = section.parse_obj(
                 await self.get_configuration(
                     section=cast(HasConfigSection, section).__config_section__, scope_uri=scope_uri
                 )
             )
+            if config is None:
+                return None
 
+            return section.parse_obj(config)
         return (
             await self.parent.send_request(
                 "workspace/configuration",

robotcode/language_server/common/protocol.py

@@ -193,9 +193,15 @@ async def on_initialized(sender) -> None:
     @_logger.call
     async def shutdown(self) -> None:
         self.shutdown_received = True
+
+        try:
+            await asyncio.wait_for(self.cancel_all_received_request(), 1)
+        except BaseException:
+            pass
+
         await self.on_shutdown(self)
         if self.server is not None:
-            self.server.close_protocol(self)
+            self.server.shutdown_protocol(self)
 
     @rpc_method(name="exit")
     @_logger.call

robotcode/language_server/robotframework/configuration.py

@@ -3,7 +3,7 @@
 from ..common.parts.workspace import ConfigBase, config_section
 
 
-@config_section("robotcode.language-server")
+@config_section("robotcode.languageServer")
 class LanguageServerConfig(ConfigBase):
     mode: str
     tcp_port: int