From 3bf0fb895733917caa52d0b4b0dd4032aa00b933 Mon Sep 17 00:00:00 2001 From: Dmitry Gridin Date: Thu, 14 Mar 2019 12:09:41 +0700 Subject: [PATCH] =?UTF-8?q?Intention=20=E2=80=9CIntroduce=20import=20alias?= =?UTF-8?q?=E2=80=9D=20shouldn't=20modify=20other=20files=20=20#KT-30412?= =?UTF-8?q?=20Fixed?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../introduceImportAlias/KotlinIntroduceImportAliasHandler.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceImportAlias/KotlinIntroduceImportAliasHandler.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceImportAlias/KotlinIntroduceImportAliasHandler.kt index 6f110e2813a..f95efda81e9 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceImportAlias/KotlinIntroduceImportAliasHandler.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceImportAlias/KotlinIntroduceImportAliasHandler.kt @@ -64,8 +64,9 @@ object KotlinIntroduceImportAliasHandler : RefactoringActionHandler { val isExtension = descriptor.isExtension findPsiElements(project, file, descriptor).flatMap { ReferencesSearch.search(it, file.useScope) - .findAll() + .findAll().asSequence().filter { reference -> reference.element.containingFile == file } .map { reference -> UsageContext(reference as KtSimpleNameReference, isExtension = isExtension) } + .toList() } }