azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Ddebugger: fix problem with imports in codeFragments when import is inserted during creation (ex. from variables view)

Browse Source 
(cherry picked from commit a2322621cb48cd1dfa2227c1baeb3983c1580c54)
This commit is contained in:
Natalia Ukhorskaya
2015-08-20 14:07:23 +03:00
parent 641a59dcf2
commit 2226ace683
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/psi/JetCodeFragment.kt
+2 -1
View File
@@ -29,6 +29,7 @@ import com.intellij.openapi.util.Key
import com.intellij.psi.impl.PsiModificationTrackerImpl import com.intellij.psi.impl.PsiModificationTrackerImpl
import com.intellij.psi.util.PsiModificationTracker import com.intellij.psi.util.PsiModificationTracker
import org.jetbrains.kotlin.types.JetType import org.jetbrains.kotlin.types.JetType
import org.jetbrains.kotlin.utils.addToStdlib.check
import java.util.LinkedHashSet import java.util.LinkedHashSet
import java.util.regex.Pattern import java.util.regex.Pattern
@@ -138,7 +139,7 @@ public abstract class JetCodeFragment(
} }
if (imports != null && !imports.isEmpty()) { 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" })
} }
} }