Jul 26, 2023 · Jul 22, 2023 · Jul 22, 2023 · Jul 26, 2023
diff --git a/bpython/autocomplete.py b/bpython/autocomplete.py
        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):
            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(
            )
            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
        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):
        self.assertSetEqual(
            com.matches(3, "car", funcprops=funcspec), {"carrot="}
        )
        self.assertSetEqual(
            com.matches(5, "func(", funcprops=funcspec),
            {"apple=", "apricot=", "banana=", "carrot="},
        )
Original file line number	Diff line number	Diff line change
Expand Up		@@ -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):
Expand DownExpand Up		@@ -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(
Expand All		@@ -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

Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -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):
Expand DownExpand Up		@@ -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="},
		)