Handle DEDENT token, warn on start failure, pre-commit hook updates and fixes

Author: CoolCat467

.pre-commit-config.yaml

@@ -20,7 +20,7 @@ repos:
       - id: sort-simple-yaml
         files: .pre-commit-config.yaml
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.12.11
+    rev: v0.13.1
     hooks:
       - id: ruff-format
       - id: ruff-check
@@ -38,10 +38,10 @@ repos:
         additional_dependencies:
           - tomli
   - repo: https://github.com/adhtruong/mirrors-typos
-    rev: v1.35.6
+    rev: v1.36.2
     hooks:
       - id: typos
   - repo: https://github.com/woodruffw/zizmor-pre-commit
-    rev: v1.12.1
+    rev: v1.13.0
     hooks:
       - id: zizmor

src/idlemypyextension/annotate.py

@@ -480,7 +480,10 @@ def read_line() -> str:
                 tokens.append(ArgumentDefault(previous + string))
             else:
                 tokens.append(ArgumentDefault(string))
-        elif tok_name[token.type] == "INDENT":  # pragma: nocover
+        elif (
+            tok_name[token.type] == "INDENT"
+            or tok_name[token.type] == "DEDENT"
+        ):  # pragma: nocover
             tokens.append(EndSeparator(string))
         elif tok_name[token.type] == "FSTRING_START":
             tokens.append(

src/idlemypyextension/extension.py

@@ -63,7 +63,7 @@ def debug(message: object) -> None:
     ##as_str = as_str.replace(home_directory, "~")
     ##as_str = as_str.replace(username, "<username>")
 
-    print(f"\n[{__title__}] DEBUG: {as_str}")
+    print(f"\n[{__name__}] DEBUG: {as_str}")
 
 
 MYPY_ERROR_TYPE: Final = re.compile(r"  \[([a-z\-]+)\]\s*$")
@@ -531,12 +531,16 @@ async def ensure_daemon_running(self) -> bool:
             if x
         )
         debug(f"{command = }")
-        return await client.start(
-            self.status_file,
-            flags=self.flags,
-            daemon_timeout=self.daemon_timeout,
-            log_file=self.log_file,
-        )
+        try:
+            return await client.start(
+                self.status_file,
+                flags=self.flags,
+                daemon_timeout=self.daemon_timeout,
+                log_file=self.log_file,
+            )
+        except (Exception, SystemExit) as exc:
+            utils.extension_log_exception(exc)
+            return False
 
     async def shutdown_dmypy_daemon_event_async(
         self,
@@ -932,7 +936,7 @@ async def dmypy_goto_definition_event_async(
 
         response_tuple = maybe_response
         assert isinstance(response_tuple, tuple)
-        raw_locations, file, start_line = response_tuple
+        raw_locations, _file, _start_line = response_tuple
 
         # Just read first one
         raw_location = raw_locations.splitlines()[0]

src/idlemypyextension/utils.py

@@ -888,7 +888,7 @@ def remove_selected_extension_comments(self) -> bool:
         Changes are wrapped in an undo block.
         """
         # Get selected region lines
-        head, _tail, chars, lines = self.formatter.get_region()
+        head, _tail, _chars, lines = self.formatter.get_region()
         region_start, _col = get_line_col(head)
 
         edited = False

tests/test_annotate.py

@@ -196,7 +196,7 @@ def test_tokenize(text: str, tokens: list[annotate.Token]) -> None:
 def test_invalid_tokenize() -> None:
     with pytest.raises(
         annotate.ParseError,
-        match="Could not parse '\\$HOME' from 'path.\\$HOME'",
+        match="Could not parse '\\$HOME' from 'path\\.\\$HOME'",
     ):
         annotate.tokenize("path.$HOME")