MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'python-fixes'

Browse Source
This commit is contained in:
Andrey Vlasovskikh
2012-01-31 22:26:56 +04:00
parent 96268118a6 152cead992
commit 8fb3e04e82
10 changed files with 67 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/src/com/jetbrains/python/psi/impl/PyKeywordArgumentReference.java
+5 -3
View File
@@ -22,9 +22,11 @@ public class PyKeywordArgumentReference extends PsiReferenceBase.Poly<PyKeywordA
@NotNull
@Override
public ResolveResult[] multiResolve(boolean incompleteCode) {
PyCallExpression call = PsiTreeUtil.getParentOfType(myElement, PyCallExpression.class);
assert call != null;
final PyExpression callee = call.getCallee();
PsiElement call = PsiTreeUtil.getParentOfType(myElement, PyCallExpression.class, PyClass.class);
if (!(call instanceof PyCallExpression)) {
return new ResolveResult[0];
}
final PyExpression callee = ((PyCallExpression)call).getCallee();
if (callee == null) return ResolveResult.EMPTY_ARRAY;
final PsiPolyVariantReference calleeReference = (PsiPolyVariantReference) callee.getReference();
if (calleeReference == null) return ResolveResult.EMPTY_ARRAY;
python/src/com/jetbrains/python/psi/types/PyModuleType.java
+44 -16
View File
@@ -4,8 +4,6 @@ import com.google.common.collect.ImmutableSet;
import com.intellij.codeInsight.lookup.LookupElement;
import com.intellij.codeInsight.lookup.LookupElementBuilder;
import com.intellij.openapi.extensions.Extensions;
import com.intellij.openapi.module.ModuleUtil;
import com.intellij.openapi.projectRoots.Sdk;
import com.intellij.openapi.util.Condition;
import com.intellij.openapi.util.SystemInfo;
import com.intellij.openapi.util.io.FileUtil;
@@ -15,12 +13,9 @@ import com.intellij.util.ProcessingContext;
import com.jetbrains.python.PyNames;
import com.jetbrains.python.codeInsight.PyDynamicMember;
import com.jetbrains.python.psi.*;
import com.jetbrains.python.psi.impl.PyBuiltinCache;
import com.jetbrains.python.psi.impl.PyQualifiedName;
import com.jetbrains.python.psi.impl.ResolveResultList;
import com.jetbrains.python.psi.resolve.CompletionVariantsProcessor;
import com.jetbrains.python.psi.resolve.PyResolveContext;
import com.jetbrains.python.psi.resolve.RatedResolveResult;
import com.jetbrains.python.psi.resolve.ResolveImportUtil;
import com.jetbrains.python.psi.resolve.*;
import com.jetbrains.python.sdk.PythonSdkType;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -38,7 +33,7 @@ public class PyModuleType implements PyType { // Modules don't descend from obje
protected static ImmutableSet<String> ourPossibleFields = ImmutableSet.of("__name__", "__file__", "__path__", "__doc__", "__dict__");
public PyModuleType(PyFile source) {
public PyModuleType(@NotNull PyFile source) {
myModule = source;
}
@@ -48,22 +43,55 @@ public class PyModuleType implements PyType { // Modules don't descend from obje
@Nullable
public List<? extends RatedResolveResult> resolveMember(final String name,
PyExpression location,
@Nullable PyExpression location,
AccessDirection direction,
PyResolveContext resolveContext) {
for(PyModuleMembersProvider provider: Extensions.getExtensions(PyModuleMembersProvider.EP_NAME)) {
for (PyModuleMembersProvider provider : Extensions.getExtensions(PyModuleMembersProvider.EP_NAME)) {
final PsiElement element = provider.resolveMember(myModule, name);
if (element != null) {
return ResolveResultList.to(element);
}
}
Sdk sdk = ModuleUtil.findModuleForPsiElement(myModule) != null ? null : PyBuiltinCache.findSdkForNonModuleFile(myModule);
final PsiElement result = ResolveImportUtil.resolveChild(myModule, name, myModule, null, sdk, false, true);
if (result != null) return ResolveResultList.to(result);
final PsiElement attribute = myModule.getElementNamed(name);
if (attribute != null) {
return ResolveResultList.to(attribute);
}
if (location != null && isPackage(myModule)) {
final PsiFile file = location.getContainingFile();
if (file instanceof PyFile) {
final PyQualifiedName packageQName = ResolveImportUtil.findCanonicalImportPath(myModule, location);
if (packageQName != null) {
final List<PyImportElement> imports = ((PyFile)file).getImportTargets();
for (PyImportElement importElement : imports) {
final PyStatement stmt = importElement.getContainingImportStatement();
PyQualifiedName importedQName = null;
if (stmt instanceof PyFromImportStatement) {
importedQName = ((PyFromImportStatement)stmt).getImportSourceQName();
}
else if (stmt instanceof PyImportStatement) {
importedQName = importElement.getImportedQName();
}
final PyQualifiedName submoduleQName = packageQName.append(name);
if (importedQName != null && importedQName.matchesPrefix(submoduleQName)) {
final PsiElement submodule = ResolveImportUtil.resolveChild(myModule, name, myModule, null, null, false, true);
if (submodule != null) {
final ResolveResultList results = new ResolveResultList();
results.poke(submodule, RatedResolveResult.RATE_NORMAL);
results.add(new ImportedResolveResult(submodule, RatedResolveResult.RATE_LOW,
Collections.<PsiElement>singletonList(importElement)));
return results;
}
}
}
}
}
}
return Collections.emptyList();
}
private static boolean isPackage(@NotNull PyFile file) {
return PyUtil.turnInitIntoDir(file) != null;
}
/**
* @param directory the module directory
@@ -98,7 +126,7 @@ public class PyModuleType implements PyType { // Modules don't descend from obje
return "pyd".equalsIgnoreCase(ext);
}
else {
return "so".equals(ext);
return "so".equals(ext);
}
}
@@ -118,7 +146,7 @@ public class PyModuleType implements PyType { // Modules don't descend from obje
final CompletionVariantsProcessor processor = new CompletionVariantsProcessor(location, new Condition<PsiElement>() {
@Override
public boolean value(PsiElement psiElement) {
return !(psiElement instanceof PyImportElement) ||
return !(psiElement instanceof PyImportElement) ||
PsiTreeUtil.getParentOfType(psiElement, PyImportStatementBase.class) instanceof PyFromImportStatement;
}
}, new PyUtil.UnderscoreFilter(0));
python/testData/__init__.py
+1
View File
@@ -0,0 +1 @@
__author__ = 'user'
python/testData/inspections/__init__.py
+1
View File
@@ -0,0 +1 @@
__author__ = 'user'
python/testData/inspections/unusedImport/__init__.py
+1
View File
@@ -0,0 +1 @@
__author__ = 'user'
python/testData/inspections/unusedImport/unusedPackageAndSubmodule/p1/__init__.py
View File
python/testData/inspections/unusedImport/unusedPackageAndSubmodule/p1/m1.py
+1
View File
@@ -0,0 +1 @@
a1 = 42
python/testData/inspections/unusedImport/unusedPackageAndSubmodule/test1.py
+4
View File
@@ -0,0 +1,4 @@
import p1
import p1.m1
print(p1.m1.a1)
python/testSrc/com/jetbrains/python/PyMultiFileResolveTest.java
+2 -1
View File
@@ -213,7 +213,8 @@ public class PyMultiFileResolveTest extends PyResolveTestCase {
assertResolvesTo(PyFunction.class, "do_stuff", "/src/mypackage1.py");
}
public void testImportPackageIntoSelf() {
// TODO: Create package attributes for its imported submodules
public void _testImportPackageIntoSelf() {
assertResolvesTo(PyFunction.class, "foo", "/src/mygame/display.py");
}
python/testSrc/com/jetbrains/python/inspections/PyUnusedImportTest.java
+8 -1
View File
@@ -6,7 +6,7 @@ import com.jetbrains.python.fixtures.PyTestCase;
* @author yole
*/
public class PyUnusedImportTest extends PyTestCase {
public void _testModuleAndSubmodule() { // PY-3626
public void testModuleAndSubmodule() { // PY-3626
myFixture.copyDirectoryToProject("inspections/unusedImport/moduleAndSubmodule", "");
myFixture.enableInspections(PyUnresolvedReferencesInspection.class);
myFixture.testHighlighting(true, false, false, "py3626.py");
@@ -17,4 +17,11 @@ public class PyUnusedImportTest extends PyTestCase {
myFixture.enableInspections(PyUnresolvedReferencesInspection.class);
myFixture.testHighlighting(true, false, false, "package1/__init__.py");
}
// PY-5589
public void testUnusedPackageAndSubmodule() {
myFixture.copyDirectoryToProject("inspections/unusedImport/unusedPackageAndSubmodule", "");
myFixture.enableInspections(PyUnresolvedReferencesInspection.class);
myFixture.testHighlighting(true, false, false, "test1.py");
}
}