diff --git a/bpython/autocomplete.py b/bpython/autocomplete.py
index e0849c6d..a36c7beb 100644
--- a/bpython/autocomplete.py
+++ b/bpython/autocomplete.py
@@ -604,7 +604,12 @@ def matches(
return matches if matches else None
def locate(self, cursor_offset: int, line: str) -> Optional[LinePart]:
- return lineparts.current_word(cursor_offset, line)
+ r = lineparts.current_word(cursor_offset, line)
+ if r and r.word[-1] == "(":
+ # if the word ends with a (, it's the parent word with an empty
+ # param. Return an empty word
+ return lineparts.LinePart(r.stop, r.stop, "")
+ return r
class ExpressionAttributeCompletion(AttrCompletion):
@@ -742,6 +747,16 @@ def get_completer(
double underscore methods like __len__ in method signatures
"""
+ def _cmpl_sort(x: str) -> Tuple[bool, ...]:
+ """
+ Function used to sort the matches.
+ """
+ # put parameters above everything in completion
+ return (
+ x[-1] != "=",
+ x,
+ )
+
for completer in completers:
try:
matches = completer.matches(
@@ -760,7 +775,9 @@ def get_completer(
)
continue
if matches is not None:
- return sorted(matches), (completer if matches else None)
+ return sorted(matches, key=_cmpl_sort), (
+ completer if matches else None
+ )
return [], None
diff --git a/bpython/test/test_autocomplete.py b/bpython/test/test_autocomplete.py
index 0000b0b6..da32fbb8 100644
--- a/bpython/test/test_autocomplete.py
+++ b/bpython/test/test_autocomplete.py
@@ -106,6 +106,15 @@ def test_two_completers_get_both(self):
cumulative = autocomplete.CumulativeCompleter([a, b])
self.assertEqual(cumulative.matches(3, "abc"), {"a", "b"})
+ def test_order_completer(self):
+ a = self.completer(["ax", "ab="])
+ b = self.completer(["aa"])
+ cumulative = autocomplete.CumulativeCompleter([a, b])
+ self.assertEqual(
+ autocomplete.get_completer([cumulative], 1, "a"),
+ (["ab=", "aa", "ax"], cumulative),
+ )
+
class TestFilenameCompletion(unittest.TestCase):
def setUp(self):
@@ -435,3 +444,7 @@ def func(apple, apricot, banana, carrot):
self.assertSetEqual(
com.matches(3, "car", funcprops=funcspec), {"carrot="}
)
+ self.assertSetEqual(
+ com.matches(5, "func(", funcprops=funcspec),
+ {"apple=", "apricot=", "banana=", "carrot="},
+ )
pFad - Phonifier reborn
Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.
Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.
Alternative Proxies:
Alternative Proxy
pFad Proxy
pFad v3 Proxy
pFad v4 Proxy