VimPlug/jedi
1
0
Fork 1
mirror of https://github.com/davidhalter/jedi.git synced 2025-12-07 14:34:31 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix some error cases for extract

Browse Source
This commit is contained in:
Dave Halter
2020-02-21 02:22:31 +01:00
parent 742c4370b5
commit 3bc66c2f00
2 changed files with 36 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
jedi/api/refactoring.py
View File

@@ -9,12 +9,14 @@ from jedi.api.exceptions import RefactoringError
from jedi.common.utils import indent_block from jedi.common.utils import indent_block
_EXPRESSION_PARTS = ( _EXPRESSION_PARTS = (
'or_test and_test not_test comparison' 'or_test and_test not_test comparison '
'xor_expr and_expr shift_expr arith_expr term factor power atom_expr ' 'expr xor_expr and_expr shift_expr arith_expr term factor power atom_expr'
).split() ).split()
_EXTRACT_USE_PARENT = _EXPRESSION_PARTS + ['trailer'] _EXTRACT_USE_PARENT = _EXPRESSION_PARTS + ['trailer']
_DEFINITION_SCOPES = ('suite', 'file_input') _DEFINITION_SCOPES = ('suite', 'file_input')
_NON_EXCTRACABLE = ('param',) _VARIABLE_EXCTRACTABLE = _EXPRESSION_PARTS + \
('keyword atom name number string testlist_star_expr test_list test '
'lambdef lambdef_nocond').split()
class ChangedFile(object): class ChangedFile(object):
@@ -245,10 +247,11 @@ def extract_variable(grammar, path, module_node, new_name, pos, until_pos):
nodes = _remove_unwanted_expression_nodes(parent_node, pos, until_pos) nodes = _remove_unwanted_expression_nodes(parent_node, pos, until_pos)
if any(node.type == 'name' and node.is_definition() for node in nodes): if any(node.type == 'name' and node.is_definition() for node in nodes):
raise RefactoringError('Cannot extract a definition of a name') raise RefactoringError('Cannot extract a name that defines something')
if any(node.type in _NON_EXCTRACABLE for node in nodes) \ if nodes[0].type not in _VARIABLE_EXCTRACTABLE \
or nodes[0].type == 'keyword' and nodes[0].value not in ('None', 'True', 'False'): or nodes[0].type == 'keyword' and nodes[0].value not in ('None', 'True', 'False'):
raise RefactoringError('Cannot extract a %s' % node.type) print(nodes)
raise RefactoringError('Cannot extract a "%s"' % nodes[0].type)
definition = _get_parent_definition(nodes[0]) definition = _get_parent_definition(nodes[0])
first_definition_leaf = definition.get_first_leaf() first_definition_leaf = definition.get_first_leaf()

31
test/refactor/extract_variable.py
View File

@@ -50,13 +50,13 @@ def test():
def test(p1): def test(p1):
return return
# ++++++++++++++++++++++++++++++++++++++++++++++++++ # ++++++++++++++++++++++++++++++++++++++++++++++++++
Cannot extract a definition of a name Cannot extract a name that defines something
# -------------------------------------------------- for-param-error-2 # -------------------------------------------------- for-param-error-2
#? 12 error {'new_name': 'x'} #? 12 error {'new_name': 'x'}
def test(p1= 3): def test(p1= 3):
return return
# ++++++++++++++++++++++++++++++++++++++++++++++++++ # ++++++++++++++++++++++++++++++++++++++++++++++++++
Cannot extract a param Cannot extract a "param"
# -------------------------------------------------- for-param-1 # -------------------------------------------------- for-param-1
#? 12 text {'new_name': 'x'} #? 12 text {'new_name': 'x'}
def test(p1=20): def test(p1=20):
@@ -97,12 +97,12 @@ class Foo(x):
#? 12 error {'new_name': 'x'} #? 12 error {'new_name': 'x'}
def x(): pass def x(): pass
# ++++++++++++++++++++++++++++++++++++++++++++++++++ # ++++++++++++++++++++++++++++++++++++++++++++++++++
Cannot extract a keyword Cannot extract a "keyword"
# -------------------------------------------------- keyword-continue # -------------------------------------------------- keyword-continue
#? 5 error {'new_name': 'x'} #? 5 error {'new_name': 'x'}
continue continue
# ++++++++++++++++++++++++++++++++++++++++++++++++++ # ++++++++++++++++++++++++++++++++++++++++++++++++++
Cannot extract a keyword Cannot extract a "keyword"
# -------------------------------------------------- keyword-None # -------------------------------------------------- keyword-None
if 1: if 1:
#? 4 text {'new_name': 'x'} #? 4 text {'new_name': 'x'}
@@ -196,3 +196,26 @@ z = (y+1*2+3)
#? 9 text {'new_name': 'x', 'until_column': 13} #? 9 text {'new_name': 'x', 'until_column': 13}
x = (y+1*2+3) x = (y+1*2+3)
z = x z = x
# -------------------------------------------------- extract-weird-1
#? 0 error {'new_name': 'x', 'until_column': 7}
foo = 3
# ++++++++++++++++++++++++++++++++++++++++++++++++++
Cannot extract a "expr_stmt"
# -------------------------------------------------- extract-weird-2
#? 0 error {'new_name': 'x', 'until_column': 5}
def x():
foo = 3
# ++++++++++++++++++++++++++++++++++++++++++++++++++
Cannot extract a "funcdef"
# -------------------------------------------------- extract-weird-3
def x():
#? 4 error {'new_name': 'x', 'until_column': 8}
if 1:
pass
# ++++++++++++++++++++++++++++++++++++++++++++++++++
Cannot extract a "if_stmt"
# -------------------------------------------------- extract-weird-4
#? 4 error {'new_name': 'x', 'until_column': 7}
x = foo = 4
# ++++++++++++++++++++++++++++++++++++++++++++++++++
Cannot extract a name that defines something