From 2226ace683fd3e9de47c2067e0e45b229a619907 Mon Sep 17 00:00:00 2001 From: Natalia Ukhorskaya Date: Thu, 20 Aug 2015 14:07:23 +0300 Subject: [PATCH] Ddebugger: fix problem with imports in codeFragments when import is inserted during creation (ex. from variables view) (cherry picked from commit a2322621cb48cd1dfa2227c1baeb3983c1580c54) --- .../frontend/src/org/jetbrains/kotlin/psi/JetCodeFragment.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetCodeFragment.kt b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetCodeFragment.kt index 53b2096afc7..648c559e2dd 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetCodeFragment.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetCodeFragment.kt @@ -29,6 +29,7 @@ import com.intellij.openapi.util.Key import com.intellij.psi.impl.PsiModificationTrackerImpl import com.intellij.psi.util.PsiModificationTracker import org.jetbrains.kotlin.types.JetType +import org.jetbrains.kotlin.utils.addToStdlib.check import java.util.LinkedHashSet import java.util.regex.Pattern @@ -138,7 +139,7 @@ public abstract class JetCodeFragment( } if (imports != null && !imports.isEmpty()) { - myImports.addAll(imports.split(IMPORT_SEPARATOR)) + myImports.addAll(imports.split(IMPORT_SEPARATOR).map { it.check { it.startsWith("import ") } ?: "import $it" }) } }