Refactor

sebastinas · sebastinas · commit f44b8c22eb89 · 2022-09-26T00:46:30.000+02:00
diff --git a/bpython/autocomplete.py b/bpython/autocomplete.py
@@ -598,7 +598,7 @@ def matches(
             if isinstance(name, str) and name.startswith(r.word)
         }
         matches.update(
-            name + "="
+            f"{name}="
             for name in funcprops.argspec.kwonly
             if name.startswith(r.word)
         )
diff --git a/bpython/inspection.py b/bpython/inspection.py
@@ -142,16 +142,16 @@ def parsekeywordpairs(signature: str) -> Dict[str, str]:
                 parendepth += 1
             elif value in ")}]":
                 parendepth -= 1
-            elif value == ":" and parendepth == -1:
-                # End of signature reached
-                break
-            elif value == ":" and parendepth == 0:
-                # Start of type annotation
-                annotation = True
-
-            if (value == "," and parendepth == 0) or (
-                value == ")" and parendepth == -1
-            ):
+            elif value == ":":
+                if parendepth == -1:
+                    # End of signature reached
+                    break
+                elif parendepth == 0:
+                    # Start of type annotation
+                    annotation = True
+
+            if (value, parendepth) in ((",", 0), (")", -1)):
+                # End of current argument
                 stack.append(substack)
                 substack = []
                 # If type annotation didn't end before, it does now.

Original file line number	Diff line number	Diff line change
`@@ -598,7 +598,7 @@ def matches(`
`598`	`598`	`if isinstance(name, str) and name.startswith(r.word)`
`599`	`599`	`}`
`600`	`600`	`matches.update(`
`601`		`- name + "="`
	`601`	`+ f"{name}="`
`602`	`602`	`for name in funcprops.argspec.kwonly`
`603`	`603`	`if name.startswith(r.word)`
`604`	`604`	`)`