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

Refactoring: call apply method without returning intermediate object

Browse Source 
(cherry picked from commit a2f7e00)
This commit is contained in:
Nikolay Krasko
2016-10-10 20:29:38 +03:00
committed by Nikolay Krasko
parent 78525ed7c6
commit bd2ddbafb3
2 changed files with 10 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/debugger/stepping/DebuggerSteppingHelper.java
+2 -14
View File
@@ -19,7 +19,6 @@ package org.jetbrains.kotlin.idea.debugger.stepping;
import com.intellij.debugger.engine.DebugProcessImpl;
import com.intellij.debugger.engine.SuspendContextImpl;
import com.intellij.debugger.engine.evaluation.EvaluateException;
import com.intellij.debugger.engine.events.SuspendContextCommandImpl;
import com.intellij.debugger.impl.DebuggerUtilsEx;
import com.intellij.debugger.jdi.StackFrameProxyImpl;
import com.intellij.debugger.jdi.ThreadReferenceProxyImpl;
@@ -38,7 +37,6 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.kotlin.psi.KtFunctionLiteral;
import org.jetbrains.kotlin.psi.KtNamedFunction;
import org.jetbrains.kotlin.utils.ExceptionUtilsKt;
import java.util.ArrayList;
import java.util.List;
@@ -63,14 +61,12 @@ public class DebuggerSteppingHelper {
kotlinSourcePosition
);
SuspendContextCommandImpl command = action.createCommand(debugProcess, suspendContext, ignoreBreakpoints);
createStepRequest(
suspendContext, getContextThread(),
debugProcess.getVirtualMachineProxy().eventRequestManager(),
StepRequest.STEP_LINE, StepRequest.STEP_OUT);
command.contextAction();
action.apply(debugProcess, suspendContext, ignoreBreakpoints);
return;
}
@@ -78,9 +74,6 @@ public class DebuggerSteppingHelper {
}
catch (EvaluateException ignored) {
}
catch (Exception e) {
throw ExceptionUtilsKt.rethrow(e);
}
}
};
}
@@ -105,23 +98,18 @@ public class DebuggerSteppingHelper {
inlineArgument
);
SuspendContextCommandImpl command = action.createCommand(debugProcess, suspendContext, ignoreBreakpoints);
createStepRequest(
suspendContext, getContextThread(),
debugProcess.getVirtualMachineProxy().eventRequestManager(),
StepRequest.STEP_LINE, StepRequest.STEP_OUT);
command.contextAction();
action.apply(debugProcess, suspendContext, ignoreBreakpoints);
return;
}
debugProcess.createStepOverCommand(suspendContext, ignoreBreakpoints).contextAction();
}
catch (EvaluateException ignored) {
}
catch (Exception e) {
throw ExceptionUtilsKt.rethrow(e);
}
}
};
idea/src/org/jetbrains/kotlin/idea/debugger/stepping/KotlinSteppingCommandProvider.kt
+8 -1
View File
@@ -328,7 +328,14 @@ sealed class Action(val position: XSourcePositionImpl?) {
class STEP_OUT: Action(null)
class RUN_TO_CURSOR(position: XSourcePositionImpl): Action(position)
fun createCommand(
fun apply(debugProcess: DebugProcessImpl,
suspendContext: SuspendContextImpl,
ignoreBreakpoints: Boolean) {
val command = createCommand(debugProcess, suspendContext, ignoreBreakpoints)
command.contextAction()
}
private fun createCommand(
debugProcess: DebugProcessImpl,
suspendContext: SuspendContextImpl,
ignoreBreakpoints: Boolean