Minor formatting changes, add tests, bump version to 1.0.1

CoolCat467 · CoolCat467 · commit 6eb438c740ea · 2024-02-24T22:16:43.000-06:00
diff --git a/pyproject.toml b/pyproject.toml
@@ -41,7 +41,7 @@ dependencies = [
 version = {attr = "idlemypyextension.__init__.__version__"}
 
 [project.optional-dependencies]
-user = ["idleuserextend~=0.0.0"]
+user = ["idleuserextend~=0.0.1"]
 
 [project.urls]
 "Source" = "https://github.com/CoolCat467/idlemypyextension"
diff --git a/src/idlemypyextension/__init__.py b/src/idlemypyextension/__init__.py
@@ -22,7 +22,7 @@
 __title__ = "idlemypyextension"
 __author__ = "CoolCat467"
 __license__ = "GNU General Public License Version 3"
-__version__ = "1.0.0"
+__version__ = "1.0.1"
 
 
 from idlemypyextension import utils
diff --git a/src/idlemypyextension/extension.py b/src/idlemypyextension/extension.py
@@ -51,6 +51,64 @@ def debug(message: object) -> None:
     print(f"\n[{__title__}] DEBUG: {message}")
 
 
+def parse_comments(
+    mypy_output: str,
+    default_file: str,
+    default_line: int,
+) -> dict[str, list[utils.Comment]]:
+    """Parse mypy output, return mapping of filenames to lists of comments."""
+    error_type = re.compile(r"  \[[a-z\-]+\]\s*$")
+
+    files: dict[str, list[utils.Comment]] = {}
+    for output_line in mypy_output.splitlines():
+        if not output_line.strip():
+            continue
+        filename = default_file
+        line = default_line
+        line_end = default_line
+        col = 0
+        col_end = 0
+        msg_type = "unrecognized"
+
+        if output_line.count(": ") < 2:
+            text = output_line
+        else:
+            where, msg_type, text = output_line.split(": ", 2)
+
+            position = where.split(":")
+
+            filename = position[0]
+            if len(position) > 1:
+                line = int(position[1])
+                line_end = line
+            if len(position) > 2:
+                col = int(position[2])
+                col_end = col
+            if len(position) > 4:
+                line_end = int(position[3])
+                if line_end == line:
+                    col_end = int(position[4])
+                else:
+                    line_end = line
+        comment_type = error_type.search(text)
+        if comment_type is not None:
+            text = text[: comment_type.start()]
+            msg_type = f"{comment_type.group(0)[3:-1]} {msg_type}"
+
+        comment = utils.Comment(
+            file=filename,
+            line=line,
+            contents=f"{msg_type}: {text}",
+            column=col,
+            line_end=line_end,
+            column_end=col_end,
+        )
+
+        files.setdefault(filename, [])
+        files[filename].append(comment)
+    return files
+
+
 # Important weird: If event handler function returns 'break',
 # then it prevents other bindings of same event type from running.
 # If returns None, normal and others are also run.
@@ -211,64 +269,6 @@ def typecomment_only_current_file(self) -> bool:
         """Should only add type comments for currently open file?."""
         return True
 
-    @staticmethod
-    def parse_comments(
-        mypy_output: str,
-        default_file: str,
-        default_line: int,
-    ) -> dict[str, list[utils.Comment]]:
-        """Parse mypy output, return mapping of filenames to lists of comments."""
-        error_type = re.compile(r"  \[[a-z\-]+\]\s*$")
-
-        files: dict[str, list[utils.Comment]] = {}
-        for output_line in mypy_output.splitlines():
-            if not output_line.strip():
-                continue
-            filename = default_file
-            line = default_line
-            line_end = default_line
-            col = 0
-            col_end = 0
-            msg_type = "unrecognized"
-
-            if output_line.count(": ") < 2:
-                text = output_line
-            else:
-                where, msg_type, text = output_line.split(": ", 2)
-
-                position = where.split(":")
-
-                filename = position[0]
-                if len(position) > 1:
-                    line = int(position[1])
-                    line_end = line
-                if len(position) > 2:
-                    col = int(position[2])
-                    col_end = col
-                if len(position) > 4:
-                    line_end = int(position[3])
-                    if line_end == line:
-                        col_end = int(position[4])
-                    else:
-                        line_end = line
-            comment_type = error_type.search(text)
-            if comment_type is not None:
-                text = text[: comment_type.start()]
-                msg_type = f"{comment_type.group(0)[3:-1]} {msg_type}"
-
-            comment = utils.Comment(
-                file=filename,
-                line=line,
-                contents=f"{msg_type}: {text}",
-                column=col,
-                line_end=line_end,
-                column_end=col_end,
-            )
-
-            files.setdefault(filename, [])
-            files[filename].append(comment)
-        return files
-
     def add_type_comments_for_file(
         self,
         target_filename: str,
@@ -308,7 +308,7 @@ def add_mypy_messages(
         """
         assert self.files.filename is not None
 
-        files = self.parse_comments(
+        files = parse_comments(
             mypy_output,
             os.path.abspath(self.files.filename),
             start_line,
@@ -368,7 +368,7 @@ def add_extra_data(
         Tuple of:
         - Number of lines attempted to add
         - List of line numbers added that were not already there
-        otherwise None because no content.
+        otherwise empty because no content.
 
         """
         if not data:
diff --git a/src/idlemypyextension/utils.py b/src/idlemypyextension/utils.py
@@ -131,9 +131,9 @@ def check_installed(
     return False
 
 
-def get_line_selection(line: int) -> tuple[str, str]:
-    """Get selection strings for given line."""
-    return f"{line}.0", f"{line+1}.0"
+def get_line_selection(line: int, length: int = 1) -> tuple[str, str]:
+    """Get selection strings for given line(s)."""
+    return f"{line}.0", f"{line+length}.0"
 
 
 # Stolen from idlelib.searchengine
@@ -421,7 +421,11 @@ def reload(cls) -> None:
                 )
                 setattr(cls, key, value)
 
-    def get_line(self, line: int, text_win: Text | None = None) -> str:
+    def get_line(
+        self,
+        line: int,
+        text_win: Text | None = None,
+    ) -> str:
         """Get the characters from the given line in currently open file."""
         if text_win is None:
             text_win = self.text
diff --git a/tests/test_annotate.py b/tests/test_annotate.py
@@ -203,6 +203,27 @@ def test_invalid_tokenize() -> None:
                 annotate.End(),
             ],
         ),
+        (
+            """def potato(
+    get_line = lambda lno: GLOBAL_LINES[lno]
+):""",
+            [
+                annotate.Definition("def"),
+                annotate.FunctionName("potato"),
+                annotate.EndSeparator("("),
+                annotate.EndSeparator(text="\n"),
+                annotate.EndSeparator(text="    "),
+                annotate.ArgumentName("get_line"),
+                annotate.DefaultDef("="),
+                annotate.ArgumentDefault(text="lambda"),
+                annotate.LambdaBody("lno: GLOBAL_LINES[lno]"),
+                annotate.EndSeparator(text="\n"),
+                annotate.EndSeparator(text=""),
+                annotate.EndSeparator(")"),
+                annotate.EndDefinition(":"),
+                annotate.End(),
+            ],
+        ),
     ],
 )
 def test_tokenize_definition(text: str, tokens: list[annotate.Token]) -> None:
@@ -500,6 +521,17 @@ def get_line(line_no: int) -> str:
             """def potato(
     get_line: Callable[[int, str], str] = lambda lno, default: (default),
     lines: int = 0,
+) -> bool:""",
+            None,
+        ),
+        (
+            """def potato(
+    get_line = lambda lno, default: (default, GLOBAL), lines = 0,
+):""",
+            ["Callable[[int, str], str]", "int"],
+            "bool",
+            """def potato(
+    get_line: Callable[[int, str], str] = lambda lno, default: (default, GLOBAL), lines: int = 0,
 ) -> bool:""",
             None,
         ),
@@ -676,6 +708,17 @@ def test_read_lambda_over_read_detection() -> None:
         assert over_read_error
 
 
+def test_read_lambda_over_read_parens() -> None:
+    text = """ line_no, default: f'{line_no}: {default}'):"""
+
+    with StringIO(text) as file:
+        content, over_read_error = annotate.read_lambda(
+            generate_tokens(file.readline),
+        )
+        assert content == " line_no, default: f'{line_no}: {default}'"
+        assert over_read_error
+
+
 @pytest.mark.parametrize(
     "end",
     [
diff --git a/tests/test_utils.py b/tests/test_utils.py
@@ -30,6 +30,11 @@ def test_get_required_config() -> None:
     )
 
 
+def test_get_line_selection() -> None:
+    assert utils.get_line_selection(3) == ("3.0", "4.0")
+    assert utils.get_line_selection(3, 3) == ("3.0", "6.0")
+
+
 @pytest.mark.parametrize(
     ("line", "expected"),
     [
@@ -44,10 +49,6 @@ def test_get_line_col_success(line: str, expected: tuple[int, int]) -> None:
     assert utils.get_line_col(line) == expected
 
 
-def test_get_line_selection() -> None:
-    assert utils.get_line_selection(3) == ("3.0", "4.0")
-
-
 @pytest.mark.parametrize(
     "line",
     [
@@ -65,6 +66,14 @@ def test_get_line_col_failure(line: str) -> None:
         utils.get_line_col(line)
 
 
+@pytest.mark.parametrize(
+    ("index", "offset", "expect"),
+    [("3.14", 0, "3.0"), ("3.14", 1, "4.0"), ("2981.23", -1, "2980.0")],
+)
+def test_get_whole_line(index: str, offset: int, expect: str) -> None:
+    assert utils.get_whole_line(index, offset) == expect
+
+
 @pytest.mark.parametrize(
     ("text", "expect"),
     [("  waf", 2), ("cat", 0), ("     fish", 5), ("   ", 3), ("", 0)],
