From a9444c386d647c49ad9503314d9d95e3cf1adfa7 Mon Sep 17 00:00:00 2001 From: Vladimir Dolzhenko Date: Thu, 25 Jun 2020 21:42:23 +0200 Subject: [PATCH] Use actual import list on PlainTextPaste #EA-225256 Fixed --- .../idea/conversion/copy/PlainTextPasteImportResolver.kt | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/idea/src/org/jetbrains/kotlin/idea/conversion/copy/PlainTextPasteImportResolver.kt b/idea/src/org/jetbrains/kotlin/idea/conversion/copy/PlainTextPasteImportResolver.kt index 84dedfdc252..4618bf40b1b 100644 --- a/idea/src/org/jetbrains/kotlin/idea/conversion/copy/PlainTextPasteImportResolver.kt +++ b/idea/src/org/jetbrains/kotlin/idea/conversion/copy/PlainTextPasteImportResolver.kt @@ -68,9 +68,11 @@ class PlainTextPasteImportResolver(private val dataForConversion: DataForConvers } private fun addImport(importStatement: PsiImportStatementBase, shouldAddToTarget: Boolean = false) { - importList.add(importStatement) - if (shouldAddToTarget) - addedImports.add(importStatement) + file.importList?.let { + it.add(importStatement) + if (shouldAddToTarget) + addedImports.add(importStatement) + } } fun addImportsFromTargetFile() {