From b2ac265ebee6aca063e4f261db4b420fe6a0a9f0 Mon Sep 17 00:00:00 2001 From: "Egor.Ushakov" Date: Mon, 11 Jul 2016 19:50:51 +0300 Subject: [PATCH] registry flag to disable force step into for single variant smart step --- .../debugger/actions/JvmSmartStepIntoActionHandler.java | 5 +++-- .../intellij/debugger/actions/JvmSmartStepIntoHandler.java | 4 ++-- platform/util/resources/misc/registry.properties | 2 ++ 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/java/debugger/impl/src/com/intellij/debugger/actions/JvmSmartStepIntoActionHandler.java b/java/debugger/impl/src/com/intellij/debugger/actions/JvmSmartStepIntoActionHandler.java index 07dd81b63e67..e436fa0c2a95 100644 --- a/java/debugger/impl/src/com/intellij/debugger/actions/JvmSmartStepIntoActionHandler.java +++ b/java/debugger/impl/src/com/intellij/debugger/actions/JvmSmartStepIntoActionHandler.java @@ -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) { diff --git a/java/debugger/impl/src/com/intellij/debugger/actions/JvmSmartStepIntoHandler.java b/java/debugger/impl/src/com/intellij/debugger/actions/JvmSmartStepIntoHandler.java index 4985cd6eef8c..f7925d52729c 100644 --- a/java/debugger/impl/src/com/intellij/debugger/actions/JvmSmartStepIntoHandler.java +++ b/java/debugger/impl/src/com/intellij/debugger/actions/JvmSmartStepIntoHandler.java @@ -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(); diff --git a/platform/util/resources/misc/registry.properties b/platform/util/resources/misc/registry.properties index 0f6d3bff37d2..726f8ea2f189 100644 --- a/platform/util/resources/misc/registry.properties +++ b/platform/util/resources/misc/registry.properties @@ -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,\