Merge pull request #2275 from lf-lang/trace-plugin-property-fix

Extensions to the trace-plugin property

core/src/integrationTest/java/org/lflang/tests/lsp/LspTests.java

@@ -229,8 +229,9 @@ private static Predicate<List<Diagnostic>> diagnosticsIncludeText(
    */
   private void runTest(Path test) {
     MockReportProgress reportProgress = new MockReportProgress();
+    MockCancelIndicator cancelIndicator = new MockCancelIndicator();
     try {
-      builder.run(URI.createFileURI(test.toString()), false, reportProgress, () -> false);
+      builder.run(URI.createFileURI(test.toString()), "", false, reportProgress, cancelIndicator);
     } catch (Exception e) {
       e.printStackTrace();
       throw e;

core/src/integrationTest/java/org/lflang/tests/lsp/MockCancelIndicator.java

@@ -0,0 +1,15 @@
+package org.lflang.tests.lsp;
+
+import org.eclipse.xtext.util.CancelIndicator;
+
+/**
+ * Mock the CancelIndicator interface for testing.
+ *
+ * @author Erling Jellum
+ */
+public class MockCancelIndicator implements CancelIndicator {
+  @Override
+  public boolean isCanceled() {
+    return false;
+  }
+}

core/src/main/java/org/lflang/LinguaFranca.xtext

@@ -221,7 +221,7 @@ Watchdog:
     'watchdog' name=ID '(' timeout=Expression ')'
     ('->' effects+=VarRefOrModeTransition (',' effects+=VarRefOrModeTransition)*)?
     code=Code;
-    
+
 STP:
     'STP' '(' value=Expression ')' code=Code;
 
@@ -232,7 +232,7 @@ Instantiation:
     (attributes+=Attribute)*
     name=ID '=' 'new' (widthSpec=WidthSpec)?
     reactorClass=[ReactorDecl] ('<' typeArgs+=Type (',' typeArgs+=Type)* '>')? '('
-    (parameters+=Assignment (',' parameters+=Assignment)*)? 
+    (parameters+=Assignment (',' parameters+=Assignment)*)?
     ')' (('at' host=Host ';') | ';'?);
 
 Connection: