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

IDEA-385699, debugger: fix lambda parameters appearing in auto variables before lambda is reached

Browse Source 
^IDEA-385699 fixed

GitOrigin-RevId: 4a4dd9fd2836c7062a06315872b90c27428db22a
This commit is contained in:
Vladimir Parfinenko
2026-02-13 16:14:07 +00:00
committed by intellij-monorepo-bot
parent 0d46e92cde
commit d5c2360e25
1 changed files with 27 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/debugger/impl/src/com/intellij/debugger/engine/JavaStackFrame.java
+27 -3
View File
@@ -54,6 +54,7 @@ import com.intellij.psi.PsiExpressionStatement;
import com.intellij.psi.PsiField;
import com.intellij.psi.PsiFile;
import com.intellij.psi.PsiJavaCodeReferenceElement;
import com.intellij.psi.PsiLambdaExpression;
import com.intellij.psi.PsiLocalVariable;
import com.intellij.psi.PsiMethod;
import com.intellij.psi.PsiMethodCallExpression;
@@ -558,11 +559,15 @@ public class JavaStackFrame extends XStackFrame implements JVMStackFrameInfoProv
@Override
public void visitElement(final @NotNull PsiElement element) {
if (myLineRange.intersects(element.getTextRange())) {
if (doesIntersect(element)) {
super.visitElement(element);
}
}
private boolean doesIntersect(@NotNull PsiElement element) {
return myLineRange.intersects(element.getTextRange());
}
@Override
public void visitMethodCallExpression(final @NotNull PsiMethodCallExpression expression) {
if (myCollectExpressions) {
@@ -576,7 +581,7 @@ public class JavaStackFrame extends XStackFrame implements JVMStackFrameInfoProv
@Override
public void visitReferenceExpression(final @NotNull PsiReferenceExpression reference) {
if (myLineRange.intersects(reference.getTextRange()) && reference.resolve() instanceof PsiVariable var) {
if (doesIntersect(reference) && reference.resolve() instanceof PsiVariable var) {
if (var instanceof PsiField) {
if (myCollectExpressions && !DebuggerUtils.hasSideEffectsOrReferencesMissingVars(reference, myVisibleLocals)) {
/*
@@ -641,7 +646,7 @@ public class JavaStackFrame extends XStackFrame implements JVMStackFrameInfoProv
}
private void processVariable(final PsiVariable variable) {
if (myLineRange.intersects(variable.getTextRange()) && myVisibleLocals.contains(variable.getName())) {
if (doesIntersect(variable) && myVisibleLocals.contains(variable.getName())) {
myVars.add(variable.getName());
}
}
@@ -650,6 +655,25 @@ public class JavaStackFrame extends XStackFrame implements JVMStackFrameInfoProv
public void visitClass(final @NotNull PsiClass aClass) {
// Do not step in to local and anonymous classes...
}
@Override
public void visitLambdaExpression(final @NotNull PsiLambdaExpression expression) {
if (!doesIntersect(expression)) {
return;
}
// If any lambda parameter is in the visible locals, we're inside the lambda.
// Otherwise, don't step in to it.
var insideLambda = false;
for (PsiParameter parameter : expression.getParameterList().getParameters()) {
if (myVisibleLocals.contains(parameter.getName())) {
insideLambda = true;
break;
}
}
if (insideLambda) {
super.visitLambdaExpression(expression);
}
}
}
protected List<LocalVariableProxyImpl> getVisibleVariables() throws EvaluateException {