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

refactoring (following IDEA-CR-14187)

Browse Source
This commit is contained in:
Dmitry Batrak
2016-10-04 14:47:13 +03:00
parent 819f2dbba2
commit 977e85be1d
1 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/tree/nodes/XValueNodeImpl.java
+3 -8
View File
@@ -39,7 +39,6 @@ import com.intellij.ui.SimpleTextAttributes;
import com.intellij.util.ThreeState;
import com.intellij.util.ui.UIUtil;
import com.intellij.xdebugger.XDebugSession;
import com.intellij.xdebugger.XDebuggerManager;
import com.intellij.xdebugger.XSourcePosition;
import com.intellij.xdebugger.frame.*;
import com.intellij.xdebugger.frame.presentation.XValuePresentation;
@@ -156,7 +155,7 @@ public class XValueNodeImpl extends XValueContainerNode<XValue> implements XValu
return;
}
if (!showAsInlay(file, position)) {
if (!showAsInlay(file, position, debuggerPosition)) {
data.put(file, position, XValueNodeImpl.this);
timestamps.put(file, document.getModificationStamp());
@@ -173,13 +172,9 @@ public class XValueNodeImpl extends XValueContainerNode<XValue> implements XValu
}
}
private boolean showAsInlay(VirtualFile file, XSourcePosition position) {
private boolean showAsInlay(VirtualFile file, XSourcePosition position, XSourcePosition debuggerPosition) {
if (!Registry.is("debugger.show.values.inplace")) return false;
XDebugSession session = XDebuggerManager.getInstance(myTree.getProject()).getCurrentSession();
if (session == null) return false;
XSourcePosition currentPosition = session.getCurrentPosition();
if (currentPosition == null) return false;
if (!currentPosition.getFile().equals(position.getFile()) || currentPosition.getLine() != position.getLine()) return false;
if (!debuggerPosition.getFile().equals(position.getFile()) || debuggerPosition.getLine() != position.getLine()) return false;
XValue container = getValueContainer();
if (!(container instanceof XValueWithInlinePresentation)) return false;
String presentation = ((XValueWithInlinePresentation)container).computeInlinePresentation();