update RF versions

d-biehl · d-biehl · commit 08da77056c49 · 2022-10-19T23:01:28.000+02:00
diff --git a/robotcode/language_server/common/parts/commands.py b/robotcode/language_server/common/parts/commands.py
@@ -46,7 +46,7 @@ def extend_capabilities(self, capabilities: ServerCapabilities) -> None:
 
     @rpc_method(name="workspace/executeCommand", param_type=ExecuteCommandParams)
     @threaded()
-    async def _text_document_code_lens(
+    async def _workspace_execute_command(
         self, command: str, arguments: Optional[List[LSPAny]], *args: Any, **kwargs: Any
     ) -> Optional[LSPAny]:
         self._logger.info(f"execute command {command}")
diff --git a/robotcode/language_server/robotframework/diagnostics/analyzer.py b/robotcode/language_server/robotframework/diagnostics/analyzer.py
@@ -851,7 +851,7 @@ async def visit_Tags(self, node: ast.AST) -> None:  # noqa: N802
         from robot.parsing.lexer.tokens import Token as RobotToken
         from robot.parsing.model.statements import Tags
 
-        if get_robot_version() >= (5, 1):
+        if get_robot_version() >= (6, 0):
             tags = cast(Tags, node)
 
             for tag in tags.get_tokens(RobotToken.ARGUMENT):
diff --git a/robotcode/language_server/robotframework/diagnostics/library_doc.py b/robotcode/language_server/robotframework/diagnostics/library_doc.py
@@ -114,7 +114,7 @@ def is_embedded_keyword(name: str) -> bool:
     from robot.running.arguments.embedded import EmbeddedArguments
 
     try:
-        if get_robot_version() >= (5, 1):
+        if get_robot_version() >= (6, 0):
             if EmbeddedArguments.from_name(name):
                 return True
         else:
@@ -149,7 +149,7 @@ def embedded_arguments(self) -> Any:
         if self._embedded_arguments is None:
             if self._can_have_embedded:
                 try:
-                    if get_robot_version() >= (5, 1):
+                    if get_robot_version() >= (6, 0):
                         self._embedded_arguments = EmbeddedArguments.from_name(self.name)
                     else:
                         self._embedded_arguments = EmbeddedArguments(self.name)
@@ -171,7 +171,7 @@ def __eq__(self, o: Any) -> bool:
             return False
 
         if self.embedded_arguments:
-            if get_robot_version() >= (5, 1):
+            if get_robot_version() >= (6, 0):
                 return self.embedded_arguments.match(o) is not None
             else:
                 return self.embedded_arguments.name.match(o) is not None
diff --git a/robotcode/language_server/robotframework/diagnostics/namespace.py b/robotcode/language_server/robotframework/diagnostics/namespace.py
@@ -1852,7 +1852,7 @@ def _create_custom_and_standard_keyword_conflict_warning_message(
         )
 
     async def _get_bdd_style_keyword(self, name: str) -> Optional[KeywordDoc]:
-        if get_robot_version() < (5, 1):
+        if get_robot_version() < (6, 0):
             lower = name.lower()
             for prefix in ["given ", "when ", "then ", "and ", "but "]:
                 if lower.startswith(prefix):
diff --git a/robotcode/language_server/robotframework/parts/code_action.py b/robotcode/language_server/robotframework/parts/code_action.py
@@ -267,7 +267,7 @@ async def collect(
         model = await self.parent.documents_cache.get_model(document, False)
         node = await get_node_at_position(model, range.start)
 
-        if get_robot_version() >= (5, 1):
+        if get_robot_version() >= (6, 0):
             from robot.conf.languages import En, Languages
             from robot.parsing.model.statements import Config
 
diff --git a/robotcode/language_server/robotframework/parts/completion.py b/robotcode/language_server/robotframework/parts/completion.py
@@ -91,7 +91,7 @@ async def get_header_style(self, config: CompletionConfig) -> str:
         if config.header_style is not None:
             return config.header_style
 
-        return DEFAULT_HEADER_STYLE if get_robot_version() < (5, 1) else DEFAULT_HEADER_STYLE_51
+        return DEFAULT_HEADER_STYLE if get_robot_version() < (6, 0) else DEFAULT_HEADER_STYLE_51
 
     @language_id("robotframework")
     @trigger_characters(
@@ -1666,7 +1666,7 @@ async def complete_with_name() -> Optional[List[CompletionItem]]:
             if context is None or context.trigger_kind != CompletionTriggerKind.INVOKED:
                 return []
 
-            if get_robot_version() >= (5, 1):
+            if get_robot_version() >= (6, 0):
                 namespace_marker = ["AS", "WITH NAME"]
             else:
                 namespace_marker = ["WITH NAME"]
@@ -1676,7 +1676,7 @@ async def complete_with_name() -> Optional[List[CompletionItem]]:
                 if position >= range_from_token(name_token).extend(end_character=2).end:
                     return [
                         CompletionItem(
-                            label="AS" if get_robot_version() >= (5, 1) else "WITH NAME",
+                            label="AS" if get_robot_version() >= (6, 0) else "WITH NAME",
                             kind=CompletionItemKind.KEYWORD,
                             # detail=e.detail,
                             sort_text="03_NAMESPACE_MARKER",
diff --git a/robotcode/language_server/robotframework/parts/discovering.py b/robotcode/language_server/robotframework/parts/discovering.py
@@ -128,7 +128,7 @@ async def _get_tests_from_workspace(
 
         from ..utils.version import get_robot_version
 
-        if get_robot_version() >= (5, 1):
+        if get_robot_version() >= (6, 0):
             from robot.running.builder.settings import (
                 Defaults as TestDefaults,  # pyright: reportMissingImports=false
             )
@@ -165,7 +165,7 @@ def _build(
                     defaults = TestDefaults()
                 if model is None:
                     try:
-                        if get_robot_version() >= (5, 1):
+                        if get_robot_version() >= (6, 0):
                             model = get_model(
                                 self._get_source(source),
                                 data_only=True,
@@ -238,7 +238,7 @@ def _validate_test_counts(self, suite: TestSuite, multisource: bool = False) ->
 
             def build(self, *paths: str) -> TestSuite:
                 structure = SuiteStructureBuilder(self.included_extensions, self.included_suites).build(paths)
-                if get_robot_version() >= (5, 1):
+                if get_robot_version() >= (6, 0):
                     parser = MySuiteStructureParserWithLang(
                         self.included_extensions, self.rpa, self.lang, self.process_curdir
                     )
@@ -329,7 +329,7 @@ def nonexisting_paths(paths: List[str]) -> Iterator[str]:
 
                     valid_paths = [i for i in normalize_paths(paths)]
 
-                    if get_robot_version() >= (5, 1):
+                    if get_robot_version() >= (6, 0):
                         builder = MyTestSuiteBuilder(
                             included_suites=suites if suites else None, rpa=rpa_mode, lang=languages
                         )
@@ -362,7 +362,7 @@ def nonexisting_paths(paths: List[str]) -> Iterator[str]:
                         )
                     ]
                 else:
-                    if get_robot_version() >= (5, 1):
+                    if get_robot_version() >= (6, 0):
                         builder = MyTestSuiteBuilder(
                             included_suites=suites if suites else None, rpa=rpa_mode, lang=languages
                         )
diff --git a/robotcode/language_server/robotframework/parts/documents_cache.py b/robotcode/language_server/robotframework/parts/documents_cache.py
@@ -50,7 +50,7 @@ def __init__(self, parent: RobotLanguageServerProtocol) -> None:
         self._workspace_languages: weakref.WeakKeyDictionary[WorkspaceFolder, Languages] = weakref.WeakKeyDictionary()
 
     async def get_workspace_languages(self, document_or_uri: Union[TextDocument, Uri, str]) -> Optional[Languages]:
-        if get_robot_version() < (5, 1):
+        if get_robot_version() < (6, 0):
             return None
 
         from robot.conf.languages import (
@@ -97,7 +97,7 @@ async def get_workspace_languages(self, document_or_uri: Union[TextDocument, Uri
     async def build_languages_from_model(
         self, document: TextDocument, model: ast.AST
     ) -> Tuple[Optional[Languages], Optional[Languages]]:
-        if get_robot_version() < (5, 1):
+        if get_robot_version() < (6, 0):
             return (None, None)
 
         from robot.conf.languages import Languages as RobotLanguages
@@ -171,7 +171,7 @@ def __internal_get_tokens(
     ) -> Any:
         import robot.api
 
-        if get_robot_version() >= (5, 1):
+        if get_robot_version() >= (6, 0):
             return robot.api.get_tokens(source, data_only=data_only, tokenize_variables=tokenize_variables, lang=lang)
         else:
             return robot.api.get_tokens(source, data_only=data_only, tokenize_variables=tokenize_variables)
@@ -185,7 +185,7 @@ def __internal_get_resource_tokens(
     ) -> Any:
         import robot.api
 
-        if get_robot_version() >= (5, 1):
+        if get_robot_version() >= (6, 0):
             return robot.api.get_resource_tokens(
                 source, data_only=data_only, tokenize_variables=tokenize_variables, lang=lang
             )
@@ -197,7 +197,7 @@ def __internal_get_init_tokens(
     ) -> Any:
         import robot.api
 
-        if get_robot_version() >= (5, 1):
+        if get_robot_version() >= (6, 0):
             return robot.api.get_init_tokens(
                 source, data_only=data_only, tokenize_variables=tokenize_variables, lang=lang
             )
diff --git a/robotcode/language_server/robotframework/parts/model_helper.py b/robotcode/language_server/robotframework/parts/model_helper.py
@@ -531,7 +531,7 @@ def split_bdd_prefix(cls, namespace: Namespace, token: Token) -> Tuple[Optional[
     def strip_bdd_prefix(cls, namespace: Namespace, token: Token) -> Token:
         from robot.parsing.lexer import Token as RobotToken
 
-        if get_robot_version() < (5, 1):
+        if get_robot_version() < (6, 0):
             bdd_match = cls.BDD_TOKEN_REGEX.match(token.value)
             if bdd_match:
                 bdd_len = len(bdd_match.group(1))
@@ -568,7 +568,7 @@ def strip_bdd_prefix(cls, namespace: Namespace, token: Token) -> Token:
 
     @classmethod
     def is_bdd_token(cls, namespace: Namespace, token: Token) -> bool:
-        if get_robot_version() < (5, 1):
+        if get_robot_version() < (6, 0):
             bdd_match = cls.BDD_TOKEN.match(token.value)
             return bool(bdd_match)
         else:
diff --git a/robotcode/language_server/robotframework/parts/semantic_tokens.py b/robotcode/language_server/robotframework/parts/semantic_tokens.py
@@ -214,7 +214,7 @@ def generate_mapping(cls) -> Dict[str, Tuple[Enum, Optional[Set[Enum]]]]:
                 }
             )
 
-        if get_robot_version() >= (5, 1):
+        if get_robot_version() >= (6, 0):
             definition.update(
                 {
                     frozenset(
@@ -331,7 +331,7 @@ async def generate_sem_sub_tokens(
                 if await namespace.find_keyword(token.value, raise_keyword_error=False, handle_bdd_style=False) is None:
                     bdd_len = 0
 
-                    if get_robot_version() < (5, 1):
+                    if get_robot_version() < (6, 0):
                         bdd_match = cls.BDD_TOKEN_REGEX.match(token.value)
                         if bdd_match:
                             bdd_len = len(bdd_match.group(1))

Original file line number	Diff line number	Diff line change
`@@ -1852,7 +1852,7 @@ def _create_custom_and_standard_keyword_conflict_warning_message(`
`1852`	`1852`	`)`
`1853`	`1853`
`1854`	`1854`	`async def _get_bdd_style_keyword(self, name: str) -> Optional[KeywordDoc]:`
`1855`		`- if get_robot_version() < (5, 1):`
	`1855`	`+ if get_robot_version() < (6, 0):`
`1856`	`1856`	`lower = name.lower()`
`1857`	`1857`	`for prefix in ["given ", "when ", "then ", "and ", "but "]:`
`1858`	`1858`	`if lower.startswith(prefix):`
Original file line number	Diff line number	Diff line change
`@@ -214,7 +214,7 @@ def generate_mapping(cls) -> Dict[str, Tuple[Enum, Optional[Set[Enum]]]]:`
`214`	`214`	`}`
`215`	`215`	`)`
`216`	`216`
`217`		`- if get_robot_version() >= (5, 1):`
	`217`	`+ if get_robot_version() >= (6, 0):`
`218`	`218`	`definition.update(`
`219`	`219`	`{`
`220`	`220`	`frozenset(`
`@@ -331,7 +331,7 @@ async def generate_sem_sub_tokens(`
`331`	`331`	`if await namespace.find_keyword(token.value, raise_keyword_error=False, handle_bdd_style=False) is None:`
`332`	`332`	`bdd_len = 0`
`333`	`333`
`334`		`- if get_robot_version() < (5, 1):`
	`334`	`+ if get_robot_version() < (6, 0):`
`335`	`335`	`bdd_match = cls.BDD_TOKEN_REGEX.match(token.value)`
`336`	`336`	`if bdd_match:`
`337`	`337`	`bdd_len = len(bdd_match.group(1))`