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

ResolveImportUtil.resolveFromImportStatementSource() -> PyFromImportStatement.resolveImportSource()

Browse Source
This commit is contained in:
Dmitry Jemerov
2011-12-15 17:40:07 +01:00
parent 40cf4c7c34
commit 178130c3c1
7 changed files with 25 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/src/com/jetbrains/python/codeInsight/imports/AddImportHelper.java
+1 -1
View File
@@ -85,7 +85,7 @@ public class AddImportHelper {
if (relativeTo instanceof PyFromImportStatement) {
final PyFromImportStatement fromImportStatement = (PyFromImportStatement)relativeTo;
relativeToName = fromImportStatement.getImportSourceQName();
source = ResolveImportUtil.resolveFromImportStatementSource(fromImportStatement);
source = fromImportStatement.resolveImportSource();
}
else {
final PyImportElement[] importElements = relativeTo.getImportElements();
python/src/com/jetbrains/python/inspections/PyUnresolvedReferencesInspection.java
+1 -1
View File
@@ -650,7 +650,7 @@ public class PyUnresolvedReferencesInspection extends PyInspection {
}
else {
assert importStatement instanceof PyFromImportStatement;
if (ResolveImportUtil.resolveFromImportStatementSource((PyFromImportStatement)importStatement) == null) {
if (((PyFromImportStatement)importStatement).resolveImportSource() == null) {
continue;
}
}
python/src/com/jetbrains/python/psi/PyFromImportStatement.java
+9
View File
@@ -51,4 +51,13 @@ public interface PyFromImportStatement extends PyImportStatementBase, StubBasedP
*/
@Nullable
PsiElement getRightParen();
/**
* Resolves the import source qualified name to a file or directory. Note: performs a Python only resolve,
* doesn't handle extension points such as import from Java classes.
*
* @return the resolved import source, or null if the import is unresolved.
*/
@Nullable
PsiElement resolveImportSource();
}
python/src/com/jetbrains/python/psi/impl/PyFileImpl.java
+2 -2
View File
@@ -252,7 +252,7 @@ public class PyFileImpl extends PsiFileBase implements PyFile, PyExpression {
if (PyUtil.isClassPrivateName(name)) {
return null;
}
PsiElement starImportSource = ResolveImportUtil.resolveFromImportStatementSource(statement);
PsiElement starImportSource = statement.resolveImportSource();
if (starImportSource != null) {
starImportSource = PyUtil.turnDirIntoInit(starImportSource);
if (starImportSource instanceof PyFileImpl) {
@@ -277,7 +277,7 @@ public class PyFileImpl extends PsiFileBase implements PyFile, PyExpression {
if (PyNames.INIT_DOT_PY.equals(getName())) {
final PyQualifiedName qName = statement.getImportSourceQName();
if (qName != null && qName.endsWith(name)) {
final PsiElement element = PyUtil.turnInitIntoDir(ResolveImportUtil.resolveFromImportStatementSource(statement));
final PsiElement element = PyUtil.turnInitIntoDir(statement.resolveImportSource());
if (element != null && element.getParent() == getContainingDirectory()) {
return element;
}
python/src/com/jetbrains/python/psi/impl/PyFromImportStatementImpl.java
+10
View File
@@ -189,4 +189,14 @@ public class PyFromImportStatementImpl extends PyBaseElementImpl<PyFromImportSta
PyPsiUtils.deleteAdjacentComma(this, child, getImportElements());
super.deleteChildInternal(child);
}
@Nullable
public PsiElement resolveImportSource() {
final PyQualifiedName qName = getImportSourceQName();
if (qName == null) {
return null;
}
final List<PsiElement> source = ResolveImportUtil.resolveFromImportStatementSource(this, qName);
return source.isEmpty() ? null : source.get(0);
}
}
python/src/com/jetbrains/python/psi/resolve/ResolveImportUtil.java
+1 -11
View File
@@ -167,18 +167,8 @@ public class ResolveImportUtil {
return results;
}
@Nullable
public static PsiElement resolveFromImportStatementSource(PyFromImportStatement from_import_statement) {
final PyQualifiedName qName = from_import_statement.getImportSourceQName();
if (qName == null) {
return null;
}
final List<PsiElement> source = resolveFromImportStatementSource(from_import_statement, qName);
return source.isEmpty() ? null : source.get(0);
}
@NotNull
private static List<PsiElement> resolveFromImportStatementSource(PyFromImportStatement from_import_statement, PyQualifiedName qName) {
public static List<PsiElement> resolveFromImportStatementSource(PyFromImportStatement from_import_statement, PyQualifiedName qName) {
boolean absolute_import_enabled = isAbsoluteImportEnabledFor(from_import_statement);
PsiFile file = from_import_statement.getContainingFile();
return resolveModule(qName, file, absolute_import_enabled, from_import_statement.getRelativeLevel());
python/src/com/jetbrains/python/psi/resolve/ResolveProcessor.java
+1 -1
View File
@@ -126,7 +126,7 @@ public class ResolveProcessor implements PsiScopeProcessor {
final PyFromImportStatement fromImportStatement = (PyFromImportStatement)element;
final PyQualifiedName qName = fromImportStatement.getImportSourceQName();
if (qName != null && qName.endsWith(myName)) {
final PsiElement source = PyUtil.turnInitIntoDir(ResolveImportUtil.resolveFromImportStatementSource(fromImportStatement));
final PsiElement source = PyUtil.turnInitIntoDir(fromImportStatement.resolveImportSource());
if (source != null && source.getParent() == element.getContainingFile().getContainingDirectory()) {
myResult = source;
addNameDefiner(fromImportStatement);