VimPlug/jedi
1
0
Fork 1
mirror of https://github.com/davidhalter/jedi.git synced 2025-12-17 19:15:55 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use the Python 3.4 parser for docstring types.

Browse Source 
We had to switch, because Ellipsis was otherwise not parseable.
This commit is contained in:
Dave Halter
2015-01-13 13:17:21 +01:00
parent e6b9111749
commit 95b518e9fc
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
jedi/evaluate/docstrings.py
View File

@@ -20,14 +20,14 @@ from itertools import chain
from textwrap import dedent from textwrap import dedent
from jedi.evaluate.cache import memoize_default from jedi.evaluate.cache import memoize_default
from jedi.parser import Parser from jedi.parser import Parser, load_grammar
from jedi.common import indent_block from jedi.common import indent_block
from jedi.evaluate.iterable import Array, FakeSequence, AlreadyEvaluated from jedi.evaluate.iterable import Array, FakeSequence, AlreadyEvaluated
DOCSTRING_PARAM_PATTERNS = [ DOCSTRING_PARAM_PATTERNS = [
r'\s*:type\s+%s:\s*([^\n]+)', # Sphinx r'\s*:type\s+%s:\s*([^\n]+)', # Sphinx
r'\s*:param\s+(\w+)\s+%s:[^\n]+', # Sphinx param with type r'\s*:param\s+(\w+)\s+%s:[^\n]+', # Sphinx param with type
r'\s*@type\s+%s:\s*([^\n]+)', # Epydoc r'\s*@type\s+%s:\s*([^\n]+)', # Epydoc
] ]
@@ -127,7 +127,10 @@ def _evaluate_for_statement_string(evaluator, string, module):
# (e.g., 'threading' in 'threading.Thread'). # (e.g., 'threading' in 'threading.Thread').
string = 'import %s\n' % element + string string = 'import %s\n' % element + string
p = Parser(evaluator.grammar, code % indent_block(string)) # Take the default grammar here, if we load the Python 2.7 grammar here, it
# will be impossible to use `...` (Ellipsis) as a token. Docstring types
# don't need to conform with the current grammar.
p = Parser(load_grammar(), code % indent_block(string))
try: try:
pseudo_cls = p.module.subscopes[0] pseudo_cls = p.module.subscopes[0]
stmt = pseudo_cls.statements[-1] stmt = pseudo_cls.statements[-1]