update readme, update python packages and tsconfig

Author: d-biehl

.flake8

@@ -11,6 +11,6 @@ exclude =
     external
     playground
 
-ignore = N805,W503
+ignore = N805,W503,N818
 per-file-ignores=__init__.py:F401,F403
 

.vscode/extensions.json

@@ -2,8 +2,9 @@
 	// See http://go.microsoft.com/fwlink/?LinkId=827846
 	// for the documentation about the extensions.json format
 	"recommendations": [
-		"dbaeumer.vscode-eslint",
 		"ms-python.python",
-		"ms-python.vscode-pylance"
+		"ms-python.vscode-pylance",
+		"esbenp.prettier-vscode",
+		"dbaeumer.vscode-eslint"
 	]
-}
+}

README.md

@@ -1,11 +1,13 @@
 # Robot Code Readme
 
-Language Server and client for Visual Studio Code.
+RobotFramework Language Server and client for Visual Studio Code.
+
 
 ## Requirements
 
-* Python 3.8 or above
+* Python 3.9 or above
 * Robotframework 4.0 and above
+* VSCode version 1.58 and above
 
 ## Installation
 

mypy.ini

@@ -2,8 +2,9 @@
 # File reference here - http://mypy.readthedocs.io/en/latest/config_file.html#config-file
 
 [mypy]
+python_version = 3.9
 plugins = pydantic.mypy
-
+exclude = robotcode/external/|dist|node_modules
 warn_redundant_casts = True
 warn_unused_ignores = True
 strict = True
@@ -13,7 +14,7 @@ strict = True
 
 ignore_missing_imports = True
 
-[mypy-*]
+[mypy-*]    
 ; disallow_untyped_calls = True
 ; disallow_untyped_defs = True
 ; check_untyped_defs = True

pyproject.toml

@@ -7,26 +7,26 @@ include = ["robotcode/py.typed", "README.md"]
 exclude = ["robotcode/external"]
 
 [tool.poetry.dependencies]
-python = "^3.8"
+python = "^3.9"
 robotframework = "^4.0.0"
 
 
 [tool.poetry.dev-dependencies]
-pydantic = "^1.7.3"
-isort = "^5.7.0"
-mypy = "^0.790"
-flake8 = "^3.8.4"
-black = "^20.8b1"
-pep8-naming = "^0.11.1"
-debugpy = "^1.2.1"
-pytest = "^6.2.1"
-pytest-asyncio = "^0.14.0"
-pytest-cov = "^2.11.1"
-coverage = { extras = ["toml"], version = "^5.5" }
-coloredlogs = "^15.0"
+pydantic = "^1.8.2"
+isort = "^5.9.2"
+mypy = "^0.910"
+flake8 = "^3.9.2"
+black = "^21.6b0"
+pep8-naming = "^0.12.0"
+debugpy = "^1.3.0"
+pytest = "^6.2.4"
+pytest-asyncio = "^0.15.1"
+pytest-cov = "^2.12.1"
+coverage = "^5.5"
+coloredlogs = "^15.0.1"
 robotremoteserver = "^1.1"
-Cython = "^0.29.22"
-robotframework-robocop = "^1.7.0"
+Cython = "^0.29.24"
+robotframework-robocop = "^1.7.1"
 
 
 [tool.poetry-dynamic-versioning]
@@ -56,9 +56,7 @@ exclude = '''
     | \.git          # root of the project    
     | \.mypy_cache
     | \.tox
-    | \.venv
-    | _build
-    | buck-out
+    | \.venv    
     | build
     | dist
     | out

robotcode/jsonrpc2/protocol.py

@@ -48,7 +48,7 @@
     "JsonRPCProtocol",
     "JsonRPCException",
     "JsonRPCParseError",
-    "InvalidProtocolVersionException",
+    "InvalidProtocolVersionError",
     "rpc_method",
     "RpcRegistry",
     "JsonRPCProtocolPart",
@@ -122,7 +122,7 @@ class JsonRPCParseError(JsonRPCException):
     pass
 
 
-class InvalidProtocolVersionException(JsonRPCParseError):
+class InvalidProtocolVersionError(JsonRPCParseError):
     pass
 
 
@@ -434,7 +434,7 @@ def _generate_json_rpc_messages_from_dict(
         def inner(d: Dict[Any, Any]) -> JsonRPCMessage:
             if "jsonrpc" in d:
                 if d["jsonrpc"] != PROTOCOL_VERSION:
-                    raise InvalidProtocolVersionException("Invalid JSON-RPC2 protocol version.")
+                    raise InvalidProtocolVersionError("Invalid JSON-RPC2 protocol version.")
 
                 if "id" in d:
                     if "method" in d:

robotcode/language_server/common/types.py

@@ -580,22 +580,6 @@ class SaveOptions(Model):
 
 
 class TextDocumentSyncOptions(Model):
-    def __init__(
-        self,
-        open_close: Optional[bool] = None,
-        change: Optional[TextDocumentSyncKind] = None,
-        will_save: Optional[bool] = None,
-        will_save_wait_until: Optional[bool] = None,
-        save: Union[bool, SaveOptions, None] = None,
-    ) -> None:
-        super().__init__(  # type: ignore
-            open_close=open_close,
-            change=change,
-            will_save=will_save,
-            will_save_wait_until=will_save_wait_until,
-            save=save,
-        )
-
     open_close: Optional[bool] = None
     change: Optional[TextDocumentSyncKind] = None
     will_save: Optional[bool] = None

robotcode/language_server/robotframework/diagnostics/namespace.py

@@ -49,15 +49,15 @@
 DIAGNOSTICS_SOURCE_NAME = "RobotCode"
 
 
-class DiagnosticsException(Exception):
+class DiagnosticsError(Exception):
     pass
 
 
-class DiagnosticsWarning(DiagnosticsException):
+class DiagnosticsWarningError(DiagnosticsError):
     pass
 
 
-class ImportError(DiagnosticsException):
+class ImportError(DiagnosticsError):
     pass
 
 
@@ -810,7 +810,7 @@ async def _import(value: Import) -> Optional[LibraryEntry]:
                     # result.import_source = value.source
                     pass
                 else:
-                    raise DiagnosticsException("Unknown import type.")
+                    raise DiagnosticsError("Unknown import type.")
 
                 if top_level and result is not None:
                     if result.library_doc.source is not None and result.library_doc.errors:
@@ -1122,7 +1122,7 @@ class DiagnosticsEntry(NamedTuple):
     code: Optional[str] = None
 
 
-class CancelSearch(Exception):
+class CancelSearchError(Exception):
     pass
 
 
@@ -1143,20 +1143,20 @@ async def find_keyword(self, name: Optional[str]) -> Optional[KeywordDoc]:
                 )
 
             return result
-        except CancelSearch:
+        except CancelSearchError:
             return None
 
     async def _find_keyword(self, name: Optional[str]) -> Optional[KeywordDoc]:
         if not name:
             self.diagnostics.append(
                 DiagnosticsEntry("Keyword name cannot be empty.", DiagnosticSeverity.ERROR, "KeywordError")
             )
-            raise CancelSearch()
+            raise CancelSearchError()
         if not isinstance(name, str):
             self.diagnostics.append(
                 DiagnosticsEntry("Keyword name must be a string.", DiagnosticSeverity.ERROR, "KeywordError")
             )
-            raise CancelSearch()
+            raise CancelSearchError()
 
         result = await self._get_keyword_from_self(name)
         if not result and "." in name:
@@ -1191,7 +1191,7 @@ async def _get_explicit_keyword(self, name: str) -> Optional[KeywordDoc]:
                     "KeywordError",
                 )
             )
-            raise CancelSearch()
+            raise CancelSearchError()
 
         return found[0][1] if found else None
 
@@ -1240,7 +1240,7 @@ async def _get_keyword_from_resource_files(self, name: str) -> Optional[KeywordD
                 "KeywordError",
             )
         )
-        raise CancelSearch()
+        raise CancelSearchError()
 
     async def _get_keyword_based_on_search_order(
         self, entries: List[Tuple[LibraryEntry, KeywordDoc]]
@@ -1276,7 +1276,7 @@ async def _get_keyword_from_libraries(self, name: str) -> Optional[KeywordDoc]:
                 "KeywordError",
             )
         )
-        raise CancelSearch()
+        raise CancelSearchError()
 
     async def _filter_stdlib_runner(
         self, entry1: Tuple[LibraryEntry, KeywordDoc], entry2: Tuple[LibraryEntry, KeywordDoc]

tsconfig.json

@@ -2,13 +2,15 @@
   "compilerOptions": {
     "baseUrl": ".",
     "module": "commonjs",
-    "target": "es2018",
+    "moduleResolution": "Node",
+    "target": "ES2021",
     "outDir": "out",
-    "lib": ["es6", "es2018", "dom", "ES2019", "ES2020"],
+    "lib": ["es6", "dom", "ES2018", "ES2019", "ES2020"],
     "sourceMap": true,
     "rootDir": "vscode-client",
     "strict": true,
     "experimentalDecorators": true,
+    "emitDecoratorMetadata": true,
     //"esModuleInterop": true,
     //"allowSyntheticDefaultImports": true,
     "noImplicitAny": true,