Bug 18188 - Inspect is broken

2 files changed, 21 insertions, 4 deletions

diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/expression/ExpressionViewEventHandler.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/expression/ExpressionViewEventHandler.java
index 1d860f6a1..42bfaba3a 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/expression/ExpressionViewEventHandler.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/expression/ExpressionViewEventHandler.java
@@ -7,6 +7,7 @@ package org.eclipse.debug.internal.ui.views.expression;
 
 import java.util.List;
 
+import org.eclipse.debug.core.DebugEvent;
 import org.eclipse.debug.core.DebugPlugin;
 import org.eclipse.debug.core.IExpressionListener;
 import org.eclipse.debug.core.model.IExpression;
@@ -94,4 +95,10 @@ public class ExpressionViewEventHandler extends VariablesViewEventHandler implem
 		};
 		getView().asyncExec(r);			
 	}
+	
+	/**
+	 * Override the superclass method. Do nothing.
+	 */
+	protected void doHandleResumeEvent(DebugEvent event) {
+	}
 }
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/VariablesViewEventHandler.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/VariablesViewEventHandler.java
index 51962aedc..cfa8ffe64 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/VariablesViewEventHandler.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/VariablesViewEventHandler.java
@@ -55,14 +55,24 @@ public class VariablesViewEventHandler extends AbstractDebugEventHandler {
 					}
 					break;
 				case DebugEvent.RESUME:
-					if (!event.isStepStart() && !event.isEvaluation()) {
-						// Clear existing variables from the view
-						getViewer().setInput(null);
-					}
+					doHandleResumeEvent(event);
 			}
 		}
 	}
 
+	/**
+	 * Clear the variables immediately upon resume.
+	 */
+	protected void doHandleResumeEvent(DebugEvent event) {
+		if (!event.isStepStart() && !event.isEvaluation()) {
+			// Clear existing variables from the view
+			getViewer().setInput(null);
+		}
+	}
+
+
+
+
 	protected VariablesView getVariablesView() {
 		return (VariablesView)getView();
 	}