idea: cleanup code

idea/jvm-debugger/jvm-debugger-evaluation/src/org/jetbrains/kotlin/idea/debugger/evaluate/KotlinCodeFragmentFactory.kt

@@ -1,17 +1,6 @@
 /*
- * 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 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
@@ -34,7 +23,8 @@ import com.intellij.psi.util.PsiTreeUtil
 import com.intellij.psi.util.PsiTypesUtil
 import com.intellij.util.IncorrectOperationException
 import com.intellij.util.concurrency.Semaphore
-import com.sun.jdi.*
+import com.sun.jdi.AbsentInformationException
+import com.sun.jdi.InvalidStackFrameException
 import org.jetbrains.annotations.TestOnly
 import org.jetbrains.kotlin.idea.KotlinFileType
 import org.jetbrains.kotlin.idea.core.util.getKotlinJvmRuntimeMarkerClass
@@ -94,7 +84,9 @@ class KotlinCodeFragmentFactory : CodeFragmentFactory() {
 
                 val debuggerContext = DebuggerManagerEx.getInstanceEx(project).context
                 val debuggerSession = debuggerContext.debuggerSession
-                if ((debuggerSession == null || debuggerContext.suspendContext == null) && !ApplicationManager.getApplication().isUnitTestMode) {
+                if ((debuggerSession == null || debuggerContext.suspendContext == null) &&
+                    !ApplicationManager.getApplication().isUnitTestMode
+                ) {
                     LOG.warn("Couldn't create fake context element for java file, debugger isn't paused on breakpoint")
                     return@putCopyableUserData emptyFile
                 }

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

@@ -18,13 +18,15 @@ import org.jetbrains.kotlin.idea.debugger.evaluate.DebuggerFieldPropertyDescript
 import org.jetbrains.kotlin.idea.debugger.evaluate.EvaluationError
 import org.jetbrains.kotlin.idea.debugger.evaluate.EvaluationStatus
 import org.jetbrains.kotlin.idea.debugger.evaluate.ExecutionContext
-import org.jetbrains.kotlin.idea.debugger.evaluate.compilation.CodeFragmentParameter.*
 import org.jetbrains.kotlin.idea.debugger.evaluate.KotlinCodeFragmentFactory.Companion.FAKE_JAVA_CONTEXT_FUNCTION_NAME
+import org.jetbrains.kotlin.idea.debugger.evaluate.compilation.CodeFragmentParameter.*
 import org.jetbrains.kotlin.idea.debugger.safeLocation
 import org.jetbrains.kotlin.idea.debugger.safeMethod
 import org.jetbrains.kotlin.idea.util.application.runReadAction
 import org.jetbrains.kotlin.psi.*
-import org.jetbrains.kotlin.psi.psiUtil.*
+import org.jetbrains.kotlin.psi.psiUtil.getParentOfType
+import org.jetbrains.kotlin.psi.psiUtil.isAncestor
+import org.jetbrains.kotlin.psi.psiUtil.isDotSelector
 import org.jetbrains.kotlin.resolve.BindingContext
 import org.jetbrains.kotlin.resolve.calls.callUtil.getResolvedCall
 import org.jetbrains.kotlin.resolve.calls.checkers.COROUTINE_CONTEXT_1_3_FQ_NAME
@@ -310,6 +312,7 @@ class CodeFragmentParameterAnalyzer(
 
                 parameters.getOrPut(target) {
                     val type = target.type
+
                     @Suppress("DEPRECATION")
                     val kind = if (target is LocalVariableDescriptor && target.isDelegated) Kind.DELEGATED else Kind.ORDINARY
                     Smart(Dumb(kind, target.name.asString()), type, target, isLValue)

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

@@ -11,12 +11,11 @@ import com.intellij.openapi.application.ApplicationManager
 import com.intellij.psi.search.GlobalSearchScope
 import com.intellij.xdebugger.impl.XDebugSessionImpl
 import com.intellij.xdebugger.impl.ui.tree.ValueMarkup
-import org.jetbrains.kotlin.builtins.PrimitiveType
 import com.sun.jdi.*
 import org.jetbrains.kotlin.backend.common.SimpleMemberScope
-import com.sun.jdi.Type as JdiType
 import org.jetbrains.kotlin.builtins.DefaultBuiltIns
 import org.jetbrains.kotlin.builtins.KotlinBuiltIns
+import org.jetbrains.kotlin.builtins.PrimitiveType
 import org.jetbrains.kotlin.descriptors.*
 import org.jetbrains.kotlin.descriptors.annotations.Annotations
 import org.jetbrains.kotlin.descriptors.impl.DeclarationDescriptorImpl
@@ -26,13 +25,14 @@ import org.jetbrains.kotlin.descriptors.impl.PropertyGetterDescriptorImpl
 import org.jetbrains.kotlin.idea.debugger.getClassDescriptor
 import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.name.Name
-import org.jetbrains.kotlin.psi.KtCodeFragment
-import org.jetbrains.kotlin.psi.externalDescriptors
 import org.jetbrains.kotlin.platform.TargetPlatform
 import org.jetbrains.kotlin.platform.jvm.JvmPlatforms
+import org.jetbrains.kotlin.psi.KtCodeFragment
+import org.jetbrains.kotlin.psi.externalDescriptors
 import org.jetbrains.kotlin.resolve.scopes.MemberScope
 import org.jetbrains.kotlin.types.KotlinType
 import org.jetbrains.kotlin.types.Variance
+import com.sun.jdi.Type as JdiType
 import org.jetbrains.org.objectweb.asm.Type as AsmType
 
 class DebugLabelPropertyDescriptorProvider(val codeFragment: KtCodeFragment, val debugProcess: DebugProcessImpl) {
@@ -144,10 +144,8 @@ class DebugLabelPropertyDescriptorProvider(val codeFragment: KtCodeFragment, val
     }
 }
 
-private object DebugLabelModuleDescriptor
-    : DeclarationDescriptorImpl(Annotations.EMPTY, Name.identifier("DebugLabelExtensions")),
-    ModuleDescriptor
-{
+private object DebugLabelModuleDescriptor : DeclarationDescriptorImpl(Annotations.EMPTY, Name.identifier("DebugLabelExtensions")),
+    ModuleDescriptor {
     override val builtIns: KotlinBuiltIns
         get() = DefaultBuiltIns.Instance
 

idea/jvm-debugger/jvm-debugger-evaluation/src/org/jetbrains/kotlin/idea/debugger/evaluate/surroundWith/KotlinRuntimeTypeCastSurrounder.kt

@@ -1,6 +1,6 @@
 /*
- * Copyright 2000-2018 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.
+ * 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.surroundWith
@@ -20,9 +20,9 @@ import com.intellij.openapi.project.Project
 import com.intellij.openapi.util.TextRange
 import org.jetbrains.kotlin.idea.KotlinBundle
 import org.jetbrains.kotlin.idea.caches.resolve.analyze
-import org.jetbrains.kotlin.idea.debugger.evaluate.KotlinRuntimeTypeEvaluator
 import org.jetbrains.kotlin.idea.core.ShortenReferences
 import org.jetbrains.kotlin.idea.core.surroundWith.KotlinExpressionSurrounder
+import org.jetbrains.kotlin.idea.debugger.evaluate.KotlinRuntimeTypeEvaluator
 import org.jetbrains.kotlin.psi.*
 import org.jetbrains.kotlin.resolve.DescriptorUtils
 import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode
@@ -30,7 +30,7 @@ import org.jetbrains.kotlin.types.KotlinType
 import org.jetbrains.kotlin.types.TypeUtils
 import org.jetbrains.kotlin.types.checker.KotlinTypeChecker
 
-class KotlinRuntimeTypeCastSurrounder: KotlinExpressionSurrounder() {
+class KotlinRuntimeTypeCastSurrounder : KotlinExpressionSurrounder() {
 
     override fun isApplicable(expression: KtExpression): Boolean {
         if (!super.isApplicable(expression)) return false
@@ -61,11 +61,11 @@ class KotlinRuntimeTypeCastSurrounder: KotlinExpressionSurrounder() {
     }
 
     private inner class SurroundWithCastWorker(
-            private val myEditor: Editor,
-            expression: KtExpression,
-            context: DebuggerContextImpl,
-            indicator: ProgressIndicator
-    ): KotlinRuntimeTypeEvaluator(myEditor, expression, context, indicator) {
+        private val myEditor: Editor,
+        expression: KtExpression,
+        context: DebuggerContextImpl,
+        indicator: ProgressIndicator
+    ) : KotlinRuntimeTypeEvaluator(myEditor, expression, context, indicator) {
 
         override fun typeCalculationFinished(type: KotlinType?) {
             if (type == null) return
@@ -74,29 +74,28 @@ class KotlinRuntimeTypeCastSurrounder: KotlinExpressionSurrounder() {
 
             val project = myEditor.project
             DebuggerInvocationUtil.invokeLater(project, Runnable {
-                    object : WriteCommandAction<Any>(project, CodeInsightBundle.message("command.name.surround.with.runtime.cast")) {
-                        override fun run(result: Result<Any>) {
-                            try {
-                                val factory = KtPsiFactory(myElement.project)
+                object : WriteCommandAction<Any>(project, CodeInsightBundle.message("command.name.surround.with.runtime.cast")) {
+                    override fun run(result: Result<Any>) {
+                        try {
+                            val factory = KtPsiFactory(myElement.project)
 
-                                val fqName = DescriptorUtils.getFqName(type.constructor.declarationDescriptor!!)
-                                val parentCast = factory.createExpression("(expr as " + fqName.asString() + ")") as KtParenthesizedExpression
-                                val cast = parentCast.expression as KtBinaryExpressionWithTypeRHS
-                                cast.left.replace(myElement)
-                                val expr = myElement.replace(parentCast) as KtExpression
+                            val fqName = DescriptorUtils.getFqName(type.constructor.declarationDescriptor!!)
+                            val parentCast = factory.createExpression("(expr as " + fqName.asString() + ")") as KtParenthesizedExpression
+                            val cast = parentCast.expression as KtBinaryExpressionWithTypeRHS
+                            cast.left.replace(myElement)
+                            val expr = myElement.replace(parentCast) as KtExpression
 
-                                ShortenReferences.DEFAULT.process(expr)
+                            ShortenReferences.DEFAULT.process(expr)
 
-                                val range = expr.textRange
-                                myEditor.selectionModel.setSelection(range.startOffset, range.endOffset)
-                                myEditor.caretModel.moveToOffset(range.endOffset)
-                                myEditor.scrollingModel.scrollToCaret(ScrollType.RELATIVE)
-                            }
-                            finally {
-                                release()
-                            }
+                            val range = expr.textRange
+                            myEditor.selectionModel.setSelection(range.startOffset, range.endOffset)
+                            myEditor.caretModel.moveToOffset(range.endOffset)
+                            myEditor.scrollingModel.scrollToCaret(ScrollType.RELATIVE)
+                        } finally {
+                            release()
                         }
-                    }.execute()
+                    }
+                }.execute()
             }, myProgressIndicator.modalityState)
         }