mirror of
https://gitflic.ru/project/openide/openide.git
synced 2026-09-27 10:03:11 +07:00
PY-36374 Remove unused "alias" parameter from PyImportCollector and its factories
GitOrigin-RevId: c2963e5191402c402d0c389ff4d07eebcd743b21
This commit is contained in:
committed by
intellij-monorepo-bot
parent
93fbb17d04
commit
d4324ef380
+1
-4
@@ -30,16 +30,13 @@ public class PyImportCollector {
|
|||||||
private final PyElement myNode;
|
private final PyElement myNode;
|
||||||
private final PsiReference myReference;
|
private final PsiReference myReference;
|
||||||
private final String myRefText;
|
private final String myRefText;
|
||||||
private final String myAlias;
|
|
||||||
private final AutoImportQuickFix fix;
|
private final AutoImportQuickFix fix;
|
||||||
private final Set<String> seenCandidateNames;
|
private final Set<String> seenCandidateNames;
|
||||||
|
|
||||||
public PyImportCollector(PyElement node, PsiReference reference, String refText, String alias) {
|
public PyImportCollector(PyElement node, PsiReference reference, String refText) {
|
||||||
myNode = node;
|
myNode = node;
|
||||||
myReference = reference;
|
myReference = reference;
|
||||||
myRefText = refText;
|
myRefText = refText;
|
||||||
myAlias = alias;
|
|
||||||
|
|
||||||
|
|
||||||
boolean qualify = !PyCodeInsightSettings.getInstance().PREFER_FROM_IMPORT;
|
boolean qualify = !PyCodeInsightSettings.getInstance().PREFER_FROM_IMPORT;
|
||||||
fix = new AutoImportQuickFix(node, reference.getClass(), refText, qualify);
|
fix = new AutoImportQuickFix(node, reference.getClass(), refText, qualify);
|
||||||
|
|||||||
+1
-1
@@ -10,5 +10,5 @@ public interface PyImportCollectorFactory {
|
|||||||
return ApplicationManager.getApplication().getService(PyImportCollectorFactory.class);
|
return ApplicationManager.getApplication().getService(PyImportCollectorFactory.class);
|
||||||
}
|
}
|
||||||
|
|
||||||
PyImportCollector create(PyElement node, PsiReference reference, String refText, String asName);
|
PyImportCollector create(PyElement node, PsiReference reference, String refText);
|
||||||
}
|
}
|
||||||
|
|||||||
+2
-2
@@ -6,7 +6,7 @@ import com.jetbrains.python.psi.PyElement;
|
|||||||
|
|
||||||
public final class PyImportCollectorFactoryImpl implements PyImportCollectorFactory {
|
public final class PyImportCollectorFactoryImpl implements PyImportCollectorFactory {
|
||||||
@Override
|
@Override
|
||||||
public PyImportCollector create(PyElement node, PsiReference reference, String refText, String alias) {
|
public PyImportCollector create(PyElement node, PsiReference reference, String refText) {
|
||||||
return new PyImportCollector(node, reference, refText, alias);
|
return new PyImportCollector(node, reference, refText);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+3
-3
@@ -35,12 +35,12 @@ public final class PythonImportUtils {
|
|||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
return addCandidates(node, reference, refText, null);
|
return addCandidates(node, reference, refText);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Nullable
|
@Nullable
|
||||||
private static AutoImportQuickFix addCandidates(PyElement node, PsiReference reference, String refText, @Nullable String asName) {
|
private static AutoImportQuickFix addCandidates(PyElement node, PsiReference reference, String refText) {
|
||||||
return PyImportCollectorFactory.getInstance().create(node, reference, refText, asName).addCandidates();
|
return PyImportCollectorFactory.getInstance().create(node, reference, refText).addCandidates();
|
||||||
}
|
}
|
||||||
|
|
||||||
public static boolean isImportable(PsiElement refElement) {
|
public static boolean isImportable(PsiElement refElement) {
|
||||||
|
|||||||
@@ -9,8 +9,8 @@ import com.jetbrains.python.psi.PyElement;
|
|||||||
import com.jetbrains.python.psi.PyFile;
|
import com.jetbrains.python.psi.PyFile;
|
||||||
|
|
||||||
public class CodeStylePyImportCollector extends PyImportCollector {
|
public class CodeStylePyImportCollector extends PyImportCollector {
|
||||||
public CodeStylePyImportCollector(PyElement node, PsiReference reference, String refText, String alias) {
|
public CodeStylePyImportCollector(PyElement node, PsiReference reference, String refText) {
|
||||||
super(node, reference, refText, alias);
|
super(node, reference, refText);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
+2
-2
@@ -6,7 +6,7 @@ import com.jetbrains.python.psi.PyElement;
|
|||||||
|
|
||||||
public class CodeStylePyImportCollectorFactory implements PyImportCollectorFactory {
|
public class CodeStylePyImportCollectorFactory implements PyImportCollectorFactory {
|
||||||
@Override
|
@Override
|
||||||
public PyImportCollector create(PyElement node, PsiReference reference, String refText, String asName) {
|
public PyImportCollector create(PyElement node, PsiReference reference, String refText) {
|
||||||
return new CodeStylePyImportCollector(node, reference, refText, asName);
|
return new CodeStylePyImportCollector(node, reference, refText);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user