mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-25 18:05:33 +02:00
Code Issues Wiki Activity

Bug 385553 - [hover] Expression view hover in editor can show value for

Browse source 
incorrect expression

Change-Id: If149e80bbd8e1fcfa064ad5d5055cd88ea15900b
Reviewed-on: https://git.eclipse.org/r/6876
Reviewed-by: Pawel Piech <pawel.piech@windriver.com>
IP-Clean: Pawel Piech <pawel.piech@windriver.com>
Tested-by: Pawel Piech <pawel.piech@windriver.com>

Conflicts:

	dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/expression/SingleExpressionVMNode.java
This commit is contained in:
Pawel Piech 2012-07-19 14:10:19 -07:00
parent a5066c1778
commit 2c6031c2ec
2 changed files with 77 additions and 115 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/expression/ExpressionVMProvider.java
View file

@ -421,7 +421,6 @@ public class ExpressionVMProvider extends AbstractDMVMProvider
if (input instanceof IExpressionDMContext) {
IExpressionDMContext dmc = (IExpressionDMContext) input;
SingleExpressionVMNode vmNode = (SingleExpressionVMNode) getChildVMNodes(getRootVMNode())[0];
vmNode.setExpression(dmc);
final IDMVMContext viewerInput= vmNode.createVMContext(dmc);
// provide access to viewer (needed by details pane)

191
dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/expression/SingleExpressionVMNode.java
View file

@ -15,14 +15,10 @@ import java.util.LinkedList;
import java.util.List;
import org.eclipse.cdt.dsf.concurrent.CountingRequestMonitor;
import org.eclipse.cdt.dsf.concurrent.DataRequestMonitor;
import org.eclipse.cdt.dsf.concurrent.RequestMonitor;
import org.eclipse.cdt.dsf.datamodel.IDMContext;
import org.eclipse.cdt.dsf.debug.service.IExpressions.IExpressionDMContext;
import org.eclipse.cdt.dsf.debug.ui.viewmodel.expression.ExpressionVMProvider;
import org.eclipse.cdt.dsf.debug.ui.viewmodel.expression.ExpressionsChangedEvent;
import org.eclipse.cdt.dsf.debug.ui.viewmodel.expression.InvalidExpressionVMContext;
import org.eclipse.cdt.dsf.ui.concurrent.ViewerCountingRequestMonitor;
import org.eclipse.cdt.dsf.ui.concurrent.ViewerDataRequestMonitor;
import org.eclipse.cdt.dsf.ui.viewmodel.AbstractVMContext;
import org.eclipse.cdt.dsf.ui.viewmodel.AbstractVMNode;
import org.eclipse.cdt.dsf.ui.viewmodel.IVMNode;
@ -38,6 +34,7 @@ import org.eclipse.debug.internal.ui.viewers.model.provisional.IElementLabelProv
import org.eclipse.debug.internal.ui.viewers.model.provisional.IHasChildrenUpdate;
import org.eclipse.debug.internal.ui.viewers.model.provisional.ILabelUpdate;
import org.eclipse.debug.internal.ui.viewers.model.provisional.IModelDelta;
import org.eclipse.debug.internal.ui.viewers.model.provisional.IViewerUpdate;
import org.eclipse.jface.viewers.TreePath;
/**
@ -89,6 +86,10 @@ public class SingleExpressionVMNode extends AbstractVMNode implements IElementLa
return getVMNode().hashCode() + fDmc.hashCode();
}
@Override
public String toString() {
return fDmc.toString();
}
}
private static class SimpleExpression implements IExpression {
@ -133,27 +134,8 @@ public class SingleExpressionVMNode extends AbstractVMNode implements IElementLa
}
}
private static class SingleExpressionManager {
private static final IExpression[] NO_EXPRESSIONS = {};
IExpression fExpression;
public IExpression[] getExpressions() {
if (fExpression != null) {
return new IExpression[] { fExpression };
}
return NO_EXPRESSIONS;
}
public void setExpression(IExpression expression) {
fExpression = expression;
}
}
/** Local reference to the expression manager */
private final SingleExpressionManager fManager;
public SingleExpressionVMNode(ExpressionVMProvider provider) {
super(provider);
fManager = new SingleExpressionManager();
}
@Override
@ -165,13 +147,19 @@ public class SingleExpressionVMNode extends AbstractVMNode implements IElementLa
return (ExpressionVMProvider)getVMProvider();
}
private IExpressionDMContext getUpdateExpressionDMC(IViewerUpdate update) {
if (update.getElement() instanceof IDMVMContext) {
IDMContext dmc = ((IDMVMContext)update.getElement()).getDMContext();
if (dmc instanceof IExpressionDMContext) {
return (IExpressionDMContext)dmc;
}
}
return null;
}
public void update(IHasChildrenUpdate[] updates) {
// Test availability of children based on whether there are any expressions
// in the manager. We assume that the getExpressions() will just read
// local state data, so we don't bother using a job to perform this
// operation.
for (int i = 0; i < updates.length; i++) {
updates[i].setHasChilren(fManager.getExpressions().length != 0);
updates[i].setHasChilren(getUpdateExpressionDMC(updates[i]) != null);
updates[i].done();
}
}
@ -182,69 +170,45 @@ public class SingleExpressionVMNode extends AbstractVMNode implements IElementLa
// We assume that the getExpressions() will just read local state data,
// so we don't bother using a job to perform this operation.
update.setChildCount(fManager.getExpressions().length);
update.setChildCount(getUpdateExpressionDMC(update) != null ? 1 : 0);
update.done();
}
}
public void update(final IChildrenUpdate[] updates) {
for (IChildrenUpdate update : updates) {
doUpdateChildren(update);
IExpressionDMContext dmc = getUpdateExpressionDMC(update);
if (dmc != null) {
doUpdateChildren(update, new SimpleExpression(dmc.getExpression()));
}
else {
handleFailedUpdate(update);
}
}
}
public void doUpdateChildren(final IChildrenUpdate update) {
final IExpression[] expressions = fManager.getExpressions();
// For each (expression) element in update, find the layout node that can
// parse it. And for each expression that has a corresponding layout node,
// call IExpressionLayoutNode#getElementForExpression to generate a VMC.
// Since the last is an async call, we need to create a multi-RM to wait
// for all the calls to complete.
final CountingRequestMonitor multiRm = new ViewerCountingRequestMonitor(getVMProvider().getExecutor(), update);
int multiRmCount = 0;
int lowOffset= update.getOffset();
if (lowOffset < 0) {
lowOffset = 0;
}
int length= update.getLength();
if (length <= 0) {
length = expressions.length;
}
final int highOffset= lowOffset + length;
for (int i = lowOffset; i < highOffset && i < expressions.length + 1; i++) {
if (i < expressions.length) {
multiRmCount++;
final int childIndex = i;
final IExpression expression = expressions[i];
// getElementForExpression() accepts a IElementsUpdate as an argument.
// Construct an instance of VMElementsUpdate which will call a
// the request monitor when it is finished. The request monitor
// will in turn set the element in the update argument in this method.
((ExpressionVMProvider)getVMProvider()).update(
new VMExpressionUpdate(
update, expression,
new DataRequestMonitor<Object>(getVMProvider().getExecutor(), multiRm) {
@Override
protected void handleSuccess() {
update.setChild(getData(), childIndex);
multiRm.done();
}
@Override
protected void handleError() {
update.setChild(new InvalidExpressionVMContext(SingleExpressionVMNode.this, expression), childIndex);
multiRm.done();
}
})
);
}
}
// If no expressions were parsed, we're finished.
// Set the count to the counting RM.
multiRm.setDoneCount(multiRmCount);
public void doUpdateChildren(final IChildrenUpdate update, final IExpression expression) {
// getElementForExpression() accepts a IElementsUpdate as an argument.
// Construct an instance of VMElementsUpdate which will call a
// the request monitor when it is finished. The request monitor
// will in turn set the element in the update argument in this method.
((ExpressionVMProvider)getVMProvider()).update(
new VMExpressionUpdate(
update, expression,
new ViewerDataRequestMonitor<Object>(getVMProvider().getExecutor(), update) {
@Override
protected void handleSuccess() {
update.setChild(getData(), 0);
update.done();
}
@Override
protected void handleError() {
update.setChild(new InvalidExpressionVMContext(SingleExpressionVMNode.this, expression), 0);
update.done();
}
})
);
}
public void update(ILabelUpdate[] updates) {
@ -264,40 +228,47 @@ public class SingleExpressionVMNode extends AbstractVMNode implements IElementLa
retVal |= IModelDelta.ADDED | IModelDelta.REMOVED | IModelDelta.INSERTED | IModelDelta.CONTENT ;
}
for (IExpression expression : fManager.getExpressions()) {
retVal |= getExpressionVMProvider().getDeltaFlagsForExpression(expression, event);
// The expression in the hover is not known here, so assume that all
// expression nodes need to provide delta flags for event. Iterate
// through them here and collect the flags.
for (IExpressionVMNode node : getExpressionVMProvider().getExpressionNodes()) {
retVal |= getDeltaFlagsForNode(node, event);
}
return retVal;
}
private int getDeltaFlagsForNode(IVMNode node, Object event) {
int retVal = node.getDeltaFlags(event);
for (IVMNode child : getVMProvider().getChildVMNodes(node)) {
if (!node.equals(child)) {
retVal |= getDeltaFlagsForNode(child, event);
}
}
return retVal;
}
public void buildDelta(final Object event, final VMDelta parentDelta, final int nodeOffset, final RequestMonitor requestMonitor) {
if (event instanceof ExpressionsChangedEvent) {
buildDeltaForExpressionsChangedEvent((ExpressionsChangedEvent)event, parentDelta, nodeOffset, requestMonitor);
} else {
// For each expression, find its corresponding node and ask that
// layout node for its delta flags for given event. If there are delta flags to be
// generated, call the asynchronous method to do so.
CountingRequestMonitor multiRm = new CountingRequestMonitor(getExecutor(), requestMonitor);
int buildDeltaForExpressionCallCount = 0;
IExpression[] expressions = fManager.getExpressions();
for (int i = 0; i < expressions.length; i++ ) {
int flags = getExpressionVMProvider().getDeltaFlagsForExpression(expressions[i], event);
// If the given expression has no delta flags, skip it.
if (flags == IModelDelta.NO_CHANGE) continue;
int elementOffset = nodeOffset >= 0 ? nodeOffset + i : -1;
getExpressionVMProvider().buildDeltaForExpression(
expressions[i], elementOffset, event, parentDelta, getTreePathFromDelta(parentDelta),
new RequestMonitor(getExecutor(), multiRm));
buildDeltaForExpressionCallCount++;
Object parent = parentDelta.getElement();
if (parent instanceof IDMVMContext) {
IDMContext dmc = ((IDMVMContext)parent).getDMContext();
if (dmc instanceof IExpressionDMContext) {
IExpression expression = new SimpleExpression( ((IExpressionDMContext)dmc).getExpression() );
int flags = getExpressionVMProvider().getDeltaFlagsForExpression(expression, event);
// If the given expression has no delta flags, skip it.
if (flags != IModelDelta.NO_CHANGE) {
getExpressionVMProvider().buildDeltaForExpression(
expression, nodeOffset, event, parentDelta, getTreePathFromDelta(parentDelta),
requestMonitor);
return;
}
}
}
multiRm.setDoneCount(buildDeltaForExpressionCallCount);
}
requestMonitor.done();
}
private void buildDeltaForExpressionsChangedEvent(ExpressionsChangedEvent event, VMDelta parentDelta,
@ -326,16 +297,8 @@ public class SingleExpressionVMNode extends AbstractVMNode implements IElementLa
return new TreePath(elementList.toArray());
}
protected void updateElementsInSessionThread(IChildrenUpdate update) {
doUpdateChildren(update);
}
public IDMVMContext createVMContext(IDMContext dmc) {
return new RootDMVMContext(getVMProvider().getRootVMNode(), dmc);
}
public void setExpression(IExpressionDMContext dmc) {
String text = dmc.getExpression();
fManager.setExpression(new SimpleExpression(text));
}
}