refactor: simplify some code

Author: d-biehl

pyproject.toml

@@ -274,7 +274,12 @@ select = [
   # "T20",
   "PT",
   "Q",
-  "RET"
+  "RET",
+  # "SIM", # TODO enable this
+  #"TID",
+  #"TCH",
+  #"ARG",
+  #"PTH", # TODO enable this
 ]
 
 

robotcode/debugger/__main__.py

@@ -1,5 +1,6 @@
 import argparse
 import asyncio
+import contextlib
 import functools
 import logging
 import logging.config
@@ -32,10 +33,8 @@
     if str(top) not in sys.path:
         sys.path.append(str(top))
 
-    try:
+    with contextlib.suppress(ValueError):
         sys.path.remove(str(parent))
-    except ValueError:  # Already removed
-        pass
 
     __package__ = "robotcode.debugger"
 

robotcode/debugger/debugger.py

@@ -489,19 +489,18 @@ def process_start_state(self, source: str, line_no: int, type: str, status: str)
                 ),
             )
             self.requested_state = RequestedState.Nothing
-        elif self.requested_state == RequestedState.StepOut:
-            if len(self.full_stack_frames) <= self.stop_stack_len:
-                self.state = State.Paused
-                self.send_event(
-                    self,
-                    StoppedEvent(
-                        body=StoppedEventBody(
-                            reason=StoppedReason.STEP,
-                            thread_id=threading.current_thread().ident,
-                        )
-                    ),
-                )
-                self.requested_state = RequestedState.Nothing
+        elif self.requested_state == RequestedState.StepOut and len(self.full_stack_frames) <= self.stop_stack_len:
+            self.state = State.Paused
+            self.send_event(
+                self,
+                StoppedEvent(
+                    body=StoppedEventBody(
+                        reason=StoppedReason.STEP,
+                        thread_id=threading.current_thread().ident,
+                    )
+                ),
+            )
+            self.requested_state = RequestedState.Nothing
 
         if source is not None:
             source_path = self.map_path_to_client(str(Path(source).absolute()))

robotcode/jsonrpc2/protocol.py

@@ -283,7 +283,7 @@ def get_methods(obj: Any) -> Dict[str, RpcMethodEntry]:
                     if r is not None:
                         registries.insert(0, r)
                 for r in registries:
-                    for k in r.__class_parts.keys():
+                    for k in r.__class_parts:
                         getattr(self.__owner, k)
 
                 self.__methods = get_methods(self.__owner)

robotcode/language_server/common/parts/diagnostics.py

@@ -353,10 +353,7 @@ async def run_workspace_diagnostics(self) -> None:
                             progress.begin()
                             path = document.uri.to_path()
                             folder = self.parent.workspace.get_workspace_folder(document.uri)
-                            if folder is None:
-                                name = path
-                            else:
-                                name = path.relative_to(folder.uri.to_path())
+                            name = path if folder is None else path.relative_to(folder.uri.to_path())
 
                             progress.report(f"Analyse {name}", current=i + 1)
                         elif analysis_mode == AnalysisProgressMode.SIMPLE:

robotcode/language_server/robotframework/diagnostics/library_doc.py

@@ -194,7 +194,7 @@ def __repr__(self) -> str:
         return f"{type(self).__name__}(name={repr(self.name)})"
 
 
-RUN_KEYWORD_WITH_CONDITION_MATCHERS = [KeywordMatcher(e) for e in RUN_KEYWORD_WITH_CONDITION_NAMES.keys()]
+RUN_KEYWORD_WITH_CONDITION_MATCHERS = [KeywordMatcher(e) for e in RUN_KEYWORD_WITH_CONDITION_NAMES]
 
 RUN_KEYWORD_IF_MATCHER = KeywordMatcher(RUN_KEYWORD_IF_NAME)
 

robotcode/language_server/robotframework/diagnostics/namespace.py

@@ -1668,11 +1668,7 @@ def _should_ignore(self, range: Range) -> bool:
     def __should_ignore(lines: List[int], range: Range) -> bool:
         import builtins
 
-        for line_no in builtins.range(range.start.line, range.end.line + 1):
-            if line_no in lines:
-                return True
-
-        return False
+        return any(line_no in lines for line_no in builtins.range(range.start.line, range.end.line + 1))
 
 
 class DiagnosticsEntry(NamedTuple):

robotcode/language_server/robotframework/utils/robot_path.py

@@ -22,10 +22,7 @@ def find_file_ex(
     from robot.errors import DataError
 
     path = Path(path)
-    if path.is_absolute():
-        ret = _find_absolute_path(path)
-    else:
-        ret = _find_relative_path(path, basedir)
+    ret = _find_absolute_path(path) if path.is_absolute() else _find_relative_path(path, basedir)
     if ret:
         return str(ret)
     default = file_type or "File"

scripts/is_prerelease.py

@@ -4,10 +4,7 @@
 def main() -> None:
 
     version = get_version()
-    if version.prerelease:
-        preview = 1
-    else:
-        preview = 0
+    preview = 1 if version.prerelease else 0
 
     print(preview)