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-14365 Do not show object and __Classobj in AutoImportQuickFix

Browse Source 
Excluded them from the list of base classes that may be shown in
description and list items in the quick fix UI.
This commit is contained in:
Mikhail Golubev
2014-11-18 01:02:36 +03:00
parent dede69b0ee
commit 0a411c1960
4 changed files with 25 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/src/com/jetbrains/python/codeInsight/imports/ImportCandidateHolder.java
+12 -8
View File
@@ -25,10 +25,14 @@ import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiFile;
import com.intellij.psi.PsiFileSystemItem;
import com.intellij.psi.util.QualifiedName;
import com.intellij.util.Function;
import com.intellij.util.containers.ContainerUtil;
import com.jetbrains.python.psi.*;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.util.List;
/**
* An immutable holder of information for one auto-import candidate.
* <p/>
@@ -131,15 +135,15 @@ class ImportCandidateHolder implements Comparable<ImportCandidateHolder> {
sb.append(((PyFunction)myImportable).getParameterList().getPresentableText(false));
}
else if (myImportable instanceof PyClass) {
final PyClass[] supers = ((PyClass)myImportable).getSuperClasses();
if (supers.length > 0) {
final List<String> supers = ContainerUtil.mapNotNull(((PyClass)myImportable).getSuperClasses(), new Function<PyClass, String>() {
@Override
public String fun(PyClass cls) {
return PyUtil.isObjectClass(cls) ? null : cls.getName();
}
});
if (!supers.isEmpty()) {
sb.append("(");
// ", ".join(x.getName() for x in getSuperClasses())
final String[] superNames = new String[supers.length];
for (int i = 0; i < supers.length; i += 1) {
superNames[i] = supers[i].getName();
}
sb.append(StringUtil.join(superNames, ", "));
StringUtil.join(supers, ", ", sb);
sb.append(")");
}
}
python/testData/inspections/objectBaseIsNotShownInAutoImportQuickfix/main.py
+1
View File
@@ -0,0 +1 @@
<error descr="Unresolved reference 'MyOldStyleClass'">MyOldStyleCl<caret>ass</error>
python/testData/inspections/objectBaseIsNotShownInAutoImportQuickfix/module.py
+2
View File
@@ -0,0 +1,2 @@
class MyOldStyleClass:
pass
python/testSrc/com/jetbrains/python/PyQuickFixTest.java
+10
View File
@@ -50,6 +50,16 @@ public class PyQuickFixTest extends PyTestCase {
PyUnresolvedReferencesInspection.class, "Import 'importFromModule.foo.baz'", true, true);
}
// PY-14365
public void testObjectBaseIsNotShownInAutoImportQuickfix() {
myFixture.copyDirectoryToProject("objectBaseIsNotShownInAutoImportQuickfix", "");
myFixture.configureByFile("main.py");
myFixture.enableInspections(PyUnresolvedReferencesInspection.class);
final IntentionAction intention = myFixture.findSingleIntention("Import");
assertNotNull(intention);
assertEquals("Import 'module.MyOldStyleClass'", intention.getText());
}
public void testImportFromModuleStar() { // PY-6302
myFixture.enableInspections(PyUnresolvedReferencesInspection.class);
myFixture.copyDirectoryToProject("importFromModuleStar", "");