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

Keyword extraction is now working better

Browse Source
This commit is contained in:
Dave Halter
2020-02-19 09:25:59 +01:00
parent 61619c4db1
commit bfa15c61f1
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
jedi/api/refactoring.py
View File

@@ -14,7 +14,7 @@ _INLINE_NEEDS_BRACKET = (
).split() ).split()
_EXTRACT_USE_PARENT = _INLINE_NEEDS_BRACKET + ['trailer'] _EXTRACT_USE_PARENT = _INLINE_NEEDS_BRACKET + ['trailer']
_DEFINITION_SCOPES = ('suite', 'file_input') _DEFINITION_SCOPES = ('suite', 'file_input')
_NON_EXCTRACABLE = ('param', 'keyword') _NON_EXCTRACABLE = ('param',)
class ChangedFile(object): class ChangedFile(object):
@@ -242,7 +242,8 @@ def extract_variable(grammar, path, module_node, new_name, pos, until_pos):
raise RefactoringError('Cannot extract anything from that') raise RefactoringError('Cannot extract anything from that')
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 definition of a name')
if any(node.type in _NON_EXCTRACABLE for node in nodes): if any(node.type in _NON_EXCTRACABLE for node in nodes) \
or nodes[0].type == 'keyword' and nodes[0].value not in ('None', 'True', 'False'):
raise RefactoringError('Cannot extract a %s' % node.type) raise RefactoringError('Cannot extract a %s' % node.type)
definition = _get_parent_definition(node) definition = _get_parent_definition(node)

9
test/refactor/extract_variable.py
View File

@@ -103,3 +103,12 @@ Cannot extract a keyword
continue continue
# ++++++++++++++++++++++++++++++++++++++++++++++++++ # ++++++++++++++++++++++++++++++++++++++++++++++++++
Cannot extract a keyword Cannot extract a keyword
# -------------------------------------------------- keyword-None
if 1:
#? 4 text {'new_name': 'x'}
None
# ++++++++++++++++++++++++++++++++++++++++++++++++++
if 1:
#? 4 text {'new_name': 'x'}
x = None
x