Skip to content

Commit 025ddef

Browse files
DonJayamanneDonJayamanne
committed
updated jedi to 0.9.0
1 parent 5bf923b commit 025ddef

54 files changed

Lines changed: 19 additions & 93 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎pythonFiles/jedi/__init__.py‎

100644100755
File mode changed.

‎pythonFiles/jedi/__main__.py‎

100644100755
File mode changed.

‎pythonFiles/jedi/_compatibility.py‎

100644100755
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ def find_module_py33(string, path=None):
2525
except ValueError as e:
2626
# See #491. Importlib might raise a ValueError, to avoid this, we
2727
# just raise an ImportError to fix the issue.
28-
raise ImportError("Originally " + repr(e))
28+
raise ImportError("Originally ValueError: " + e.message)
2929

3030
if loader is None:
3131
raise ImportError("Couldn't find a loader for {0}".format(string))

‎pythonFiles/jedi/api/__init__.py‎

100644100755
Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,8 @@ class Script(object):
6262
:type source: str
6363
:param line: The line to perform actions on (starting with 1).
6464
:type line: int
65-
:param column: The column of the cursor (starting with 0).
66-
:type column: int
65+
:param col: The column of the cursor (starting with 0).
66+
:type col: int
6767
:param path: The path of the file in the file system, or ``''`` if
6868
it hasn't been saved yet.
6969
:type path: str or None
@@ -157,7 +157,7 @@ def get_completions(user_stmt, bs):
157157
if unfinished_dotted:
158158
return completion_names
159159
else:
160-
return set([keywords.keyword('import').name])
160+
return keywords.keyword_names('import')
161161

162162
if isinstance(user_stmt, tree.Import):
163163
module = self._parser.module()
@@ -168,11 +168,7 @@ def get_completions(user_stmt, bs):
168168
if names is None and not isinstance(user_stmt, tree.Import):
169169
if not path and not dot:
170170
# add keywords
171-
completion_names += keywords.completion_names(
172-
self._evaluator,
173-
user_stmt,
174-
self._pos,
175-
module)
171+
completion_names += keywords.keyword_names(all=True)
176172
# TODO delete? We should search for valid parser
177173
# transformations.
178174
completion_names += self._simple_complete(path, dot, like)

‎pythonFiles/jedi/api/classes.py‎

100644100755
File mode changed.

‎pythonFiles/jedi/api/helpers.py‎

100644100755
File mode changed.

‎pythonFiles/jedi/api/interpreter.py‎

100644100755
File mode changed.

‎pythonFiles/jedi/api/keywords.py‎

100644100755
Lines changed: 9 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
from jedi import common
66
from jedi.evaluate import compiled
77
from jedi.evaluate.helpers import FakeName
8-
from jedi.parser.tree import Leaf
8+
99
try:
1010
from pydoc_data import topics as pydoc_topics
1111
except ImportError:
@@ -18,49 +18,22 @@
1818
keys = keyword.kwlist + ['None', 'False', 'True']
1919

2020

21-
def has_inappropriate_leaf_keyword(pos, module):
22-
relevant_errors = filter(
23-
lambda error: error.first_pos[0] == pos[0],
24-
module.error_statement_stacks)
25-
26-
for error in relevant_errors:
27-
if error.next_token in keys:
28-
return True
29-
30-
return False
31-
32-
def completion_names(evaluator, stmt, pos, module):
33-
keyword_list = all_keywords()
34-
35-
if not isinstance(stmt, Leaf) or has_inappropriate_leaf_keyword(pos, module):
36-
keyword_list = filter(
37-
lambda keyword: not keyword.only_valid_as_leaf,
38-
keyword_list
39-
)
40-
return [keyword.name for keyword in keyword_list]
41-
42-
43-
def all_keywords(pos=(0,0)):
44-
return set([Keyword(k, pos) for k in keys])
21+
def keywords(string='', pos=(0, 0), all=False):
22+
if all:
23+
return set([Keyword(k, pos) for k in keys])
24+
if string in keys:
25+
return set([Keyword(string, pos)])
26+
return set()
4527

4628

47-
def keyword(string, pos=(0,0)):
48-
if string in keys:
49-
return Keyword(string, pos)
50-
else:
51-
return None
29+
def keyword_names(*args, **kwargs):
30+
return [k.name for k in keywords(*args, **kwargs)]
5231

5332

5433
def get_operator(string, pos):
5534
return Keyword(string, pos)
5635

5736

58-
keywords_only_valid_as_leaf = (
59-
'continue',
60-
'break',
61-
)
62-
63-
6437
class Keyword(object):
6538
def __init__(self, name, pos):
6639
self.name = FakeName(name, self, pos)
@@ -70,10 +43,6 @@ def __init__(self, name, pos):
7043
def get_parent_until(self):
7144
return self.parent
7245

73-
@property
74-
def only_valid_as_leaf(self):
75-
return self.name.value in keywords_only_valid_as_leaf
76-
7746
@property
7847
def names(self):
7948
""" For a `parsing.Name` like comparision """

‎pythonFiles/jedi/api/replstartup.py‎

100644100755
File mode changed.

‎pythonFiles/jedi/api/usages.py‎

100644100755
File mode changed.

0 commit comments

Comments
 (0)