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

QualifiedNameResolver and ResolveImportUtil is back from resolving PsiFileSystemItems to PsiElements

Browse Source
This commit is contained in:
Dmitry Jemerov
2012-08-13 13:39:12 +02:00
parent 1123c7b0d8
commit 4455bd8ea5
7 changed files with 40 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/psi-api/src/com/jetbrains/python/psi/PyFromImportStatement.java
+2 -3
View File
@@ -1,7 +1,6 @@
package com.jetbrains.python.psi;
import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiFileSystemItem;
import com.intellij.psi.StubBasedPsiElement;
import com.jetbrains.python.psi.impl.PyQualifiedName;
import com.jetbrains.python.psi.stubs.PyFromImportStatementStub;
@@ -63,7 +62,7 @@ public interface PyFromImportStatement extends PyImportStatementBase, StubBasedP
* @return the resolved import source (file or directory containing __init__.py), or null if the import is unresolved.
*/
@Nullable
PsiFileSystemItem resolveImportSource();
PsiElement resolveImportSource();
/**
* Resolves the import source qualified name to a number of possible files or directories. Note: performs a Python only resolve,
@@ -72,5 +71,5 @@ public interface PyFromImportStatement extends PyImportStatementBase, StubBasedP
* @return possible candidates the resolved import source (file or directory containing __init__.py), or an empty list if the import is unresolved.
*/
@NotNull
List<PsiFileSystemItem> resolveImportSourceCandidates();
List<PsiElement> resolveImportSourceCandidates();
}
python/psi-api/src/com/jetbrains/python/psi/resolve/QualifiedNameResolver.java
+2 -3
View File
@@ -4,7 +4,6 @@ import com.intellij.openapi.module.Module;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.projectRoots.Sdk;
import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiFileSystemItem;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -31,10 +30,10 @@ public interface QualifiedNameResolver {
QualifiedNameResolver withPlainDirectories();
@NotNull
List<PsiFileSystemItem> resultsAsList();
List<PsiElement> resultsAsList();
@Nullable
PsiFileSystemItem firstResult();
PsiElement firstResult();
@NotNull
<T extends PsiElement> List<T> resultsOfType(Class<T> clazz);