registry flag to disable force step into for single variant smart step

This commit is contained in:
Egor.Ushakov
2016-07-11 19:51:51 +03:00
parent 8961bcfbe6
commit b2ac265ebe
3 changed files with 7 additions and 4 deletions
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2015 JetBrains s.r.o.
* Copyright 2000-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.
@@ -26,6 +26,7 @@ import com.intellij.openapi.fileEditor.FileEditor;
import com.intellij.openapi.fileEditor.FileEditorManager;
import com.intellij.openapi.fileEditor.TextEditor;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.registry.Registry;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.xdebugger.impl.actions.DebuggerActionHandler;
import org.jetbrains.annotations.NotNull;
@@ -51,7 +52,7 @@ public class JvmSmartStepIntoActionHandler extends DebuggerActionHandler {
}
}
session.sessionResumed();
session.stepInto(true, null);
session.stepInto(Registry.is("debugger.single.smart.step.force"), null);
}
public boolean isEnabled(@NotNull final Project project, final AnActionEvent event) {
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2015 JetBrains s.r.o.
* Copyright 2000-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.
@@ -62,7 +62,7 @@ public abstract class JvmSmartStepIntoHandler {
final SmartStepTarget firstTarget = targets.get(0);
if (targets.size() == 1) {
session.sessionResumed();
session.stepInto(true, createMethodFilter(firstTarget));
session.stepInto(Registry.is("debugger.single.smart.step.force"), createMethodFilter(firstTarget));
}
else {
final Editor editor = fileEditor.getEditor();
@@ -216,6 +216,8 @@ debugger.click.disable.breakpoints=false
debugger.click.disable.breakpoints.description=Single click to disable a breakpoint, middle click to remove
debugger.renderers.file=true
debugger.renderers.file.description=Enable file object renderer
debugger.single.smart.step.force=true
debugger.single.smart.step.force.description=Do force step into on single variant smart step into
analyze.exceptions.on.the.fly=false
analyze.exceptions.on.the.fly.description=Automatically analyze clipboard on frame activation,\