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

PY-23487: `resolveImportSourceCandidates` returns package *and* folder for python packages in plugin.

Browse Source 
Issue is similar to PY-23267.
This commit is contained in:
Ilya.Kazakevich
2017-04-19 01:15:54 +03:00
parent 4403202a3e
commit c377fd4542
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/src/com/jetbrains/python/psi/impl/PyFromImportStatementImpl.java
+2 -2
View File
@@ -15,6 +15,7 @@
*/
package com.jetbrains.python.psi.impl;
import com.google.common.collect.FluentIterable;
import com.google.common.collect.ImmutableList;
import com.intellij.lang.ASTNode;
import com.intellij.openapi.util.text.StringUtil;
@@ -24,7 +25,6 @@ import com.intellij.psi.scope.PsiScopeProcessor;
import com.intellij.psi.stubs.IStubElementType;
import com.intellij.psi.util.QualifiedName;
import com.intellij.util.ArrayUtil;
import com.intellij.util.containers.ContainerUtil;
import com.jetbrains.python.PyElementTypes;
import com.jetbrains.python.PyNames;
import com.jetbrains.python.PyTokenTypes;
@@ -229,7 +229,7 @@ public class PyFromImportStatementImpl extends PyBaseElementImpl<PyFromImportSta
@Nullable
public PsiFileSystemItem resolveImportSource() {
return as(ContainerUtil.getFirstItem(resolveImportSourceCandidates()), PsiFileSystemItem.class);
return FluentIterable.from(resolveImportSourceCandidates()).filter(PsiFileSystemItem.class).first().orNull();
}
@NotNull