VimPlug/jedi
1
0
Fork 1
mirror of https://github.com/davidhalter/jedi.git synced 2026-01-30 21:35:22 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Don't use a random grammar for extract

Browse Source
This commit is contained in:
Dave Halter
2020-02-27 22:50:30 +01:00
parent 140a45081f
commit 0ef8053919
3 changed files with 15 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
test/refactor.py
View File

@@ -31,9 +31,9 @@ class RefactoringCase(object):
f_name = os.path.basename(self._path)
return f_name.replace('.py', '')
def refactor(self):
def refactor(self, environment):
project = jedi.Project(os.path.join(test_dir, 'refactor'))
script = jedi.Script(self._code, path=self._path, project=project)
script = jedi.Script(self._code, path=self._path, project=project, environment=environment)
refactor_func = getattr(script, self.refactor_type)
return refactor_func(self._line_nr, self._index, **self._kwargs)

8
test/test_integration.py
View File

@@ -56,7 +56,7 @@ def test_static_analysis(static_analysis_case, environment):
static_analysis_case.run(assert_static_analysis, environment)
def test_refactor(refactor_case, skip_pre_python36):
def test_refactor(refactor_case, skip_pre_python36, environment):
"""
Run refactoring test case.
@@ -64,13 +64,13 @@ def test_refactor(refactor_case, skip_pre_python36):
"""
if refactor_case.type == 'error':
with pytest.raises(RefactoringError) as e:
refactor_case.refactor()
refactor_case.refactor(environment)
assert e.value.args[0] == refactor_case.desired_result.strip()
elif refactor_case.type == 'text':
refactoring = refactor_case.refactor()
refactoring = refactor_case.refactor(environment)
assert not refactoring.get_renames()
text = ''.join(f.get_new_code() for f in refactoring.get_changed_files().values())
assert_case_equal(refactor_case, text, refactor_case.desired_result)
else:
diff = refactor_case.refactor().get_diff()
diff = refactor_case.refactor(environment).get_diff()
assert_case_equal(refactor_case, diff, refactor_case.desired_result)