MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2025-12-17 15:50:53 +07:00
Code Issues Packages Projects Releases Wiki Activity

Reverted resolving foreign results in front of Python results (PY-23265, PY-23857, PY-23487)

Browse Source 
It was a regression caused by changing the order of imports that
affected most Python plugin users due to Jython specific resolve logic
applied to CPython interpreters.
This commit is contained in:
Andrey Vlasovskikh
2017-04-28 22:54:15 +03:00
parent 3f4d8ebbc1
commit 4f67c11a20
4 changed files with 32 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
python/pluginTestSrc/com/jetbrains/jython/PyToJavaResolveTest.java
View File

@@ -15,12 +15,19 @@
*/
package com.jetbrains.jython;
import com.intellij.openapi.vfs.LocalFileSystem;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.psi.*;
import com.intellij.testFramework.PsiTestUtil;
import com.intellij.testFramework.ResolveTestCase;
import com.intellij.testFramework.TestDataPath;
import com.intellij.util.containers.ContainerUtil;
import com.jetbrains.python.PythonHelpersLocator;
import com.jetbrains.python.psi.PyFile;
import junit.framework.Assert;
import java.util.List;
/**
* @author yole
*/
@@ -85,6 +92,23 @@ public class PyToJavaResolveTest extends ResolveTestCase {
Assert.assertEquals("println", ((PsiMethod) target).getName());
}
// PY-23265, PY-23857
public void testPurePythonSymbolsFirst() throws Exception {
final LocalFileSystem fs = LocalFileSystem.getInstance();
final VirtualFile tmpDir = fs.findFileByIoFile(createTempDirectory());
copyDirContentsTo(fs.findFileByPath(getTestDataPath() + getTestName(true)), tmpDir);
PsiTestUtil.addSourceRoot(getModule(), tmpDir.findChild("src"));
final PsiReference ref = configureByFile(getTestName(true) + "/src/main.py", tmpDir);
final PsiPolyVariantReference multiRef = (PsiPolyVariantReference)ref;
final ResolveResult[] results = multiRef.multiResolve(false);
final List<PsiElement> targets = ContainerUtil.map(results, ResolveResult::getElement);
assertSize(2, targets);
assertInstanceOf(targets.get(0), PyFile.class);
assertInstanceOf(targets.get(1), PsiPackage.class);
}
@Override
protected String getTestDataPath() {
return PythonHelpersLocator.getPythonCommunityPath() + "/testData/resolve/pyToJava/";