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

Minor: code rearrange

Browse Source
This commit is contained in:
Nikolay Krasko
2017-12-20 16:01:37 +03:00
parent c5886bc7a2
commit f38a4f509d
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/KotlinPositionManagerFactory.java
+2 -1
View File
@@ -19,10 +19,11 @@ package org.jetbrains.kotlin.idea.debugger;
import com.intellij.debugger.PositionManager; import com.intellij.debugger.PositionManager;
import com.intellij.debugger.PositionManagerFactory; import com.intellij.debugger.PositionManagerFactory;
import com.intellij.debugger.engine.DebugProcess; import com.intellij.debugger.engine.DebugProcess;
import org.jetbrains.annotations.NotNull;
public class KotlinPositionManagerFactory extends PositionManagerFactory { public class KotlinPositionManagerFactory extends PositionManagerFactory {
@Override @Override
public PositionManager createPositionManager(DebugProcess process) { public PositionManager createPositionManager(@NotNull DebugProcess process) {
return new KotlinPositionManager(process); return new KotlinPositionManager(process);
} }
} }
idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/debuggerUtil.kt
+7 -7
View File
@@ -49,17 +49,17 @@ fun numberOfInlinedFunctions(visibleVariables: List<LocalVariableProxyImpl>): In
fun isInsideInlineArgument(inlineArgument: KtFunction, location: Location, debugProcess: DebugProcessImpl): Boolean { fun isInsideInlineArgument(inlineArgument: KtFunction, location: Location, debugProcess: DebugProcessImpl): Boolean {
val visibleVariables = location.visibleVariables(debugProcess) val visibleVariables = location.visibleVariables(debugProcess)
val context = KotlinDebuggerCaches.getOrCreateTypeMapper(inlineArgument).bindingContext
val lambdaOrdinal = runReadAction { lambdaOrdinalByArgument(inlineArgument, context) }
val markerLocalVariables = visibleVariables.filter { it.name().startsWith(JvmAbi.LOCAL_VARIABLE_NAME_PREFIX_INLINE_ARGUMENT) } val markerLocalVariables = visibleVariables.filter { it.name().startsWith(JvmAbi.LOCAL_VARIABLE_NAME_PREFIX_INLINE_ARGUMENT) }
val context = KotlinDebuggerCaches.getOrCreateTypeMapper(inlineArgument).bindingContext
val lambdaOrdinal = runReadAction { lambdaOrdinalByArgument(inlineArgument, context) }
val functionName = runReadAction { functionNameByArgument(inlineArgument, context) } val functionName = runReadAction { functionNameByArgument(inlineArgument, context) }
return markerLocalVariables.firstOrNull { return markerLocalVariables
lambdaOrdinalByLocalVariable(it.name()) == lambdaOrdinal && functionNameByLocalVariable(it.name()) == functionName .map { it.name() }
} != null .any { variableName ->
lambdaOrdinalByLocalVariable(variableName) == lambdaOrdinal && functionNameByLocalVariable(variableName) == functionName
}
} }
fun <T : Any> DebugProcessImpl.invokeInManagerThread(f: (DebuggerContextImpl) -> T?): T? { fun <T : Any> DebugProcessImpl.invokeInManagerThread(f: (DebuggerContextImpl) -> T?): T? {