MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

show local variables even without sources

Browse Source
This commit is contained in:
Egor.Ushakov
2015-10-05 18:44:22 +03:00
parent 20d32af511
commit a5b81b9ea4
2 changed files with 25 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/debugger/impl/src/com/intellij/debugger/engine/FrameExtraVariablesProvider.java
+7 -3
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2014 JetBrains s.r.o.
* Copyright 2000-2015 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.
@@ -19,6 +19,7 @@ import com.intellij.debugger.SourcePosition;
import com.intellij.debugger.engine.evaluation.EvaluationContext;
import com.intellij.debugger.engine.evaluation.TextWithImports;
import com.intellij.openapi.extensions.ExtensionPointName;
import org.jetbrains.annotations.NotNull;
import java.util.Set;
@@ -28,7 +29,10 @@ import java.util.Set;
public interface FrameExtraVariablesProvider {
ExtensionPointName<FrameExtraVariablesProvider> EP_NAME = ExtensionPointName.create("com.intellij.debugger.frameExtraVarsProvider");
boolean isAvailable(SourcePosition sourcePosition, EvaluationContext evalContext);
boolean isAvailable(@NotNull SourcePosition sourcePosition, @NotNull EvaluationContext evalContext);
Set<TextWithImports> collectVariables(SourcePosition sourcePosition, EvaluationContext evalContext, Set<String> alreadyCollected);
@NotNull
Set<TextWithImports> collectVariables(@NotNull SourcePosition sourcePosition,
@NotNull EvaluationContext evalContext,
@NotNull Set<String> alreadyCollected);
}
java/debugger/impl/src/com/intellij/debugger/engine/JavaStackFrame.java
+18 -14
View File
@@ -248,6 +248,9 @@ public class JavaStackFrame extends XStackFrame {
}
}
private static final Pair<Set<String>, Set<TextWithImports>> EMPTY_USED_VARS =
Pair.create(Collections.<String>emptySet(), Collections.<TextWithImports>emptySet());
// copied from FrameVariablesTree
private void buildVariables(DebuggerContextImpl debuggerContext,
final EvaluationContextImpl evaluationContext,
@@ -276,10 +279,6 @@ public class JavaStackFrame extends XStackFrame {
if (evaluationContext == null) {
return;
}
final SourcePosition sourcePosition = debuggerContext.getSourcePosition();
if (sourcePosition == null) {
return;
}
try {
if (!XDebuggerSettingsManager.getInstance().getDataViewSettings().isAutoExpressions() && !myAutoWatchMode) {
@@ -287,15 +286,19 @@ public class JavaStackFrame extends XStackFrame {
superBuildVariables(evaluationContext, children);
}
else {
final SourcePosition sourcePosition = debuggerContext.getSourcePosition();
final Map<String, LocalVariableProxyImpl> visibleVariables = getVisibleVariables(getStackFrameProxy());
final Pair<Set<String>, Set<TextWithImports>> usedVars =
ApplicationManager.getApplication().runReadAction(new Computable<Pair<Set<String>, Set<TextWithImports>>>() {
Pair<Set<String>, Set<TextWithImports>> usedVars = EMPTY_USED_VARS;
if (sourcePosition != null) {
usedVars = ApplicationManager.getApplication().runReadAction(new Computable<Pair<Set<String>, Set<TextWithImports>>>() {
@Override
public Pair<Set<String>, Set<TextWithImports>> compute() {
return findReferencedVars(ContainerUtil.union(visibleVariables.keySet(), visibleLocals), sourcePosition);
}
});
// add locals
}
// add locals
if (myAutoWatchMode) {
for (String var : usedVars.first) {
LocalVariableProxyImpl local = visibleVariables.get(var);
@@ -310,10 +313,11 @@ public class JavaStackFrame extends XStackFrame {
final EvaluationContextImpl evalContextCopy = evaluationContext.createEvaluationContext(evaluationContext.getThisObject());
evalContextCopy.setAutoLoadClasses(false);
final Set<TextWithImports> extraVars = computeExtraVars(usedVars, sourcePosition, evaluationContext);
// add extra vars
addToChildrenFrom(extraVars, children, evaluationContext);
if (sourcePosition != null) {
Set<TextWithImports> extraVars = computeExtraVars(usedVars, sourcePosition, evaluationContext);
// add extra vars
addToChildrenFrom(extraVars, children, evaluationContext);
}
// add expressions
addToChildrenFrom(usedVars.second, children, evalContextCopy);
@@ -340,8 +344,8 @@ public class JavaStackFrame extends XStackFrame {
}
private static Set<TextWithImports> computeExtraVars(Pair<Set<String>, Set<TextWithImports>> usedVars,
SourcePosition sourcePosition,
EvaluationContextImpl evalContext) {
@NotNull SourcePosition sourcePosition,
@NotNull EvaluationContextImpl evalContext) {
Set<String> alreadyCollected = new HashSet<String>(usedVars.first);
for (TextWithImports text : usedVars.second) {
alreadyCollected.add(text.getText());
@@ -578,7 +582,7 @@ public class JavaStackFrame extends XStackFrame {
return true;
}
private static Pair<Set<String>, Set<TextWithImports>> findReferencedVars(Set<String> visibleVars, SourcePosition position) {
private static Pair<Set<String>, Set<TextWithImports>> findReferencedVars(Set<String> visibleVars, @NotNull SourcePosition position) {
final int line = position.getLine();
if (line < 0) {
return Pair.create(Collections.<String>emptySet(), Collections.<TextWithImports>emptySet());