Conditionnal Breakpoint

src/org/rascalmpl/dap/RascalDebugAdapter.java

@@ -158,6 +158,7 @@ public CompletableFuture<Capabilities> initialize(InitializeRequestArguments arg
             capabilities.setSupportsSetVariable(false);
             capabilities.setSupportsRestartRequest(false);
             capabilities.setSupportsCompletionsRequest(true);
+            capabilities.setSupportsConditionalBreakpoints(true);
 
             return capabilities;
         }, ownExecutor);
@@ -208,7 +209,12 @@ public CompletableFuture<SetBreakpointsResponse> setBreakpoints(SetBreakpointsAr
                 ITree treeBreakableLocation = locateBreakableTree(parseTree, breakpoint.getLine());
                 if(treeBreakableLocation != null) {
                     ISourceLocation breakableLocation = TreeAdapter.getLocation(treeBreakableLocation);
-                    breakpointsCollection.addBreakpoint(breakableLocation, args.getSource());
+                    if(breakpoint.getCondition() != null){
+                        breakpointsCollection.addBreakpoint(breakableLocation, args.getSource(), breakpoint.getCondition());
+                    }
+                    else {
+                        breakpointsCollection.addBreakpoint(breakableLocation, args.getSource());
+                    }
                 }
                 Breakpoint b = new Breakpoint();
                 b.setId(i);

src/org/rascalmpl/dap/breakpoint/BreakpointsCollection.java

@@ -68,6 +68,13 @@ public void addBreakpoint(ISourceLocation location, Source source){
         debugHandler.processMessage(DebugMessageFactory.requestSetBreakpoint(location));
     }
 
+    public void addBreakpoint(ISourceLocation location, Source source, String condition){
+        String path = location.getPath();
+        BreakpointInfo breakpoint = new BreakpointInfo(breakpointIDCounter.incrementAndGet(), source);
+        breakpoints.computeIfAbsent(path, k -> new HashMap<>()).put(location, breakpoint);
+        debugHandler.processMessage(DebugMessageFactory.requestSetConditionalBreakpoint(location, condition));
+    }
+
     public int getBreakpointID(ISourceLocation location){
         String path = location.getPath();
         Map<ISourceLocation, BreakpointInfo> fileBreakpoints = breakpoints.get(path);

src/org/rascalmpl/debug/DebugHandler.java

@@ -18,7 +18,7 @@
 
 import static org.rascalmpl.debug.AbstractInterpreterEventTrigger.newNullEventTrigger;
 
-import java.util.Set;
+import java.util.Map;
 import java.util.function.IntSupplier;
 
 import org.rascalmpl.ast.AbstractAST;
@@ -27,15 +27,12 @@
 import org.rascalmpl.interpreter.control_exceptions.InterruptException;
 import org.rascalmpl.interpreter.control_exceptions.QuitException;
 import org.rascalmpl.interpreter.env.Environment;
+import org.rascalmpl.interpreter.env.Pair;
 import org.rascalmpl.interpreter.result.Result;
 import org.rascalmpl.repl.output.ICommandOutput;
 import org.rascalmpl.repl.rascal.RascalValuePrinter;
 import org.rascalmpl.values.functions.IFunction;
 import java.util.function.Function;
-import org.rascalmpl.semantics.dynamic.Statement.For;
-import org.rascalmpl.semantics.dynamic.Statement.Switch;
-import org.rascalmpl.semantics.dynamic.Statement.Visit;
-import org.rascalmpl.semantics.dynamic.Statement.While;
 import org.rascalmpl.exceptions.RascalStackOverflowError;
 import org.rascalmpl.interpreter.staticErrors.StaticError;
 import org.rascalmpl.exceptions.Throw;
@@ -56,7 +53,7 @@ public final class DebugHandler implements IDebugHandler, IRascalRuntimeEvaluati
 
 	private static final ISourceLocation DEBUGGER_PROMPT_LOCATION = URIUtil.rootLocation("debugger");
 
-	private final Set<ISourceLocation> breakpoints = new java.util.HashSet<>();
+	private final Map<ISourceLocation, String> breakpoints = new java.util.HashMap<>();
 
 	/**
 	 * Indicates a manual suspend request from the debugger, e.g. caused by a pause action in the GUI.
@@ -106,11 +103,31 @@ public DebugHandler() {
 	}
 
 	private boolean hasBreakpoint(ISourceLocation b) {
-		return breakpoints.contains(b);
+		if(!breakpoints.containsKey(b)) {
+			return false;
+		}
+		if(breakpoints.get(b) == null) {
+			return true;
+		}
+		setSuspended(true);
+
+		try {
+			Result<IValue> condResult = this.evaluate(breakpoints.get(b), (Environment) evaluator.getCurrentStack().lastElement()).result;
+			setSuspended(false);
+			return condResult.isTrue();
+		}
+		catch (Throwable e) {
+			setSuspended(false);
+			return false;
+		}
 	}
 
 	private void addBreakpoint(ISourceLocation breakpointLocation) {
-		breakpoints.add(breakpointLocation);
+		breakpoints.put(breakpointLocation, null);
+	}
+
+	private void addBreakpoint(ISourceLocation breakpointLocation, String condition) {
+		breakpoints.put(breakpointLocation, condition);
 	}
 
 	private void removeBreakpoint(ISourceLocation breakpointLocation) {
@@ -278,6 +295,7 @@ protected Function<IValue, IValue> liftProviderFunction(IFunction func) {
 			// Save old state
 			AbstractInterpreterEventTrigger oldTrigger = evaluator.getEventTrigger();
 			Environment oldEnvironment = evaluator.getCurrentEnvt();
+			AbstractAST oldAST = evaluator.getCurrentAST();
 			try {
 				// disable suspend triggers while evaluating expressions from the debugger
 				evaluator.removeSuspendTriggerListener(this);
@@ -341,6 +359,7 @@ protected Function<IValue, IValue> liftProviderFunction(IFunction func) {
 				evaluator.setCurrentEnvt(oldEnvironment);
 				evaluator.setEventTrigger(oldTrigger);
 				evaluator.addSuspendTriggerListener(this);
+				evaluator.setCurrentAST(oldAST);
 			}
 		}
 	}
@@ -367,14 +386,21 @@ public void processMessage(IDebugMessage message) {
 	  switch (message.getSubject()) {
 
 	  case BREAKPOINT:
-	    ISourceLocation breakpointLocation = (ISourceLocation) message.getPayload();
-
 	    switch (message.getAction()) {
 	    case SET:
-	      addBreakpoint(breakpointLocation);
+		  switch (message.getDetail()) {
+			case CONDITIONAL:
+				Pair<ISourceLocation, String> payload = (Pair<ISourceLocation, String>) message.getPayload();		
+	      		addBreakpoint(payload.getFirst(), payload.getSecond());
+				break;
+			case UNKNOWN:
+	      		ISourceLocation breakpointLocation = (ISourceLocation) message.getPayload();
+	      		addBreakpoint(breakpointLocation);
+		  }
 	      break;
 
 	    case DELETE:
+	      ISourceLocation breakpointLocation = (ISourceLocation) message.getPayload();
 	      removeBreakpoint(breakpointLocation);
 	      break;
 	    }

src/org/rascalmpl/debug/DebugMessageFactory.java

@@ -11,6 +11,8 @@
 *******************************************************************************/
 package org.rascalmpl.debug;
 
+import org.rascalmpl.interpreter.env.Pair;
+
 import io.usethesource.vallang.ISourceLocation;
 
 /**
@@ -53,6 +55,10 @@ public static IDebugMessage requestSetBreakpoint(ISourceLocation location) {
 		return new DebugMessage(IDebugMessage.Action.SET, IDebugMessage.Subject.BREAKPOINT, IDebugMessage.Detail.UNKNOWN, location);
 	}
 
+	public static IDebugMessage requestSetConditionalBreakpoint(ISourceLocation location, String condition) {
+		return new DebugMessage(IDebugMessage.Action.SET, IDebugMessage.Subject.BREAKPOINT, IDebugMessage.Detail.CONDITIONAL, new Pair<ISourceLocation, String>(location, condition));
+	}
+
 	public static IDebugMessage requestDeleteBreakpoint(ISourceLocation location) {
 		return new DebugMessage(IDebugMessage.Action.DELETE, IDebugMessage.Subject.BREAKPOINT, IDebugMessage.Detail.UNKNOWN, location);
 	}

src/org/rascalmpl/debug/IDebugMessage.java

@@ -73,7 +73,12 @@ enum Detail {
 		 * Indicates a continuation of the execution, caused by a step out
 		 * request.
 		 */
-		STEP_OUT
+		STEP_OUT,
+
+		/**
+		 * Indicates a conditional breakpoint.
+		 */
+		CONDITIONAL
 	}
 
 	Action getAction();