more cov

Author: rmorshea

src/idom/_console/update_html_usages.py

@@ -63,14 +63,14 @@ def generate_rewrite(file: Path, source: str) -> None:
 
     changed: list[Sequence[ast.AST]] = []
     for parents, node in walk_with_parent(tree):
-        if isinstance(node, ast.Call):
+        if isinstance(node, ast.Call) and node.args:
             func = node.func
             if isinstance(func, ast.Attribute):
                 name = func.attr
             elif isinstance(func, ast.Name):
                 name = func.id
             else:
-                name = ""
+                continue
             if hasattr(html, name) or name == "vdom":
                 if name == "vdom":
                     maybe_attr_dict_node = node.args[1]
@@ -112,7 +112,7 @@ def generate_rewrite(file: Path, source: str) -> None:
             ):
                 nodes_to_unparse.append(current_node)
                 break
-        else:
+        else:  # pragma: no cover
             raise RuntimeError("Failed to change code")
 
     # check if an nodes to rewrite contain eachother, pick outermost nodes
@@ -134,12 +134,11 @@ def generate_rewrite(file: Path, source: str) -> None:
         # there may be some content just before and after the content we're re-writing
         before_replacement = lines[node.lineno - 1][: node.col_offset].lstrip()
 
-        if node.end_lineno is not None and node.end_col_offset is not None:
-            after_replacement = lines[node.end_lineno - 1][
-                node.end_col_offset :
-            ].strip()
-        else:
-            after_replacement = ""
+        after_replacement = (
+            lines[node.end_lineno - 1][node.end_col_offset :].strip()
+            if node.end_lineno is not None and node.end_col_offset is not None
+            else ""
+        )
 
         replacement = indent(
             before_replacement
@@ -148,10 +147,7 @@ def generate_rewrite(file: Path, source: str) -> None:
             " " * (node.col_offset - len(before_replacement)),
         )
 
-        if node.end_lineno:
-            lines[node.lineno - 1 : node.end_lineno] = [replacement]
-        else:
-            lines[node.lineno - 1] = replacement
+        lines[node.lineno - 1 : node.end_lineno or node.lineno] = [replacement]
 
         if comments:
             moved_comment_lines_from_end.append(len(lines) - node.lineno)

tests/test__console/test_update_html_usages.py

@@ -38,8 +38,8 @@ def test_update_html_usages(tmp_path):
             "html.div(**{variable: 'test', **other, 'key': value})",
         ),
         (
-            'html.div(dict(other, className="test"))',
-            "html.div(**other, class_name='test')",
+            'html.div(dict(other, className="test", **another))',
+            "html.div(**other, class_name='test', **another)",
         ),
         (
             'html.div({"className": "outer"}, html.div({"className": "inner"}))',
@@ -76,6 +76,23 @@ def test_update_html_usages(tmp_path):
             'html.div({"tagName": "test"})',
             None,
         ),
+        (
+            'html.div(dict(tagName="test"))',
+            None,
+        ),
+        (
+            'html.not_an_html_tag({"className": "test"})',
+            None,
+        ),
+        (
+            'html.div(class_name="test")',
+            None,
+        ),
+        (
+            # we don't try to interpret the logic here
+            '(div or button)({"className": "test"})',
+            None,
+        ),
         # avoid unnecessary changes
         (
             """
@@ -192,6 +209,9 @@ def func():
             """,
         ),
     ],
+    ids=lambda item: " ".join(map(str.strip, item.split()))
+    if isinstance(item, str)
+    else item,
 )
 def test_generate_rewrite(source, expected):
     actual = generate_rewrite(Path("test.py"), dedent(source).strip())