From e112f3371a0e32f42846abc8e20f336525ef9a85 Mon Sep 17 00:00:00 2001 From: Eugene Zhuravlev Date: Tue, 18 Aug 2009 19:45:31 +0400 Subject: [PATCH] in autovars mode for PsiCompiledElement show all visible variables (related to IDEADEV-39671) --- .../intellij/debugger/ui/impl/FrameDebuggerTree.java | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/debugger/impl/com/intellij/debugger/ui/impl/FrameDebuggerTree.java b/debugger/impl/com/intellij/debugger/ui/impl/FrameDebuggerTree.java index 59327fd2bb..0a9894e8b5 100644 --- a/debugger/impl/com/intellij/debugger/ui/impl/FrameDebuggerTree.java +++ b/debugger/impl/com/intellij/debugger/ui/impl/FrameDebuggerTree.java @@ -227,12 +227,17 @@ public class FrameDebuggerTree extends DebuggerTree { } //noinspection unchecked - final Set vars = new HashSet(); - final Set expressions = new HashSet(); - final PsiElementVisitor variablesCollector = new VariablesCollector(visibleVars, adjustRange(element, lineRange), expressions, vars); - element.accept(variablesCollector); + if (element instanceof PsiCompiledElement) { + return new Pair, Set>(visibleVars, Collections.emptySet()); + } + else { + final Set vars = new HashSet(); + final Set expressions = new HashSet(); + final PsiElementVisitor variablesCollector = new VariablesCollector(visibleVars, adjustRange(element, lineRange), expressions, vars); + element.accept(variablesCollector); - return new Pair, Set>(vars, expressions); + return new Pair, Set>(vars, expressions); + } } } return new Pair, Set>(Collections.emptySet(), Collections.emptySet()); @@ -252,9 +257,6 @@ public class FrameDebuggerTree extends DebuggerTree { } private static TextRange adjustRange(final PsiElement element, final TextRange originalRange) { - if (element instanceof PsiCompiledElement) { - return originalRange; - } final Ref rangeRef = new Ref(originalRange); element.accept(new JavaRecursiveElementVisitor() { @Override public void visitExpressionStatement(final PsiExpressionStatement statement) { @@ -385,7 +387,7 @@ public class FrameDebuggerTree extends DebuggerTree { } - private static class VariablesCollector extends JavaRecursiveElementWalkingVisitor { + private static class VariablesCollector extends JavaRecursiveElementVisitor { private final Set myVisibleLocals; private final TextRange myLineRange; private final Set myExpressions; -- 2.11.4.GIT