bpython
diff --git a/‎bpython/autocomplete.py‎
Lines changed: 4 additions & 7 deletions b/‎bpython/autocomplete.py‎
Lines changed: 4 additions & 7 deletions
diff --git a/‎bpython/test/test_autocomplete.py‎
Lines changed: 41 additions & 1 deletion b/‎bpython/test/test_autocomplete.py‎
Lines changed: 41 additions & 1 deletion
@@ -313,12 +313,10 @@ def locate(self, current_offset, line):
     import jedi
 except ImportError:
     class MultilineJediCompletion(BaseCompletionType):
-        @classmethod
-        def matches(cls, cursor_offset, line, **kwargs):
+        def matches(self, cursor_offset, line, **kwargs):
             return None
 else:
     class JediCompletion(BaseCompletionType):
-        @classmethod
         def matches(self, cursor_offset, line, history, **kwargs):
             if not lineparts.current_word(cursor_offset, line):
                 return None
@@ -338,7 +336,7 @@ def matches(self, cursor_offset, line, history, **kwargs):
                 return None # Too general - giving completions starting with multiple letters
             else:
                 # case-sensitive matches only
-                return [m for m in matches if m.startswith(first_letter)]
+                return set([m for m in matches if m.startswith(first_letter)])
 
         def locate(self, cursor_offset, line):
             start = self._orig_start
@@ -347,11 +345,10 @@ def locate(self, cursor_offset, line):
 
 
     class MultilineJediCompletion(JediCompletion):
-        @classmethod
-        def matches(cls, cursor_offset, line, current_block, history, **kwargs):
+        def matches(self, cursor_offset, line, current_block, history, **kwargs):
             if '\n' in current_block:
                 assert cursor_offset <= len(line), "%r %r" % (cursor_offset, line)
-                results = JediCompletion.matches(cursor_offset, line, history)
+                results = JediCompletion.matches(self, cursor_offset, line, history)
                 return results
             else:
                 return None
 
@@ -1,3 +1,4 @@
+from collections import namedtuple
 from bpython import autocomplete
 
 import mock
@@ -6,6 +7,12 @@
 except ImportError:
     import unittest
 
+try:
+    import jedi
+    has_jedi = True
+except ImportError:
+    has_jedi = False
+
 
 class TestSafeEval(unittest.TestCase):
     def test_catches_syntax_error(self):
@@ -191,4 +198,37 @@ def test_magic_methods_complete_after_double_underscores(self):
         block = "class Something(object)\n    def __"
         self.assertSetEqual(com.matches(10, '    def __', block), set(autocomplete.MAGIC_METHODS))
 
-
+Comp = namedtuple('Completion', ['name', 'complete'])
+
+class TestMultilineJediCompletion(unittest.TestCase):
+
+    @unittest.skipIf(not has_jedi, "jedi not available")
+    def test_returns_none_with_single_line(self):
+        com = autocomplete.MultilineJediCompletion()
+        self.assertEqual(com.matches(2, 'Va', 'Va', []), None)
+
+    @unittest.skipIf(not has_jedi, "jedi not available")
+    def test_returns_non_with_blank_second_line(self):
+        com = autocomplete.MultilineJediCompletion()
+        self.assertEqual(com.matches(0, '', 'class Foo():\n', ['class Foo():']), None)
+
+    def matches_from_completions(self, cursor, line, block, history, completions):
+        with mock.patch('bpython.autocomplete.jedi.Script') as Script:
+            script = Script.return_value
+            script.completions.return_value = completions
+            com = autocomplete.MultilineJediCompletion()
+            return com.matches(cursor, line, block, history)
+
+    @unittest.skipIf(not has_jedi, "jedi not available")
+    def test_completions_starting_with_different_letters(self):
+        matches = self.matches_from_completions(
+            2, ' a', 'class Foo:\n a', ['adsf'],
+            [Comp('Abc', 'bc'), Comp('Cbc', 'bc')])
+        self.assertEqual(matches, None)
+
+    @unittest.skipIf(not has_jedi, "jedi not available")
+    def test_completions_starting_with_different_cases(self):
+        matches = self.matches_from_completions(
+            2, ' a', 'class Foo:\n a', ['adsf'],
+            [Comp('Abc', 'bc'), Comp('ade', 'de')])
+        self.assertSetEqual(matches, set(['ade']))