From 72ca3ddb8b59aaae99a98796e3202e6f1ed167f2 Mon Sep 17 00:00:00 2001 From: Mikhail Golubev Date: Wed, 6 Jan 2021 13:51:01 +0300 Subject: [PATCH] PY-36374 Mention the alias when suggesting import variants with aliases GitOrigin-RevId: 24c62c6ec4c9f6038acd641376c27b1047fb2256 --- .../python/codeInsight/imports/ImportCandidateHolder.java | 3 +++ .../jetbrains/python/quickFixes/PyAddImportQuickFixTest.java | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/python/python-psi-impl/src/com/jetbrains/python/codeInsight/imports/ImportCandidateHolder.java b/python/python-psi-impl/src/com/jetbrains/python/codeInsight/imports/ImportCandidateHolder.java index 21aa4029f45b..4cf3972e15ea 100644 --- a/python/python-psi-impl/src/com/jetbrains/python/codeInsight/imports/ImportCandidateHolder.java +++ b/python/python-psi-impl/src/com/jetbrains/python/codeInsight/imports/ImportCandidateHolder.java @@ -155,6 +155,9 @@ public class ImportCandidateHolder implements Comparable sb.append(source.asQualifiedName()); } } + if (myAsName != null) { + sb.append(" as ").append(myAsName); + } return sb.toString(); } diff --git a/python/testSrc/com/jetbrains/python/quickFixes/PyAddImportQuickFixTest.java b/python/testSrc/com/jetbrains/python/quickFixes/PyAddImportQuickFixTest.java index 4aade7706d2e..6cbdfb0f9c73 100644 --- a/python/testSrc/com/jetbrains/python/quickFixes/PyAddImportQuickFixTest.java +++ b/python/testSrc/com/jetbrains/python/quickFixes/PyAddImportQuickFixTest.java @@ -279,7 +279,7 @@ public class PyAddImportQuickFixTest extends PyQuickFixTestCase { }); assertNotNull(importNumpyAsNpVariant); List candidateText = ContainerUtil.map(fix.getCandidates(), c -> c.getPresentableText()); - assertContainsInRelativeOrder(candidateText, "numpy", "pandas.np"); + assertContainsInRelativeOrder(candidateText, "numpy as np", "pandas.np"); return true; }); }