Move out JVM debugger functionality

build.gradle.kts

@@ -596,7 +596,10 @@ tasks {
             ":idea:idea-maven:test",
             ":j2k:test",
             ":nj2k:test",
-            ":idea:eval4j:test"
+            ":idea:jvm-debugger:jvm-debugger-core:test",
+            ":idea:jvm-debugger:jvm-debugger-evaluation:test",
+            ":idea:jvm-debugger:jvm-debugger-sequence:test",
+            ":idea:jvm-debugger:eval4j:test"
         )
     }
 

compiler/backend-common/src/org/jetbrains/kotlin/backend/common/CollectionUtil.kt

@@ -0,0 +1,16 @@
+/*
+ * Copyright 2000-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.backend.common
+
+fun <T> Collection<T>.atMostOne(): T? {
+    return when (this.size) {
+        0 -> null
+        1 -> this.iterator().next()
+        else -> throw IllegalArgumentException("Collection has more than one element.")
+    }
+}
+
+inline fun <T> Iterable<T>.atMostOne(predicate: (T) -> Boolean): T? = this.filter(predicate).atMostOne()

compiler/backend-common/src/org/jetbrains/kotlin/backend/common/SimpleMemberScope.kt

@@ -0,0 +1,36 @@
+/*
+ * Copyright 2000-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.backend.common
+
+import org.jetbrains.kotlin.descriptors.*
+import org.jetbrains.kotlin.incremental.components.LookupLocation
+import org.jetbrains.kotlin.name.Name
+import org.jetbrains.kotlin.resolve.scopes.DescriptorKindFilter
+import org.jetbrains.kotlin.resolve.scopes.MemberScopeImpl
+import org.jetbrains.kotlin.utils.Printer
+
+class SimpleMemberScope(val members: List<DeclarationDescriptor>) : MemberScopeImpl() {
+
+    override fun getContributedClassifier(name: Name, location: LookupLocation): ClassifierDescriptor? =
+        members.filterIsInstance<ClassifierDescriptor>()
+            .atMostOne { it.name == name }
+
+    override fun getContributedVariables(name: Name, location: LookupLocation): Collection<PropertyDescriptor> =
+        members.filterIsInstance<PropertyDescriptor>()
+            .filter { it.name == name }
+
+    override fun getContributedFunctions(name: Name, location: LookupLocation): Collection<SimpleFunctionDescriptor> =
+        members.filterIsInstance<SimpleFunctionDescriptor>()
+            .filter { it.name == name }
+
+    override fun getContributedDescriptors(
+        kindFilter: DescriptorKindFilter,
+        nameFilter: (Name) -> Boolean
+    ): Collection<DeclarationDescriptor> =
+        members.filter { kindFilter.accepts(it) && nameFilter(it.name) }
+
+    override fun printScopeStructure(p: Printer) = TODO("not implemented")
+}

compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/Utils.kt

@@ -29,16 +29,6 @@ fun <E> MutableList<E>.pop() = this.removeAt(size - 1)
 
 fun <E> MutableList<E>.peek(): E? = if (size == 0) null else this[size - 1]
 
-fun <T> Collection<T>.atMostOne(): T? {
-    return when (this.size) {
-        0 -> null
-        1 -> this.iterator().next()
-        else -> throw IllegalArgumentException("Collection has more than one element.")
-    }
-}
-
-inline fun <T> Iterable<T>.atMostOne(predicate: (T) -> Boolean): T? = this.filter(predicate).atMostOne()
-
 fun <T: Any> T.onlyIf(condition: T.()->Boolean, then: (T)->Unit): T {
     if (this.condition()) then(this)
     return this

compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/LowerUtils.kt

@@ -18,10 +18,8 @@ package org.jetbrains.kotlin.backend.common.lower
 
 import org.jetbrains.kotlin.backend.common.BackendContext
 import org.jetbrains.kotlin.backend.common.CommonBackendContext
-import org.jetbrains.kotlin.backend.common.atMostOne
 import org.jetbrains.kotlin.descriptors.*
 import org.jetbrains.kotlin.descriptors.impl.ValueParameterDescriptorImpl
-import org.jetbrains.kotlin.incremental.components.LookupLocation
 import org.jetbrains.kotlin.ir.IrElement
 import org.jetbrains.kotlin.ir.IrStatement
 import org.jetbrains.kotlin.ir.UNDEFINED_OFFSET
@@ -34,16 +32,12 @@ import org.jetbrains.kotlin.ir.symbols.IrSymbol
 import org.jetbrains.kotlin.ir.types.IrSimpleType
 import org.jetbrains.kotlin.ir.types.IrType
 import org.jetbrains.kotlin.ir.types.classifierOrFail
-import org.jetbrains.kotlin.ir.types.isAny
 import org.jetbrains.kotlin.ir.util.defaultType
 import org.jetbrains.kotlin.ir.visitors.IrElementTransformer
 import org.jetbrains.kotlin.ir.visitors.IrElementTransformerVoid
 import org.jetbrains.kotlin.ir.visitors.IrElementVisitorVoid
 import org.jetbrains.kotlin.ir.visitors.acceptChildrenVoid
 import org.jetbrains.kotlin.name.Name
-import org.jetbrains.kotlin.resolve.scopes.DescriptorKindFilter
-import org.jetbrains.kotlin.resolve.scopes.MemberScopeImpl
-import org.jetbrains.kotlin.utils.Printer
 
 class IrLoweringContext(backendContext: BackendContext) : IrGeneratorContextBase(backendContext.irBuiltIns)
 
@@ -166,29 +160,6 @@ open class IrBuildingTransformer(private val context: BackendContext) : IrElemen
     }
 }
 
-class SimpleMemberScope(val members: List<DeclarationDescriptor>) : MemberScopeImpl() {
-
-    override fun getContributedClassifier(name: Name, location: LookupLocation): ClassifierDescriptor? =
-        members.filterIsInstance<ClassifierDescriptor>()
-            .atMostOne { it.name == name }
-
-    override fun getContributedVariables(name: Name, location: LookupLocation): Collection<PropertyDescriptor> =
-        members.filterIsInstance<PropertyDescriptor>()
-            .filter { it.name == name }
-
-    override fun getContributedFunctions(name: Name, location: LookupLocation): Collection<SimpleFunctionDescriptor> =
-        members.filterIsInstance<SimpleFunctionDescriptor>()
-            .filter { it.name == name }
-
-    override fun getContributedDescriptors(
-        kindFilter: DescriptorKindFilter,
-        nameFilter: (Name) -> Boolean
-    ): Collection<DeclarationDescriptor> =
-        members.filter { kindFilter.accepts(it) && nameFilter(it.name) }
-
-    override fun printScopeStructure(p: Printer) = TODO("not implemented")
-}
-
 fun IrConstructor.callsSuper(irBuiltIns: IrBuiltIns): Boolean {
     val constructedClass = parent as IrClass
     val superClass = constructedClass.superTypes

idea/build.gradle.kts

@@ -31,8 +31,12 @@ dependencies {
     compile(projectRuntimeJar(":kotlin-daemon-client"))
     compile(project(":kotlin-compiler-runner")) { isTransitive = false }
     compile(project(":compiler:plugin-api"))
-    compile(project(":idea:eval4j"))
+    compile(project(":idea:jvm-debugger:jvm-debugger-util"))
+    compile(project(":idea:jvm-debugger:jvm-debugger-core"))
+    compile(project(":idea:jvm-debugger:jvm-debugger-evaluation"))
+    compile(project(":idea:jvm-debugger:jvm-debugger-sequence"))
     compile(project(":j2k"))
+    compile(project(":idea:idea-j2k"))
     compile(project(":idea:formatter"))
     compile(project(":idea:fir-view"))
     compile(project(":compiler:fir:fir2ir"))

idea/idea-core/build.gradle.kts

@@ -7,6 +7,7 @@ plugins {
 dependencies {
     compile(kotlinStdlib())
     compileOnly(project(":kotlin-reflect-api"))
+    compile(project(":compiler:psi"))
     compile(project(":core:descriptors"))
     compile(project(":core:descriptors.jvm"))
     compile(project(":compiler:frontend"))

idea/idea-core/src/org/jetbrains/kotlin/idea/core/KotlinFileTypeFactory.java

@@ -14,12 +14,13 @@
  * limitations under the License.
  */
 
-package org.jetbrains.kotlin.idea;
+package org.jetbrains.kotlin.idea.core;
 
 import com.intellij.openapi.fileTypes.FileType;
 import com.intellij.openapi.fileTypes.FileTypeConsumer;
 import com.intellij.openapi.fileTypes.FileTypeFactory;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.kotlin.idea.KotlinFileType;
 
 import java.util.Arrays;
 import java.util.HashSet;

idea/idea-core/src/org/jetbrains/kotlin/idea/core/extension/CompletionInformationProvider.kt

@@ -14,6 +14,10 @@
  * limitations under the License.
  */
 
+/*
+ * The old package name left for compatibility reasons with Android IDE plugin
+ * (it's bundled inside Android Studio).
+ */
 package org.jetbrains.kotlin.idea.completion
 
 import com.intellij.openapi.extensions.ExtensionPointName

idea/idea-core/src/org/jetbrains/kotlin/idea/core/surroundWith/KotlinExpressionSurroundDescriptorBase.java

@@ -0,0 +1,29 @@
+/*
+ * Copyright 2000-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.idea.core.surroundWith;
+
+import com.intellij.lang.surroundWith.SurroundDescriptor;
+import com.intellij.psi.PsiElement;
+import com.intellij.psi.PsiFile;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.kotlin.idea.core.util.CodeInsightUtils;
+import org.jetbrains.kotlin.psi.KtExpression;
+
+public abstract class KotlinExpressionSurroundDescriptorBase implements SurroundDescriptor {
+    @Override
+    @NotNull
+    public PsiElement[] getElementsToSurround(PsiFile file, int startOffset, int endOffset) {
+        KtExpression expression = (KtExpression) CodeInsightUtils.findElement(
+                file, startOffset, endOffset, CodeInsightUtils.ElementKind.EXPRESSION);
+
+        return expression == null ? PsiElement.EMPTY_ARRAY : new PsiElement[] {expression};
+    }
+
+    @Override
+    public boolean isExclusive() {
+        return false;
+    }
+}

idea/idea-core/src/org/jetbrains/kotlin/idea/core/surroundWith/KotlinExpressionSurrounder.java

@@ -1,20 +1,9 @@
 /*
- * Copyright 2010-2017 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Copyright 2000-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
-package org.jetbrains.kotlin.idea.codeInsight.surroundWith.expression;
+package org.jetbrains.kotlin.idea.core.surroundWith;
 
 import com.intellij.lang.surroundWith.Surrounder;
 import com.intellij.openapi.editor.Editor;
@@ -32,7 +21,7 @@ import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode;
 import org.jetbrains.kotlin.types.KotlinType;
 
 import static org.jetbrains.kotlin.builtins.KotlinBuiltIns.isUnit;
-import static org.jetbrains.kotlin.idea.codeInsight.surroundWith.KotlinSurrounderUtils.isUsedAsStatement;
+import static org.jetbrains.kotlin.idea.core.surroundWith.KotlinSurrounderUtils.isUsedAsStatement;
 
 public abstract class KotlinExpressionSurrounder implements Surrounder {
 

idea/idea-core/src/org/jetbrains/kotlin/idea/core/surroundWith/KotlinSurrounderUtils.java

@@ -1,20 +1,9 @@
 /*
- * Copyright 2010-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Copyright 2000-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
-package org.jetbrains.kotlin.idea.codeInsight.surroundWith;
+package org.jetbrains.kotlin.idea.core.surroundWith;
 
 import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.project.Project;
@@ -22,7 +11,7 @@ import com.intellij.psi.PsiElement;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.kotlin.idea.KotlinBundle;
 import org.jetbrains.kotlin.idea.caches.resolve.ResolutionUtils;
-import org.jetbrains.kotlin.idea.codeInsight.CodeInsightUtils;
+import org.jetbrains.kotlin.idea.core.util.CodeInsightUtils;
 import org.jetbrains.kotlin.psi.KtBlockExpression;
 import org.jetbrains.kotlin.psi.KtExpression;
 import org.jetbrains.kotlin.resolve.BindingContext;

idea/idea-core/src/org/jetbrains/kotlin/idea/core/util/AttachmentUtils.kt

@@ -1,33 +1,14 @@
 /*
- * Copyright 2010-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Copyright 2000-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
-package org.jetbrains.kotlin.idea.util.attachment
+package org.jetbrains.kotlin.idea.core.util
 
 import com.intellij.diagnostic.AttachmentFactory
 import com.intellij.openapi.diagnostic.Attachment
 import com.intellij.psi.PsiFile
 
-fun attachmentByPsiFileAsArray(file: PsiFile?): Array<Attachment> {
-    val attachment = attachmentByPsiFile(file)
-    if (attachment == null) {
-        return arrayOf()
-    }
-    return arrayOf(attachment)
-}
-
 fun attachmentByPsiFile(file: PsiFile?): Attachment? {
     if (file == null) return null
 

idea/idea-core/src/org/jetbrains/kotlin/idea/core/util/CodeInsightUtils.java

@@ -1,20 +1,9 @@
 /*
- * Copyright 2010-2016 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Copyright 2000-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
-package org.jetbrains.kotlin.idea.codeInsight;
+package org.jetbrains.kotlin.idea.core.util;
 
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.editor.Document;

idea/idea-core/src/org/jetbrains/kotlin/idea/core/util/PhysicalFileSystemUtils.kt

@@ -0,0 +1,26 @@
+/*
+ * Copyright 2000-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.idea.core.util
+
+import com.intellij.openapi.project.Project
+import com.intellij.openapi.vfs.LocalFileSystem
+import com.intellij.openapi.vfs.VirtualFile
+import com.intellij.psi.PsiDirectory
+import com.intellij.psi.PsiFile
+import com.intellij.psi.PsiManager
+import java.io.File
+
+fun File.toPsiFile(project: Project): PsiFile? = toVirtualFile()?.toPsiFile(project)
+
+fun File.toVirtualFile(): VirtualFile? = LocalFileSystem.getInstance().findFileByIoFile(this)
+
+fun File.toPsiDirectory(project: Project): PsiDirectory? {
+    return toVirtualFile()?.let { vfile -> PsiManager.getInstance(project).findDirectory(vfile) }
+}
+
+fun VirtualFile.toPsiFile(project: Project): PsiFile? = PsiManager.getInstance(project).findFile(this)
+
+fun VirtualFile.toPsiDirectory(project: Project): PsiDirectory? = PsiManager.getInstance(project).findDirectory(this)

idea/idea-core/src/org/jetbrains/kotlin/idea/core/util/ProgressUtil.kt

@@ -1,20 +1,9 @@
 /*
- * Copyright 2010-2016 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Copyright 2000-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
-package org.jetbrains.kotlin.idea
+package org.jetbrains.kotlin.idea.core.util
 
 import com.intellij.openapi.application.ApplicationManager
 import com.intellij.openapi.progress.ProcessCanceledException

idea/idea-core/src/org/jetbrains/kotlin/idea/core/util/PsiLinesUtils.kt

@@ -0,0 +1,55 @@
+/*
+ * Copyright 2000-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.idea.core.util
+
+import com.intellij.openapi.util.TextRange
+import com.intellij.psi.*
+import com.intellij.psi.util.PsiTreeUtil
+import org.jetbrains.kotlin.psi.psiUtil.endOffset
+import org.jetbrains.kotlin.psi.psiUtil.startOffset
+
+fun PsiFile.getLineStartOffset(line: Int): Int? {
+    val doc = viewProvider.document ?: PsiDocumentManager.getInstance(project).getDocument(this)
+    if (doc != null && line >= 0 && line < doc.lineCount) {
+        val startOffset = doc.getLineStartOffset(line)
+        val element = findElementAt(startOffset) ?: return startOffset
+
+        if (element is PsiWhiteSpace || element is PsiComment) {
+            return PsiTreeUtil.skipSiblingsForward(element, PsiWhiteSpace::class.java, PsiComment::class.java)?.startOffset ?: startOffset
+        }
+        return startOffset
+    }
+
+    return null
+}
+
+fun PsiFile.getLineEndOffset(line: Int): Int? {
+    val document = viewProvider.document ?: PsiDocumentManager.getInstance(project).getDocument(this)
+    return document?.getLineEndOffset(line)
+}
+
+fun PsiElement.getLineNumber(start: Boolean = true): Int {
+    val document = containingFile.viewProvider.document ?: PsiDocumentManager.getInstance(project).getDocument(containingFile)
+    return document?.getLineNumber(if (start) this.startOffset else this.endOffset) ?: 0
+}
+
+fun PsiElement.getLineCount(): Int {
+    val doc = containingFile?.let { file -> PsiDocumentManager.getInstance(project).getDocument(file) }
+    if (doc != null) {
+        val spaceRange = textRange ?: TextRange.EMPTY_RANGE
+
+        if (spaceRange.endOffset <= doc.textLength) {
+            val startLine = doc.getLineNumber(spaceRange.startOffset)
+            val endLine = doc.getLineNumber(spaceRange.endOffset)
+
+            return endLine - startLine
+        }
+    }
+
+    return (text ?: "").count { it == '\n' } + 1
+}
+
+fun PsiElement.isMultiLine(): Boolean = getLineCount() > 1

idea/idea-core/src/org/jetbrains/kotlin/idea/core/util/RangeUtils.kt

@@ -0,0 +1,31 @@
+/*
+ * Copyright 2000-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.idea.core.util
+
+import com.intellij.openapi.editor.RangeMarker
+import com.intellij.openapi.util.TextRange
+import com.intellij.psi.PsiElement
+
+val TextRange.start: Int
+    get() = startOffset
+
+val TextRange.end: Int
+    get() = endOffset
+
+val PsiElement.range: TextRange
+    get() = textRange!!
+
+val RangeMarker.range: TextRange?
+    get() = if (isValid) {
+        val start = startOffset
+        val end = endOffset
+        if (start in 0..end) {
+            TextRange(start, end)
+        } else {
+            // Probably a race condition had happened and range marker is invalidated
+            null
+        }
+    } else null

idea/idea-core/src/org/jetbrains/kotlin/idea/core/util/RuntimeLibraryUtils.kt

@@ -0,0 +1,22 @@
+/*
+ * Copyright 2000-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.idea.core.util
+
+import com.intellij.openapi.project.Project
+import com.intellij.psi.JavaPsiFacade
+import com.intellij.psi.PsiClass
+import com.intellij.psi.search.GlobalSearchScope
+import org.jetbrains.kotlin.builtins.KotlinBuiltIns
+import org.jetbrains.kotlin.idea.util.application.runReadAction
+import org.jetbrains.kotlin.idea.util.runWithAlternativeResolveEnabled
+
+fun getKotlinJvmRuntimeMarkerClass(project: Project, scope: GlobalSearchScope): PsiClass? {
+    return runReadAction {
+        project.runWithAlternativeResolveEnabled {
+            JavaPsiFacade.getInstance(project).findClass(KotlinBuiltIns.FQ_NAMES.unit.asString(), scope)
+        }
+    }
+}

idea/idea-core/src/org/jetbrains/kotlin/idea/core/util/UiUtils.kt

@@ -1,9 +1,9 @@
 /*
- * Copyright 2010-2018 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Copyright 2000-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
-package org.jetbrains.kotlin.idea.util
+package org.jetbrains.kotlin.idea.core.util
 
 import com.intellij.ui.DocumentAdapter
 import javax.swing.event.DocumentEvent

idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/gradleModuleBuilderUtils.kt

@@ -17,7 +17,7 @@ import com.intellij.openapi.vfs.LocalFileSystem
 import com.intellij.openapi.vfs.VfsUtil
 import com.intellij.openapi.vfs.VirtualFile
 import com.intellij.psi.codeStyle.CodeStyleManager
-import org.jetbrains.kotlin.idea.refactoring.toPsiFile
+import org.jetbrains.kotlin.idea.core.util.toPsiFile
 import org.jetbrains.kotlin.psi.UserDataProperty
 import org.jetbrains.plugins.gradle.frameworkSupport.GradleFrameworkSupportProvider
 import org.jetbrains.plugins.gradle.service.project.wizard.GradleModuleBuilder

idea/idea-j2k/build.gradle.kts

@@ -0,0 +1,14 @@
+plugins {
+    kotlin("jvm")
+    id("jps-compatible")
+}
+
+dependencies {
+    compile(project(":j2k"))
+    compile(project(":idea:idea-core"))
+}
+
+sourceSets {
+    "main" { projectDefault() }
+    "test" { none() }
+}

idea/idea-j2k/src/org/jetbrains/kotlin/idea/j2k/J2KUtils.kt

@@ -0,0 +1,40 @@
+/*
+ * Copyright 2010-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license
+ * that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.idea.j2k
+
+import com.intellij.lang.java.JavaLanguage
+import com.intellij.psi.PsiElement
+import com.intellij.psi.PsiExpression
+import com.intellij.psi.PsiMember
+import org.jetbrains.kotlin.j2k.ConverterSettings
+import org.jetbrains.kotlin.psi.KtExpression
+import org.jetbrains.kotlin.psi.KtNamedDeclaration
+import org.jetbrains.kotlin.psi.KtPsiFactory
+
+fun PsiElement.j2kText(): String? =
+    convertToKotlin()?.results?.single()?.text //TODO: insert imports
+
+fun PsiElement.convertToKotlin(): org.jetbrains.kotlin.j2k.Result? {
+    if (language != JavaLanguage.INSTANCE) return null
+
+    val j2kConverter =
+        JavaToKotlinConverterFactory.createJavaToKotlinConverter(
+            project,
+            ConverterSettings.defaultSettings,
+            IdeaJavaToKotlinServices
+        )
+    return j2kConverter.elementsToKotlin(listOf(this))
+}
+
+fun PsiExpression.j2k(): KtExpression? {
+    val text = j2kText() ?: return null
+    return KtPsiFactory(project).createExpression(text)
+}
+
+fun PsiMember.j2k(): KtNamedDeclaration? {
+    val text = j2kText() ?: return null
+    return KtPsiFactory(project).createDeclaration(text)
+}

idea/idea-j2k/src/org/jetbrains/kotlin/idea/j2k/J2kPostProcessings.kt

@@ -0,0 +1,26 @@
+/*
+ * Copyright 2000-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.idea.j2k
+
+import com.intellij.openapi.components.ServiceManager
+import org.jetbrains.kotlin.psi.KtElement
+import org.jetbrains.kotlin.resolve.diagnostics.Diagnostics
+
+interface J2kPostProcessing {
+    fun createAction(element: KtElement, diagnostics: Diagnostics): (() -> Unit)?
+    val writeActionNeeded: Boolean
+}
+
+interface J2KPostProcessingRegistrar {
+    val processings: Collection<J2kPostProcessing>
+
+    fun priority(processing: J2kPostProcessing): Int
+
+    companion object {
+        val instance: J2KPostProcessingRegistrar
+            get() = ServiceManager.getService(J2KPostProcessingRegistrar::class.java)
+    }
+}

idea/idea-j2k/src/org/jetbrains/kotlin/idea/j2k/J2kPostProcessor.kt

@@ -27,7 +27,7 @@ import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.withContext
 import org.jetbrains.kotlin.idea.caches.resolve.getResolutionFacade
 import org.jetbrains.kotlin.idea.caches.resolve.resolveImportReference
-import org.jetbrains.kotlin.idea.conversion.copy.range
+import org.jetbrains.kotlin.idea.core.util.range
 import org.jetbrains.kotlin.idea.core.util.EDT
 import org.jetbrains.kotlin.idea.util.ImportInsertHelper
 import org.jetbrains.kotlin.idea.util.application.runReadAction
@@ -119,13 +119,14 @@ class J2kPostProcessor(private val formatCode: Boolean) : PostProcessor {
                     super.visitElement(element)
 
                     if (rangeResult == RangeFilterResult.PROCESS) {
-                        J2KPostProcessingRegistrarImpl.processings.forEach { processing ->
+                        val postProcessingRegistrar = J2KPostProcessingRegistrar.instance
+                        postProcessingRegistrar.processings.forEach { processing ->
                             val action = processing.createAction(element, diagnostics)
                             if (action != null) {
                                 availableActions.add(
                                     ActionData(
                                         element, action,
-                                        J2KPostProcessingRegistrarImpl.priority(processing),
+                                        postProcessingRegistrar.priority(processing),
                                         processing.writeActionNeeded
                                     )
                                 )

idea/idea-jvm/build.gradle.kts

@@ -20,7 +20,6 @@ dependencies {
     compileOnly(intellijPluginDep("copyright"))
     compileOnly(intellijPluginDep("properties"))
     compileOnly(intellijPluginDep("java-i18n"))
-    compileOnly(intellijPluginDep("stream-debugger"))
 }
 
 

idea/idea-jvm/src/org/jetbrains/kotlin/idea/configuration/ConfigureKotlinInProjectUtils.kt

@@ -26,6 +26,7 @@ import com.intellij.psi.search.GlobalSearchScope
 import org.jetbrains.kotlin.builtins.KotlinBuiltIns
 import org.jetbrains.kotlin.idea.KotlinFileType
 import org.jetbrains.kotlin.idea.configuration.ui.notifications.ConfigureKotlinNotification
+import org.jetbrains.kotlin.idea.core.util.getKotlinJvmRuntimeMarkerClass
 import org.jetbrains.kotlin.idea.framework.JSLibraryKind
 import org.jetbrains.kotlin.idea.framework.effectiveKind
 import org.jetbrains.kotlin.idea.quickfix.KotlinAddRequiredModuleFix
@@ -37,7 +38,6 @@ import org.jetbrains.kotlin.idea.util.projectStructure.allModules
 import org.jetbrains.kotlin.idea.util.projectStructure.sdk
 import org.jetbrains.kotlin.idea.util.projectStructure.version
 import org.jetbrains.kotlin.idea.versions.SuppressNotificationState
-import org.jetbrains.kotlin.idea.versions.getKotlinJvmRuntimeMarkerClass
 import org.jetbrains.kotlin.idea.versions.hasKotlinJsKjsmFile
 import org.jetbrains.kotlin.idea.versions.isSnapshot
 import org.jetbrains.kotlin.idea.vfilefinder.IDEVirtualFileFinder

idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/evaluate/compilation/CompiledDataDescriptor.kt

@@ -1,48 +0,0 @@
-/*
- * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package org.jetbrains.kotlin.idea.debugger.evaluate.compilation
-
-import com.intellij.debugger.SourcePosition
-import org.jetbrains.kotlin.idea.debugger.evaluate.classLoading.ClassToLoad
-
-data class CompiledDataDescriptor(
-    val classes: List<ClassToLoad>,
-    val parameters: List<CodeFragmentParameter.Dumb>,
-    val crossingBounds: Set<CodeFragmentParameter.Dumb>,
-    val mainMethodSignature: CodeFragmentCompiler.MethodSignature,
-    val sourcePosition: SourcePosition?
-) {
-    companion object {
-        fun from(result: CodeFragmentCompiler.CompilationResult, sourcePosition: SourcePosition?): CompiledDataDescriptor {
-            val localFunctionSuffixes = result.localFunctionSuffixes
-
-            val dumbParameters = ArrayList<CodeFragmentParameter.Dumb>(result.parameterInfo.parameters.size)
-            for (parameter in result.parameterInfo.parameters) {
-                val dumb = parameter.dumb
-                if (dumb.kind == CodeFragmentParameter.Kind.LOCAL_FUNCTION) {
-                    val suffix = localFunctionSuffixes[dumb]
-                    if (suffix != null) {
-                        dumbParameters += dumb.copy(name = dumb.name + suffix)
-                        continue
-                    }
-                }
-
-                dumbParameters += dumb
-            }
-
-            return CompiledDataDescriptor(
-                result.classes,
-                dumbParameters,
-                result.parameterInfo.crossingBounds,
-                result.mainMethodSignature,
-                sourcePosition
-            )
-        }
-    }
-}
-
-val CompiledDataDescriptor.mainClass: ClassToLoad
-    get() = classes.first { it.isMainClass }

idea/idea-jvm/src/org/jetbrains/kotlin/idea/framework/ui/CopyIntoPanel.java

@@ -24,7 +24,7 @@ import com.intellij.util.EventDispatcher;
 import kotlin.Unit;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.kotlin.idea.util.UiUtilKt;
+import org.jetbrains.kotlin.idea.core.util.UiUtilsKt;
 
 import javax.swing.*;
 import javax.swing.event.DocumentEvent;
@@ -47,7 +47,7 @@ public class CopyIntoPanel {
         copyIntoField.addBrowseFolderListener(
                 "Copy Into...", "Choose folder where files will be copied", project,
                 FileChooserDescriptorFactory.createSingleFolderDescriptor());
-        UiUtilKt.onTextChange(
+        UiUtilsKt.onTextChange(
                 copyIntoField.getTextField(),
                 (DocumentEvent e) -> {
                     updateComponents();

idea/idea-jvm/src/org/jetbrains/kotlin/idea/injection/KotlinLanguageInjector.kt

@@ -47,10 +47,10 @@ import org.jetbrains.kotlin.descriptors.FunctionDescriptor
 import org.jetbrains.kotlin.descriptors.annotations.Annotated
 import org.jetbrains.kotlin.idea.caches.resolve.allowResolveInWriteAction
 import org.jetbrains.kotlin.idea.caches.resolve.analyze
+import org.jetbrains.kotlin.idea.core.util.runInReadActionWithWriteActionPriority
 import org.jetbrains.kotlin.idea.patterns.KotlinFunctionPattern
 import org.jetbrains.kotlin.idea.references.KtReference
 import org.jetbrains.kotlin.idea.references.mainReference
-import org.jetbrains.kotlin.idea.runInReadActionWithWriteActionPriority
 import org.jetbrains.kotlin.idea.search.usagesSearch.descriptor
 import org.jetbrains.kotlin.idea.util.ProjectRootsUtil
 import org.jetbrains.kotlin.lexer.KtTokens

idea/idea-jvm/src/org/jetbrains/kotlin/idea/scratch/KtScratchFile.kt

@@ -24,9 +24,9 @@ import com.intellij.psi.PsiWhiteSpace
 import com.intellij.psi.util.PsiUtil
 import org.jetbrains.kotlin.diagnostics.Severity
 import org.jetbrains.kotlin.idea.caches.resolve.analyzeWithContent
-import org.jetbrains.kotlin.idea.codeInsight.CodeInsightUtils
-import org.jetbrains.kotlin.idea.refactoring.getLineNumber
-import org.jetbrains.kotlin.idea.refactoring.getLineStartOffset
+import org.jetbrains.kotlin.idea.core.util.CodeInsightUtils
+import org.jetbrains.kotlin.idea.core.util.getLineNumber
+import org.jetbrains.kotlin.idea.core.util.getLineStartOffset
 import org.jetbrains.kotlin.psi.KtDeclaration
 import org.jetbrains.kotlin.psi.KtFile
 import org.jetbrains.kotlin.psi.KtImportDirective

idea/idea-maven/test/org/jetbrains/kotlin/idea/maven/AbstractKotlinMavenInspectionTest.kt

@@ -31,9 +31,9 @@ import com.intellij.psi.PsiManager
 import com.intellij.psi.search.FileTypeIndex
 import org.jetbrains.jps.model.java.JavaSourceRootType
 import org.jetbrains.kotlin.config.SourceKotlinRootType
+import org.jetbrains.kotlin.idea.core.util.toPsiDirectory
 import org.jetbrains.kotlin.idea.inspections.runInspection
 import org.jetbrains.kotlin.idea.maven.inspections.KotlinMavenPluginPhaseInspection
-import org.jetbrains.kotlin.idea.refactoring.toPsiDirectory
 import org.jetbrains.kotlin.idea.util.projectStructure.allModules
 import org.jetbrains.kotlin.test.KotlinTestUtils
 import org.jetbrains.kotlin.utils.keysToMap

idea/idea-maven/test/org/jetbrains/kotlin/idea/maven/KotlinMavenImporterTest.kt

@@ -36,6 +36,7 @@ import org.jetbrains.kotlin.config.*
 import org.jetbrains.kotlin.idea.caches.project.productionSourceInfo
 import org.jetbrains.kotlin.idea.caches.project.testSourceInfo
 import org.jetbrains.kotlin.idea.caches.resolve.analyzeAndGetResult
+import org.jetbrains.kotlin.idea.core.util.toPsiFile
 import org.jetbrains.kotlin.idea.facet.KotlinFacet
 import org.jetbrains.kotlin.idea.formatter.KotlinObsoleteCodeStyle
 import org.jetbrains.kotlin.idea.formatter.KotlinStyleGuideCodeStyle
@@ -44,7 +45,6 @@ import org.jetbrains.kotlin.idea.framework.CommonLibraryKind
 import org.jetbrains.kotlin.idea.framework.JSLibraryKind
 import org.jetbrains.kotlin.idea.framework.KotlinSdkType
 import org.jetbrains.kotlin.idea.project.languageVersionSettings
-import org.jetbrains.kotlin.idea.refactoring.toPsiFile
 import org.jetbrains.kotlin.psi.KtFile
 import org.jetbrains.kotlin.test.JUnit3WithIdeaConfigurationRunner
 import org.jetbrains.kotlin.platform.CommonPlatforms

idea/jvm-debugger/jvm-debugger-core/build.gradle.kts

@@ -0,0 +1,24 @@
+plugins {
+    kotlin("jvm")
+    id("jps-compatible")
+}
+
+dependencies {
+    compile(project(":compiler:backend"))
+    compile(project(":compiler:backend-common"))
+    compile(project(":compiler:light-classes"))
+    compile(project(":idea:idea-core"))
+    compile(project(":idea:ide-common"))
+    compile(project(":idea:jvm-debugger:jvm-debugger-util"))
+    compile(files("${System.getProperty("java.home")}/../lib/tools.jar"))
+
+    compileOnly(intellijPluginDep("stream-debugger"))
+
+    testCompile(project(":kotlin-test:kotlin-test-junit"))
+    testCompile(commonDep("junit:junit"))
+}
+
+sourceSets {
+    "main" { projectDefault() }
+    "test" { none() }
+}

idea/jvm-debugger/jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/KotlinCoroutinesAsyncStackTraceProvider.kt

@@ -19,7 +19,6 @@ import com.intellij.xdebugger.frame.XNamedValue
 import com.sun.jdi.*
 import org.jetbrains.kotlin.codegen.coroutines.CONTINUATION_VARIABLE_NAME
 import org.jetbrains.kotlin.idea.debugger.evaluate.ExecutionContext
-import org.jetbrains.kotlin.idea.debugger.evaluate.variables.VariableFinder.Companion.SUSPEND_LAMBDA_CLASSES
 
 class KotlinCoroutinesAsyncStackTraceProvider : KotlinCoroutinesAsyncStackTraceProviderBase {
     private companion object {

idea/jvm-debugger/jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/KotlinFrameExtraVariablesProvider.kt

@@ -33,9 +33,9 @@ import com.intellij.util.text.CharArrayUtil
 import org.jetbrains.kotlin.descriptors.PropertyDescriptor
 import org.jetbrains.kotlin.idea.KotlinFileType
 import org.jetbrains.kotlin.idea.caches.resolve.analyzeWithAllCompilerChecks
-import org.jetbrains.kotlin.idea.codeInsight.CodeInsightUtils
-import org.jetbrains.kotlin.idea.refactoring.getLineEndOffset
-import org.jetbrains.kotlin.idea.refactoring.getLineStartOffset
+import org.jetbrains.kotlin.idea.core.util.CodeInsightUtils
+import org.jetbrains.kotlin.idea.core.util.getLineEndOffset
+import org.jetbrains.kotlin.idea.core.util.getLineStartOffset
 import org.jetbrains.kotlin.idea.util.application.runReadAction
 import org.jetbrains.kotlin.psi.*
 import org.jetbrains.kotlin.resolve.BindingContext

idea/jvm-debugger/jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/KotlinPositionManager.kt

@@ -44,14 +44,13 @@ import com.sun.jdi.ReferenceType
 import com.sun.jdi.request.ClassPrepareRequest
 import org.jetbrains.kotlin.codegen.inline.KOTLIN_STRATA_NAME
 import org.jetbrains.kotlin.fileClasses.JvmFileClassUtil
-import org.jetbrains.kotlin.idea.KotlinFileTypeFactory
-import org.jetbrains.kotlin.idea.codeInsight.CodeInsightUtils
+import org.jetbrains.kotlin.idea.core.KotlinFileTypeFactory
+import org.jetbrains.kotlin.idea.core.util.CodeInsightUtils
+import org.jetbrains.kotlin.idea.core.util.getLineCount
+import org.jetbrains.kotlin.idea.core.util.getLineStartOffset
 import org.jetbrains.kotlin.idea.debugger.breakpoints.getLambdasAtLineIfAny
-import org.jetbrains.kotlin.idea.debugger.evaluate.KotlinCodeFragmentFactory
 import org.jetbrains.kotlin.idea.debugger.evaluate.KotlinDebuggerCaches
 import org.jetbrains.kotlin.idea.decompiler.classFile.KtClsFile
-import org.jetbrains.kotlin.idea.refactoring.getLineCount
-import org.jetbrains.kotlin.idea.refactoring.getLineStartOffset
 import org.jetbrains.kotlin.idea.stubindex.KotlinSourceFilterScope
 import org.jetbrains.kotlin.idea.util.ProjectRootsUtil
 import org.jetbrains.kotlin.idea.util.application.runReadAction
@@ -201,7 +200,7 @@ class KotlinPositionManager(private val myDebugProcess: DebugProcess) : MultiReq
     private fun getElementForDeclarationLine(location: Location, file: KtFile, lineNumber: Int): KtElement? {
         val lineStartOffset = file.getLineStartOffset(lineNumber) ?: return null
         val elementAt = file.findElementAt(lineStartOffset)
-        val contextElement = KotlinCodeFragmentFactory.getContextElement(elementAt)
+        val contextElement = getContextElement(elementAt)
 
         if (contextElement !is KtClass) return null
 

idea/jvm-debugger/jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/KotlinSourcePositionProvider.kt

@@ -25,19 +25,14 @@ import com.intellij.debugger.ui.tree.FieldDescriptor
 import com.intellij.debugger.ui.tree.LocalVariableDescriptor
 import com.intellij.debugger.ui.tree.NodeDescriptor
 import com.intellij.openapi.project.Project
-import com.intellij.psi.JavaPsiFacade
-import com.intellij.psi.PsiElement
+import com.intellij.psi.*
 import com.intellij.psi.search.GlobalSearchScope
 import com.sun.jdi.AbsentInformationException
 import com.sun.jdi.ClassNotPreparedException
 import com.sun.jdi.ReferenceType
 import org.jetbrains.kotlin.codegen.AsmUtil
 import org.jetbrains.kotlin.idea.caches.resolve.analyze
-import org.jetbrains.kotlin.idea.debugger.evaluate.KotlinCodeFragmentFactory
-import org.jetbrains.kotlin.psi.KtClassOrObject
-import org.jetbrains.kotlin.psi.KtFile
-import org.jetbrains.kotlin.psi.KtPsiFactory
-import org.jetbrains.kotlin.psi.KtSimpleNameExpression
+import org.jetbrains.kotlin.psi.*
 import org.jetbrains.kotlin.psi.psiUtil.getStrictParentOfType
 import org.jetbrains.kotlin.resolve.BindingContextUtils
 import org.jetbrains.kotlin.resolve.jvm.JvmClassName
@@ -45,7 +40,7 @@ import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode
 import org.jetbrains.kotlin.resolve.source.KotlinSourceElement
 import org.jetbrains.kotlin.resolve.source.getPsi
 
-class KotlinSourcePositionProvider: SourcePositionProvider() {
+class KotlinSourcePositionProvider : SourcePositionProvider() {
     override fun computeSourcePosition(descriptor: NodeDescriptor, project: Project, context: DebuggerContextImpl, nearest: Boolean): SourcePosition? {
         if (context.frameProxy == null) return null
 
@@ -60,11 +55,16 @@ class KotlinSourcePositionProvider: SourcePositionProvider() {
         return null
     }
 
-    private fun computeSourcePosition(descriptor: LocalVariableDescriptor, project: Project, context: DebuggerContextImpl, nearest: Boolean): SourcePosition? {
+    private fun computeSourcePosition(
+        descriptor: LocalVariableDescriptor,
+        project: Project,
+        context: DebuggerContextImpl,
+        nearest: Boolean
+    ): SourcePosition? {
         val place = PositionUtil.getContextElement(context) ?: return null
         if (place.containingFile !is KtFile) return null
 
-        val contextElement = KotlinCodeFragmentFactory.getContextElement(place) ?: return null
+        val contextElement = getContextElement(place) ?: return null
 
         val codeFragment = KtPsiFactory(project).createExpressionCodeFragment(descriptor.name, contextElement)
         val expression = codeFragment.getContentElement()

idea/jvm-debugger/jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/KotlinStackFrame.kt

@@ -30,6 +30,7 @@ import com.intellij.debugger.ui.impl.watch.MethodsTracker
 import com.intellij.debugger.ui.impl.watch.StackFrameDescriptorImpl
 import com.intellij.debugger.ui.impl.watch.ThisDescriptorImpl
 import com.intellij.debugger.ui.impl.watch.ValueDescriptorImpl
+import com.intellij.openapi.diagnostic.Logger
 import com.intellij.openapi.project.Project
 import com.intellij.psi.JavaPsiFacade
 import com.intellij.psi.PsiExpression
@@ -46,13 +47,17 @@ import org.jetbrains.kotlin.codegen.DESTRUCTURED_LAMBDA_ARGUMENT_VARIABLE_PREFIX
 import org.jetbrains.kotlin.codegen.coroutines.CONTINUATION_VARIABLE_NAME
 import org.jetbrains.kotlin.codegen.inline.INLINE_FUN_VAR_SUFFIX
 import org.jetbrains.kotlin.codegen.inline.isFakeLocalVariableForInline
-import org.jetbrains.kotlin.idea.debugger.evaluate.variables.VariableFinder
+import org.jetbrains.org.objectweb.asm.Type as AsmType
 import org.jetbrains.kotlin.utils.getSafe
 import java.lang.reflect.Modifier
 import java.util.*
-import org.jetbrains.kotlin.idea.debugger.evaluate.LOG as DebuggerLog
+import kotlin.coroutines.Continuation
 
 class KotlinStackFrame(frame: StackFrameProxyImpl) : JavaStackFrame(StackFrameDescriptorImpl(frame, MethodsTracker()), true) {
+    private companion object {
+        private val LOG = Logger.getInstance(this::class.java)
+    }
+
     private val kotlinVariableViewService = ToggleKotlinVariablesState.getService()
 
     override fun superBuildVariables(evaluationContext: EvaluationContextImpl, children: XValueChildrenList) {
@@ -93,7 +98,7 @@ class KotlinStackFrame(frame: StackFrameProxyImpl) : JavaStackFrame(StackFrameDe
     ): Boolean {
         val thisObject = evaluationContext.frameProxy?.thisObject() ?: return false
 
-        if (thisObject.type().isSubtype(VariableFinder.CONTINUATION_TYPE)) {
+        if (thisObject.type().isSubtype(CONTINUATION_TYPE)) {
             ExistingInstanceThis.find(children)?.remove()
             return true
         }
@@ -118,7 +123,7 @@ class KotlinStackFrame(frame: StackFrameProxyImpl) : JavaStackFrame(StackFrameDe
         val frameProxy = evaluationContext.frameProxy
 
         val variables = frameProxy?.safeVisibleVariables() ?: return false
-        val inlineDepth = VariableFinder.getInlineDepth(variables)
+        val inlineDepth = getInlineDepth(variables)
         val declarationSiteThis = variables.firstOrNull { v ->
             val name = v.name()
             name.endsWith(INLINE_FUN_VAR_SUFFIX) && name.dropInlineSuffix() == AsmUtil.INLINE_DECLARATION_SITE_THIS
@@ -253,7 +258,7 @@ class KotlinStackFrame(frame: StackFrameProxyImpl) : JavaStackFrame(StackFrameDe
                 }
             }
 
-            DebuggerLog.error(
+            LOG.error(
                 "Can't find name/value lists, existing fields: "
                         + Arrays.toString(XValueChildrenList::class.java.declaredFields)
             )
@@ -273,7 +278,7 @@ class KotlinStackFrame(frame: StackFrameProxyImpl) : JavaStackFrame(StackFrameDe
             }
         }
 
-        val inlineDepth = VariableFinder.getInlineDepth(allVisibleVariables)
+        val inlineDepth = getInlineDepth(allVisibleVariables)
 
         val (thisVariables, otherVariables) = allVisibleVariables.asSequence()
             .filter { !isHidden(it, inlineDepth) }
@@ -281,7 +286,7 @@ class KotlinStackFrame(frame: StackFrameProxyImpl) : JavaStackFrame(StackFrameDe
                 it.name() == THIS
                         || it.name() == AsmUtil.THIS_IN_DEFAULT_IMPLS
                         || it.name().startsWith(AsmUtil.LABELED_THIS_PARAMETER)
-                        || (VariableFinder.inlinedThisRegex.matches(it.name()))
+                        || (INLINED_THIS_REGEX.matches(it.name()))
             }
 
         val (mainThis, otherThis) = thisVariables
@@ -298,7 +303,7 @@ class KotlinStackFrame(frame: StackFrameProxyImpl) : JavaStackFrame(StackFrameDe
         return isFakeLocalVariableForInline(name)
                 || name.startsWith(DESTRUCTURED_LAMBDA_ARGUMENT_VARIABLE_PREFIX)
                 || name.startsWith(AsmUtil.LOCAL_FUNCTION_VARIABLE_PREFIX)
-                || VariableFinder.getInlineDepth(variable.name()) != inlineDepth
+                || getInlineDepth(variable.name()) != inlineDepth
                 || name == CONTINUATION_VARIABLE_NAME
     }
 
@@ -313,7 +318,7 @@ class KotlinStackFrame(frame: StackFrameProxyImpl) : JavaStackFrame(StackFrameDe
             }
             name == AsmUtil.THIS_IN_DEFAULT_IMPLS -> clone(THIS + " (outer)", null)
             name == AsmUtil.RECEIVER_PARAMETER_NAME -> clone(THIS + " (receiver)", null)
-            VariableFinder.inlinedThisRegex.matches(name) -> {
+            INLINED_THIS_REGEX.matches(name) -> {
                 val label = generateThisLabel(frame.getValue(this)?.type())
                 if (label != null) {
                     clone(getThisName(label), label)
@@ -348,7 +353,7 @@ class KotlinStackFrame(frame: StackFrameProxyImpl) : JavaStackFrame(StackFrameDe
     }
 
     private fun String.dropInlineSuffix(): String {
-        val depth = VariableFinder.getInlineDepth(this)
+        val depth = getInlineDepth(this)
         if (depth == 0) {
             return this
         }

idea/jvm-debugger/jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/ToggleKotlinVariablesView.kt

@@ -11,7 +11,7 @@ import com.intellij.openapi.actionSystem.ToggleAction
 import com.intellij.openapi.components.ServiceManager
 import com.intellij.xdebugger.XDebugSession
 import com.intellij.xdebugger.impl.XDebuggerUtilImpl
-import org.jetbrains.kotlin.idea.KotlinFileTypeFactory
+import org.jetbrains.kotlin.idea.core.KotlinFileTypeFactory
 
 class ToggleKotlinVariablesState {
     companion object {

idea/jvm-debugger/jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/breakpoints/breakpointTypeUtils.kt

@@ -30,9 +30,9 @@ import com.intellij.xdebugger.XDebuggerUtil
 import com.intellij.xdebugger.XSourcePosition
 import com.intellij.xdebugger.impl.XSourcePositionImpl
 import org.jetbrains.kotlin.idea.KotlinFileType
-import org.jetbrains.kotlin.idea.codeInsight.CodeInsightUtils
+import org.jetbrains.kotlin.idea.core.util.CodeInsightUtils
+import org.jetbrains.kotlin.idea.core.util.getLineNumber
 import org.jetbrains.kotlin.idea.debugger.findElementAtLine
-import org.jetbrains.kotlin.idea.refactoring.getLineNumber
 import org.jetbrains.kotlin.psi.*
 import org.jetbrains.kotlin.psi.psiUtil.endOffset
 import org.jetbrains.kotlin.psi.psiUtil.parentsWithSelf

idea/jvm-debugger/jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/breakpoints/dialog/AddFieldBreakpointDialog.java

@@ -28,7 +28,7 @@ import com.intellij.psi.search.GlobalSearchScope;
 import kotlin.Unit;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.kotlin.idea.core.util.DescriptorMemberChooserObject;
-import org.jetbrains.kotlin.idea.util.UiUtilKt;
+import org.jetbrains.kotlin.idea.core.util.UiUtilsKt;
 import org.jetbrains.kotlin.psi.KtProperty;
 
 import javax.swing.*;
@@ -52,7 +52,7 @@ public abstract class AddFieldBreakpointDialog extends DialogWrapper {
 
     @Override
     protected JComponent createCenterPanel() {
-        UiUtilKt.onTextChange(
+        UiUtilsKt.onTextChange(
                 myClassChooser.getTextField(),
                 (DocumentEvent e) -> {
                     updateUI();

idea/jvm-debugger/jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/debuggerUtil.kt

@@ -18,11 +18,11 @@ import org.jetbrains.kotlin.codegen.coroutines.DO_RESUME_METHOD_NAME
 import org.jetbrains.kotlin.codegen.coroutines.INVOKE_SUSPEND_METHOD_NAME
 import org.jetbrains.kotlin.codegen.coroutines.continuationAsmTypes
 import org.jetbrains.kotlin.codegen.inline.KOTLIN_STRATA_NAME
-import org.jetbrains.kotlin.idea.KotlinFileTypeFactory
-import org.jetbrains.kotlin.idea.codeInsight.CodeInsightUtils
+import org.jetbrains.kotlin.idea.core.KotlinFileTypeFactory
+import org.jetbrains.kotlin.idea.core.util.CodeInsightUtils
 import org.jetbrains.kotlin.idea.debugger.evaluate.KotlinDebuggerCaches
-import org.jetbrains.kotlin.idea.refactoring.getLineEndOffset
-import org.jetbrains.kotlin.idea.refactoring.getLineStartOffset
+import org.jetbrains.kotlin.idea.core.util.getLineEndOffset
+import org.jetbrains.kotlin.idea.core.util.getLineStartOffset
 import org.jetbrains.kotlin.idea.util.application.runReadAction
 import org.jetbrains.kotlin.lexer.KtTokens
 import org.jetbrains.kotlin.load.java.JvmAbi
@@ -249,34 +249,6 @@ fun findCallByEndToken(element: PsiElement): KtCallExpression? {
     }
 }
 
-fun Type.isSubtype(className: String): Boolean = isSubtype(AsmType.getObjectType(className))
-
-fun Type.isSubtype(type: AsmType): Boolean {
-    if (this.signature() == type.descriptor) {
-        return true
-    }
-
-    if (type.sort != AsmType.OBJECT || this !is ClassType) {
-        return false
-    }
-
-    val superTypeName = type.className
-
-    if (allInterfaces().any { it.name() == superTypeName }) {
-        return true
-    }
-
-    var superClass = superclass()
-    while (superClass != null) {
-        if (superClass.name() == superTypeName) {
-            return true
-        }
-        superClass = superClass.superclass()
-    }
-
-    return false
-}
-
 val DebuggerContextImpl.canRunEvaluation: Boolean
     get() = debugProcess?.canRunEvaluation ?: false
 

idea/jvm-debugger/jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/evaluate/KotlinRuntimeTypeEvaluator.kt

@@ -0,0 +1,102 @@
+/*
+ * Copyright 2000-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.idea.debugger.evaluate
+
+import com.intellij.debugger.DebuggerBundle
+import com.intellij.debugger.DebuggerInvocationUtil
+import com.intellij.debugger.engine.ContextUtil
+import com.intellij.debugger.engine.evaluation.EvaluateException
+import com.intellij.debugger.engine.evaluation.EvaluateExceptionUtil
+import com.intellij.debugger.engine.evaluation.EvaluationContextImpl
+import com.intellij.debugger.engine.evaluation.expression.ExpressionEvaluator
+import com.intellij.debugger.impl.DebuggerContextImpl
+import com.intellij.debugger.impl.DebuggerUtilsEx
+import com.intellij.debugger.ui.EditorEvaluationCommand
+import com.intellij.openapi.editor.Editor
+import com.intellij.openapi.progress.ProcessCanceledException
+import com.intellij.openapi.progress.ProgressIndicator
+import com.intellij.psi.CommonClassNames
+import com.intellij.psi.search.GlobalSearchScope
+import com.sun.jdi.ClassType
+import com.sun.jdi.Value
+import org.jetbrains.eval4j.jdi.asValue
+import org.jetbrains.kotlin.idea.KotlinFileType
+import org.jetbrains.kotlin.idea.debugger.getClassDescriptor
+import org.jetbrains.kotlin.idea.util.application.runReadAction
+import org.jetbrains.kotlin.psi.KtExpression
+import org.jetbrains.kotlin.psi.KtPsiFactory
+import org.jetbrains.kotlin.types.KotlinType
+import org.jetbrains.org.objectweb.asm.Type as AsmType
+
+abstract class KotlinRuntimeTypeEvaluator(
+    editor: Editor?,
+    expression: KtExpression,
+    context: DebuggerContextImpl,
+    indicator: ProgressIndicator
+) : EditorEvaluationCommand<KotlinType>(editor, expression, context, indicator) {
+
+    override fun threadAction() {
+        var type: KotlinType? = null
+        try {
+            type = evaluate()
+        } catch (ignored: ProcessCanceledException) {
+        } catch (ignored: EvaluateException) {
+        } finally {
+            typeCalculationFinished(type)
+        }
+    }
+
+    protected abstract fun typeCalculationFinished(type: KotlinType?)
+
+    override fun evaluate(evaluationContext: EvaluationContextImpl): KotlinType? {
+        val project = evaluationContext.project
+
+        val evaluator = DebuggerInvocationUtil.commitAndRunReadAction<ExpressionEvaluator>(project) {
+            val codeFragment = KtPsiFactory(myElement.project)
+                .createExpressionCodeFragment(myElement.text, myElement.containingFile.context)
+
+            val codeFragmentFactory = DebuggerUtilsEx.getCodeFragmentFactory(codeFragment.context, KotlinFileType.INSTANCE)
+            codeFragmentFactory.evaluatorBuilder.build(codeFragment, ContextUtil.getSourcePosition(evaluationContext))
+        }
+
+        val value = evaluator.evaluate(evaluationContext)
+        if (value != null) {
+            return runReadAction { getCastableRuntimeType(evaluationContext.debugProcess.searchScope, value) }
+        }
+
+        throw EvaluateExceptionUtil.createEvaluateException(DebuggerBundle.message("evaluation.error.surrounded.expression.null"))
+    }
+
+    companion object {
+        private fun getCastableRuntimeType(scope: GlobalSearchScope, value: Value): KotlinType? {
+            val myValue = value.asValue()
+            var psiClass = myValue.asmType.getClassDescriptor(scope)
+            if (psiClass != null) {
+                return psiClass.defaultType
+            }
+
+            val type = value.type()
+            if (type is ClassType) {
+                val superclass = type.superclass()
+                if (superclass != null && CommonClassNames.JAVA_LANG_OBJECT != superclass.name()) {
+                    psiClass = AsmType.getType(superclass.signature()).getClassDescriptor(scope)
+                    if (psiClass != null) {
+                        return psiClass.defaultType
+                    }
+                }
+
+                for (interfaceType in type.interfaces()) {
+                    psiClass = AsmType.getType(interfaceType.signature()).getClassDescriptor(scope)
+                    if (psiClass != null) {
+                        return psiClass.defaultType
+                    }
+                }
+            }
+            return null
+        }
+    }
+}
+

idea/jvm-debugger/jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/stepping/KotlinLambdaMethodFilter.kt

@@ -22,8 +22,8 @@ import com.intellij.debugger.engine.DebugProcessImpl
 import com.intellij.util.Range
 import com.sun.jdi.Location
 import org.jetbrains.kotlin.codegen.coroutines.isResumeImplMethodNameFromAnyLanguageSettings
+import org.jetbrains.kotlin.idea.core.util.isMultiLine
 import org.jetbrains.kotlin.idea.debugger.isInsideInlineArgument
-import org.jetbrains.kotlin.idea.refactoring.isMultiLine
 import org.jetbrains.kotlin.psi.KtBlockExpression
 import org.jetbrains.kotlin.psi.KtFunction
 import org.jetbrains.kotlin.util.OperatorNameConventions