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

cut .py extension from file completion variants (PY-3595)

Browse Source
This commit is contained in:
Dmitry Jemerov
2011-05-24 17:13:46 +04:00
parent 8ea5beccdf
commit 55f45e5732
5 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/src/com/jetbrains/python/psi/resolve/VariantsProcessor.java
+6 -3
View File
@@ -4,6 +4,7 @@ import com.intellij.codeInsight.lookup.LookupElement;
import com.intellij.codeInsight.lookup.LookupElementBuilder;
import com.intellij.openapi.util.Condition;
import com.intellij.openapi.util.Key;
import com.intellij.openapi.util.io.FileUtil;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiNamedElement;
@@ -110,9 +111,11 @@ public class VariantsProcessor implements PsiScopeProcessor {
// TODO: refactor to look saner; much code duplication
if (element instanceof PsiNamedElement) {
final PsiNamedElement psiNamedElement = (PsiNamedElement)element;
final String name = psiNamedElement.getName();
if (nameIsAcceptable(name)) {
myVariants.put(name, setupItem(LookupElementBuilder.create(psiNamedElement).setIcon(element.getIcon(0))));
final String name = psiNamedElement instanceof PyFile
? FileUtil.getNameWithoutExtension(((PyFile) psiNamedElement).getName())
: psiNamedElement.getName();
if (name != null && nameIsAcceptable(name)) {
myVariants.put(name, setupItem(LookupElementBuilder.create(psiNamedElement, name).setIcon(element.getIcon(0))));
}
}
else if (element instanceof PyReferenceExpression) {
python/testData/completion/py3595/moduleX.after.py
+3 -1
View File
@@ -1 +1,3 @@
from smname.moduleY import moduleZ
import smname
import smname.moduleY
smname.moduleY.moduleZ
python/testData/completion/py3595/moduleX.py
+3 -1
View File
@@ -1 +1,3 @@
from smname.moduleY import mo<caret>
import smname
import smname.moduleY
smname.moduleY.mod<caret>
python/testData/completion/py3595/smname/moduleY.py
+1 -1
View File
@@ -1 +1 @@
from . import moduleZ
from smname import moduleZ
python/testSrc/com/jetbrains/python/PythonCompletionTest.java
+3 -2
View File
@@ -368,9 +368,10 @@ public class PythonCompletionTest extends PyLightFixtureTestCase {
}
public void testFromImportedModuleCompletion() { // PY-3595
myFixture.copyDirectoryToProject("completion/py3595", "py3595");
myFixture.configureByFile("py3595/moduleX.py");
myFixture.copyDirectoryToProject("completion/py3595", "");
myFixture.configureByFile("moduleX.py");
myFixture.completeBasic();
myFixture.getLookupElementStrings();
myFixture.checkResultByFile("completion/py3595/moduleX.after.py");
}