From d4324ef380b1ffe5cd19c1983157808237aa0e3a Mon Sep 17 00:00:00 2001 From: Mikhail Golubev Date: Wed, 6 Jan 2021 15:09:47 +0300 Subject: [PATCH] PY-36374 Remove unused "alias" parameter from PyImportCollector and its factories GitOrigin-RevId: c2963e5191402c402d0c389ff4d07eebcd743b21 --- .../python/codeInsight/imports/PyImportCollector.java | 5 +---- .../codeInsight/imports/PyImportCollectorFactory.java | 2 +- .../codeInsight/imports/PyImportCollectorFactoryImpl.java | 4 ++-- .../python/codeInsight/imports/PythonImportUtils.java | 6 +++--- .../codeInsight/imports/CodeStylePyImportCollector.java | 4 ++-- .../imports/CodeStylePyImportCollectorFactory.java | 4 ++-- 6 files changed, 11 insertions(+), 14 deletions(-) diff --git a/python/python-psi-impl/src/com/jetbrains/python/codeInsight/imports/PyImportCollector.java b/python/python-psi-impl/src/com/jetbrains/python/codeInsight/imports/PyImportCollector.java index 3e3c624b93ba..77cff920b44b 100644 --- a/python/python-psi-impl/src/com/jetbrains/python/codeInsight/imports/PyImportCollector.java +++ b/python/python-psi-impl/src/com/jetbrains/python/codeInsight/imports/PyImportCollector.java @@ -30,16 +30,13 @@ public class PyImportCollector { private final PyElement myNode; private final PsiReference myReference; private final String myRefText; - private final String myAlias; private final AutoImportQuickFix fix; private final Set seenCandidateNames; - public PyImportCollector(PyElement node, PsiReference reference, String refText, String alias) { + public PyImportCollector(PyElement node, PsiReference reference, String refText) { myNode = node; myReference = reference; myRefText = refText; - myAlias = alias; - boolean qualify = !PyCodeInsightSettings.getInstance().PREFER_FROM_IMPORT; fix = new AutoImportQuickFix(node, reference.getClass(), refText, qualify); diff --git a/python/python-psi-impl/src/com/jetbrains/python/codeInsight/imports/PyImportCollectorFactory.java b/python/python-psi-impl/src/com/jetbrains/python/codeInsight/imports/PyImportCollectorFactory.java index e6e0bf195b54..118dffa8de7d 100644 --- a/python/python-psi-impl/src/com/jetbrains/python/codeInsight/imports/PyImportCollectorFactory.java +++ b/python/python-psi-impl/src/com/jetbrains/python/codeInsight/imports/PyImportCollectorFactory.java @@ -10,5 +10,5 @@ public interface PyImportCollectorFactory { return ApplicationManager.getApplication().getService(PyImportCollectorFactory.class); } - PyImportCollector create(PyElement node, PsiReference reference, String refText, String asName); + PyImportCollector create(PyElement node, PsiReference reference, String refText); } diff --git a/python/python-psi-impl/src/com/jetbrains/python/codeInsight/imports/PyImportCollectorFactoryImpl.java b/python/python-psi-impl/src/com/jetbrains/python/codeInsight/imports/PyImportCollectorFactoryImpl.java index 84d02e7a6a80..5b7db6e7f851 100644 --- a/python/python-psi-impl/src/com/jetbrains/python/codeInsight/imports/PyImportCollectorFactoryImpl.java +++ b/python/python-psi-impl/src/com/jetbrains/python/codeInsight/imports/PyImportCollectorFactoryImpl.java @@ -6,7 +6,7 @@ import com.jetbrains.python.psi.PyElement; public final class PyImportCollectorFactoryImpl implements PyImportCollectorFactory { @Override - public PyImportCollector create(PyElement node, PsiReference reference, String refText, String alias) { - return new PyImportCollector(node, reference, refText, alias); + public PyImportCollector create(PyElement node, PsiReference reference, String refText) { + return new PyImportCollector(node, reference, refText); } } diff --git a/python/python-psi-impl/src/com/jetbrains/python/codeInsight/imports/PythonImportUtils.java b/python/python-psi-impl/src/com/jetbrains/python/codeInsight/imports/PythonImportUtils.java index 1408c8d6b513..4247d241968c 100644 --- a/python/python-psi-impl/src/com/jetbrains/python/codeInsight/imports/PythonImportUtils.java +++ b/python/python-psi-impl/src/com/jetbrains/python/codeInsight/imports/PythonImportUtils.java @@ -35,12 +35,12 @@ public final class PythonImportUtils { return null; } - return addCandidates(node, reference, refText, null); + return addCandidates(node, reference, refText); } @Nullable - private static AutoImportQuickFix addCandidates(PyElement node, PsiReference reference, String refText, @Nullable String asName) { - return PyImportCollectorFactory.getInstance().create(node, reference, refText, asName).addCandidates(); + private static AutoImportQuickFix addCandidates(PyElement node, PsiReference reference, String refText) { + return PyImportCollectorFactory.getInstance().create(node, reference, refText).addCandidates(); } public static boolean isImportable(PsiElement refElement) { diff --git a/python/src/com/jetbrains/python/codeInsight/imports/CodeStylePyImportCollector.java b/python/src/com/jetbrains/python/codeInsight/imports/CodeStylePyImportCollector.java index ddb73773a278..3e9a22228263 100644 --- a/python/src/com/jetbrains/python/codeInsight/imports/CodeStylePyImportCollector.java +++ b/python/src/com/jetbrains/python/codeInsight/imports/CodeStylePyImportCollector.java @@ -9,8 +9,8 @@ import com.jetbrains.python.psi.PyElement; import com.jetbrains.python.psi.PyFile; public class CodeStylePyImportCollector extends PyImportCollector { - public CodeStylePyImportCollector(PyElement node, PsiReference reference, String refText, String alias) { - super(node, reference, refText, alias); + public CodeStylePyImportCollector(PyElement node, PsiReference reference, String refText) { + super(node, reference, refText); } @Override diff --git a/python/src/com/jetbrains/python/codeInsight/imports/CodeStylePyImportCollectorFactory.java b/python/src/com/jetbrains/python/codeInsight/imports/CodeStylePyImportCollectorFactory.java index 64a645d173f5..fffaa456fbfe 100644 --- a/python/src/com/jetbrains/python/codeInsight/imports/CodeStylePyImportCollectorFactory.java +++ b/python/src/com/jetbrains/python/codeInsight/imports/CodeStylePyImportCollectorFactory.java @@ -6,7 +6,7 @@ import com.jetbrains.python.psi.PyElement; public class CodeStylePyImportCollectorFactory implements PyImportCollectorFactory { @Override - public PyImportCollector create(PyElement node, PsiReference reference, String refText, String asName) { - return new CodeStylePyImportCollector(node, reference, refText, asName); + public PyImportCollector create(PyElement node, PsiReference reference, String refText) { + return new CodeStylePyImportCollector(node, reference, refText); } }