Skip to content

Commit dd2e0ad

Browse files
authored
remove java deps from debugger
EA-95080 - NCDFE: DlvStackFrame$.lambda$getExpressionRangeAtOffset$
1 parent 610ff0e commit dd2e0ad

File tree

1 file changed

+7
-3
lines changed

1 file changed

+7
-3
lines changed

src/com/goide/dlv/DlvStackFrame.java

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
import com.goide.dlv.protocol.DlvRequest;
2222
import com.goide.psi.*;
2323
import com.goide.sdk.GoSdkService;
24-
import com.intellij.debugger.impl.DebuggerUtilsEx;
2524
import com.intellij.execution.configurations.ModuleBasedConfiguration;
2625
import com.intellij.execution.configurations.RunProfile;
2726
import com.intellij.icons.AllIcons;
@@ -37,6 +36,7 @@
3736
import com.intellij.openapi.vfs.VirtualFile;
3837
import com.intellij.psi.PsiDocumentManager;
3938
import com.intellij.psi.PsiElement;
39+
import com.intellij.psi.PsiFile;
4040
import com.intellij.psi.util.PsiTreeUtil;
4141
import com.intellij.ui.ColoredTextContainer;
4242
import com.intellij.ui.SimpleTextAttributes;
@@ -81,6 +81,11 @@ public void evaluate(@NotNull String expression,
8181
.done(variable -> callback.evaluated(createXValue(variable, AllIcons.Debugger.Watch)))
8282
.rejected(throwable -> callback.errorOccurred(throwable.getMessage()));
8383
}
84+
85+
@Nullable
86+
private PsiElement findElementAt(@Nullable PsiFile file, int offset) {
87+
return file != null ? file.findElementAt(offset) : null;
88+
}
8489

8590
@Nullable
8691
@Override
@@ -91,8 +96,7 @@ public TextRange getExpressionRangeAtOffset(@NotNull Project project,
9196
Ref<TextRange> currentRange = Ref.create(null);
9297
PsiDocumentManager.getInstance(project).commitAndRunReadAction(() -> {
9398
try {
94-
PsiElement elementAtCursor =
95-
DebuggerUtilsEx.findElementAt(PsiDocumentManager.getInstance(project).getPsiFile(document), offset);
99+
PsiElement elementAtCursor = findElementAt(PsiDocumentManager.getInstance(project).getPsiFile(document), offset);
96100
GoTypeOwner e = PsiTreeUtil.getParentOfType(elementAtCursor,
97101
GoExpression.class,
98102
GoVarDefinition.class,

0 commit comments

Comments
 (0)