make jedi optional dependency

thomasballinger · thomasballinger · commit 6a38aab7ab5e · 2015-01-24T23:37:26.000-05:00
diff --git a/.travis.install.sh b/.travis.install.sh
@@ -9,6 +9,8 @@ if [[ $RUN == nosetests ]]; then
     pip install pygments requests 'curtsies >=0.1.17,<0.2.0' greenlet
     # filewatch specific dependencies
     pip install watchdog
+    # jedi specific dependencies
+    pip install jedi
     # translation specific dependencies
     pip install babel
     # Python 2.6 specific dependencies
diff --git a/bpython/autocomplete.py b/bpython/autocomplete.py
@@ -31,8 +31,6 @@
 
 from glob import glob
 
-import jedi
-
 from bpython import inspection
 from bpython import importcompletion
 from bpython import line as lineparts
@@ -311,42 +309,52 @@ def matches(self, cursor_offset, line, **kwargs):
     def locate(self, current_offset, line):
         return lineparts.current_string_literal_attr(current_offset, line)
 
-class JediCompletion(BaseCompletionType):
-    @classmethod
-    def matches(self, cursor_offset, line, history, **kwargs):
-        if not lineparts.current_word(cursor_offset, line):
-            return None
-        history = '\n'.join(history) + '\n' + line
-        script = jedi.Script(history, len(history.splitlines()), cursor_offset, 'fake.py')
-        completions = script.completions()
-        if completions:
-            self._original = completions[0]
-        else:
-            self._original = None
-
-        matches = [c.name for c in completions]
-        if all(m.startswith('_') for m in matches):
-            return matches
-        elif any(not m.startswith(matches[0][0]) for m in matches):
-            return matches
-        else:
-            return [m for m in matches if not m.startswith('_')]
-
-    def locate(self, cursor_offset, line):
-        start = cursor_offset - (len(self._original.name) - len(self._original.complete))
-        end = cursor_offset
-        return start, end, line[start:end]
-
-
-class MultilineJediCompletion(JediCompletion):
-    @classmethod
-    def matches(cls, 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)
-            return results
-        else:
+try:
+    import jedi
+except ImportError:
+    class MultilineJediCompletion(BaseCompletionType):
+        @classmethod
+        def matches(cls, 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
+            history = '\n'.join(history) + '\n' + line
+            script = jedi.Script(history, len(history.splitlines()), cursor_offset, 'fake.py')
+            completions = script.completions()
+            if completions:
+                self._orig_start = cursor_offset - (len(completions[0].name) - len(completions[0].complete))
+            else:
+                self._orig_start = None
+                return None
+
+            first_letter = line[self._orig_start:self._orig_start+1]
+
+            matches = [c.name for c in completions]
+            if any(not m.lower().startswith(matches[0][0].lower()) for m in matches):
+                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)]
+
+        def locate(self, cursor_offset, line):
+            start = self._orig_start
+            end = cursor_offset
+            return start, end, line[start:end]
+
+
+    class MultilineJediCompletion(JediCompletion):
+        @classmethod
+        def matches(cls, 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)
+                return results
+            else:
+                return None
 
 
 def get_completer(completers, cursor_offset, line, **kwargs):
diff --git a/bpython/test/test_autocomplete.py b/bpython/test/test_autocomplete.py
@@ -6,10 +6,6 @@
 except ImportError:
     import unittest
 
-#TODO: Parts of autocompletion to test:
-# Test that the right matches come back from find_matches (test that priority is correct)
-# Test the various complete methods (import, filename) to see if right matches
-# Test that MatchesIterator.substitute correctly subs given a match and a completer
 
 class TestSafeEval(unittest.TestCase):
     def test_catches_syntax_error(self):
diff --git a/setup.py b/setup.py
@@ -174,7 +174,8 @@ def initialize_options(self):
 
 extras_require = {
     'urwid' : ['urwid'],
-    'watch' : ['watchdog']
+    'watch' : ['watchdog'],
+    'jedi'  : ['jedi'],
 }
 
 packages = [

Original file line number	Diff line number	Diff line change
`@@ -174,7 +174,8 @@ def initialize_options(self):`
`174`	`174`
`175`	`175`	`extras_require = {`
`176`	`176`	`'urwid' : ['urwid'],`
`177`		`- 'watch' : ['watchdog']`
	`177`	`+ 'watch' : ['watchdog'],`
	`178`	`+ 'jedi' : ['jedi'],`
`178`	`179`	`}`
`179`	`180`
`180`	`181`	`packages = [`