From 6b8a881e8e7b70fa408f6e04361e844879d77b75 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Fournier?= <clement.fournier76@gmail.com>
Date: Sun, 26 Sep 2021 16:52:13 +0200
Subject: [PATCH 01/21] Add end position to LfIssue

---
 org.lflang.lfc/src/org/lflang/lfc/Main.java              | 9 +++++----
 org.lflang.lfc/src/org/lflang/lfc/ReportingUtil.kt       | 2 ++
 .../src/org/lflang/lfc/StandaloneErrorReporter.java      | 2 +-
 .../src/org/lflang/lfc/StandaloneIssueAcceptor.java      | 2 ++
 4 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/org.lflang.lfc/src/org/lflang/lfc/Main.java b/org.lflang.lfc/src/org/lflang/lfc/Main.java
index 8b5c2ae3ba..1e954e9c61 100644
--- a/org.lflang.lfc/src/org/lflang/lfc/Main.java
+++ b/org.lflang.lfc/src/org/lflang/lfc/Main.java
@@ -521,11 +521,12 @@ private Resource getValidatedResource(Path path) {
         for (Issue issue : issues) {
             URI uri = issue.getUriToProblem(); // Issues may also relate to imported resources.
             try {
-                issueCollector.accept(new LfIssue(issue.getMessage(),
-                    issue.getSeverity(), issue.getLineNumber(),
-                    issue.getColumn(), issue.getLength(), FileConfig.toPath(uri)));
+                issueCollector.accept(new LfIssue(issue.getMessage(), issue.getSeverity(),
+                                                  issue.getLineNumber(), issue.getColumn(),
+                                                  issue.getLineNumberEnd(), issue.getColumnEnd(),
+                                                  issue.getLength(), FileConfig.toPath(uri)));
             } catch (IOException e) {
-                reporter.printError("Unable to convert '" + uri + "' to path.");
+                reporter.printError("Unable to convert '" + uri + "' to path." + e);
             }
         }
         return resource;
diff --git a/org.lflang.lfc/src/org/lflang/lfc/ReportingUtil.kt b/org.lflang.lfc/src/org/lflang/lfc/ReportingUtil.kt
index dca98b5bd6..3ec30e0249 100644
--- a/org.lflang.lfc/src/org/lflang/lfc/ReportingUtil.kt
+++ b/org.lflang.lfc/src/org/lflang/lfc/ReportingUtil.kt
@@ -83,6 +83,8 @@ data class LfIssue(
     val severity: Severity,
     val line: Int?,
     val column: Int?,
+    val endLine: Int?,
+    val endColumn: Int?,
     val length: Int?,
     val file: Path?
 ) : Comparable<LfIssue> {
diff --git a/org.lflang.lfc/src/org/lflang/lfc/StandaloneErrorReporter.java b/org.lflang.lfc/src/org/lflang/lfc/StandaloneErrorReporter.java
index 9f67e5efc4..96a75bb89d 100644
--- a/org.lflang.lfc/src/org/lflang/lfc/StandaloneErrorReporter.java
+++ b/org.lflang.lfc/src/org/lflang/lfc/StandaloneErrorReporter.java
@@ -51,7 +51,7 @@ private String reportWithNode(String message, Severity severity, EObject obj) {
     }
 
     private String reportSimpleFileCtx(String message, Severity severity, Integer line, Path path) {
-        LfIssue issue = new LfIssue(message, severity, line, null, null, path);
+        LfIssue issue = new LfIssue(message, severity, line, 1, line, 1, 0, path);
         issueAcceptor.accept(issue);
         // Return a string that can be inserted into the generated code.
         return message;
diff --git a/org.lflang.lfc/src/org/lflang/lfc/StandaloneIssueAcceptor.java b/org.lflang.lfc/src/org/lflang/lfc/StandaloneIssueAcceptor.java
index 2ac587e338..aed51b59f7 100644
--- a/org.lflang.lfc/src/org/lflang/lfc/StandaloneIssueAcceptor.java
+++ b/org.lflang.lfc/src/org/lflang/lfc/StandaloneIssueAcceptor.java
@@ -48,6 +48,8 @@ void accept(Severity severity, String message, EObject object, EStructuralFeatur
             severity,
             diagnostic.getLine(),
             diagnostic.getColumn(),
+            diagnostic.getLineEnd(),
+            diagnostic.getColumnEnd(),
             diagnostic.getLength(),
             getPath(object)
         );

From 2505e2c2ea6e8c7c4bfc0320e059fce496247fc2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Fournier?= <clement.fournier76@gmail.com>
Date: Sun, 26 Sep 2021 17:57:07 +0200
Subject: [PATCH 02/21] Add tests for standalone error messages

---
 org.lflang.lfc/build.gradle                   |  21 +++
 .../org/lflang/lfc/LFStandaloneModule.java    |   7 +-
 org.lflang.lfc/src/org/lflang/lfc/Main.java   | 120 +++++++++++-------
 .../src/org/lflang/lfc/ReportingUtil.kt       |  10 +-
 .../lflang/lfc/tests/LfIssueReportingTest.kt  |  93 ++++++++++++++
 .../org/lflang/lfc/tests/multilineWarning.lf  |   5 +
 .../lflang/lfc/tests/multilineWarning.stderr  |   5 +
 .../org/lflang/lfc/tests/simpleWarning.lf     |   5 +
 .../org/lflang/lfc/tests/simpleWarning.stderr |  16 +++
 .../lflang/tests/standalone/simpleWarning.lf  |   0
 .../tests/standalone/simpleWarning.stderr     |   0
 11 files changed, 231 insertions(+), 51 deletions(-)
 create mode 100644 org.lflang.lfc/test/kotlin/org/lflang/lfc/tests/LfIssueReportingTest.kt
 create mode 100644 org.lflang.lfc/test/resources/org/lflang/lfc/tests/multilineWarning.lf
 create mode 100644 org.lflang.lfc/test/resources/org/lflang/lfc/tests/multilineWarning.stderr
 create mode 100644 org.lflang.lfc/test/resources/org/lflang/lfc/tests/simpleWarning.lf
 create mode 100644 org.lflang.lfc/test/resources/org/lflang/lfc/tests/simpleWarning.stderr
 create mode 100644 org.lflang.tests/src/org/lflang/tests/standalone/simpleWarning.lf
 create mode 100644 org.lflang.tests/src/org/lflang/tests/standalone/simpleWarning.stderr

diff --git a/org.lflang.lfc/build.gradle b/org.lflang.lfc/build.gradle
index f96d08da49..ad4b8b1a36 100644
--- a/org.lflang.lfc/build.gradle
+++ b/org.lflang.lfc/build.gradle
@@ -1,7 +1,28 @@
+
+sourceSets {
+    test {
+        java.srcDirs = []
+        kotlin.srcDirs = ['test/kotlin']
+        resources.srcDir('test/resources')
+        resources.include '**/*'
+    }
+}
+
+compileTestKotlin {
+    destinationDir = compileTestJava.destinationDir
+    kotlinOptions {
+        jvmTarget = "1.8"
+    }
+}
+
+
+
 dependencies {
     implementation project(':org.lflang')
     implementation "org.eclipse.xtext:org.eclipse.xtext.ide:${xtextVersion}"
     implementation "org.eclipse.xtext:org.eclipse.xtext.xbase.ide:${xtextVersion}"
+
+    testImplementation "junit:junit:4.12"
 }
 
 apply plugin: 'application'
diff --git a/org.lflang.lfc/src/org/lflang/lfc/LFStandaloneModule.java b/org.lflang.lfc/src/org/lflang/lfc/LFStandaloneModule.java
index 01215fef69..291c28eaf2 100644
--- a/org.lflang.lfc/src/org/lflang/lfc/LFStandaloneModule.java
+++ b/org.lflang.lfc/src/org/lflang/lfc/LFStandaloneModule.java
@@ -26,15 +26,14 @@
  * generated by Xtext 2.23.0
  */
 
-package org.lflang;
+package org.lflang.lfc;
 
 import java.util.Objects;
 
 import org.eclipse.xtext.validation.ValidationMessageAcceptor;
 
-import org.lflang.lfc.ReportingBackend;
-import org.lflang.lfc.StandaloneErrorReporter;
-import org.lflang.lfc.StandaloneIssueAcceptor;
+import org.lflang.ErrorReporter;
+import org.lflang.LFRuntimeModule;
 
 import com.google.inject.Binder;
 import com.google.inject.Module;
diff --git a/org.lflang.lfc/src/org/lflang/lfc/Main.java b/org.lflang.lfc/src/org/lflang/lfc/Main.java
index 1e954e9c61..b74af4d7bb 100644
--- a/org.lflang.lfc/src/org/lflang/lfc/Main.java
+++ b/org.lflang.lfc/src/org/lflang/lfc/Main.java
@@ -1,3 +1,27 @@
+/*
+ * Copyright (c) 2021, TU Dresden.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
+ * THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
+ * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
 /**
  * Stand-alone version of the Lingua Franca compiler (lfc).
  */
@@ -35,11 +59,11 @@
 import org.eclipse.xtext.validation.CheckMode;
 import org.eclipse.xtext.validation.IResourceValidator;
 import org.eclipse.xtext.validation.Issue;
+
 import org.lflang.ASTUtils;
 import org.lflang.ErrorReporter;
 import org.lflang.FileConfig;
 import org.lflang.LFRuntimeModule;
-import org.lflang.LFStandaloneModule;
 import org.lflang.LFStandaloneSetup;
 import org.lflang.generator.StandaloneContext;
 
@@ -59,9 +83,9 @@ public class Main {
      * The location of the class file of this class inside of the jar.
      */
     private static String MAIN_PATH_IN_JAR = String.join("/",
-                                                         new String[] {"!", "org", "lflang", "lfc", "Main.class"});
+                                                         new String[] {"!", "org", "lflang", "org/lflang/lfc", "Main.class"});
+
 
-    
     /**
      * Object for interpreting command line arguments.
      */
@@ -87,13 +111,13 @@ public class Main {
      */
     @Inject
     private Provider<ResourceSet> resourceSetProvider;
-    
+
     /**
      * Injected resource validator.
      */
     @Inject
     private IResourceValidator validator;
-    
+
     /**
      * Injected code generator.
      */
@@ -140,20 +164,20 @@ enum CLIOption {
         OUTPUT_PATH("o", "output-path", true, false, "Specify the root output directory.", false),
         RUNTIME_VERSION(null, "runtime-version", true, false, "Specify the version of the runtime library used for compiling LF programs.", true),
         EXTERNAL_RUNTIME_PATH(null, "external-runtime-path", true, false, "Specify an external runtime library to be used by the compiled binary.", true);
-        
+
         /**
          * The corresponding Apache CLI Option object.
          */
         public final Option option;
-        
+
         /**
          * Whether or not to pass this option to the code generator.
          */
         public final boolean passOn;
-        
+
         /**
          * Construct a new CLIOption.
-         * 
+         *
          * @param opt         The short option name. E.g.: "f" denotes a flag
          *                    "-f".
          * @param longOpt     The long option name. E.g.: "foo" denotes a flag
@@ -171,10 +195,10 @@ enum CLIOption {
             option.setRequired(isReq);
             this.passOn = passOn;
         }
-    
+
         /**
          * Create an Apache Commons CLI Options object and add all the options.
-         * 
+         *
          * @return Options object that includes all the options in this enum.
          */
         public static Options getOptions() {
@@ -182,11 +206,11 @@ public static Options getOptions() {
             Arrays.asList(CLIOption.values()).forEach(o -> opts.addOption(o.option));
             return opts;
         }
-        
+
         /**
          * Return a list of options that are to be passed on to the code
          * generator.
-         * 
+         *
          * @return List of options that must be passed on to the code gen stage.
          */
         public static List<Option> getPassedOptions() {
@@ -194,7 +218,7 @@ public static List<Option> getPassedOptions() {
                          .filter(opt -> opt.passOn).map(opt -> opt.option)
                          .collect(Collectors.toList());
         }
-        
+
     }
 
     /**
@@ -204,7 +228,7 @@ public static List<Option> getPassedOptions() {
     private boolean mustUpdate() {
         return cmd.hasOption(CLIOption.UPDATE.option.getOpt());
     }
-    
+
     /**
      * Indicate whether or not a rebuild must occur.
      * @return whether or not the rebuild or update flag is present.
@@ -212,7 +236,7 @@ private boolean mustUpdate() {
     private boolean mustRebuild() {
         return mustUpdate() || cmd.hasOption(CLIOption.REBUILD.option.getOpt());
     }
-    
+
     /**
      * Main function of the stand-alone compiler.
      * @param args CLI arguments
@@ -248,17 +272,17 @@ public static void main(final String[] args) {
 
         try {
             main.cmd = parser.parse(options, args, true);
-            
+
             if (main.cmd.hasOption(CLIOption.HELP.option.getOpt())) {
-                formatter.printHelp("lfc", options);
+                formatter.printHelp("org/lflang/lfc", options);
                 System.exit(0);
             }
-            
+
             // If the rebuild flag is not used, or if it is used but the jar
             // is not out of date, continue with the normal flow of execution.
             if (!main.mustRebuild() || (main.mustRebuild() && !main.rebuildAndFork())) {
                 List<String> files = main.cmd.getArgList();
-                
+
                 if (files.size() < 1) {
                     reporter.printFatalErrorAndExit("No input files.");
                 }
@@ -271,15 +295,15 @@ public static void main(final String[] args) {
             }
         } catch (ParseException e) {
             reporter.printFatalError("Unable to parse commandline arguments. Reason: " + e.getMessage());
-            formatter.printHelp("lfc", options);
+            formatter.printHelp("org/lflang/lfc", options);
             System.exit(1);
         }
     }
-    
+
     /**
      * Fork off a new process (that is an execution of a freshly rebuilt jar)
      * and wait for it to return.
-     * 
+     *
      * @param cmd The CommandLine object that has stored in it the CLI 
      * arguments of the parent process, to be passed on to the child process.
      */
@@ -310,18 +334,18 @@ private void forkAndWait(CommandLine cmd) {
         } catch (InterruptedException e) {
             reporter.printError("Child process was interupted. Exiting.");
         }
-        
+
     }
-    
+
     private boolean modifiedFilesExist(Path start, long mod) throws IOException {
         return ((Files.find(start, Integer.MAX_VALUE,
                 (path, attr) -> (attr.lastModifiedTime()
                         .compareTo(FileTime.fromMillis(mod)) > 0))).count() > 0);
     }
-    
+
     /**
      * Indicate whether or not there is any work to do.
-     * 
+     *
      * @return True if a rebuild is necessary, false otherwise.
      */
     private boolean needsUpdate() {
@@ -336,7 +360,7 @@ private boolean needsUpdate() {
         }
         return outOfDate;
     }
-    
+
     /**
      * Rebuild and return. If the rebuilding failed, exit.
      */
@@ -353,12 +377,12 @@ private void rebuildOrExit() {
         }
         ProcessBuilder build = new ProcessBuilder(cmdList);
         build.directory(rootPath.toFile());
-    
+
         try {
             Process p = build.start();
             // Read the output from the build.
             String result = new String(p.getInputStream().readAllBytes());
-            
+
             p.waitFor();
             if (p.exitValue() == 0) {
                 reporter.printInfo("Rebuild successful; forking off updated version of lfc.");
@@ -369,7 +393,7 @@ private void rebuildOrExit() {
             reporter.printFatalErrorAndExit("Rebuild failed. Reason: " + e.getMessage());
         }
     }
-    
+
     /**
      * Rebuild and fork if an update is needed. If the rebuild was successful,
      * return true. If no update was needed, return false. If the rebuild was
@@ -389,7 +413,7 @@ private boolean rebuildAndFork() {
         }
         return true;
     }
-  
+
     /**
      * Store arguments as properties, to be passed on to the generator.
      */
@@ -465,7 +489,7 @@ private void runGenerator(List<Path> files, Injector injector) {
             this.fileAccess.setOutputPath(resolved);
 
             final Resource resource = getValidatedResource(path);
-            
+
             exitIfCollectedErrors();
 
             StandaloneContext context = new StandaloneContext();
@@ -490,34 +514,39 @@ private void runGenerator(List<Path> files, Injector injector) {
     private void exitIfCollectedErrors() {
         if (issueCollector.getErrorsOccurred()) {
             // if there are errors, don't print warnings.
-            List<LfIssue> errors = issueCollector.getErrors();
-            errors.forEach(reporter::printIssue);
+            List<LfIssue> errors = printErrorsIfAny();
             String cause = errors.size() == 1 ? "previous error"
                                               : errors.size() + " previous errors";
             reporter.printFatalErrorAndExit("Aborting due to " + cause);
         }
     }
-    
+
+    // visible in tests
+    public List<LfIssue> printErrorsIfAny() {
+        List<LfIssue> errors = issueCollector.getErrors();
+        errors.forEach(reporter::printIssue);
+        return errors;
+    }
+
     /**
      * Given a path, obtain a resource and validate it. If issues arise during validation,
      * these are recorded using the issue collector.
-     * 
+     *
      * @param path Path to the resource to validate.
      * @return A validated resource
      */
-    private Resource getValidatedResource(Path path) {
-        final ResourceSet set = this.resourceSetProvider.get();
-        final Resource resource =
-            set.getResource(URI.createFileURI(path.toString()), true);
+    // visible in tests
+    public Resource getValidatedResource(Path path) {
+        final Resource resource = getResource(path);
 
-        if (cmd.hasOption(CLIOption.FEDERATED.option.getOpt())) {
+        if (cmd != null && cmd.hasOption(CLIOption.FEDERATED.option.getOpt())) {
             if (!ASTUtils.makeFederated(resource)) {
                 reporter.printError("Unable to change main reactor to federated reactor.");
             }
         }
 
         List<Issue> issues = this.validator.validate(resource, CheckMode.ALL, CancelIndicator.NullImpl);
-        
+
         for (Issue issue : issues) {
             URI uri = issue.getUriToProblem(); // Issues may also relate to imported resources.
             try {
@@ -531,4 +560,9 @@ private Resource getValidatedResource(Path path) {
         }
         return resource;
     }
+
+    public Resource getResource(Path path) {
+        final ResourceSet set = this.resourceSetProvider.get();
+        return set.getResource(URI.createFileURI(path.toString()), true);
+    }
 }
diff --git a/org.lflang.lfc/src/org/lflang/lfc/ReportingUtil.kt b/org.lflang.lfc/src/org/lflang/lfc/ReportingUtil.kt
index 3ec30e0249..80bec89c76 100644
--- a/org.lflang.lfc/src/org/lflang/lfc/ReportingUtil.kt
+++ b/org.lflang.lfc/src/org/lflang/lfc/ReportingUtil.kt
@@ -151,11 +151,11 @@ class ReportingBackend constructor(
      * messages when printing a code snippet from the file
      * in which the error originated.
      */
-    private val numLinesAround: Int,
+    private val numLinesAround: Int = 2,
 ) {
     /** Secondary constructor with default arguments and marked with @Inject */
     @Inject
-    constructor(io: Io) : this(io, AnsiColors(true), 2)
+    constructor(io: Io) : this(io, AnsiColors(true))
 
     /** *Absolute* path to lines. */
     private val fileCache = mutableMapOf<Path, List<String>?>()
@@ -309,9 +309,11 @@ class ReportingBackend constructor(
             val tabOffset = makeOffset(0, issue.column!!) // offset up to marker
             val tabSpanOffset = makeOffset(issue.column - 1, issue.length!!) // offset within marker
 
-            val realLen = min(line.length, issue.column + issue.length)
+            // make sure the length fits the line
+            val clippedUp = min(line.length, issue.column + issue.length + tabSpanOffset)
+            val clippedDown = max(0, clippedUp - issue.column)
 
-            val caretLine = with(issue) { buildCaretLine(message.trim(), column!! + tabOffset, realLen + tabSpanOffset) }
+            val caretLine = with(issue) { buildCaretLine(message.trim(), column!! + tabOffset, clippedDown) }
             // gutter has its own ANSI stuff so only caretLine gets severityColors
             return emptyGutter(pad) + colors.severityColors(caretLine, issue.severity)
         }
diff --git a/org.lflang.lfc/test/kotlin/org/lflang/lfc/tests/LfIssueReportingTest.kt b/org.lflang.lfc/test/kotlin/org/lflang/lfc/tests/LfIssueReportingTest.kt
new file mode 100644
index 0000000000..efff9d090a
--- /dev/null
+++ b/org.lflang.lfc/test/kotlin/org/lflang/lfc/tests/LfIssueReportingTest.kt
@@ -0,0 +1,93 @@
+/*
+ * Copyright (c) 2021, TU Dresden.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
+ * THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
+ * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.lflang.lfc.tests
+
+import junit.framework.Assert.assertEquals
+import junit.framework.AssertionFailedError
+import org.junit.Test
+import org.lflang.LFRuntimeModule
+import org.lflang.LFStandaloneSetup
+import org.lflang.lfc.*
+import java.io.*
+import java.nio.charset.StandardCharsets
+import java.nio.file.Files
+import java.nio.file.Paths
+
+
+class SpyPrintStream {
+    private val baout = ByteArrayOutputStream()
+    val ps = PrintStream(baout)
+
+    override fun toString(): String = baout.toString(StandardCharsets.UTF_8)
+}
+
+
+class LfIssueReportingTest {
+
+
+    @Test
+    fun testSimpleWarning() {
+        doTest(fileBaseName = "simpleWarning")
+    }
+
+    /**
+     * Looks for a file named [fileBaseName].lf to validate,
+     * and its sibling [fileBaseName].stderr, which is the
+     * expected output to stderr. Those files are in the test/resources directory
+     */
+    private fun doTest(fileBaseName: String, loader: Class<*> = this::class.java) {
+
+
+        val stderr = SpyPrintStream()
+
+        val backend = ReportingBackend(Io(err = stderr.ps), AnsiColors(false), 2)
+        val injector = LFStandaloneSetup(LFRuntimeModule(), LFStandaloneModule(backend))
+            .createInjectorAndDoEMFRegistration()
+        val main = injector.getInstance(Main::class.java)
+
+        val packageName = loader.packageName.replace('.', '/')
+        // relative to root of gradle project
+        val lfFile = Paths.get("test/resources/$packageName/$fileBaseName.lf")
+        val expectedPath = Paths.get("test/resources/$packageName/$fileBaseName.stderr")
+
+        // this side-effects on the ReportingBackend
+        main.getValidatedResource(lfFile)
+        main.printErrorsIfAny()
+
+        val actualOutput = stderr.toString()
+
+        if (!Files.exists(expectedPath)) {
+            Files.writeString(expectedPath, actualOutput)
+            throw AssertionFailedError("Expected file $expectedPath does not exit, created it")
+        }
+        val expected = Files.readString(expectedPath)
+
+        assertEquals(expected.normalize(), actualOutput.normalize())
+    }
+
+    private fun String.normalize() =
+        // normalize newlines and remove line-trailing whitespace
+        trim().replace(Regex("\\s+\\R"), "\n")
+
+}
diff --git a/org.lflang.lfc/test/resources/org/lflang/lfc/tests/multilineWarning.lf b/org.lflang.lfc/test/resources/org/lflang/lfc/tests/multilineWarning.lf
new file mode 100644
index 0000000000..0d08ee4fc9
--- /dev/null
+++ b/org.lflang.lfc/test/resources/org/lflang/lfc/tests/multilineWarning.lf
@@ -0,0 +1,5 @@
+target unknown;
+
+main reactor Foo {
+
+}
diff --git a/org.lflang.lfc/test/resources/org/lflang/lfc/tests/multilineWarning.stderr b/org.lflang.lfc/test/resources/org/lflang/lfc/tests/multilineWarning.stderr
new file mode 100644
index 0000000000..0d08ee4fc9
--- /dev/null
+++ b/org.lflang.lfc/test/resources/org/lflang/lfc/tests/multilineWarning.stderr
@@ -0,0 +1,5 @@
+target unknown;
+
+main reactor Foo {
+
+}
diff --git a/org.lflang.lfc/test/resources/org/lflang/lfc/tests/simpleWarning.lf b/org.lflang.lfc/test/resources/org/lflang/lfc/tests/simpleWarning.lf
new file mode 100644
index 0000000000..0d08ee4fc9
--- /dev/null
+++ b/org.lflang.lfc/test/resources/org/lflang/lfc/tests/simpleWarning.lf
@@ -0,0 +1,5 @@
+target unknown;
+
+main reactor Foo {
+
+}
diff --git a/org.lflang.lfc/test/resources/org/lflang/lfc/tests/simpleWarning.stderr b/org.lflang.lfc/test/resources/org/lflang/lfc/tests/simpleWarning.stderr
new file mode 100644
index 0000000000..560678a80f
--- /dev/null
+++ b/org.lflang.lfc/test/resources/org/lflang/lfc/tests/simpleWarning.stderr
@@ -0,0 +1,16 @@
+lfc: error: Unrecognized target: unknown
+--> test/resources/org/lflang/lfc/tests/simpleWarning.lf:1:8
+  |
+1 | target unknown;
+  |        ^^^^^^^ Unrecognized target: unknown
+  |
+2 |
+
+lfc: error: Name of main reactor must match the file name (or be omitted).
+--> test/resources/org/lflang/lfc/tests/simpleWarning.lf:3:14
+  |
+2 |
+3 | main reactor Foo {
+  |              ^^^ Name of main reactor must match the file name (or be omitted).
+  |
+4 |
diff --git a/org.lflang.tests/src/org/lflang/tests/standalone/simpleWarning.lf b/org.lflang.tests/src/org/lflang/tests/standalone/simpleWarning.lf
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/org.lflang.tests/src/org/lflang/tests/standalone/simpleWarning.stderr b/org.lflang.tests/src/org/lflang/tests/standalone/simpleWarning.stderr
new file mode 100644
index 0000000000..e69de29bb2

From 27a3e30b5f63025512e82fbdb95d5780859e6e52 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Fournier?= <clement.fournier76@gmail.com>
Date: Sun, 26 Sep 2021 18:36:18 +0200
Subject: [PATCH 03/21] Support multiline warnings

---
 .../src/org/lflang/lfc/ReportingUtil.kt       | 51 +++++++++++++++----
 .../lflang/lfc/tests/LfIssueReportingTest.kt  | 17 ++++++-
 .../org/lflang/lfc/tests/multilineWarning.lf  |  4 +-
 .../lflang/lfc/tests/multilineWarning.stderr  | 14 +++--
 .../lfc/tests/multilineWarningTooBig.lf       | 13 +++++
 .../lfc/tests/multilineWarningTooBig.stderr   | 12 +++++
 .../resources/org/lflang/lfc/tests/tabs.lf    |  6 +++
 .../org/lflang/lfc/tests/tabs.stderr          | 16 ++++++
 8 files changed, 114 insertions(+), 19 deletions(-)
 create mode 100644 org.lflang.lfc/test/resources/org/lflang/lfc/tests/multilineWarningTooBig.lf
 create mode 100644 org.lflang.lfc/test/resources/org/lflang/lfc/tests/multilineWarningTooBig.stderr
 create mode 100644 org.lflang.lfc/test/resources/org/lflang/lfc/tests/tabs.lf
 create mode 100644 org.lflang.lfc/test/resources/org/lflang/lfc/tests/tabs.stderr

diff --git a/org.lflang.lfc/src/org/lflang/lfc/ReportingUtil.kt b/org.lflang.lfc/src/org/lflang/lfc/ReportingUtil.kt
index 80bec89c76..131e2abd17 100644
--- a/org.lflang.lfc/src/org/lflang/lfc/ReportingUtil.kt
+++ b/org.lflang.lfc/src/org/lflang/lfc/ReportingUtil.kt
@@ -34,6 +34,7 @@ import java.nio.file.Files
 import java.nio.file.Path
 import java.nio.file.Paths
 import java.util.*
+import kotlin.collections.ArrayList
 import kotlin.math.max
 import kotlin.math.min
 import kotlin.system.exitProcess
@@ -242,11 +243,10 @@ class ReportingBackend constructor(
     }
 
     private fun getBuilder(issue: LfIssue, lines: List<String>, displayPath: String): MessageTextBuilder {
-        val zeroL = issue.line!! - 1
-        val firstL = max(0, zeroL - numLinesAround + 1)
-        val lastL = min(lines.size, zeroL + numLinesAround)
+        val firstL = max(0, issue.line!! - 1 - numLinesAround + 1)
+        val lastL = min(lines.size, issue.endLine!! - 1 + numLinesAround)
         val strings: List<String> = lines.subList(firstL, lastL)
-        return MessageTextBuilder(strings, firstL, zeroL - firstL, displayPath, issue)
+        return MessageTextBuilder(strings, firstL, issue.line - 1 - firstL, displayPath, issue)
     }
 
     /** Renders a single issue. */
@@ -267,11 +267,27 @@ class ReportingBackend constructor(
         fun build(): String {
             // the padding to apply to line numbers
             val pad = 2 + widthOfLargestLineNum()
-            val withLineNums: MutableList<String> =
+            val withLineNums: ArrayList<String> =
                 lines.indices.mapTo(ArrayList()) { numberedLine(it, pad) }
 
-            withLineNums.add(errorIdx + 1, makeErrorLine(pad))
-            withLineNums.add(errorIdx + 2, emptyGutter(pad)) // skip a line
+            if (issue.line!! == issue.endLine!!) {
+                // single line warning
+                withLineNums.add(errorIdx + 1, makeErrorLine(pad))
+                withLineNums.add(errorIdx + 2, emptyGutter(pad)) // skip a line
+            } else {
+                // multiline
+                val spanInLines = issue.endLine - issue.line
+
+                withLineNums.add(errorIdx, makeMultilineFence(pad, forward = true))
+                withLineNums.add(errorIdx + spanInLines + 2, makeMultilineFence(pad, forward = false, message = issue.message))
+
+                if (spanInLines >= 3) {
+                    // too big, remove some lines
+                    withLineNums.subList(errorIdx + 3, errorIdx + spanInLines ).clear()
+                    // replace with an ellipsis
+                    withLineNums.add(errorIdx + 3, emptyGutter(pad) + " ...")
+                }
+            }
 
             // skip a line at the beginning
             // add it at the end to not move other indices
@@ -294,8 +310,21 @@ class ReportingBackend constructor(
             return "$prefix $fileDisplayName:${issue.line}:${issue.column}"
         }
 
+        private fun makeMultilineFence(pad: Int, forward: Boolean, message: String? = null): String {
+            val char = if (forward) '>' else '<'
+            val caretLine = buildString {
+                append(' ')
+                repeatChar(char, 14)
+                if (message != null)
+                    append(' ').append(message)
+            }
+            // gutter has its own ANSI stuff so only caretLine gets severityColors
+            return emptyGutter(pad) + colors.severityColors(caretLine, issue.severity)
+        }
+
         private fun makeErrorLine(pad: Int): String {
             val line = lines[errorIdx]
+
             // tabs are replaced with spaces to align messages properly
             fun makeOffset(startIdx: Int, length: Int): Int {
                 // note: this is needed because when the issue spans several lines,
@@ -328,11 +357,11 @@ class ReportingBackend constructor(
 
         private fun formatLineNum(str: String) = colors.cyanAndBold(str)
 
-        private fun buildCaretLine(message: String, column: Int, rangeLen: Int): String {
-            fun StringBuilder.repeatChar(c: Char, n: Int) {
-                repeat(n) { append(c) }
-            }
+        fun StringBuilder.repeatChar(c: Char, n: Int) {
+            repeat(n) { append(c) }
+        }
 
+        private fun buildCaretLine(message: String, column: Int, rangeLen: Int): String {
             return buildString {
                 repeatChar(' ', column)
                 repeatChar('^', max(rangeLen, 1))
diff --git a/org.lflang.lfc/test/kotlin/org/lflang/lfc/tests/LfIssueReportingTest.kt b/org.lflang.lfc/test/kotlin/org/lflang/lfc/tests/LfIssueReportingTest.kt
index efff9d090a..898e2cc413 100644
--- a/org.lflang.lfc/test/kotlin/org/lflang/lfc/tests/LfIssueReportingTest.kt
+++ b/org.lflang.lfc/test/kotlin/org/lflang/lfc/tests/LfIssueReportingTest.kt
@@ -51,6 +51,21 @@ class LfIssueReportingTest {
         doTest(fileBaseName = "simpleWarning")
     }
 
+    @Test
+    fun testMultilineWarning() {
+        doTest(fileBaseName = "multilineWarning")
+    }
+
+    @Test
+    fun testMultilineWarningTooBig() {
+        doTest(fileBaseName = "multilineWarningTooBig")
+    }
+
+    @Test
+    fun testTabs() {
+        doTest(fileBaseName = "tabs")
+    }
+
     /**
      * Looks for a file named [fileBaseName].lf to validate,
      * and its sibling [fileBaseName].stderr, which is the
@@ -79,7 +94,7 @@ class LfIssueReportingTest {
 
         if (!Files.exists(expectedPath)) {
             Files.writeString(expectedPath, actualOutput)
-            throw AssertionFailedError("Expected file $expectedPath does not exit, created it")
+            throw AssertionFailedError("Expected file $expectedPath does not exist, created it")
         }
         val expected = Files.readString(expectedPath)
 
diff --git a/org.lflang.lfc/test/resources/org/lflang/lfc/tests/multilineWarning.lf b/org.lflang.lfc/test/resources/org/lflang/lfc/tests/multilineWarning.lf
index 0d08ee4fc9..3d406f1c03 100644
--- a/org.lflang.lfc/test/resources/org/lflang/lfc/tests/multilineWarning.lf
+++ b/org.lflang.lfc/test/resources/org/lflang/lfc/tests/multilineWarning.lf
@@ -1,5 +1,5 @@
-target unknown;
+target Cpp;
 
-main reactor Foo {
+reactor {
 
 }
diff --git a/org.lflang.lfc/test/resources/org/lflang/lfc/tests/multilineWarning.stderr b/org.lflang.lfc/test/resources/org/lflang/lfc/tests/multilineWarning.stderr
index 0d08ee4fc9..02df1858ec 100644
--- a/org.lflang.lfc/test/resources/org/lflang/lfc/tests/multilineWarning.stderr
+++ b/org.lflang.lfc/test/resources/org/lflang/lfc/tests/multilineWarning.stderr
@@ -1,5 +1,9 @@
-target unknown;
-
-main reactor Foo {
-
-}
+lfc: error: Reactor must be named.
+--> test/resources/org/lflang/lfc/tests/multilineWarning.lf:3:1
+  |
+2 |
+  | >>>>>>>>>>>>>>
+3 | reactor {
+4 |
+5 | }
+  | <<<<<<<<<<<<<< Reactor must be named.
diff --git a/org.lflang.lfc/test/resources/org/lflang/lfc/tests/multilineWarningTooBig.lf b/org.lflang.lfc/test/resources/org/lflang/lfc/tests/multilineWarningTooBig.lf
new file mode 100644
index 0000000000..1df335e2f5
--- /dev/null
+++ b/org.lflang.lfc/test/resources/org/lflang/lfc/tests/multilineWarningTooBig.lf
@@ -0,0 +1,13 @@
+target Cpp;
+
+// leading
+reactor {
+    // included 1
+    // excluded
+    // excluded
+    // excluded
+    // excluded
+    // excluded
+    // included 2
+}
+// trailing
diff --git a/org.lflang.lfc/test/resources/org/lflang/lfc/tests/multilineWarningTooBig.stderr b/org.lflang.lfc/test/resources/org/lflang/lfc/tests/multilineWarningTooBig.stderr
new file mode 100644
index 0000000000..de0fdccf27
--- /dev/null
+++ b/org.lflang.lfc/test/resources/org/lflang/lfc/tests/multilineWarningTooBig.stderr
@@ -0,0 +1,12 @@
+lfc: error: Reactor must be named.
+ --> test/resources/org/lflang/lfc/tests/multilineWarningTooBig.lf:4:1
+   |
+ 3 | // leading
+   | >>>>>>>>>>>>>>
+ 4 | reactor {
+ 5 |     // included 1
+   | ...
+11 |     // included 2
+12 | }
+   | <<<<<<<<<<<<<< Reactor must be named.
+13 | // trailing
diff --git a/org.lflang.lfc/test/resources/org/lflang/lfc/tests/tabs.lf b/org.lflang.lfc/test/resources/org/lflang/lfc/tests/tabs.lf
new file mode 100644
index 0000000000..43705c8a51
--- /dev/null
+++ b/org.lflang.lfc/test/resources/org/lflang/lfc/tests/tabs.lf
@@ -0,0 +1,6 @@
+target C;
+
+main reactor {
+	state foo(1);
+	state	bar(1);
+}
diff --git a/org.lflang.lfc/test/resources/org/lflang/lfc/tests/tabs.stderr b/org.lflang.lfc/test/resources/org/lflang/lfc/tests/tabs.stderr
new file mode 100644
index 0000000000..ff009cd531
--- /dev/null
+++ b/org.lflang.lfc/test/resources/org/lflang/lfc/tests/tabs.stderr
@@ -0,0 +1,16 @@
+lfc: error: State must have a type.
+--> test/resources/org/lflang/lfc/tests/tabs.lf:4:2
+  |
+3 | main reactor {
+4 |     state foo(1);
+  |     ^^^^^^^^^^^^ State must have a type.
+  |
+5 |     state    bar(1);
+lfc: error: State must have a type.
+--> test/resources/org/lflang/lfc/tests/tabs.lf:5:2
+  |
+4 |     state foo(1);
+5 |     state    bar(1);
+  |     ^^^^^^^^^^^^ State must have a type.
+  |
+6 | }

From ed2290c3a7879d33f42d12d502b51e258856ef68 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Fournier?= <clement.fournier76@gmail.com>
Date: Sun, 26 Sep 2021 19:05:37 +0200
Subject: [PATCH 04/21] Test colored output

---
 .../org/lflang/lfc/tests/LfIssueReportingTest.kt |  9 +++++++--
 .../resources/org/lflang/lfc/tests/colors.lf     |  9 +++++++++
 .../resources/org/lflang/lfc/tests/colors.stderr | 16 ++++++++++++++++
 3 files changed, 32 insertions(+), 2 deletions(-)
 create mode 100644 org.lflang.lfc/test/resources/org/lflang/lfc/tests/colors.lf
 create mode 100644 org.lflang.lfc/test/resources/org/lflang/lfc/tests/colors.stderr

diff --git a/org.lflang.lfc/test/kotlin/org/lflang/lfc/tests/LfIssueReportingTest.kt b/org.lflang.lfc/test/kotlin/org/lflang/lfc/tests/LfIssueReportingTest.kt
index 898e2cc413..d00f41244a 100644
--- a/org.lflang.lfc/test/kotlin/org/lflang/lfc/tests/LfIssueReportingTest.kt
+++ b/org.lflang.lfc/test/kotlin/org/lflang/lfc/tests/LfIssueReportingTest.kt
@@ -66,17 +66,22 @@ class LfIssueReportingTest {
         doTest(fileBaseName = "tabs")
     }
 
+    @Test
+    fun testColors() {
+        doTest(fileBaseName = "colors", useColors = true)
+    }
+
     /**
      * Looks for a file named [fileBaseName].lf to validate,
      * and its sibling [fileBaseName].stderr, which is the
      * expected output to stderr. Those files are in the test/resources directory
      */
-    private fun doTest(fileBaseName: String, loader: Class<*> = this::class.java) {
+    private fun doTest(fileBaseName: String, loader: Class<*> = this::class.java, useColors: Boolean = false) {
 
 
         val stderr = SpyPrintStream()
 
-        val backend = ReportingBackend(Io(err = stderr.ps), AnsiColors(false), 2)
+        val backend = ReportingBackend(Io(err = stderr.ps), AnsiColors(useColors), 2)
         val injector = LFStandaloneSetup(LFRuntimeModule(), LFStandaloneModule(backend))
             .createInjectorAndDoEMFRegistration()
         val main = injector.getInstance(Main::class.java)
diff --git a/org.lflang.lfc/test/resources/org/lflang/lfc/tests/colors.lf b/org.lflang.lfc/test/resources/org/lflang/lfc/tests/colors.lf
new file mode 100644
index 0000000000..90423dfcb5
--- /dev/null
+++ b/org.lflang.lfc/test/resources/org/lflang/lfc/tests/colors.lf
@@ -0,0 +1,9 @@
+// you can use `less -R filepath.stderr` to see the colored text
+// https://unix.stackexchange.com/questions/262185/display-file-with-ansi-colors
+
+target unknown;
+
+main reactor Foo {
+
+}
+
diff --git a/org.lflang.lfc/test/resources/org/lflang/lfc/tests/colors.stderr b/org.lflang.lfc/test/resources/org/lflang/lfc/tests/colors.stderr
new file mode 100644
index 0000000000..f7a97fc4fa
--- /dev/null
+++ b/org.lflang.lfc/test/resources/org/lflang/lfc/tests/colors.stderr
@@ -0,0 +1,16 @@
+lfc: error: Unrecognized target: unknown
+--> test/resources/org/lflang/lfc/tests/colors.lf:4:8
+  |
+3 |
+4 | target unknown;
+  |        ^^^^^^^ Unrecognized target: unknown
+  |
+5 |
+lfc: error: Name of main reactor must match the file name (or be omitted).
+--> test/resources/org/lflang/lfc/tests/colors.lf:6:14
+  |
+5 |
+6 | main reactor Foo {
+  |              ^^^ Name of main reactor must match the file name (or be omitted).
+  |
+7 |

From 110ae8a4045f2145bfa13d3a2b9dac4341be9690 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Fournier?= <clement.fournier76@gmail.com>
Date: Sun, 26 Sep 2021 20:11:53 +0200
Subject: [PATCH 05/21] wip fix tests

problem with guice
---
 .../src/org/lflang/lfc/LFStandaloneModule.java         | 10 ++++++++++
 .../org/lflang/lfc/tests/LfIssueReportingTest.kt       |  2 ++
 org.lflang/src/org/lflang/LFRuntimeModule.java         |  2 +-
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/org.lflang.lfc/src/org/lflang/lfc/LFStandaloneModule.java b/org.lflang.lfc/src/org/lflang/lfc/LFStandaloneModule.java
index 291c28eaf2..bc2d1c38cb 100644
--- a/org.lflang.lfc/src/org/lflang/lfc/LFStandaloneModule.java
+++ b/org.lflang.lfc/src/org/lflang/lfc/LFStandaloneModule.java
@@ -30,6 +30,8 @@
 
 import java.util.Objects;
 
+import org.eclipse.emf.ecore.EValidator;
+import org.eclipse.emf.ecore.impl.EValidatorRegistryImpl;
 import org.eclipse.xtext.validation.ValidationMessageAcceptor;
 
 import org.lflang.ErrorReporter;
@@ -59,5 +61,13 @@ public void configure(Binder binder) {
         binder.bind(ErrorReporter.class).to(StandaloneErrorReporter.class);
         binder.bind(ReportingBackend.class).toInstance(helper);
         binder.bind(ValidationMessageAcceptor.class).to(StandaloneIssueAcceptor.class);
+        // This is required to force the ResourceValidator to
+        // use a new registry instance (which is reused by the injector as a singleton).
+        // Otherwise, it uses the static EValidator.Registry.INSTANCE which is bad
+        // as the first validator to be created would be persisted in that static instance.
+        // New injectors would reuse the existing instance, but
+        // its fields would have been injected by an older injector
+        // and be out of sync with the rest of the application.
+        binder.bind(EValidator.Registry.class).to(EValidatorRegistryImpl.class).asEagerSingleton();
     }
 }
diff --git a/org.lflang.lfc/test/kotlin/org/lflang/lfc/tests/LfIssueReportingTest.kt b/org.lflang.lfc/test/kotlin/org/lflang/lfc/tests/LfIssueReportingTest.kt
index d00f41244a..024bbf125f 100644
--- a/org.lflang.lfc/test/kotlin/org/lflang/lfc/tests/LfIssueReportingTest.kt
+++ b/org.lflang.lfc/test/kotlin/org/lflang/lfc/tests/LfIssueReportingTest.kt
@@ -91,6 +91,8 @@ class LfIssueReportingTest {
         val lfFile = Paths.get("test/resources/$packageName/$fileBaseName.lf")
         val expectedPath = Paths.get("test/resources/$packageName/$fileBaseName.stderr")
 
+        assert(Files.exists(lfFile)) { "Missing test file $lfFile" }
+
         // this side-effects on the ReportingBackend
         main.getValidatedResource(lfFile)
         main.printErrorsIfAny()
diff --git a/org.lflang/src/org/lflang/LFRuntimeModule.java b/org.lflang/src/org/lflang/LFRuntimeModule.java
index 936c5d848a..79a73fd556 100644
--- a/org.lflang/src/org/lflang/LFRuntimeModule.java
+++ b/org.lflang/src/org/lflang/LFRuntimeModule.java
@@ -41,7 +41,7 @@ public Class<? extends INamesAreUniqueValidationHelper> bindNamesAreUniqueValida
     
     public Class<? extends ISyntaxErrorMessageProvider> bindISyntaxErrorMessageProvider() {
         return LFSyntaxErrorMessageProvider.class;
-}
+    }
 
     /** The error reporter. {@link LFStandaloneModule} overrides this binding. */
     public Class<? extends ErrorReporter> bindErrorReporter() {

From 455a9543253a39f5c20bf87f3499b9dac6f480da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Fournier?= <clement.fournier76@gmail.com>
Date: Mon, 27 Sep 2021 12:46:16 +0200
Subject: [PATCH 06/21] Remove extra diff

---
 org.lflang.lfc/src/org/lflang/lfc/Main.java | 34 +++------------------
 1 file changed, 5 insertions(+), 29 deletions(-)

diff --git a/org.lflang.lfc/src/org/lflang/lfc/Main.java b/org.lflang.lfc/src/org/lflang/lfc/Main.java
index b74af4d7bb..6ad709af88 100644
--- a/org.lflang.lfc/src/org/lflang/lfc/Main.java
+++ b/org.lflang.lfc/src/org/lflang/lfc/Main.java
@@ -1,27 +1,3 @@
-/*
- * Copyright (c) 2021, TU Dresden.
- *
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- *    this list of conditions and the following disclaimer in the documentation
- *    and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
- * THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
- * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
 /**
  * Stand-alone version of the Lingua Franca compiler (lfc).
  */
@@ -59,11 +35,11 @@
 import org.eclipse.xtext.validation.CheckMode;
 import org.eclipse.xtext.validation.IResourceValidator;
 import org.eclipse.xtext.validation.Issue;
-
 import org.lflang.ASTUtils;
 import org.lflang.ErrorReporter;
 import org.lflang.FileConfig;
 import org.lflang.LFRuntimeModule;
+import org.lflang.LFStandaloneModule;
 import org.lflang.LFStandaloneSetup;
 import org.lflang.generator.StandaloneContext;
 
@@ -83,7 +59,7 @@ public class Main {
      * The location of the class file of this class inside of the jar.
      */
     private static String MAIN_PATH_IN_JAR = String.join("/",
-                                                         new String[] {"!", "org", "lflang", "org/lflang/lfc", "Main.class"});
+                                                         new String[] {"!", "org", "lflang", "lfc", "Main.class"});
 
 
     /**
@@ -274,7 +250,7 @@ public static void main(final String[] args) {
             main.cmd = parser.parse(options, args, true);
 
             if (main.cmd.hasOption(CLIOption.HELP.option.getOpt())) {
-                formatter.printHelp("org/lflang/lfc", options);
+                formatter.printHelp("lfc", options);
                 System.exit(0);
             }
 
@@ -295,7 +271,7 @@ public static void main(final String[] args) {
             }
         } catch (ParseException e) {
             reporter.printFatalError("Unable to parse commandline arguments. Reason: " + e.getMessage());
-            formatter.printHelp("org/lflang/lfc", options);
+            formatter.printHelp("lfc", options);
             System.exit(1);
         }
     }
@@ -304,7 +280,7 @@ public static void main(final String[] args) {
      * Fork off a new process (that is an execution of a freshly rebuilt jar)
      * and wait for it to return.
      *
-     * @param cmd The CommandLine object that has stored in it the CLI 
+     * @param cmd The CommandLine object that has stored in it the CLI
      * arguments of the parent process, to be passed on to the child process.
      */
     private void forkAndWait(CommandLine cmd) {

From 6f01913c57095d0134de98f5bec90cda9ff665d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Fournier?= <clement.fournier76@gmail.com>
Date: Mon, 27 Sep 2021 14:03:34 +0200
Subject: [PATCH 07/21] Fix compil

---
 org.lflang.lfc/src/org/lflang/lfc/Main.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/org.lflang.lfc/src/org/lflang/lfc/Main.java b/org.lflang.lfc/src/org/lflang/lfc/Main.java
index 6ad709af88..82d412cf8d 100644
--- a/org.lflang.lfc/src/org/lflang/lfc/Main.java
+++ b/org.lflang.lfc/src/org/lflang/lfc/Main.java
@@ -39,9 +39,9 @@
 import org.lflang.ErrorReporter;
 import org.lflang.FileConfig;
 import org.lflang.LFRuntimeModule;
-import org.lflang.LFStandaloneModule;
 import org.lflang.LFStandaloneSetup;
 import org.lflang.generator.StandaloneContext;
+import org.lflang.lfc.LFStandaloneModule;
 
 import com.google.inject.Inject;
 import com.google.inject.Injector;

From 4e634ac76d989dab3cbd78c61d789183c4919f09 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Fournier?= <clement.fournier76@gmail.com>
Date: Mon, 27 Sep 2021 14:47:09 +0200
Subject: [PATCH 08/21] Update CI and build files

We need to update the config for the new tests in org.lflang.lfc
---
 .github/workflows/build.yml | 30 ++++++++++++++++++++++++++++++
 build.gradle                | 15 +++++++++++++++
 2 files changed, 45 insertions(+)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index e087715ba2..0b9e15e3aa 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -48,6 +48,36 @@ jobs:
           verbose: true # optional (default = false)
         if: runner.os == 'Linux'
 
+  standalone-lfc-tests:
+    strategy:
+      matrix:
+        platform: [ubuntu-latest, macos-latest, windows-latest]
+    runs-on: ${{ matrix.platform }}
+    steps:
+      # Setup Build dependencies
+      - name: Setup Java JDK
+        uses: actions/setup-java@v1.4.3
+        with:
+          # The Java version to make available on the path. Takes a whole or semver Java version, or 1.x syntax (e.g. 1.8 => Java 8.x). Early access versions can be specified in the form of e.g. 14-ea, 14.0.0-ea, or 14.0.0-ea.28
+          java-version: 11
+      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
+      - uses: actions/checkout@v2
+      - name: Run standalone LFC tests
+        run: |
+          ./gradlew :org.lflang.lfc:test
+      - name: Report to CodeCov
+        uses: codecov/codecov-action@v1
+        with:
+          token: ${{ secrets.CODECOV_TOKEN }} # not required for public repos
+          files: $GITHUB_WORKSPACE/org.lflang.lfc/build/reports/xml/jacoco
+          # gcov_prefix:
+          # optional flags: unittests
+          # optional name: codecov-umbrella
+          # optional fail_ci_if_error: true
+          # optional (default = false)
+          verbose: true # optional (default = false)
+        if: runner.os == 'Linux'
+
   c-tests:
     strategy:
       matrix:
diff --git a/build.gradle b/build.gradle
index 45bdaae265..9fca3c366e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -66,3 +66,18 @@ subprojects {
 		delete "${projectDir}/src-gen/"
 	}
 }
+
+gradle.projectsEvaluated {
+	// Our CI uses --tests filters, which fails if some
+	// subprojects have no matching test.
+	//
+	// https://stackoverflow.com/questions/26147480/how-to-make-gradle-not-to-mark-build-failed-if-no-tests-are-found
+	subprojects {
+		test {
+			filter {
+				setFailOnNoMatchingTests(false)
+			}
+		}
+	}
+}
+

From de1223dab54c1b568d78dd65cf9811b8d58180bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Fournier?= <clement.fournier76@gmail.com>
Date: Mon, 27 Sep 2021 14:54:59 +0200
Subject: [PATCH 09/21] Windows compatibility

---
 org.lflang.lfc/src/org/lflang/lfc/ReportingUtil.kt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/org.lflang.lfc/src/org/lflang/lfc/ReportingUtil.kt b/org.lflang.lfc/src/org/lflang/lfc/ReportingUtil.kt
index 131e2abd17..ac5d17074e 100644
--- a/org.lflang.lfc/src/org/lflang/lfc/ReportingUtil.kt
+++ b/org.lflang.lfc/src/org/lflang/lfc/ReportingUtil.kt
@@ -212,7 +212,7 @@ class ReportingBackend constructor(
 
         val header = severity.name.toLowerCase(Locale.ROOT)
 
-        var fullMessage: String = this.header + colors.severityColors(header, severity) + colors.bold(": " + issue.message) + "\n"
+        var fullMessage: String = this.header + colors.severityColors(header, severity) + colors.bold(": " + issue.message) + System.lineSeparator()
         val snippet: String? = filePath?.let { formatIssue(issue, filePath) }
 
         if (snippet == null) {
@@ -294,7 +294,7 @@ class ReportingBackend constructor(
             withLineNums.add(0, emptyGutter(pad))
             withLineNums.add(0, makeHeaderLine(pad))
 
-            return withLineNums.joinToString("\n")
+            return withLineNums.joinToString(System.lineSeparator())
         }
 
         private fun widthOfLargestLineNum() = (lines.size + first).toString().length

From 9c4dd8f763574541172a8f39280b44a43a58f0de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Fournier?= <clement.fournier76@gmail.com>
Date: Mon, 27 Sep 2021 20:27:30 +0200
Subject: [PATCH 10/21] remove empty files

---
 org.lflang.tests/src/org/lflang/tests/standalone/simpleWarning.lf | 0
 .../src/org/lflang/tests/standalone/simpleWarning.stderr          | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 org.lflang.tests/src/org/lflang/tests/standalone/simpleWarning.lf
 delete mode 100644 org.lflang.tests/src/org/lflang/tests/standalone/simpleWarning.stderr

diff --git a/org.lflang.tests/src/org/lflang/tests/standalone/simpleWarning.lf b/org.lflang.tests/src/org/lflang/tests/standalone/simpleWarning.lf
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/org.lflang.tests/src/org/lflang/tests/standalone/simpleWarning.stderr b/org.lflang.tests/src/org/lflang/tests/standalone/simpleWarning.stderr
deleted file mode 100644
index e69de29bb2..0000000000

From d7f575ce4a9409a4d405584ad971d75858b6bfbe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Fournier?= <clement.fournier76@gmail.com>
Date: Mon, 27 Sep 2021 20:30:55 +0200
Subject: [PATCH 11/21] Remove codecov task

---
 .github/workflows/build.yml | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 0b9e15e3aa..884ca6ed91 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -65,18 +65,6 @@ jobs:
       - name: Run standalone LFC tests
         run: |
           ./gradlew :org.lflang.lfc:test
-      - name: Report to CodeCov
-        uses: codecov/codecov-action@v1
-        with:
-          token: ${{ secrets.CODECOV_TOKEN }} # not required for public repos
-          files: $GITHUB_WORKSPACE/org.lflang.lfc/build/reports/xml/jacoco
-          # gcov_prefix:
-          # optional flags: unittests
-          # optional name: codecov-umbrella
-          # optional fail_ci_if_error: true
-          # optional (default = false)
-          verbose: true # optional (default = false)
-        if: runner.os == 'Linux'
 
   c-tests:
     strategy:

From abfbf63d088481f30e251ecd679e3518ad239488 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Fournier?= <clement.fournier76@gmail.com>
Date: Mon, 27 Sep 2021 20:38:23 +0200
Subject: [PATCH 12/21] Update reference files

---
 .../org/lflang/lfc/tests/LfIssueReportingTest.kt   | 14 ++++++++++++++
 .../org/lflang/lfc/tests/multilineWarning.stderr   |  2 +-
 .../lflang/lfc/tests/multilineWarningTooBig.stderr |  2 +-
 .../resources/org/lflang/lfc/tests/tabs.stderr     |  2 +-
 4 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/org.lflang.lfc/test/kotlin/org/lflang/lfc/tests/LfIssueReportingTest.kt b/org.lflang.lfc/test/kotlin/org/lflang/lfc/tests/LfIssueReportingTest.kt
index 024bbf125f..fbcc17b0d5 100644
--- a/org.lflang.lfc/test/kotlin/org/lflang/lfc/tests/LfIssueReportingTest.kt
+++ b/org.lflang.lfc/test/kotlin/org/lflang/lfc/tests/LfIssueReportingTest.kt
@@ -44,6 +44,20 @@ class SpyPrintStream {
 
 
 class LfIssueReportingTest {
+    /*
+        Note: when executing these tests in Intellij, I get the following error:
+
+            java.lang.SecurityException: class "org.eclipse.core.runtime.IPath"'s
+             signer information does not match signer information of other classes
+             in the same package
+
+        To fix this:
+        - Go into File > Project Structure (CTRL+MAJ+S)
+        - Open the "Modules" tab
+        - Select the module org.lflang/lfc/test in the tree view
+        - Open the "Dependencies" tab
+        - Remove the dependency org.eclipse.platform:org.eclipse.equinox.common (it will have Provided scope)
+     */
 
 
     @Test
diff --git a/org.lflang.lfc/test/resources/org/lflang/lfc/tests/multilineWarning.stderr b/org.lflang.lfc/test/resources/org/lflang/lfc/tests/multilineWarning.stderr
index 02df1858ec..d75c35cdb9 100644
--- a/org.lflang.lfc/test/resources/org/lflang/lfc/tests/multilineWarning.stderr
+++ b/org.lflang.lfc/test/resources/org/lflang/lfc/tests/multilineWarning.stderr
@@ -6,4 +6,4 @@ lfc: error: Reactor must be named.
 3 | reactor {
 4 |
 5 | }
-  | <<<<<<<<<<<<<< Reactor must be named.
+  | < Reactor must be named.
diff --git a/org.lflang.lfc/test/resources/org/lflang/lfc/tests/multilineWarningTooBig.stderr b/org.lflang.lfc/test/resources/org/lflang/lfc/tests/multilineWarningTooBig.stderr
index de0fdccf27..0a8dca34aa 100644
--- a/org.lflang.lfc/test/resources/org/lflang/lfc/tests/multilineWarningTooBig.stderr
+++ b/org.lflang.lfc/test/resources/org/lflang/lfc/tests/multilineWarningTooBig.stderr
@@ -8,5 +8,5 @@ lfc: error: Reactor must be named.
    | ...
 11 |     // included 2
 12 | }
-   | <<<<<<<<<<<<<< Reactor must be named.
+   | < Reactor must be named.
 13 | // trailing
diff --git a/org.lflang.lfc/test/resources/org/lflang/lfc/tests/tabs.stderr b/org.lflang.lfc/test/resources/org/lflang/lfc/tests/tabs.stderr
index ff009cd531..733c56fe4f 100644
--- a/org.lflang.lfc/test/resources/org/lflang/lfc/tests/tabs.stderr
+++ b/org.lflang.lfc/test/resources/org/lflang/lfc/tests/tabs.stderr
@@ -11,6 +11,6 @@ lfc: error: State must have a type.
   |
 4 |     state foo(1);
 5 |     state    bar(1);
-  |     ^^^^^^^^^^^^ State must have a type.
+  |     ^^^^^^^^^^^^^^^ State must have a type.
   |
 6 | }

From 919156f6e806f34019eb46db6da1d33e1ceab23d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Fournier?= <clement.fournier76@gmail.com>
Date: Mon, 27 Sep 2021 20:45:17 +0200
Subject: [PATCH 13/21] Shorten fence when message can be better placed

---
 .../src/org/lflang/lfc/ReportingUtil.kt          | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/org.lflang.lfc/src/org/lflang/lfc/ReportingUtil.kt b/org.lflang.lfc/src/org/lflang/lfc/ReportingUtil.kt
index ac5d17074e..37d1899c1b 100644
--- a/org.lflang.lfc/src/org/lflang/lfc/ReportingUtil.kt
+++ b/org.lflang.lfc/src/org/lflang/lfc/ReportingUtil.kt
@@ -312,14 +312,21 @@ class ReportingBackend constructor(
 
         private fun makeMultilineFence(pad: Int, forward: Boolean, message: String? = null): String {
             val char = if (forward) '>' else '<'
-            val caretLine = buildString {
+            val fenceWidth =
+                if (!forward && issue.endColumn != null) {
+                    (issue.endColumn - 1).coerceIn(1..FENCE_WIDTH)
+                } else {
+                    FENCE_WIDTH
+                }
+
+            val fence = buildString {
                 append(' ')
-                repeatChar(char, 14)
+                repeatChar(char, fenceWidth)
                 if (message != null)
                     append(' ').append(message)
             }
-            // gutter has its own ANSI stuff so only caretLine gets severityColors
-            return emptyGutter(pad) + colors.severityColors(caretLine, issue.severity)
+            // gutter has its own ANSI stuff so only fence gets severityColors
+            return emptyGutter(pad) + colors.severityColors(fence, issue.severity)
         }
 
         private fun makeErrorLine(pad: Int): String {
@@ -372,6 +379,7 @@ class ReportingBackend constructor(
 
     companion object {
         const val TAB_REPLACEMENT = "    "
+        const val FENCE_WIDTH = 14
     }
 }
 

From 6eb16e140541bddb333c401a8e5298172563fc68 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Fournier?= <clement.fournier76@gmail.com>
Date: Mon, 27 Sep 2021 20:49:55 +0200
Subject: [PATCH 14/21] Fix problem with tabs

---
 org.lflang.lfc/src/org/lflang/lfc/ReportingUtil.kt    | 11 +++--------
 .../test/resources/org/lflang/lfc/tests/tabs.stderr   |  4 ++--
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/org.lflang.lfc/src/org/lflang/lfc/ReportingUtil.kt b/org.lflang.lfc/src/org/lflang/lfc/ReportingUtil.kt
index 37d1899c1b..0cc1e230ac 100644
--- a/org.lflang.lfc/src/org/lflang/lfc/ReportingUtil.kt
+++ b/org.lflang.lfc/src/org/lflang/lfc/ReportingUtil.kt
@@ -334,9 +334,6 @@ class ReportingBackend constructor(
 
             // tabs are replaced with spaces to align messages properly
             fun makeOffset(startIdx: Int, length: Int): Int {
-                // note: this is needed because when the issue spans several lines,
-                // startIdx+length may be greater than the line length.
-                // todo implement real way to format multiline issues
                 val endIndex = min(line.length, startIdx + length)
                 val numTabs = line.substring(startIdx, endIndex).count { it == '\t' }
                 return numTabs * (TAB_REPLACEMENT.length - 1)
@@ -345,11 +342,9 @@ class ReportingBackend constructor(
             val tabOffset = makeOffset(0, issue.column!!) // offset up to marker
             val tabSpanOffset = makeOffset(issue.column - 1, issue.length!!) // offset within marker
 
-            // make sure the length fits the line
-            val clippedUp = min(line.length, issue.column + issue.length + tabSpanOffset)
-            val clippedDown = max(0, clippedUp - issue.column)
-
-            val caretLine = with(issue) { buildCaretLine(message.trim(), column!! + tabOffset, clippedDown) }
+            val caretLine = with(issue) {
+                buildCaretLine(message.trim(), column!! + tabOffset, length!! + tabSpanOffset)
+            }
             // gutter has its own ANSI stuff so only caretLine gets severityColors
             return emptyGutter(pad) + colors.severityColors(caretLine, issue.severity)
         }
diff --git a/org.lflang.lfc/test/resources/org/lflang/lfc/tests/tabs.stderr b/org.lflang.lfc/test/resources/org/lflang/lfc/tests/tabs.stderr
index 733c56fe4f..7c007b23d8 100644
--- a/org.lflang.lfc/test/resources/org/lflang/lfc/tests/tabs.stderr
+++ b/org.lflang.lfc/test/resources/org/lflang/lfc/tests/tabs.stderr
@@ -3,7 +3,7 @@ lfc: error: State must have a type.
   |
 3 | main reactor {
 4 |     state foo(1);
-  |     ^^^^^^^^^^^^ State must have a type.
+  |     ^^^^^^^^^^^^^ State must have a type.
   |
 5 |     state    bar(1);
 lfc: error: State must have a type.
@@ -11,6 +11,6 @@ lfc: error: State must have a type.
   |
 4 |     state foo(1);
 5 |     state    bar(1);
-  |     ^^^^^^^^^^^^^^^ State must have a type.
+  |     ^^^^^^^^^^^^^^^^ State must have a type.
   |
 6 | }

From af4e90050d27628a5d7d76862388d8b602cd51eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Fournier?= <clement.fournier76@gmail.com>
Date: Mon, 27 Sep 2021 20:52:28 +0200
Subject: [PATCH 15/21] Add test for 2-line warning

---
 .../kotlin/org/lflang/lfc/tests/LfIssueReportingTest.kt   | 5 +++++
 .../test/resources/org/lflang/lfc/tests/twoLineWarning.lf | 4 ++++
 .../resources/org/lflang/lfc/tests/twoLineWarning.stderr  | 8 ++++++++
 3 files changed, 17 insertions(+)
 create mode 100644 org.lflang.lfc/test/resources/org/lflang/lfc/tests/twoLineWarning.lf
 create mode 100644 org.lflang.lfc/test/resources/org/lflang/lfc/tests/twoLineWarning.stderr

diff --git a/org.lflang.lfc/test/kotlin/org/lflang/lfc/tests/LfIssueReportingTest.kt b/org.lflang.lfc/test/kotlin/org/lflang/lfc/tests/LfIssueReportingTest.kt
index fbcc17b0d5..01b5d4e42c 100644
--- a/org.lflang.lfc/test/kotlin/org/lflang/lfc/tests/LfIssueReportingTest.kt
+++ b/org.lflang.lfc/test/kotlin/org/lflang/lfc/tests/LfIssueReportingTest.kt
@@ -70,6 +70,11 @@ class LfIssueReportingTest {
         doTest(fileBaseName = "multilineWarning")
     }
 
+    @Test
+    fun testTwoLineWarning() {
+        doTest(fileBaseName = "twoLineWarning")
+    }
+
     @Test
     fun testMultilineWarningTooBig() {
         doTest(fileBaseName = "multilineWarningTooBig")
diff --git a/org.lflang.lfc/test/resources/org/lflang/lfc/tests/twoLineWarning.lf b/org.lflang.lfc/test/resources/org/lflang/lfc/tests/twoLineWarning.lf
new file mode 100644
index 0000000000..ed3790f89d
--- /dev/null
+++ b/org.lflang.lfc/test/resources/org/lflang/lfc/tests/twoLineWarning.lf
@@ -0,0 +1,4 @@
+target Cpp;
+
+ reactor {
+     }
diff --git a/org.lflang.lfc/test/resources/org/lflang/lfc/tests/twoLineWarning.stderr b/org.lflang.lfc/test/resources/org/lflang/lfc/tests/twoLineWarning.stderr
new file mode 100644
index 0000000000..f259bbe25e
--- /dev/null
+++ b/org.lflang.lfc/test/resources/org/lflang/lfc/tests/twoLineWarning.stderr
@@ -0,0 +1,8 @@
+lfc: error: Reactor must be named.
+--> test/resources/org/lflang/lfc/tests/twoLineWarning.lf:3:2
+  |
+2 |
+  | >>>>>>>>>>>>>>
+3 |  reactor {
+4 |      }
+  | <<<<<< Reactor must be named.

From 54d13b3d8bc7a0b48143590f4eb9e5bd37d86a5f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Fournier?= <clement.fournier76@gmail.com>
Date: Mon, 27 Sep 2021 20:53:08 +0200
Subject: [PATCH 16/21] Update comment

Co-authored-by: Marten Lohstroh <marten@berkeley.edu>
---
 org.lflang.lfc/src/org/lflang/lfc/LFStandaloneModule.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/org.lflang.lfc/src/org/lflang/lfc/LFStandaloneModule.java b/org.lflang.lfc/src/org/lflang/lfc/LFStandaloneModule.java
index bc2d1c38cb..a26878335d 100644
--- a/org.lflang.lfc/src/org/lflang/lfc/LFStandaloneModule.java
+++ b/org.lflang.lfc/src/org/lflang/lfc/LFStandaloneModule.java
@@ -64,7 +64,7 @@ public void configure(Binder binder) {
         // This is required to force the ResourceValidator to
         // use a new registry instance (which is reused by the injector as a singleton).
         // Otherwise, it uses the static EValidator.Registry.INSTANCE which is bad
-        // as the first validator to be created would be persisted in that static instance.
+        // as the first validator to be created would persist in that static instance.
         // New injectors would reuse the existing instance, but
         // its fields would have been injected by an older injector
         // and be out of sync with the rest of the application.

From d8bc919e53dea1ac4b969cdfb3b570979cf3329e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Fournier?= <clement.fournier76@gmail.com>
Date: Mon, 27 Sep 2021 23:46:56 +0200
Subject: [PATCH 17/21] Fix #490

---
 .../src/org/lflang/lfc/ReportingUtil.kt       | 17 +++++++----
 .../lflang/lfc/tests/LfIssueReportingTest.kt  |  7 ++++-
 .../org/lflang/lfc/tests/issue490.lf          |  9 ++++++
 .../org/lflang/lfc/tests/issue490.stderr      | 28 +++++++++++++++++++
 4 files changed, 54 insertions(+), 7 deletions(-)
 create mode 100644 org.lflang.lfc/test/resources/org/lflang/lfc/tests/issue490.lf
 create mode 100644 org.lflang.lfc/test/resources/org/lflang/lfc/tests/issue490.stderr

diff --git a/org.lflang.lfc/src/org/lflang/lfc/ReportingUtil.kt b/org.lflang.lfc/src/org/lflang/lfc/ReportingUtil.kt
index 0cc1e230ac..c2ebe77da2 100644
--- a/org.lflang.lfc/src/org/lflang/lfc/ReportingUtil.kt
+++ b/org.lflang.lfc/src/org/lflang/lfc/ReportingUtil.kt
@@ -34,6 +34,7 @@ import java.nio.file.Files
 import java.nio.file.Path
 import java.nio.file.Paths
 import java.util.*
+import java.util.Collections.nCopies
 import kotlin.collections.ArrayList
 import kotlin.math.max
 import kotlin.math.min
@@ -166,7 +167,10 @@ class ReportingBackend constructor(
         if (path == null) null
         else fileCache.computeIfAbsent(path.toAbsolutePath()) {
             try {
-                Files.readAllLines(it, StandardCharsets.UTF_8)
+                Files.readAllLines(it, StandardCharsets.UTF_8) +
+                        // Add a bunch of fake empty lines at the end to avoid IndexOutOfBoundsException
+                        // with errors that hit EOF.
+                        nCopies(5, "")
             } catch (e: IOException) {
                 null
             }
@@ -243,10 +247,11 @@ class ReportingBackend constructor(
     }
 
     private fun getBuilder(issue: LfIssue, lines: List<String>, displayPath: String): MessageTextBuilder {
-        val firstL = max(0, issue.line!! - 1 - numLinesAround + 1)
-        val lastL = min(lines.size, issue.endLine!! - 1 + numLinesAround)
-        val strings: List<String> = lines.subList(firstL, lastL)
-        return MessageTextBuilder(strings, firstL, issue.line - 1 - firstL, displayPath, issue)
+        val firstL = (issue.line!! - numLinesAround).coerceIn(0..lines.size)
+        val lastL = (issue.endLine!! - 1 + numLinesAround).coerceIn(0..lines.size)
+        val lineRange: List<String> = lines.subList(firstL, lastL)
+        val errorIdxInLineRange = issue.line - 1 - firstL
+        return MessageTextBuilder(lineRange, firstL, errorIdxInLineRange, displayPath, issue)
     }
 
     /** Renders a single issue. */
@@ -261,7 +266,7 @@ class ReportingBackend constructor(
     ) {
 
         init {
-            assert(0 <= errorIdx && errorIdx < lines.size) { "Weird indices --- first=$first, errorIdx=$errorIdx, lines=$lines" }
+            assert(errorIdx in 0..lines.size) { "Weird indices --- first=$first, errorIdx=$errorIdx, lines=$lines" }
         }
 
         fun build(): String {
diff --git a/org.lflang.lfc/test/kotlin/org/lflang/lfc/tests/LfIssueReportingTest.kt b/org.lflang.lfc/test/kotlin/org/lflang/lfc/tests/LfIssueReportingTest.kt
index 01b5d4e42c..7e7bf4180d 100644
--- a/org.lflang.lfc/test/kotlin/org/lflang/lfc/tests/LfIssueReportingTest.kt
+++ b/org.lflang.lfc/test/kotlin/org/lflang/lfc/tests/LfIssueReportingTest.kt
@@ -80,6 +80,11 @@ class LfIssueReportingTest {
         doTest(fileBaseName = "multilineWarningTooBig")
     }
 
+    @Test
+    fun testIssue490() {
+        doTest(fileBaseName = "issue490")
+    }
+
     @Test
     fun testTabs() {
         doTest(fileBaseName = "tabs")
@@ -120,7 +125,7 @@ class LfIssueReportingTest {
 
         if (!Files.exists(expectedPath)) {
             Files.writeString(expectedPath, actualOutput)
-            throw AssertionFailedError("Expected file $expectedPath does not exist, created it")
+            throw AssertionFailedError("Expected file $expectedPath does not exist, created it. Don't forget to `git add` it.")
         }
         val expected = Files.readString(expectedPath)
 
diff --git a/org.lflang.lfc/test/resources/org/lflang/lfc/tests/issue490.lf b/org.lflang.lfc/test/resources/org/lflang/lfc/tests/issue490.lf
new file mode 100644
index 0000000000..2fe700e349
--- /dev/null
+++ b/org.lflang.lfc/test/resources/org/lflang/lfc/tests/issue490.lf
@@ -0,0 +1,9 @@
+# https://github.com/lf-lang/lingua-franca/issues/490
+# issue is that one error ends at EOF
+target Python;
+main reactor R(p(3)) {
+  state liss(2, 3);
+  reaction (startup) {
+    print(self.liss)
+}
+}
diff --git a/org.lflang.lfc/test/resources/org/lflang/lfc/tests/issue490.stderr b/org.lflang.lfc/test/resources/org/lflang/lfc/tests/issue490.stderr
new file mode 100644
index 0000000000..edf6e2f4c4
--- /dev/null
+++ b/org.lflang.lfc/test/resources/org/lflang/lfc/tests/issue490.stderr
@@ -0,0 +1,28 @@
+lfc: error: Name of main reactor must match the file name (or be omitted).
+--> test/resources/org/lflang/lfc/tests/issue490.lf:4:14
+  |
+3 | target Python;
+4 | main reactor R(p(3)) {
+  |              ^ Name of main reactor must match the file name (or be omitted).
+  |
+5 |   state liss(2, 3);
+
+lfc: error: missing '{=' at '{'
+--> test/resources/org/lflang/lfc/tests/issue490.lf:6:22
+  |
+5 |   state liss(2, 3);
+6 |   reaction (startup) {
+  |                      ^ missing '{=' at '{'
+  |
+7 |     print(self.liss)
+
+lfc: error: mismatched input '<EOF>' expecting '=}'
+ --> test/resources/org/lflang/lfc/tests/issue490.lf:9:2
+   |
+ 8 | }
+   | >>>>>>>>>>>>>>
+ 9 | }
+10 | 
+   | < mismatched input '<EOF>' expecting '=}'
+11 | 
+

From 13098aeb54145162e73a12d1087601f7dd13536c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Fournier?= <clement.fournier76@gmail.com>
Date: Mon, 27 Sep 2021 23:49:21 +0200
Subject: [PATCH 18/21] Add one more test

---
 .../kotlin/org/lflang/lfc/tests/LfIssueReportingTest.kt   | 5 +++++
 .../test/resources/org/lflang/lfc/tests/emptyFile.lf      | 0
 .../test/resources/org/lflang/lfc/tests/emptyFile.stderr  | 8 ++++++++
 3 files changed, 13 insertions(+)
 create mode 100644 org.lflang.lfc/test/resources/org/lflang/lfc/tests/emptyFile.lf
 create mode 100644 org.lflang.lfc/test/resources/org/lflang/lfc/tests/emptyFile.stderr

diff --git a/org.lflang.lfc/test/kotlin/org/lflang/lfc/tests/LfIssueReportingTest.kt b/org.lflang.lfc/test/kotlin/org/lflang/lfc/tests/LfIssueReportingTest.kt
index 7e7bf4180d..b4b7b83662 100644
--- a/org.lflang.lfc/test/kotlin/org/lflang/lfc/tests/LfIssueReportingTest.kt
+++ b/org.lflang.lfc/test/kotlin/org/lflang/lfc/tests/LfIssueReportingTest.kt
@@ -90,6 +90,11 @@ class LfIssueReportingTest {
         doTest(fileBaseName = "tabs")
     }
 
+    @Test
+    fun testEmptyFile() {
+        doTest(fileBaseName = "emptyFile")
+    }
+
     @Test
     fun testColors() {
         doTest(fileBaseName = "colors", useColors = true)
diff --git a/org.lflang.lfc/test/resources/org/lflang/lfc/tests/emptyFile.lf b/org.lflang.lfc/test/resources/org/lflang/lfc/tests/emptyFile.lf
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/org.lflang.lfc/test/resources/org/lflang/lfc/tests/emptyFile.stderr b/org.lflang.lfc/test/resources/org/lflang/lfc/tests/emptyFile.stderr
new file mode 100644
index 0000000000..930a66806d
--- /dev/null
+++ b/org.lflang.lfc/test/resources/org/lflang/lfc/tests/emptyFile.stderr
@@ -0,0 +1,8 @@
+lfc: error: mismatched input '<EOF>' expecting 'target'
+--> test/resources/org/lflang/lfc/tests/emptyFile.lf:1:1
+  |
+1 | 
+  | ^ mismatched input '<EOF>' expecting 'target'
+  |
+2 | 
+

From 4d7e9f0eab43a03f56ef565b0506a67f7f43dc57 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Fournier?= <clement.fournier76@gmail.com>
Date: Tue, 28 Sep 2021 00:56:10 +0200
Subject: [PATCH 19/21] Fix tests

---
 .../test/resources/org/lflang/lfc/tests/multilineWarning.stderr  | 1 +
 .../test/resources/org/lflang/lfc/tests/twoLineWarning.stderr    | 1 +
 2 files changed, 2 insertions(+)

diff --git a/org.lflang.lfc/test/resources/org/lflang/lfc/tests/multilineWarning.stderr b/org.lflang.lfc/test/resources/org/lflang/lfc/tests/multilineWarning.stderr
index d75c35cdb9..5a60374f0c 100644
--- a/org.lflang.lfc/test/resources/org/lflang/lfc/tests/multilineWarning.stderr
+++ b/org.lflang.lfc/test/resources/org/lflang/lfc/tests/multilineWarning.stderr
@@ -7,3 +7,4 @@ lfc: error: Reactor must be named.
 4 |
 5 | }
   | < Reactor must be named.
+6 |
diff --git a/org.lflang.lfc/test/resources/org/lflang/lfc/tests/twoLineWarning.stderr b/org.lflang.lfc/test/resources/org/lflang/lfc/tests/twoLineWarning.stderr
index f259bbe25e..f91be55991 100644
--- a/org.lflang.lfc/test/resources/org/lflang/lfc/tests/twoLineWarning.stderr
+++ b/org.lflang.lfc/test/resources/org/lflang/lfc/tests/twoLineWarning.stderr
@@ -6,3 +6,4 @@ lfc: error: Reactor must be named.
 3 |  reactor {
 4 |      }
   | <<<<<< Reactor must be named.
+5 |

From 7673a77b46c9610bf338b103cc6c4f93182787df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Fournier?= <clement.fournier76@gmail.com>
Date: Wed, 29 Sep 2021 16:52:01 +0200
Subject: [PATCH 20/21] Use stacktrace option in ci

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 884ca6ed91..49d7bc99d0 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -64,7 +64,7 @@ jobs:
       - uses: actions/checkout@v2
       - name: Run standalone LFC tests
         run: |
-          ./gradlew :org.lflang.lfc:test
+          ./gradlew :org.lflang.lfc:test --stacktrace
 
   c-tests:
     strategy:

From 69367b8ae018e645da8c28211b28641e4be629b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Fournier?= <clement.fournier76@gmail.com>
Date: Sun, 17 Oct 2021 16:21:42 +0200
Subject: [PATCH 21/21] Fix windows tests

---
 .../lflang/lfc/tests/LfIssueReportingTest.kt   | 18 ++++++++++++++----
 .../org/lflang/lfc/tests/colors.stderr         |  4 ++--
 .../org/lflang/lfc/tests/emptyFile.stderr      |  2 +-
 .../org/lflang/lfc/tests/issue490.stderr       |  6 +++---
 .../lflang/lfc/tests/multilineWarning.stderr   |  2 +-
 .../lfc/tests/multilineWarningTooBig.stderr    |  2 +-
 .../org/lflang/lfc/tests/simpleWarning.stderr  |  4 ++--
 .../resources/org/lflang/lfc/tests/tabs.stderr |  6 +++---
 .../org/lflang/lfc/tests/twoLineWarning.stderr |  2 +-
 9 files changed, 28 insertions(+), 18 deletions(-)

diff --git a/org.lflang.lfc/test/kotlin/org/lflang/lfc/tests/LfIssueReportingTest.kt b/org.lflang.lfc/test/kotlin/org/lflang/lfc/tests/LfIssueReportingTest.kt
index b4b7b83662..8dee00cf03 100644
--- a/org.lflang.lfc/test/kotlin/org/lflang/lfc/tests/LfIssueReportingTest.kt
+++ b/org.lflang.lfc/test/kotlin/org/lflang/lfc/tests/LfIssueReportingTest.kt
@@ -32,7 +32,9 @@ import org.lflang.lfc.*
 import java.io.*
 import java.nio.charset.StandardCharsets
 import java.nio.file.Files
+import java.nio.file.Path
 import java.nio.file.Paths
+import java.util.*
 
 
 class SpyPrintStream {
@@ -126,19 +128,27 @@ class LfIssueReportingTest {
         main.getValidatedResource(lfFile)
         main.printErrorsIfAny()
 
-        val actualOutput = stderr.toString()
+        val actualOutput = stderr.toString().normalize(lfFile)
 
         if (!Files.exists(expectedPath)) {
-            Files.writeString(expectedPath, actualOutput)
+            val lines = actualOutput.split("\n") // resplit on normalized delimiter
+            Files.write(expectedPath, lines) // write using platform-specific delimiter, will be normalized by Git
             throw AssertionFailedError("Expected file $expectedPath does not exist, created it. Don't forget to `git add` it.")
         }
         val expected = Files.readString(expectedPath)
 
-        assertEquals(expected.normalize(), actualOutput.normalize())
+        assertEquals(expected.normalize(lfFile), actualOutput)
     }
 
-    private fun String.normalize() =
+    /**
+     * Normalize [this] string to be platform independent.
+     * @param lfFile Path to the test lf file
+     */
+    private fun String.normalize(lfFile: Path) =
         // normalize newlines and remove line-trailing whitespace
         trim().replace(Regex("\\s+\\R"), "\n")
+            // Replace file path with placeholder. File path is not
+            // rendered the same on linux and windows (forward/backward slash)
+            .replace(lfFile.toString(), "%%%PATH.lf%%%")
 
 }
diff --git a/org.lflang.lfc/test/resources/org/lflang/lfc/tests/colors.stderr b/org.lflang.lfc/test/resources/org/lflang/lfc/tests/colors.stderr
index f7a97fc4fa..475f9517f6 100644
--- a/org.lflang.lfc/test/resources/org/lflang/lfc/tests/colors.stderr
+++ b/org.lflang.lfc/test/resources/org/lflang/lfc/tests/colors.stderr
@@ -1,5 +1,5 @@
 lfc: error: Unrecognized target: unknown
---> test/resources/org/lflang/lfc/tests/colors.lf:4:8
+--> %%%PATH.lf%%%:4:8
   |
 3 |
 4 | target unknown;
@@ -7,7 +7,7 @@
   |
 5 |
 lfc: error: Name of main reactor must match the file name (or be omitted).
---> test/resources/org/lflang/lfc/tests/colors.lf:6:14
+--> %%%PATH.lf%%%:6:14
   |
 5 |
 6 | main reactor Foo {
diff --git a/org.lflang.lfc/test/resources/org/lflang/lfc/tests/emptyFile.stderr b/org.lflang.lfc/test/resources/org/lflang/lfc/tests/emptyFile.stderr
index 930a66806d..f63f06cc5c 100644
--- a/org.lflang.lfc/test/resources/org/lflang/lfc/tests/emptyFile.stderr
+++ b/org.lflang.lfc/test/resources/org/lflang/lfc/tests/emptyFile.stderr
@@ -1,5 +1,5 @@
 lfc: error: mismatched input '<EOF>' expecting 'target'
---> test/resources/org/lflang/lfc/tests/emptyFile.lf:1:1
+--> %%%PATH.lf%%%:1:1
   |
 1 | 
   | ^ mismatched input '<EOF>' expecting 'target'
diff --git a/org.lflang.lfc/test/resources/org/lflang/lfc/tests/issue490.stderr b/org.lflang.lfc/test/resources/org/lflang/lfc/tests/issue490.stderr
index edf6e2f4c4..edf3254755 100644
--- a/org.lflang.lfc/test/resources/org/lflang/lfc/tests/issue490.stderr
+++ b/org.lflang.lfc/test/resources/org/lflang/lfc/tests/issue490.stderr
@@ -1,5 +1,5 @@
 lfc: error: Name of main reactor must match the file name (or be omitted).
---> test/resources/org/lflang/lfc/tests/issue490.lf:4:14
+--> %%%PATH.lf%%%:4:14
   |
 3 | target Python;
 4 | main reactor R(p(3)) {
@@ -8,7 +8,7 @@ lfc: error: Name of main reactor must match the file name (or be omitted).
 5 |   state liss(2, 3);
 
 lfc: error: missing '{=' at '{'
---> test/resources/org/lflang/lfc/tests/issue490.lf:6:22
+--> %%%PATH.lf%%%:6:22
   |
 5 |   state liss(2, 3);
 6 |   reaction (startup) {
@@ -17,7 +17,7 @@ lfc: error: missing '{=' at '{'
 7 |     print(self.liss)
 
 lfc: error: mismatched input '<EOF>' expecting '=}'
- --> test/resources/org/lflang/lfc/tests/issue490.lf:9:2
+ --> %%%PATH.lf%%%:9:2
    |
  8 | }
    | >>>>>>>>>>>>>>
diff --git a/org.lflang.lfc/test/resources/org/lflang/lfc/tests/multilineWarning.stderr b/org.lflang.lfc/test/resources/org/lflang/lfc/tests/multilineWarning.stderr
index 5a60374f0c..5579a27731 100644
--- a/org.lflang.lfc/test/resources/org/lflang/lfc/tests/multilineWarning.stderr
+++ b/org.lflang.lfc/test/resources/org/lflang/lfc/tests/multilineWarning.stderr
@@ -1,5 +1,5 @@
 lfc: error: Reactor must be named.
---> test/resources/org/lflang/lfc/tests/multilineWarning.lf:3:1
+--> %%%PATH.lf%%%:3:1
   |
 2 |
   | >>>>>>>>>>>>>>
diff --git a/org.lflang.lfc/test/resources/org/lflang/lfc/tests/multilineWarningTooBig.stderr b/org.lflang.lfc/test/resources/org/lflang/lfc/tests/multilineWarningTooBig.stderr
index 0a8dca34aa..188aa2208f 100644
--- a/org.lflang.lfc/test/resources/org/lflang/lfc/tests/multilineWarningTooBig.stderr
+++ b/org.lflang.lfc/test/resources/org/lflang/lfc/tests/multilineWarningTooBig.stderr
@@ -1,5 +1,5 @@
 lfc: error: Reactor must be named.
- --> test/resources/org/lflang/lfc/tests/multilineWarningTooBig.lf:4:1
+ --> %%%PATH.lf%%%:4:1
    |
  3 | // leading
    | >>>>>>>>>>>>>>
diff --git a/org.lflang.lfc/test/resources/org/lflang/lfc/tests/simpleWarning.stderr b/org.lflang.lfc/test/resources/org/lflang/lfc/tests/simpleWarning.stderr
index 560678a80f..b66665fcfd 100644
--- a/org.lflang.lfc/test/resources/org/lflang/lfc/tests/simpleWarning.stderr
+++ b/org.lflang.lfc/test/resources/org/lflang/lfc/tests/simpleWarning.stderr
@@ -1,5 +1,5 @@
 lfc: error: Unrecognized target: unknown
---> test/resources/org/lflang/lfc/tests/simpleWarning.lf:1:8
+--> %%%PATH.lf%%%:1:8
   |
 1 | target unknown;
   |        ^^^^^^^ Unrecognized target: unknown
@@ -7,7 +7,7 @@ lfc: error: Unrecognized target: unknown
 2 |
 
 lfc: error: Name of main reactor must match the file name (or be omitted).
---> test/resources/org/lflang/lfc/tests/simpleWarning.lf:3:14
+--> %%%PATH.lf%%%:3:14
   |
 2 |
 3 | main reactor Foo {
diff --git a/org.lflang.lfc/test/resources/org/lflang/lfc/tests/tabs.stderr b/org.lflang.lfc/test/resources/org/lflang/lfc/tests/tabs.stderr
index 7c007b23d8..e3b1e765da 100644
--- a/org.lflang.lfc/test/resources/org/lflang/lfc/tests/tabs.stderr
+++ b/org.lflang.lfc/test/resources/org/lflang/lfc/tests/tabs.stderr
@@ -1,5 +1,5 @@
 lfc: error: State must have a type.
---> test/resources/org/lflang/lfc/tests/tabs.lf:4:2
+--> %%%PATH.lf%%%:4:2
   |
 3 | main reactor {
 4 |     state foo(1);
@@ -7,10 +7,10 @@ lfc: error: State must have a type.
   |
 5 |     state    bar(1);
 lfc: error: State must have a type.
---> test/resources/org/lflang/lfc/tests/tabs.lf:5:2
+--> %%%PATH.lf%%%:5:2
   |
 4 |     state foo(1);
 5 |     state    bar(1);
   |     ^^^^^^^^^^^^^^^^ State must have a type.
   |
-6 | }
+6 | }
\ No newline at end of file
diff --git a/org.lflang.lfc/test/resources/org/lflang/lfc/tests/twoLineWarning.stderr b/org.lflang.lfc/test/resources/org/lflang/lfc/tests/twoLineWarning.stderr
index f91be55991..745b863fb7 100644
--- a/org.lflang.lfc/test/resources/org/lflang/lfc/tests/twoLineWarning.stderr
+++ b/org.lflang.lfc/test/resources/org/lflang/lfc/tests/twoLineWarning.stderr
@@ -1,5 +1,5 @@
 lfc: error: Reactor must be named.
---> test/resources/org/lflang/lfc/tests/twoLineWarning.lf:3:2
+--> %%%PATH.lf%%%:3:2
   |
 2 |
   | >>>>>>>>>>>>>>