From 0520f30975a547409a374697bb00dd737862e96e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Fournier?= <clement.fournier@tu-dresden.de>
Date: Fri, 11 Nov 2022 16:10:35 +0100
Subject: [PATCH 01/17] Misc cleanups in error validators

---
 org.lflang/src/org/lflang/ErrorReporter.java  | 16 +++-
 .../HumanReadableReportingStrategy.java       | 12 +--
 .../LanguageServerErrorReporter.java          | 38 ++++-----
 .../src/org/lflang/generator/Validator.java   | 10 +--
 .../src/org/lflang/generator/c/CCompiler.java | 18 ++---
 .../src/org/lflang/generator/c/CUtil.java     |  4 +-
 .../generator/cpp/CppStandaloneGenerator.kt   |  4 +-
 .../generator/python/PythonValidator.java     | 68 +++++++++-------
 .../lflang/generator/rust/RustGenerator.kt    |  2 +-
 .../org/lflang/generator/rust/RustModel.kt    | 50 +++++++++++-
 .../lflang/generator/rust/RustValidator.kt    | 79 +++++++++++--------
 .../org/lflang/generator/ts/TSGenerator.kt    |  4 +-
 .../org/lflang/generator/ts/TSValidator.kt    | 61 +++++++-------
 org.lflang/src/org/lflang/util/LFCommand.java |  4 +-
 14 files changed, 225 insertions(+), 145 deletions(-)

diff --git a/org.lflang/src/org/lflang/ErrorReporter.java b/org.lflang/src/org/lflang/ErrorReporter.java
index 3d9273adf6..3590e7f945 100644
--- a/org.lflang/src/org/lflang/ErrorReporter.java
+++ b/org.lflang/src/org/lflang/ErrorReporter.java
@@ -6,6 +6,7 @@
 import org.eclipse.lsp4j.DiagnosticSeverity;
 
 import org.lflang.generator.Position;
+import org.lflang.generator.Range;
 
 /**
  * Interface for reporting errors.
@@ -161,7 +162,20 @@ default String report(Path file, DiagnosticSeverity severity, String message, in
      * @return a string that describes the diagnostic
      */
     default String report(Path file, DiagnosticSeverity severity, String message, Position startPos, Position endPos) {
-        return report(file, severity, message, startPos.getOneBasedLine());
+        return report(file, severity, message, new Range(startPos, endPos));
+    }
+
+    /**
+     * Report a message of severity {@code severity} that
+     * pertains to the given range of an LF source file.
+     * @param file The file to which the message pertains, or {@code null} if the file is unknown.
+     * @param severity the severity of the message
+     * @param message the message to send to the IDE
+     * @param range range of code in the file
+     * @return a string that describes the diagnostic
+     */
+    default String report(Path file, DiagnosticSeverity severity, String message, Range range) {
+        return report(file, severity, message, range.getStartInclusive().getOneBasedLine());
     }
 
     /**
diff --git a/org.lflang/src/org/lflang/generator/HumanReadableReportingStrategy.java b/org.lflang/src/org/lflang/generator/HumanReadableReportingStrategy.java
index 95617d6e8b..4c72374148 100644
--- a/org.lflang/src/org/lflang/generator/HumanReadableReportingStrategy.java
+++ b/org.lflang/src/org/lflang/generator/HumanReadableReportingStrategy.java
@@ -4,12 +4,12 @@
 import java.nio.file.Paths;
 import java.util.Iterator;
 import java.util.Map;
+import java.util.function.Consumer;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 import org.eclipse.lsp4j.DiagnosticSeverity;
 import org.eclipse.xtext.xbase.lib.Procedures.Procedure0;
-import org.eclipse.xtext.xbase.lib.Procedures.Procedure2;
 
 import org.lflang.ErrorReporter;
 
@@ -117,7 +117,7 @@ private void reportErrorLine(String line, Iterator<String> it, ErrorReporter err
                 Position lfFilePosition = map.adjusted(srcFile, generatedFilePosition);
                 if (matcher.group("column") != null) {
                     reportAppropriateRange(
-                        (p0, p1) -> errorReporter.report(srcFile, severity, message, p0, p1), lfFilePosition, it
+                        range -> errorReporter.report(srcFile, severity, message, range), lfFilePosition, it
                     );
                 } else {
                     errorReporter.report(srcFile, severity, message, lfFilePosition.getOneBasedLine());
@@ -138,9 +138,9 @@ private void reportErrorLine(String line, Iterator<String> it, ErrorReporter err
      *           following a diagnostic message.
      */
     private void reportAppropriateRange(
-        Procedure2<Position, Position> report, Position lfFilePosition, Iterator<String> it
+        Consumer<Range> report, Position lfFilePosition, Iterator<String> it
     ) {
-        Procedure0 failGracefully = () -> report.apply(lfFilePosition, lfFilePosition.plus(" "));
+        Procedure0 failGracefully = () -> report.accept(new Range(lfFilePosition, lfFilePosition.plus(" ")));
         if (!it.hasNext()) {
             failGracefully.apply();
             return;
@@ -148,13 +148,13 @@ private void reportAppropriateRange(
         String line = it.next();
         Matcher labelMatcher = labelPattern.matcher(line);
         if (labelMatcher.find()) {
-            report.apply(
+            report.accept(new Range(
                 Position.fromZeroBased(
                     lfFilePosition.getZeroBasedLine(),
                     lfFilePosition.getZeroBasedColumn() - labelMatcher.group(1).length()
                 ),
                 lfFilePosition.plus(labelMatcher.group(2))
-            );
+            ));
             return;
         }
         if (diagnosticMessagePattern.matcher(line).find()) {
diff --git a/org.lflang/src/org/lflang/generator/LanguageServerErrorReporter.java b/org.lflang/src/org/lflang/generator/LanguageServerErrorReporter.java
index 945a55ce9e..1302491c30 100644
--- a/org.lflang/src/org/lflang/generator/LanguageServerErrorReporter.java
+++ b/org.lflang/src/org/lflang/generator/LanguageServerErrorReporter.java
@@ -12,9 +12,8 @@
 import org.eclipse.lsp4j.Diagnostic;
 import org.eclipse.lsp4j.DiagnosticSeverity;
 import org.eclipse.lsp4j.PublishDiagnosticsParams;
-import org.eclipse.lsp4j.Range;
-import org.eclipse.xtext.nodemodel.util.NodeModelUtils;
 import org.eclipse.lsp4j.services.LanguageClient;
+import org.eclipse.xtext.nodemodel.util.NodeModelUtils;
 
 import org.lflang.ErrorReporter;
 
@@ -117,23 +116,28 @@ public String report(Path file, DiagnosticSeverity severity, String message, int
             file,
             severity,
             message,
-            Position.fromOneBased(line, 1),
-            Position.fromOneBased(line, 1 + (text.isEmpty() ? 0 : text.get().length()))
+            new Range(
+                Position.fromOneBased(line, 1),
+                Position.fromOneBased(line, 1 + (text.isEmpty() ? 0 : text.get().length()))
+            )
         );
     }
 
     @Override
-    public String report(Path file, DiagnosticSeverity severity, String message, Position startPos, Position endPos) {
-        if (file == null) file = getMainFile();
-        diagnostics.putIfAbsent(file, new ArrayList<>());
-        diagnostics.get(file).add(new Diagnostic(
-            toRange(startPos, endPos), message, severity, "LF Language Server"
-        ));
+    public String report(Path file, DiagnosticSeverity severity, String message, Range range) {
+        if (file == null) {
+            file = getMainFile();
+        }
+        diagnostics.computeIfAbsent(file, k -> new ArrayList<>())
+            .add(new Diagnostic(
+                toEclipseRange(range), message, severity, "LF Language Server"
+            ));
         return "" + severity + ": " + message;
     }
 
     /**
      * Save a reference to the language client.
+     *
      * @param client the language client
      */
     public static void setClient(LanguageClient client) {
@@ -187,15 +191,13 @@ private Optional<String> getLine(int line) {
     }
 
     /**
-     * Return the Range that starts at {@code p0} and ends
-     * at {@code p1}.
-     * @param p0 an arbitrary Position
-     * @param p1 a Position that is greater than {@code p0}
-     * @return the Range that starts at {@code p0} and ends
-     * at {@code p1}
+     * Convert an instance of our range class to the equivalent
+     * eclipse class.
      */
-    private Range toRange(Position p0, Position p1) {
-        return new Range(
+    private org.eclipse.lsp4j.Range toEclipseRange(Range range) {
+        Position p0 = range.getStartInclusive();
+        Position p1 = range.getEndExclusive();
+        return new org.eclipse.lsp4j.Range(
             new org.eclipse.lsp4j.Position(p0.getZeroBasedLine(), p0.getZeroBasedColumn()),
             new org.eclipse.lsp4j.Position(p1.getZeroBasedLine(), p1.getZeroBasedColumn())
         );
diff --git a/org.lflang/src/org/lflang/generator/Validator.java b/org.lflang/src/org/lflang/generator/Validator.java
index 0ad83f9c35..37767bf17b 100644
--- a/org.lflang/src/org/lflang/generator/Validator.java
+++ b/org.lflang/src/org/lflang/generator/Validator.java
@@ -68,8 +68,8 @@ public final void doValidate(LFGeneratorContext context) throws ExecutionExcepti
             }
         ).collect(Collectors.toList());
         for (Future<Pair<ValidationStrategy, LFCommand>> f : getFutures(tasks)) {
-            f.get().first.getErrorReportingStrategy().report(f.get().second.getErrors().toString(), errorReporter, codeMaps);
-            f.get().first.getOutputReportingStrategy().report(f.get().second.getOutput().toString(), errorReporter, codeMaps);
+            f.get().first.getErrorReportingStrategy().report(f.get().second.getErrors(), errorReporter, codeMaps);
+            f.get().first.getOutputReportingStrategy().report(f.get().second.getOutput(), errorReporter, codeMaps);
         }
     }
 
@@ -125,8 +125,8 @@ private static <T> List<Future<T>> getFutures(List<Callable<T>> tasks) throws In
      */
     public final int run(LFCommand command, CancelIndicator cancelIndicator) {
         final int returnCode = command.run(cancelIndicator);
-        getBuildReportingStrategies().first.report(command.getErrors().toString(), errorReporter, codeMaps);
-        getBuildReportingStrategies().second.report(command.getOutput().toString(), errorReporter, codeMaps);
+        getBuildReportingStrategies().first.report(command.getErrors(), errorReporter, codeMaps);
+        getBuildReportingStrategies().second.report(command.getOutput(), errorReporter, codeMaps);
         return returnCode;
     }
 
@@ -161,7 +161,7 @@ private List<Pair<ValidationStrategy, LFCommand>> getValidationStrategies() {
      */
     private Pair<ValidationStrategy, LFCommand> getValidationStrategy(Path generatedFile) {
         List<ValidationStrategy> sorted = getPossibleStrategies().stream()
-            .sorted(Comparator.comparingInt(vs -> -vs.getPriority())).collect(Collectors.toList());
+            .sorted(Comparator.comparingInt(vs -> -vs.getPriority())).toList();
         for (ValidationStrategy strategy : sorted) {
             LFCommand validateCommand = strategy.getCommand(generatedFile);
             if (validateCommand != null) {
diff --git a/org.lflang/src/org/lflang/generator/c/CCompiler.java b/org.lflang/src/org/lflang/generator/c/CCompiler.java
index e2084cd5e2..45601a0f85 100644
--- a/org.lflang/src/org/lflang/generator/c/CCompiler.java
+++ b/org.lflang/src/org/lflang/generator/c/CCompiler.java
@@ -140,16 +140,16 @@ public boolean runCCompiler(
 
         if (cMakeReturnCode != 0 &&
                 context.getMode() == LFGeneratorContext.Mode.STANDALONE &&
-                !outputContainsKnownCMakeErrors(compile.getErrors().toString())) {
+                !outputContainsKnownCMakeErrors(compile.getErrors())) {
             errorReporter.reportError(targetConfig.compiler + " failed with error code " + cMakeReturnCode);
         }
 
         // For warnings (vs. errors), the return code is 0.
         // But we still want to mark the IDE.
-        if (compile.getErrors().toString().length() > 0 &&
+        if (compile.getErrors().length() > 0 &&
                 context.getMode() != LFGeneratorContext.Mode.STANDALONE &&
-                !outputContainsKnownCMakeErrors(compile.getErrors().toString())) {
-            generator.reportCommandErrors(compile.getErrors().toString());
+                !outputContainsKnownCMakeErrors(compile.getErrors())) {
+            generator.reportCommandErrors(compile.getErrors());
         }
 
         int makeReturnCode = 0;
@@ -161,20 +161,20 @@ public boolean runCCompiler(
 
             if (makeReturnCode != 0 &&
                     context.getMode() == LFGeneratorContext.Mode.STANDALONE &&
-                    !outputContainsKnownCMakeErrors(build.getErrors().toString())) {
+                    !outputContainsKnownCMakeErrors(build.getErrors())) {
                 errorReporter.reportError(targetConfig.compiler + " failed with error code " + makeReturnCode);
             }
 
             // For warnings (vs. errors), the return code is 0.
             // But we still want to mark the IDE.
-            if (build.getErrors().toString().length() > 0 &&
+            if (build.getErrors().length() > 0 &&
                     context.getMode() != LFGeneratorContext.Mode.STANDALONE &&
-                    !outputContainsKnownCMakeErrors(build.getErrors().toString())) {
-                generator.reportCommandErrors(build.getErrors().toString());
+                    !outputContainsKnownCMakeErrors(build.getErrors())) {
+                generator.reportCommandErrors(build.getErrors());
             }
 
 
-            if (makeReturnCode == 0 && build.getErrors().toString().length() == 0) {
+            if (makeReturnCode == 0 && build.getErrors().length() == 0) {
                 errorReporter.reportInfo("SUCCESS: Compiling generated code for " + fileConfig.name + " finished with no errors.");
             }
 
diff --git a/org.lflang/src/org/lflang/generator/c/CUtil.java b/org.lflang/src/org/lflang/generator/c/CUtil.java
index 9ecd016a2a..0d57ffd29c 100644
--- a/org.lflang/src/org/lflang/generator/c/CUtil.java
+++ b/org.lflang/src/org/lflang/generator/c/CUtil.java
@@ -709,8 +709,8 @@ public static void runBuildCommand(
             }
             // For warnings (vs. errors), the return code is 0.
             // But we still want to mark the IDE.
-            if (!cmd.getErrors().toString().isEmpty() && mode == LFGeneratorContext.Mode.EPOCH) {
-                reportCommandErrors.report(cmd.getErrors().toString());
+            if (!cmd.getErrors().isEmpty() && mode == LFGeneratorContext.Mode.EPOCH) {
+                reportCommandErrors.report(cmd.getErrors());
                 return; // FIXME: Why do we return here? Even if there are warnings, the build process should proceed.
             }
         }
diff --git a/org.lflang/src/org/lflang/generator/cpp/CppStandaloneGenerator.kt b/org.lflang/src/org/lflang/generator/cpp/CppStandaloneGenerator.kt
index c6899f5388..0164d78360 100644
--- a/org.lflang/src/org/lflang/generator/cpp/CppStandaloneGenerator.kt
+++ b/org.lflang/src/org/lflang/generator/cpp/CppStandaloneGenerator.kt
@@ -89,7 +89,7 @@ class CppStandaloneGenerator(generator: CppGenerator) :
         var version: String? = null
         if (cmd != null && cmd.run() == 0) {
             val regex = "\\d+(\\.\\d+)+".toRegex()
-            version = regex.find(cmd.output.toString())?.value
+            version = regex.find(cmd.output)?.value
         }
         if (version == null || version.compareVersion("3.5.0") < 0) {
             errorReporter.reportError(
@@ -173,4 +173,4 @@ class CppStandaloneGenerator(generator: CppGenerator) :
         }
         return cmd
     }
-}
\ No newline at end of file
+}
diff --git a/org.lflang/src/org/lflang/generator/python/PythonValidator.java b/org.lflang/src/org/lflang/generator/python/PythonValidator.java
index 746e4dfdb3..6bba840973 100644
--- a/org.lflang/src/org/lflang/generator/python/PythonValidator.java
+++ b/org.lflang/src/org/lflang/generator/python/PythonValidator.java
@@ -6,6 +6,7 @@
 import java.util.Map;
 import java.util.Set;
 import java.util.function.Function;
+import java.util.function.UnaryOperator;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -17,6 +18,7 @@
 import org.lflang.generator.DiagnosticReporting;
 import org.lflang.generator.DiagnosticReporting.Strategy;
 import org.lflang.generator.Position;
+import org.lflang.generator.Range;
 import org.lflang.generator.ValidationStrategy;
 import org.lflang.util.LFCommand;
 
@@ -256,40 +258,48 @@ public Strategy getErrorReportingStrategy() {
             @Override
             public Strategy getOutputReportingStrategy() {
                 return (validationOutput, errorReporter, codeMaps) -> {
-                    if (validationOutput.isBlank()) return;
+                    if (validationOutput.isBlank()) {
+                        return;
+                    }
+                    PylintMessage[] pylintMessages;
                     try {
-                        for (PylintMessage message : mapper.readValue(validationOutput, PylintMessage[].class)) {
-                            if (shouldIgnore(message)) continue;
-                            CodeMap map = codeMaps.get(message.getPath(fileConfig.getSrcGenPath()));
-                            if (map != null) {
-                                for (Path lfFile : map.lfSourcePaths()) {
-                                    Function<Position, Position> adjust = p -> map.adjusted(lfFile, p);
-                                    String humanMessage = DiagnosticReporting.messageOf(
-                                        message.message,
-                                        message.getPath(fileConfig.getSrcGenPath()),
-                                        message.getStart()
-                                    );
-                                    Position lfStart = adjust.apply(message.getStart());
-                                    Position lfEnd = adjust.apply(message.getEnd());
-                                    bestEffortReport(
-                                        errorReporter,
-                                        adjust,
-                                        lfStart,
-                                        lfEnd,
-                                        lfFile,
-                                        message.getSeverity(),
-                                        humanMessage
-                                    );
-                                }
-                            }
-                        }
+                        pylintMessages = mapper.readValue(validationOutput, PylintMessage[].class);
                     } catch (JsonProcessingException e) {
                         System.err.printf("Failed to parse \"%s\":%n", validationOutput);
                         e.printStackTrace();
                         errorReporter.reportWarning(
                             "Failed to parse linter output. The Lingua Franca code generator is tested with Pylint "
-                             + "version 2.12.2. Consider updating Pylint if you have an older version."
+                                + "version 2.12.2. Consider updating Pylint if you have an older version."
                         );
+                        return;
+                    }
+                    for (PylintMessage message : pylintMessages) {
+                        if (shouldIgnore(message)) {
+                            continue;
+                        }
+                        CodeMap map = codeMaps.get(message.getPath(fileConfig.getSrcGenPath()));
+                        if (map == null) {
+                            continue;
+                        }
+                        for (Path lfFile : map.lfSourcePaths()) {
+                            UnaryOperator<Position> adjust = p -> map.adjusted(lfFile, p);
+                            String humanMessage = DiagnosticReporting.messageOf(
+                                message.message,
+                                message.getPath(fileConfig.getSrcGenPath()),
+                                message.getStart()
+                            );
+                            Position lfStart = adjust.apply(message.getStart());
+                            Position lfEnd = adjust.apply(message.getEnd());
+                            bestEffortReport(
+                                errorReporter,
+                                adjust,
+                                lfStart,
+                                lfEnd,
+                                lfFile,
+                                message.getSeverity(),
+                                humanMessage
+                            );
+                        }
                     }
                 };
             }
@@ -312,7 +322,7 @@ private boolean shouldIgnore(PylintMessage message) {
             /** Make a best-effort attempt to place the diagnostic on the correct line. */
             private void bestEffortReport(
                 ErrorReporter errorReporter,
-                Function<Position, Position> adjust,
+                UnaryOperator<Position> adjust,
                 Position lfStart,
                 Position lfEnd,
                 Path file,
@@ -320,7 +330,7 @@ private void bestEffortReport(
                 String humanMessage
             ) {
                 if (!lfEnd.equals(Position.ORIGIN) && !lfStart.equals(Position.ORIGIN)) { // Ideal case
-                    errorReporter.report(file, severity, humanMessage, lfStart, lfEnd);
+                    errorReporter.report(file, severity, humanMessage, new Range(lfStart, lfEnd));
                 } else {  // Fallback: Try to report on the correct line, or failing that, just line 1.
                     if (lfStart.equals(Position.ORIGIN)) lfStart = adjust.apply(
                         Position.fromZeroBased(lfStart.getZeroBasedLine(), Integer.MAX_VALUE)
diff --git a/org.lflang/src/org/lflang/generator/rust/RustGenerator.kt b/org.lflang/src/org/lflang/generator/rust/RustGenerator.kt
index 5e93fc92d3..2e723392d0 100644
--- a/org.lflang/src/org/lflang/generator/rust/RustGenerator.kt
+++ b/org.lflang/src/org/lflang/generator/rust/RustGenerator.kt
@@ -143,7 +143,7 @@ class RustGenerator(
             }
 
             val buildType = targetConfig.rust.buildType
-            var binaryPath = validator.getMetadata()?.targetDirectory!!
+            val binaryPath = validator.metadata?.targetDirectory!!
                 .resolve(buildType.cargoProfileName)
                 .resolve(localizedExecName)
             val destPath = fileConfig.binPath.resolve(localizedExecName)
diff --git a/org.lflang/src/org/lflang/generator/rust/RustModel.kt b/org.lflang/src/org/lflang/generator/rust/RustModel.kt
index d05ebe03c5..ecf32986dd 100644
--- a/org.lflang/src/org/lflang/generator/rust/RustModel.kt
+++ b/org.lflang/src/org/lflang/generator/rust/RustModel.kt
@@ -25,12 +25,55 @@
 
 package org.lflang.generator.rust
 
-import org.lflang.*
+import org.lflang.ASTUtils
+import org.lflang.AttributeUtils
+import org.lflang.ErrorReporter
+import org.lflang.IDENT_REGEX
+import org.lflang.InferredType
+import org.lflang.TargetConfig
 import org.lflang.TargetProperty.BuildType
-import org.lflang.generator.*
+import org.lflang.TimeUnit
+import org.lflang.TimeValue
+import org.lflang.allComponents
+import org.lflang.camelToSnakeCase
+import org.lflang.generator.CodeMap
+import org.lflang.generator.InvalidLfSourceException
+import org.lflang.generator.LocationInfo
+import org.lflang.generator.TargetCode
+import org.lflang.generator.UnsupportedGeneratorFeatureException
 import org.lflang.generator.cpp.toCppCode
-import org.lflang.lf.*
+import org.lflang.generator.locationInfo
+import org.lflang.inBlock
+import org.lflang.indexInContainer
+import org.lflang.inferredType
+import org.lflang.isBank
+import org.lflang.isInitWithBraces
+import org.lflang.isInput
+import org.lflang.isLogical
+import org.lflang.isMultiport
+import org.lflang.lf.Action
+import org.lflang.lf.BuiltinTrigger
+import org.lflang.lf.BuiltinTriggerRef
+import org.lflang.lf.Code
+import org.lflang.lf.Connection
+import org.lflang.lf.Expression
+import org.lflang.lf.Input
+import org.lflang.lf.Instantiation
+import org.lflang.lf.Literal
+import org.lflang.lf.ParameterReference
+import org.lflang.lf.Port
+import org.lflang.lf.Reaction
+import org.lflang.lf.Reactor
+import org.lflang.lf.Time
 import org.lflang.lf.Timer
+import org.lflang.lf.TypeParm
+import org.lflang.lf.VarRef
+import org.lflang.lf.Variable
+import org.lflang.lf.WidthSpec
+import org.lflang.reactor
+import org.lflang.toPath
+import org.lflang.toText
+import org.lflang.toTimeValue
 import java.nio.file.Path
 import java.util.*
 
@@ -698,6 +741,7 @@ val BuildType.cargoProfileName: String
         BuildType.RELEASE           -> "release"
         BuildType.REL_WITH_DEB_INFO -> "release-with-debug-info"
         BuildType.MIN_SIZE_REL      -> "release-with-min-size"
+        BuildType.TEST              -> "debug" // todo
     }
 
 /** Just the constructor of [CargoDependencySpec], but allows using named arguments. */
diff --git a/org.lflang/src/org/lflang/generator/rust/RustValidator.kt b/org.lflang/src/org/lflang/generator/rust/RustValidator.kt
index 637a8f7475..bf7a4db9b2 100644
--- a/org.lflang/src/org/lflang/generator/rust/RustValidator.kt
+++ b/org.lflang/src/org/lflang/generator/rust/RustValidator.kt
@@ -10,6 +10,7 @@ import org.lflang.FileConfig
 import org.lflang.generator.CodeMap
 import org.lflang.generator.DiagnosticReporting
 import org.lflang.generator.Position
+import org.lflang.generator.Range
 import org.lflang.generator.ValidationStrategy
 import org.lflang.generator.Validator
 import org.lflang.util.LFCommand
@@ -32,7 +33,7 @@ class RustValidator(
         private const val COMPILER_MESSAGE_REASON = "compiler-message"
     }
     // See the following reference for details on cargo metadata: https://doc.rust-lang.org/cargo/commands/cargo-metadata.html
-    public data class RustMetadata(
+    data class RustMetadata(
         // Other fields exist, but we don't need them. The mapper is configured not to fail on unknown properties.
         @JsonProperty("workspace_root") private val _workspaceRoot: String,
         @JsonProperty("target_directory") private val _targetDirectory: String
@@ -42,6 +43,7 @@ class RustValidator(
         val targetDirectory: Path
             get() = Paths.get(_targetDirectory)
     }
+
     // See the following references for details on these data classes:
     //  * https://doc.rust-lang.org/cargo/reference/external-tools.html#json-messages
     //  * https://doc.rust-lang.org/rustc/json.html
@@ -103,39 +105,43 @@ class RustValidator(
         @JsonProperty("expansion") val expansion: RustSpanExpansion?
     ) {
         val start: Position
-            get() = Position.fromOneBased(lineStart, columnStart)
+            get() = Position.fromZeroBased(lineStart, columnStart)
         val end: Position
-            get() = Position.fromOneBased(lineEnd, columnEnd)
+            get() = Position.fromZeroBased(lineEnd, columnEnd)
+        val range: Range get() = Range(start, end)
     }
     private data class RustSpanExpansion(
         @JsonProperty("span") val span: RustSpan,
         @JsonProperty("macro_decl_name") val macroDeclName: String,
         @JsonProperty("def_site_span") val defSiteSpan: RustSpan?
     )
+
     private data class RustSpanText(
         @JsonProperty("text") val text: String,
         @JsonProperty("highlight_start") val highlightStart: Int,
         @JsonProperty("highlight_end") val highlightEnd: Int
     )
 
-    private var _metadata: RustMetadata? = null
 
-    public fun getMetadata(): RustMetadata? {
-        val nullableCommand = LFCommand.get("cargo", listOf("metadata", "--format-version", "1"), true, fileConfig.srcGenPkgPath)
-        _metadata = _metadata ?: nullableCommand?.let { command ->
-            command.run { false }
-            command.output.toString().lines().filter { it.startsWith("{") }.mapNotNull {
+    val metadata: RustMetadata? by lazy {
+        val command =
+            LFCommand.get("cargo", listOf("metadata", "--format-version", "1"), true, fileConfig.srcGenPkgPath)
+                ?: return@lazy null
+
+        command.run { false }
+        command.output.toString()
+            .lines()
+            .filter { it.startsWith("{") }
+            .firstNotNullOfOrNull {
                 try {
                     mapper.readValue(it, RustMetadata::class.java)
                 } catch (e: JsonProcessingException) {
                     null
                 }
-            }.firstOrNull()
-        }
-        return _metadata
+            }
     }
 
-    override fun getPossibleStrategies(): Collection<ValidationStrategy> = listOf(object: ValidationStrategy {
+    private val rustValidationStrategy = object : ValidationStrategy {
         override fun getCommand(generatedFile: Path?): LFCommand {
             return LFCommand.get(
                 "cargo",
@@ -147,36 +153,41 @@ class RustValidator(
 
         override fun getErrorReportingStrategy() = DiagnosticReporting.Strategy { _, _, _ -> }
 
-        override fun getOutputReportingStrategy() = DiagnosticReporting.Strategy {
-            validationOutput, errorReporter, map -> validationOutput.lines().forEach { messageLine ->
-                if (messageLine.isNotBlank() && mapper.readValue(messageLine, RustOutput::class.java).reason == COMPILER_MESSAGE_REASON) {
-                    val message = mapper.readValue(messageLine, RustCompilerMessage::class.java).message
-                    if (message.spans.isEmpty()) errorReporter.report(null, message.severity, message.message)
-                    for (s: RustSpan in message.spans) {
-                        val p: Path? = getMetadata()?.workspaceRoot?.resolve(s.fileName)
-                        map[p]?.let {
-                            for (lfSourcePath: Path in it.lfSourcePaths()) {
-                                errorReporter.report(
-                                    lfSourcePath,
-                                    message.severity,
-                                    DiagnosticReporting.messageOf(message.message, p, s.start),
-                                    it.adjusted(lfSourcePath, s.start),
-                                    it.adjusted(lfSourcePath, s.end),
-                                )
-                            }
-                        }
+        override fun getOutputReportingStrategy() = DiagnosticReporting.Strategy { validationOutput, errorReporter, map ->
+            for (messageLine in validationOutput.lines()) {
+                if (messageLine.isBlank()
+                    || mapper.readValue(messageLine, RustOutput::class.java).reason != COMPILER_MESSAGE_REASON
+                ) continue
+
+                val message = mapper.readValue(messageLine, RustCompilerMessage::class.java).message
+
+                if (message.spans.isEmpty()) errorReporter.report(null, message.severity, message.message)
+                for (span in message.spans) {
+                    val genFilePath = metadata?.workspaceRoot?.resolve(span.fileName)
+                    val codeMap = map[genFilePath] ?: continue
+
+                    for (lfSourcePath in codeMap.lfSourcePaths()) { // fixme error is reported several times
+                        errorReporter.report(
+                            lfSourcePath,
+                            message.severity,
+                            DiagnosticReporting.messageOf(message.message, genFilePath, span.start),
+                            codeMap.adjusted(lfSourcePath, span.range),
+                        )
                     }
-                    message.rendered?.let { println(it) }
                 }
+                message.rendered?.let { println(it) }
             }
         }
 
         override fun getPriority(): Int = 0
 
         override fun isFullBatch(): Boolean = true
-    })
+    }
+
+    override fun getPossibleStrategies(): Collection<ValidationStrategy> = listOf(rustValidationStrategy)
 
     override fun getBuildReportingStrategies(): Pair<DiagnosticReporting.Strategy, DiagnosticReporting.Strategy> = Pair(
-        possibleStrategies.first().errorReportingStrategy, possibleStrategies.first().outputReportingStrategy
+        rustValidationStrategy.errorReportingStrategy,
+        rustValidationStrategy.outputReportingStrategy
     )
 }
diff --git a/org.lflang/src/org/lflang/generator/ts/TSGenerator.kt b/org.lflang/src/org/lflang/generator/ts/TSGenerator.kt
index 04f00cc788..a4fd3b0bb6 100644
--- a/org.lflang/src/org/lflang/generator/ts/TSGenerator.kt
+++ b/org.lflang/src/org/lflang/generator/ts/TSGenerator.kt
@@ -353,7 +353,7 @@ class TSGenerator(
         if (pnpmInstall != null) {
             val ret = pnpmInstall.run(context.cancelIndicator)
             if (ret != 0) {
-                val errors: String = pnpmInstall.errors.toString()
+                val errors: String = pnpmInstall.errors
                 errorReporter.reportError(
                     GeneratorUtils.findTarget(resource),
                     "ERROR: pnpm install command failed" + if (errors.isBlank()) "." else ":\n$errors")
@@ -372,7 +372,7 @@ class TSGenerator(
             if (npmInstall.run(context.cancelIndicator) != 0) {
                 errorReporter.reportError(
                     GeneratorUtils.findTarget(resource),
-                    "ERROR: npm install command failed: " + npmInstall.errors.toString())
+                    "ERROR: npm install command failed: " + npmInstall.errors)
                 errorReporter.reportError(
                     GeneratorUtils.findTarget(resource), "ERROR: npm install command failed." +
                         "\nFor installation instructions, see: https://www.npmjs.com/get-npm")
diff --git a/org.lflang/src/org/lflang/generator/ts/TSValidator.kt b/org.lflang/src/org/lflang/generator/ts/TSValidator.kt
index aa861ce800..dfc15720d4 100644
--- a/org.lflang/src/org/lflang/generator/ts/TSValidator.kt
+++ b/org.lflang/src/org/lflang/generator/ts/TSValidator.kt
@@ -11,6 +11,7 @@ import org.lflang.generator.DiagnosticReporting
 import org.lflang.generator.HumanReadableReportingStrategy
 import org.lflang.generator.LFGeneratorContext
 import org.lflang.generator.Position
+import org.lflang.generator.Range
 import org.lflang.generator.ValidationStrategy
 import org.lflang.generator.Validator
 import org.lflang.util.LFCommand
@@ -82,39 +83,37 @@ class TSValidator(
         )
 
         override fun getPossibleStrategies(): Collection<ValidationStrategy> = listOf(object: ValidationStrategy {
-            override fun getCommand(generatedFile: Path?): LFCommand? {
-                return generatedFile?.let {
-                    LFCommand.get(
-                        "npx",
-                        listOf("eslint", "--format", "json", fileConfig.srcGenPkgPath.relativize(it).toString()),
-                        true,
-                        fileConfig.srcGenPkgPath
-                    )
-                }
-            }
+            override fun getCommand(generatedFile: Path): LFCommand =
+                LFCommand.get(
+                    "npx",
+                    listOf("eslint", "--format", "json", fileConfig.srcGenPkgPath.relativize(generatedFile).toString()),
+                    true,
+                    fileConfig.srcGenPkgPath
+                )
 
             override fun getErrorReportingStrategy() = DiagnosticReporting.Strategy { _, _, _ -> }
 
-            override fun getOutputReportingStrategy() = DiagnosticReporting.Strategy {
-                validationOutput, errorReporter, map -> validationOutput.lines().filter { it.isNotBlank() }.forEach {
-                    line: String -> mapper.readValue(line, Array<ESLintOutput>::class.java).forEach {
-                        output: ESLintOutput -> output.messages.forEach {
-                            message: ESLintMessage ->
-                            val genPath: Path = fileConfig.srcGenPkgPath.resolve(output.filePath)
-                            map[genPath]?.let {
-                                codeMap ->
-                                codeMap.lfSourcePaths().forEach {
-                                    val lfStart = codeMap.adjusted(it, message.start)
-                                    val lfEnd = codeMap.adjusted(it, message.end)
-                                    if (!lfStart.equals(Position.ORIGIN)) {  // Ignore linting errors in non-user-supplied code.
-                                        errorReporter.report(
-                                            it,
-                                            message.severity,
-                                            DiagnosticReporting.messageOf(message.message, genPath, message.start),
+            override fun getOutputReportingStrategy() = DiagnosticReporting.Strategy { validationOutput, errorReporter, map ->
+                for (line in validationOutput.lines().filter { it.isNotBlank() }) {
+                    for (output in mapper.readValue(line, Array<ESLintOutput>::class.java)) {
+                        for (message in output.messages) {
+
+                            val genPath = fileConfig.srcGenPkgPath.resolve(output.filePath)
+                            val codeMap = map[genPath] ?: continue
+
+                            for (path in codeMap.lfSourcePaths()) {
+                                val lfStart = codeMap.adjusted(path, message.start)
+                                val lfEnd = codeMap.adjusted(path, message.end)
+                                if (lfStart != Position.ORIGIN) {  // Ignore linting errors in non-user-supplied code.
+                                    errorReporter.report(
+                                        path,
+                                        message.severity,
+                                        DiagnosticReporting.messageOf(message.message, genPath, message.start),
+                                        Range(
                                             lfStart,
-                                            if (lfEnd > lfStart) lfEnd else lfStart.plus(" "),
+                                            if (lfEnd > lfStart) lfEnd else lfStart + " ",
                                         )
-                                    }
+                                    )
                                 }
                             }
                         }
@@ -133,9 +132,9 @@ class TSValidator(
 
     override fun getPossibleStrategies(): Collection<ValidationStrategy>
         = listOf(object: ValidationStrategy {
-            override fun getCommand(generatedFile: Path?): LFCommand? {  // FIXME: Add "--incremental" argument if we update to TypeScript 4
-                return LFCommand.get("npx", listOf("tsc", "--pretty", "--noEmit"), true, fileConfig.srcGenPkgPath)
-            }
+        override fun getCommand(generatedFile: Path): LFCommand {  // FIXME: Add "--incremental" argument if we update to TypeScript 4
+            return LFCommand.get("npx", listOf("tsc", "--pretty", "--noEmit"), true, fileConfig.srcGenPkgPath)
+        }
 
             override fun getErrorReportingStrategy() = DiagnosticReporting.Strategy { _, _, _ -> }
 
diff --git a/org.lflang/src/org/lflang/util/LFCommand.java b/org.lflang/src/org/lflang/util/LFCommand.java
index 37610803f4..8fd4feb3ad 100644
--- a/org.lflang/src/org/lflang/util/LFCommand.java
+++ b/org.lflang/src/org/lflang/util/LFCommand.java
@@ -83,13 +83,13 @@ protected LFCommand(ProcessBuilder pb, boolean quiet) {
     /**
      * Get the output collected during command execution
      */
-    public OutputStream getOutput() { return output; }
+    public String getOutput() { return output.toString(); }
 
 
     /**
      * Get the error output collected during command execution
      */
-    public OutputStream getErrors() { return errors; }
+    public String getErrors() { return errors.toString(); }
 
     /** Get this command's program and arguments. */
     public List<String> command() { return processBuilder.command(); }

From e66f37dbe894b19e9cdd90292ea4a1812dbb9425 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Fournier?= <clement.fournier@tu-dresden.de>
Date: Thu, 20 Apr 2023 13:51:24 +0200
Subject: [PATCH 02/17] Format

---
 org.lflang/src/org/lflang/ErrorReporter.java  |  24 +-
 .../src/org/lflang/generator/Validator.java   |  42 ++--
 .../src/org/lflang/generator/c/CCompiler.java | 205 ++++++++---------
 .../src/org/lflang/generator/c/CUtil.java     | 213 +++++++++---------
 org.lflang/src/org/lflang/util/LFCommand.java |  44 ++--
 5 files changed, 248 insertions(+), 280 deletions(-)

diff --git a/org.lflang/src/org/lflang/ErrorReporter.java b/org.lflang/src/org/lflang/ErrorReporter.java
index 23baded772..715ac6b5e9 100644
--- a/org.lflang/src/org/lflang/ErrorReporter.java
+++ b/org.lflang/src/org/lflang/ErrorReporter.java
@@ -170,16 +170,16 @@ default String report(Path file, DiagnosticSeverity severity, String message, Ra
     return report(file, severity, message, range.getStartInclusive().getOneBasedLine());
   }
 
-    /**
-     * Check if errors where reported.
-     *
-     * @return true if errors where reported
-     */
-    boolean getErrorsOccurred();
-
-    /**
-     * Clear error history, if exists.
-     * This is usually only the case for error markers in Epoch (Eclipse).
-     */
-    default void clearHistory() {}
+  /**
+   * Check if errors where reported.
+   *
+   * @return true if errors where reported
+   */
+  boolean getErrorsOccurred();
+
+  /**
+   * Clear error history, if exists. This is usually only the case for error markers in Epoch
+   * (Eclipse).
+   */
+  default void clearHistory() {}
 }
diff --git a/org.lflang/src/org/lflang/generator/Validator.java b/org.lflang/src/org/lflang/generator/Validator.java
index 61c2dde97d..53efd6412e 100644
--- a/org.lflang/src/org/lflang/generator/Validator.java
+++ b/org.lflang/src/org/lflang/generator/Validator.java
@@ -1,5 +1,6 @@
 package org.lflang.generator;
 
+import com.google.common.collect.ImmutableMap;
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -13,14 +14,10 @@
 import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
 import java.util.stream.Collectors;
-
 import org.eclipse.xtext.util.CancelIndicator;
-
 import org.lflang.ErrorReporter;
 import org.lflang.util.LFCommand;
 
-import com.google.common.collect.ImmutableMap;
-
 /**
  * Validate generated code.
  *
@@ -170,25 +167,26 @@ private List<Pair<ValidationStrategy, LFCommand>> getValidationStrategies() {
     return commands;
   }
 
-    /**
-     * Return the validation strategy and command
-     * corresponding to the given file if such a strategy
-     * and command are available.
-     * @return the validation strategy and command
-     * corresponding to the given file if such a strategy
-     * and command are available
-     */
-    private Pair<ValidationStrategy, LFCommand> getValidationStrategy(Path generatedFile) {
-        List<ValidationStrategy> sorted = getPossibleStrategies().stream()
-            .sorted(Comparator.comparingInt(vs -> -vs.getPriority())).toList();
-        for (ValidationStrategy strategy : sorted) {
-            LFCommand validateCommand = strategy.getCommand(generatedFile);
-            if (validateCommand != null) {
-                return new Pair<>(strategy, validateCommand);
-            }
-        }
-        return new Pair<>(null, null);
+  /**
+   * Return the validation strategy and command corresponding to the given file if such a strategy
+   * and command are available.
+   *
+   * @return the validation strategy and command corresponding to the given file if such a strategy
+   *     and command are available
+   */
+  private Pair<ValidationStrategy, LFCommand> getValidationStrategy(Path generatedFile) {
+    List<ValidationStrategy> sorted =
+        getPossibleStrategies().stream()
+            .sorted(Comparator.comparingInt(vs -> -vs.getPriority()))
+            .toList();
+    for (ValidationStrategy strategy : sorted) {
+      LFCommand validateCommand = strategy.getCommand(generatedFile);
+      if (validateCommand != null) {
+        return new Pair<>(strategy, validateCommand);
+      }
     }
+    return new Pair<>(null, null);
+  }
 
   /**
    * List all validation strategies that exist for the implementor without filtering by platform or
diff --git a/org.lflang/src/org/lflang/generator/c/CCompiler.java b/org.lflang/src/org/lflang/generator/c/CCompiler.java
index d62ee7ba7b..609b3614b6 100644
--- a/org.lflang/src/org/lflang/generator/c/CCompiler.java
+++ b/org.lflang/src/org/lflang/generator/c/CCompiler.java
@@ -167,25 +167,27 @@ public boolean runCCompiler(GeneratorBase generator, LFGeneratorContext context)
         generator.reportCommandErrors(build.getErrors());
       }
 
+      if (makeReturnCode == 0 && build.getErrors().isEmpty()) {
+        errorReporter.reportInfo(
+            "SUCCESS: Compiling generated code for "
+                + fileConfig.name
+                + " finished with no errors.");
+      }
 
-            if (makeReturnCode == 0 && build.getErrors().isEmpty()) {
-                errorReporter.reportInfo("SUCCESS: Compiling generated code for " + fileConfig.name + " finished with no errors.");
-            }
-
-            if (targetConfig.platformOptions.platform == Platform.ZEPHYR && targetConfig.platformOptions.flash) {
-                errorReporter.reportInfo("Invoking flash command for Zephyr");
-                LFCommand flash = buildWestFlashCommand();
-                int flashRet = flash.run();
-                if (flashRet != 0) {
-                    errorReporter.reportError("West flash command failed with error code " + flashRet);
-                } else {
-                    errorReporter.reportInfo("SUCCESS: Flashed application with west");
-                }
-            }
-
+      if (targetConfig.platformOptions.platform == Platform.ZEPHYR
+          && targetConfig.platformOptions.flash) {
+        errorReporter.reportInfo("Invoking flash command for Zephyr");
+        LFCommand flash = buildWestFlashCommand();
+        int flashRet = flash.run();
+        if (flashRet != 0) {
+          errorReporter.reportError("West flash command failed with error code " + flashRet);
+        } else {
+          errorReporter.reportInfo("SUCCESS: Flashed application with west");
         }
-        return cMakeReturnCode == 0 && makeReturnCode == 0;
+      }
     }
+    return cMakeReturnCode == 0 && makeReturnCode == 0;
+  }
 
   /**
    * Return a command to compile the specified C file using CMake. This produces a C-specific
@@ -222,13 +224,9 @@ private static List<String> cmakeOptions(TargetConfig targetConfig, FileConfig f
                     ? targetConfig.cmakeBuildType.toString()
                     : "Release"),
             "-DCMAKE_INSTALL_PREFIX=" + FileUtil.toUnixString(fileConfig.getOutPath()),
-            "-DCMAKE_INSTALL_BINDIR=" + FileUtil.toUnixString(
-                fileConfig.getOutPath().relativize(
-                    fileConfig.binPath
-                )
-            ),
-            FileUtil.toUnixString(fileConfig.getSrcGenPath())
-        ));
+            "-DCMAKE_INSTALL_BINDIR="
+                + FileUtil.toUnixString(fileConfig.getOutPath().relativize(fileConfig.binPath)),
+            FileUtil.toUnixString(fileConfig.getSrcGenPath())));
 
     if (GeneratorUtils.isHostWindows()) {
       arguments.add("-DCMAKE_SYSTEM_VERSION=\"10.0\"");
@@ -281,80 +279,68 @@ public LFCommand buildCmakeCommand() {
     return command;
   }
 
-    /**
-     * Return a flash/emulate command using west.
-     * If board is null (defaults to qemu_cortex_m3) or qemu_*
-     * Return a flash command which runs the target as an emulation
-     * If ordinary target, return `west flash`
-     */
-    public LFCommand buildWestFlashCommand() {
-        // Set the build directory to be "build"
-        Path buildPath = fileConfig.getSrcGenPath().resolve("build");
-        String board = targetConfig.platformOptions.board;
-        LFCommand cmd;
-        if (board == null || board.startsWith("qemu")) {
-            cmd = commandFactory.createCommand(
-                "west", List.of("build", "-t", "run"), buildPath);
-        } else {
-            cmd = commandFactory.createCommand(
-                "west", List.of("flash"), buildPath);
-        }
-        if (cmd == null) {
-            errorReporter.reportError(
-                "Could not create west flash command."
-            );
-        }
-
-        return cmd;
+  /**
+   * Return a flash/emulate command using west. If board is null (defaults to qemu_cortex_m3) or
+   * qemu_* Return a flash command which runs the target as an emulation If ordinary target, return
+   * `west flash`
+   */
+  public LFCommand buildWestFlashCommand() {
+    // Set the build directory to be "build"
+    Path buildPath = fileConfig.getSrcGenPath().resolve("build");
+    String board = targetConfig.platformOptions.board;
+    LFCommand cmd;
+    if (board == null || board.startsWith("qemu")) {
+      cmd = commandFactory.createCommand("west", List.of("build", "-t", "run"), buildPath);
+    } else {
+      cmd = commandFactory.createCommand("west", List.of("flash"), buildPath);
+    }
+    if (cmd == null) {
+      errorReporter.reportError("Could not create west flash command.");
     }
 
-    /**
-     * Check if the output produced by CMake has any known and common errors.
-     * If a known error is detected, a specialized, more informative message
-     * is shown.
-     *
-     * Errors currently detected:
-     * - C++ compiler used to compile C files: This error shows up as
-     *  '#error "The CMAKE_C_COMPILER is set to a C++ compiler"' in
-     *  the 'CMakeOutput' string.
-     *
-     * @param CMakeOutput The captured output from CMake.
-     * @return true if the provided 'CMakeOutput' contains a known error.
-     *  false otherwise.
-     */
-    @SuppressWarnings("BooleanMethodIsAlwaysInverted")
-    private boolean outputContainsKnownCMakeErrors(String CMakeOutput) {
-        // Check if the error thrown is due to the wrong compiler
-        if (CMakeOutput.contains("The CMAKE_C_COMPILER is set to a C++ compiler")) {
-            // If so, print an appropriate error message
-            if (targetConfig.compiler != null) {
-                errorReporter.reportError(
-                        "A C++ compiler was requested in the compiler target property."
-                                + " Use the CCpp or the Cpp target instead.");
-            } else {
-                errorReporter.reportError("\"A C++ compiler was detected."
-                       + " The C target works best with a C compiler."
-                       + " Use the CCpp or the Cpp target instead.\"");
-            }
-            return true;
-        }
-        return false;
+    return cmd;
+  }
+
+  /**
+   * Check if the output produced by CMake has any known and common errors. If a known error is
+   * detected, a specialized, more informative message is shown.
+   *
+   * <p>Errors currently detected: - C++ compiler used to compile C files: This error shows up as
+   * '#error "The CMAKE_C_COMPILER is set to a C++ compiler"' in the 'CMakeOutput' string.
+   *
+   * @param CMakeOutput The captured output from CMake.
+   * @return true if the provided 'CMakeOutput' contains a known error. false otherwise.
+   */
+  @SuppressWarnings("BooleanMethodIsAlwaysInverted")
+  private boolean outputContainsKnownCMakeErrors(String CMakeOutput) {
+    // Check if the error thrown is due to the wrong compiler
+    if (CMakeOutput.contains("The CMAKE_C_COMPILER is set to a C++ compiler")) {
+      // If so, print an appropriate error message
+      if (targetConfig.compiler != null) {
+        errorReporter.reportError(
+            "A C++ compiler was requested in the compiler target property."
+                + " Use the CCpp or the Cpp target instead.");
+      } else {
+        errorReporter.reportError(
+            "\"A C++ compiler was detected."
+                + " The C target works best with a C compiler."
+                + " Use the CCpp or the Cpp target instead.\"");
+      }
+      return true;
     }
+    return false;
+  }
 
-    /**
-     * Return a command to compile the specified C file using a native compiler
-     * (generally gcc unless overridden by the user).
-     * This produces a C specific compile command.
-     *
-     * @param fileToCompile The C filename without the .c extension.
-     * @param noBinary If true, the compiler will create a .o output instead of a binary.
-     *  If false, the compile command will produce a binary.
-     */
-    public LFCommand compileCCommand(
-        String fileToCompile,
-        boolean noBinary
-    ) {
-        String cFilename = getTargetFileName(fileToCompile, cppMode, targetConfig);
+  /**
+   * Return a command to compile the specified C file using a native compiler (generally gcc unless
+   * overridden by the user). This produces a C specific compile command.
+   *
+   * @param fileToCompile The C filename without the .c extension.
+   * @param noBinary If true, the compiler will create a .o output instead of a binary. If false,
+   *     the compile command will produce a binary.
+   */
+  public LFCommand compileCCommand(String fileToCompile, boolean noBinary) {
+    String cFilename = getTargetFileName(fileToCompile, cppMode, targetConfig);
 
     Path relativeSrcPath =
         fileConfig
@@ -412,22 +398,21 @@ public LFCommand compileCCommand(
     return command;
   }
 
-    /**
-     * Produces the filename including the target-specific extension
-     *
-     * @param fileName The base name of the file without any extensions
-     * @param cppMode  Indicate whether the compiler is in C++ mode
-     * In C++ mode, the compiler produces .cpp files instead
-     * of .c files and uses a C++ compiler to compiler the code.
-     */
-    static String getTargetFileName(String fileName, boolean cppMode, TargetConfig targetConfig) {
-        if (targetConfig.platformOptions.platform == Platform.ARDUINO) {
-            return fileName + ".ino";
-        }
-        if (cppMode) {
-            // If the C++ mode is enabled, use a .cpp extension
-            return fileName + ".cpp";
-        }
-        return fileName + ".c";
+  /**
+   * Produces the filename including the target-specific extension
+   *
+   * @param fileName The base name of the file without any extensions
+   * @param cppMode Indicate whether the compiler is in C++ mode In C++ mode, the compiler produces
+   *     .cpp files instead of .c files and uses a C++ compiler to compiler the code.
+   */
+  static String getTargetFileName(String fileName, boolean cppMode, TargetConfig targetConfig) {
+    if (targetConfig.platformOptions.platform == Platform.ARDUINO) {
+      return fileName + ".ino";
     }
+    if (cppMode) {
+      // If the C++ mode is enabled, use a .cpp extension
+      return fileName + ".cpp";
+    }
+    return fileName + ".c";
+  }
 }
diff --git a/org.lflang/src/org/lflang/generator/c/CUtil.java b/org.lflang/src/org/lflang/generator/c/CUtil.java
index 92ceaa0c8f..0808d97c28 100644
--- a/org.lflang/src/org/lflang/generator/c/CUtil.java
+++ b/org.lflang/src/org/lflang/generator/c/CUtil.java
@@ -37,13 +37,11 @@
 import java.util.List;
 import java.util.Objects;
 import java.util.stream.Collectors;
-
 import org.lflang.ASTUtils;
 import org.lflang.ErrorReporter;
 import org.lflang.FileConfig;
 import org.lflang.InferredType;
 import org.lflang.TargetConfig;
-
 import org.lflang.generator.ActionInstance;
 import org.lflang.generator.GeneratorCommandFactory;
 import org.lflang.generator.LFGeneratorContext;
@@ -54,7 +52,6 @@
 import org.lflang.lf.Parameter;
 import org.lflang.lf.Port;
 import org.lflang.lf.Reactor;
-import org.lflang.lf.ReactorDecl;
 import org.lflang.lf.VarRef;
 import org.lflang.lf.Variable;
 import org.lflang.lf.WidthTerm;
@@ -62,9 +59,9 @@
 import org.lflang.util.LFCommand;
 
 /**
- * A collection of utilities for C code generation.
- * This class codifies the coding conventions for the C target code generator.
- * I.e., it defines how variables are named and referenced.
+ * A collection of utilities for C code generation. This class codifies the coding conventions for
+ * the C target code generator. I.e., it defines how variables are named and referenced.
+ *
  * @author Edward A. Lee
  */
 public class CUtil {
@@ -84,30 +81,29 @@ public class CUtil {
   //////////////////////////////////////////////////////
   //// Public methods.
 
-    /**
-     * Return a reference to the action struct of the specified
-     * action instance. This action_base_t struct is on the self struct.
-     * @param instance The action instance.
-     * @param runtimeIndex An optional index variable name to use to address runtime instances.
-     */
-    public static String actionRef(ActionInstance instance, String runtimeIndex) {
-        return reactorRef(instance.getParent(), runtimeIndex)
-                + "->_lf_"
-                + instance.getName();
-    }
+  /**
+   * Return a reference to the action struct of the specified action instance. This action_base_t
+   * struct is on the self struct.
+   *
+   * @param instance The action instance.
+   * @param runtimeIndex An optional index variable name to use to address runtime instances.
+   */
+  public static String actionRef(ActionInstance instance, String runtimeIndex) {
+    return reactorRef(instance.getParent(), runtimeIndex) + "->_lf_" + instance.getName();
+  }
 
-    /**
-     * Return a default name of a variable to refer to the bank index of a reactor
-     * in a bank. This is has the form uniqueID_i where uniqueID
-     * is an identifier for the instance that is guaranteed to be different
-     * from the ID of any other instance in the program.
-     * If the instance is not a bank, return "0".
-     * @param instance A reactor instance.
-     */
-    public static String bankIndex(ReactorInstance instance) {
-        if (!instance.isBank()) return "0";
-        return bankIndexName(instance);
-    }
+  /**
+   * Return a default name of a variable to refer to the bank index of a reactor in a bank. This is
+   * has the form uniqueID_i where uniqueID is an identifier for the instance that is guaranteed to
+   * be different from the ID of any other instance in the program. If the instance is not a bank,
+   * return "0".
+   *
+   * @param instance A reactor instance.
+   */
+  public static String bankIndex(ReactorInstance instance) {
+    if (!instance.isBank()) return "0";
+    return bankIndexName(instance);
+  }
 
   /**
    * Return a default name of a variable to refer to the bank index of a reactor in a bank. This is
@@ -140,72 +136,68 @@ public static String channelIndexName(PortInstance port) {
     return port.uniqueID() + "_c";
   }
 
-    /**
-     * Return the name of the reactor. A '_main` is appended to the name if the
-     * reactor is main (to allow for instantiations that have the same name as
-     * the main reactor or the .lf file).
-     */
-    public static String getName(Reactor reactor) {
-        String name = reactor.getName().toLowerCase() + reactor.hashCode();
-        if (reactor.isMain()) {
-            return name + "_main";
-        }
-        return name;
+  /**
+   * Return the name of the reactor. A '_main` is appended to the name if the reactor is main (to
+   * allow for instantiations that have the same name as the main reactor or the .lf file).
+   */
+  public static String getName(Reactor reactor) {
+    String name = reactor.getName().toLowerCase() + reactor.hashCode();
+    if (reactor.isMain()) {
+      return name + "_main";
     }
+    return name;
+  }
 
-    /**
-     * Return a reference to the specified port.
-     *
-     * The returned string will have one of the following forms:
-     *
-     * * selfStructs[k]->_lf_portName
-     * * selfStructs[k]->_lf_portName
-     * * selfStructs[k]->_lf_portName[i]
-     * * selfStructs[k]->_lf_parent.portName
-     * * selfStructs[k]->_lf_parent.portName[i]
-     * * selfStructs[k]->_lf_parent[j].portName
-     * * selfStructs[k]->_lf_parent[j].portName[i]
-     *
-     * where k is the runtime index of either the port's parent
-     * or the port's parent's parent, the latter when isNested is true.
-     * The index j is present if the parent is a bank, and
-     * the index i is present if the port is a multiport.
-     *
-     * The first two forms are used if isNested is false,
-     * and the remaining four are used if isNested is true.
-     * Set isNested to true when referencing a port belonging
-     * to a contained reactor.
-     *
-     * @param port The port.
-     * @param isNested True to return a reference relative to the parent's parent.
-     * @param includeChannelIndex True to include the channel index at the end.
-     * @param runtimeIndex A variable name to use to index the runtime instance or
-     *  null to use the default, the string returned by {@link CUtil#runtimeIndex(ReactorInstance)}.
-     * @param bankIndex A variable name to use to index the bank or null to use the
-     *  default, the string returned by {@link CUtil#bankIndex(ReactorInstance)}.
-     * @param channelIndex A variable name to use to index the channel or null to
-     *  use the default, the string returned by {@link CUtil#channelIndex(PortInstance)}.
-     */
-    public static String portRef(
-            PortInstance port,
-            boolean isNested,
-            boolean includeChannelIndex,
-            String runtimeIndex,
-            String bankIndex,
-            String channelIndex
-    ) {
-        String channel = "";
-        if (channelIndex == null) channelIndex = channelIndex(port);
-        if (port.isMultiport() && includeChannelIndex) {
-            channel = "[" + channelIndex + "]";
-        }
-        if (isNested) {
-            return reactorRefNested(port.getParent(), runtimeIndex, bankIndex) + "." + port.getName() + channel;
-        } else {
-            String sourceStruct = CUtil.reactorRef(port.getParent(), runtimeIndex);
-            return sourceStruct + "->_lf_" + port.getName() + channel;
-        }
+  /**
+   * Return a reference to the specified port.
+   *
+   * <p>The returned string will have one of the following forms:
+   *
+   * <p>* selfStructs[k]->_lf_portName * selfStructs[k]->_lf_portName *
+   * selfStructs[k]->_lf_portName[i] * selfStructs[k]->_lf_parent.portName *
+   * selfStructs[k]->_lf_parent.portName[i] * selfStructs[k]->_lf_parent[j].portName *
+   * selfStructs[k]->_lf_parent[j].portName[i]
+   *
+   * <p>where k is the runtime index of either the port's parent or the port's parent's parent, the
+   * latter when isNested is true. The index j is present if the parent is a bank, and the index i
+   * is present if the port is a multiport.
+   *
+   * <p>The first two forms are used if isNested is false, and the remaining four are used if
+   * isNested is true. Set isNested to true when referencing a port belonging to a contained
+   * reactor.
+   *
+   * @param port The port.
+   * @param isNested True to return a reference relative to the parent's parent.
+   * @param includeChannelIndex True to include the channel index at the end.
+   * @param runtimeIndex A variable name to use to index the runtime instance or null to use the
+   *     default, the string returned by {@link CUtil#runtimeIndex(ReactorInstance)}.
+   * @param bankIndex A variable name to use to index the bank or null to use the default, the
+   *     string returned by {@link CUtil#bankIndex(ReactorInstance)}.
+   * @param channelIndex A variable name to use to index the channel or null to use the default, the
+   *     string returned by {@link CUtil#channelIndex(PortInstance)}.
+   */
+  public static String portRef(
+      PortInstance port,
+      boolean isNested,
+      boolean includeChannelIndex,
+      String runtimeIndex,
+      String bankIndex,
+      String channelIndex) {
+    String channel = "";
+    if (channelIndex == null) channelIndex = channelIndex(port);
+    if (port.isMultiport() && includeChannelIndex) {
+      channel = "[" + channelIndex + "]";
     }
+    if (isNested) {
+      return reactorRefNested(port.getParent(), runtimeIndex, bankIndex)
+          + "."
+          + port.getName()
+          + channel;
+    } else {
+      String sourceStruct = CUtil.reactorRef(port.getParent(), runtimeIndex);
+      return sourceStruct + "->_lf_" + port.getName() + channel;
+    }
+  }
 
   /**
    * Return a reference to the port on the self struct of the port's parent. This is used when an
@@ -494,23 +486,24 @@ public static String runtimeIndex(ReactorInstance reactor) {
     return result.toString();
   }
 
-    /**
-     * Return a unique type for the "self" struct of the specified
-     * reactor class from the reactor class.
-     * @param reactor The reactor class.
-     * @return The type of a self struct for the specified reactor class.
-     */
-    public static String selfType(Reactor reactor) {
-        if (reactor.isMain()) {
-            return "_" + CUtil.getName(reactor) + "_main_self_t";
-        }
-        return "_" + CUtil.getName(reactor) + "_self_t";
+  /**
+   * Return a unique type for the "self" struct of the specified reactor class from the reactor
+   * class.
+   *
+   * @param reactor The reactor class.
+   * @return The type of a self struct for the specified reactor class.
+   */
+  public static String selfType(Reactor reactor) {
+    if (reactor.isMain()) {
+      return "_" + CUtil.getName(reactor) + "_main_self_t";
     }
+    return "_" + CUtil.getName(reactor) + "_self_t";
+  }
 
-    /** Construct a unique type for the "self" struct of the class of the given reactor. */
-    public static String selfType(ReactorInstance instance) {
-        return selfType(ASTUtils.toDefinition(instance.getDefinition().getReactorClass()));
-    }
+  /** Construct a unique type for the "self" struct of the class of the given reactor. */
+  public static String selfType(ReactorInstance instance) {
+    return selfType(ASTUtils.toDefinition(instance.getDefinition().getReactorClass()));
+  }
 
   /**
    * Return a reference to the trigger_t struct of the specified trigger instance (input port or
@@ -849,9 +842,9 @@ public static boolean isTokenType(InferredType type, CTypes types) {
     return type.isVariableSizeList || targetType.trim().endsWith("*");
   }
 
-    public static String generateWidthVariable(String var) {
-        return var + "_width";
-    }
+  public static String generateWidthVariable(String var) {
+    return var + "_width";
+  }
 
   /**
    * If the type specification of the form {@code type[]}, {@code type*}, or {@code type}, return
diff --git a/org.lflang/src/org/lflang/util/LFCommand.java b/org.lflang/src/org/lflang/util/LFCommand.java
index a6be4cb690..749c150748 100644
--- a/org.lflang/src/org/lflang/util/LFCommand.java
+++ b/org.lflang/src/org/lflang/util/LFCommand.java
@@ -145,32 +145,24 @@ private void poll(Process process, CancelIndicator cancelIndicator) {
     }
   }
 
-
-    /**
-     * Execute the command.
-     * <p>
-     * Executing a process directly with `processBuilder.start()` could
-     * lead to a deadlock as the subprocess blocks when output or error
-     * buffers are full. This method ensures that output and error messages
-     * are continuously read and forwards them to the system output and
-     * error streams as well as to the output and error streams hold in
-     * this class.
-     * </p>
-     * <p>
-     * If the current operation is cancelled (as indicated
-     * by <code>cancelIndicator</code>), the subprocess
-     * is destroyed. Output and error streams until that
-     * point are still collected.
-     * </p>
-     *
-     * @param cancelIndicator The indicator of whether the underlying process
-     * should be terminated.
-     * @return the process' return code
-     * @author Christian Menard
-     */
-    public int run(CancelIndicator cancelIndicator) {
-        assert !didRun;
-        didRun = true;
+  /**
+   * Execute the command.
+   *
+   * <p>Executing a process directly with `processBuilder.start()` could lead to a deadlock as the
+   * subprocess blocks when output or error buffers are full. This method ensures that output and
+   * error messages are continuously read and forwards them to the system output and error streams
+   * as well as to the output and error streams hold in this class.
+   *
+   * <p>If the current operation is cancelled (as indicated by <code>cancelIndicator</code>), the
+   * subprocess is destroyed. Output and error streams until that point are still collected.
+   *
+   * @param cancelIndicator The indicator of whether the underlying process should be terminated.
+   * @return the process' return code
+   * @author Christian Menard
+   */
+  public int run(CancelIndicator cancelIndicator) {
+    assert !didRun;
+    didRun = true;
 
     System.out.println("--- Current working directory: " + processBuilder.directory().toString());
     System.out.println("--- Executing command: " + String.join(" ", processBuilder.command()));

From bf8b28e811a3d6e6158c51827aa3669e0542d5f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Fournier?= <clement.fournier@tu-dresden.de>
Date: Mon, 12 Jun 2023 17:32:44 +0200
Subject: [PATCH 03/17] Delete changes in java files

---
 .../LanguageServerErrorReporter.java          | 32 ++++---
 .../src/org/lflang/generator/Validator.java   | 12 ++-
 .../src/org/lflang/generator/c/CUtil.java     | 86 +++++++++++--------
 .../generator/python/PythonValidator.java     | 66 +++++++-------
 org.lflang/src/org/lflang/util/LFCommand.java | 25 +++---
 5 files changed, 117 insertions(+), 104 deletions(-)

diff --git a/org.lflang/src/org/lflang/generator/LanguageServerErrorReporter.java b/org.lflang/src/org/lflang/generator/LanguageServerErrorReporter.java
index 6e73c3dc42..31304f43c9 100644
--- a/org.lflang/src/org/lflang/generator/LanguageServerErrorReporter.java
+++ b/org.lflang/src/org/lflang/generator/LanguageServerErrorReporter.java
@@ -11,6 +11,7 @@
 import org.eclipse.lsp4j.Diagnostic;
 import org.eclipse.lsp4j.DiagnosticSeverity;
 import org.eclipse.lsp4j.PublishDiagnosticsParams;
+import org.eclipse.lsp4j.Range;
 import org.eclipse.lsp4j.services.LanguageClient;
 import org.eclipse.xtext.nodemodel.util.NodeModelUtils;
 import org.lflang.ErrorReporter;
@@ -114,19 +115,18 @@ public String report(Path file, DiagnosticSeverity severity, String message, int
         file,
         severity,
         message,
-        new Range(
-            Position.fromOneBased(line, 1),
-            Position.fromOneBased(line, 1 + (text.isEmpty() ? 0 : text.get().length()))));
+        Position.fromOneBased(line, 1),
+        Position.fromOneBased(line, 1 + (text.isEmpty() ? 0 : text.get().length())));
   }
 
   @Override
-  public String report(Path file, DiagnosticSeverity severity, String message, Range range) {
-    if (file == null) {
-      file = getMainFile();
-    }
+  public String report(
+      Path file, DiagnosticSeverity severity, String message, Position startPos, Position endPos) {
+    if (file == null) file = getMainFile();
+    diagnostics.putIfAbsent(file, new ArrayList<>());
     diagnostics
-        .computeIfAbsent(file, k -> new ArrayList<>())
-        .add(new Diagnostic(toEclipseRange(range), message, severity, "LF Language Server"));
+        .get(file)
+        .add(new Diagnostic(toRange(startPos, endPos), message, severity, "LF Language Server"));
     return "" + severity + ": " + message;
   }
 
@@ -181,11 +181,15 @@ private Optional<String> getLine(int line) {
     return getText().lines().skip(line).findFirst();
   }
 
-  /** Convert an instance of our range class to the equivalent eclipse class. */
-  private org.eclipse.lsp4j.Range toEclipseRange(Range range) {
-    Position p0 = range.getStartInclusive();
-    Position p1 = range.getEndExclusive();
-    return new org.eclipse.lsp4j.Range(
+  /**
+   * Return the Range that starts at {@code p0} and ends at {@code p1}.
+   *
+   * @param p0 an arbitrary Position
+   * @param p1 a Position that is greater than {@code p0}
+   * @return the Range that starts at {@code p0} and ends at {@code p1}
+   */
+  private Range toRange(Position p0, Position p1) {
+    return new Range(
         new org.eclipse.lsp4j.Position(p0.getZeroBasedLine(), p0.getZeroBasedColumn()),
         new org.eclipse.lsp4j.Position(p1.getZeroBasedLine(), p1.getZeroBasedColumn()));
   }
diff --git a/org.lflang/src/org/lflang/generator/Validator.java b/org.lflang/src/org/lflang/generator/Validator.java
index 53efd6412e..f9ae61f854 100644
--- a/org.lflang/src/org/lflang/generator/Validator.java
+++ b/org.lflang/src/org/lflang/generator/Validator.java
@@ -77,11 +77,11 @@ public final void doValidate(LFGeneratorContext context)
       f.get()
           .first
           .getErrorReportingStrategy()
-          .report(f.get().second.getErrors(), errorReporter, codeMaps);
+          .report(f.get().second.getErrors().toString(), errorReporter, codeMaps);
       f.get()
           .first
           .getOutputReportingStrategy()
-          .report(f.get().second.getOutput(), errorReporter, codeMaps);
+          .report(f.get().second.getOutput().toString(), errorReporter, codeMaps);
     }
   }
 
@@ -141,8 +141,12 @@ private static <T> List<Future<T>> getFutures(List<Callable<T>> tasks)
    */
   public final int run(LFCommand command, CancelIndicator cancelIndicator) {
     final int returnCode = command.run(cancelIndicator);
-    getBuildReportingStrategies().first.report(command.getErrors(), errorReporter, codeMaps);
-    getBuildReportingStrategies().second.report(command.getOutput(), errorReporter, codeMaps);
+    getBuildReportingStrategies()
+        .first
+        .report(command.getErrors().toString(), errorReporter, codeMaps);
+    getBuildReportingStrategies()
+        .second
+        .report(command.getOutput().toString(), errorReporter, codeMaps);
     return returnCode;
   }
 
diff --git a/org.lflang/src/org/lflang/generator/c/CUtil.java b/org.lflang/src/org/lflang/generator/c/CUtil.java
index c8af2b37ab..3a7f151a2c 100644
--- a/org.lflang/src/org/lflang/generator/c/CUtil.java
+++ b/org.lflang/src/org/lflang/generator/c/CUtil.java
@@ -32,7 +32,6 @@
 import java.util.List;
 import java.util.Objects;
 import java.util.stream.Collectors;
-import org.lflang.ASTUtils;
 import org.lflang.ErrorReporter;
 import org.lflang.FileConfig;
 import org.lflang.InferredType;
@@ -132,12 +131,12 @@ public static String channelIndexName(PortInstance port) {
   }
 
   /**
-   * Return the name of the reactor. A '_main` is appended to the name if the reactor is main (to
-   * allow for instantiations that have the same name as the main reactor or the .lf file).
+   * Return the name of the reactor. A {@code _main} is appended to the name if the reactor is main
+   * (to allow for instantiations that have the same name as the main reactor or the .lf file).
    */
-  public static String getName(Reactor reactor) {
-    String name = reactor.getName().toLowerCase() + reactor.hashCode();
-    if (reactor.isMain()) {
+  public static String getName(TypeParameterizedReactor reactor) {
+    String name = reactor.reactor().getName().toLowerCase() + reactor.hashCode();
+    if (reactor.reactor().isMain()) {
       return name + "_main";
     }
     return name;
@@ -148,18 +147,23 @@ public static String getName(Reactor reactor) {
    *
    * <p>The returned string will have one of the following forms:
    *
-   * <p>* selfStructs[k]->_lf_portName * selfStructs[k]->_lf_portName *
-   * selfStructs[k]->_lf_portName[i] * selfStructs[k]->_lf_parent.portName *
-   * selfStructs[k]->_lf_parent.portName[i] * selfStructs[k]->_lf_parent[j].portName *
-   * selfStructs[k]->_lf_parent[j].portName[i]
+   * <ul>
+   *   <li>{@code selfStructs[k]->_lf_portName}
+   *   <li>{@code selfStructs[k]->_lf_portName}
+   *   <li>{@code selfStructs[k]->_lf_portName[i]}
+   *   <li>{@code selfStructs[k]->_lf_parent.portName}
+   *   <li>{@code selfStructs[k]->_lf_parent.portName[i]}
+   *   <li>{@code selfStructs[k]->_lf_parent[j].portName}
+   *   <li>{@code selfStructs[k]->_lf_parent[j].portName[i]}
+   * </ul>
    *
-   * <p>where k is the runtime index of either the port's parent or the port's parent's parent, the
-   * latter when isNested is true. The index j is present if the parent is a bank, and the index i
-   * is present if the port is a multiport.
+   * where {@code k} is the runtime index of either the port's parent or the port's parent's parent,
+   * the latter when isNested is {@code true}. The index {@code j} is present if the parent is a
+   * bank, and the index {@code i} is present if the port is a multiport.
    *
    * <p>The first two forms are used if isNested is false, and the remaining four are used if
-   * isNested is true. Set isNested to true when referencing a port belonging to a contained
-   * reactor.
+   * isNested is true. Set {@code isNested} to {@code true} when referencing a port belonging to a
+   * contained reactor.
    *
    * @param port The port.
    * @param isNested True to return a reference relative to the parent's parent.
@@ -197,8 +201,8 @@ public static String portRef(
   /**
    * Return a reference to the port on the self struct of the port's parent. This is used when an
    * input port triggers a reaction in the port's parent or when an output port is written to by a
-   * reaction in the port's parent. This is equivalent to calling `portRef(port, false, true, null,
-   * null)`.
+   * reaction in the port's parent. This is equivalent to calling {@code portRef(port, false, true,
+   * null, null)}.
    *
    * @param port An instance of the port to be referenced.
    */
@@ -210,7 +214,7 @@ public static String portRef(PortInstance port) {
    * Return a reference to the port on the self struct of the port's parent using the specified
    * index variables. This is used when an input port triggers a reaction in the port's parent or
    * when an output port is written to by a reaction in the port's parent. This is equivalent to
-   * calling `portRef(port, false, true, bankIndex, channelIndex)`.
+   * calling {@code portRef(port, false, true, bankIndex, channelIndex)}.
    *
    * @param port An instance of the port to be referenced.
    * @param runtimeIndex A variable name to use to index the runtime instance or null to use the
@@ -256,7 +260,7 @@ public static String portRefName(
    * Return a port reference to a port on the self struct of the parent of the port's parent. This
    * is used when an input port is written to by a reaction in the parent of the port's parent, or
    * when an output port triggers a reaction in the parent of the port's parent. This is equivalent
-   * to calling `portRef(port, true, true, null, null, null)`.
+   * to calling {@code portRef(port, true, true, null, null, null)}.
    *
    * @param port The port.
    */
@@ -268,7 +272,7 @@ public static String portRefNested(PortInstance port) {
    * Return a reference to the port on the self struct of the parent of the port's parent. This is
    * used when an input port is written to by a reaction in the parent of the port's parent, or when
    * an output port triggers a reaction in the parent of the port's parent. This is equivalent to
-   * calling `portRef(port, true, true, runtimeIndex, bankIndex, channelIndex)`.
+   * calling {@code portRef(port, true, true, runtimeIndex, bankIndex, channelIndex)}.
    *
    * @param port The port.
    * @param runtimeIndex A variable name to use to index the runtime instance or null to use the
@@ -287,8 +291,8 @@ public static String portRefNested(
    * Return a reference to the port on the self struct of the parent of the port's parent, but
    * without the channel indexing, even if it is a multiport. This is used when an input port is
    * written to by a reaction in the parent of the port's parent, or when an output port triggers a
-   * reaction in the parent of the port's parent. This is equivalent to calling `portRef(port, true,
-   * false, null, null, null)`.
+   * reaction in the parent of the port's parent. This is equivalent to calling {@code portRef(port,
+   * true, false, null, null, null)}.
    *
    * @param port The port.
    */
@@ -300,8 +304,8 @@ public static String portRefNestedName(PortInstance port) {
    * Return a reference to the port on the self struct of the parent of the port's parent, but
    * without the channel indexing, even if it is a multiport. This is used when an input port is
    * written to by a reaction in the parent of the port's parent, or when an output port triggers a
-   * reaction in the parent of the port's parent. This is equivalent to calling `portRefNested(port,
-   * true, false, runtimeIndex, bankIndex, channelIndex)`.
+   * reaction in the parent of the port's parent. This is equivalent to calling {@code
+   * portRefNested(port, true, false, runtimeIndex, bankIndex, channelIndex)}.
    *
    * @param port The port.
    * @param runtimeIndex A variable name to use to index the runtime instance or null to use the
@@ -455,7 +459,9 @@ public static String reactorRefNested(
    * or the variable name returned by {@link #bankIndexName(ReactorInstance)} if the parent is a
    * bank. The returned expression, when evaluated, will yield the following value:
    *
-   * <p>d0 + w0 * (d1 + w1 * ( ... (dn-1 + wn-1 * dn) ... )
+   * <pre>
+   *     d0 + w0 * (d1 + w1 * ( ... (dn-1 + wn-1 * dn) ... )
+   * </pre>
    *
    * @param reactor The reactor.
    */
@@ -488,8 +494,8 @@ public static String runtimeIndex(ReactorInstance reactor) {
    * @param reactor The reactor class.
    * @return The type of a self struct for the specified reactor class.
    */
-  public static String selfType(Reactor reactor) {
-    if (reactor.isMain()) {
+  public static String selfType(TypeParameterizedReactor reactor) {
+    if (reactor.reactor().isMain()) {
       return "_" + CUtil.getName(reactor) + "_main_self_t";
     }
     return "_" + CUtil.getName(reactor) + "_self_t";
@@ -497,7 +503,7 @@ public static String selfType(Reactor reactor) {
 
   /** Construct a unique type for the "self" struct of the class of the given reactor. */
   public static String selfType(ReactorInstance instance) {
-    return selfType(ASTUtils.toDefinition(instance.getDefinition().getReactorClass()));
+    return selfType(instance.tpr);
   }
 
   /**
@@ -575,10 +581,13 @@ public interface ReportCommandErrors {
    *
    * <p>The following environment variables will be available to the command:
    *
-   * <p>* LF_CURRENT_WORKING_DIRECTORY: The directory in which the command is invoked. *
-   * LF_SOURCE_DIRECTORY: The directory containing the .lf file being compiled. *
-   * LF_SOURCE_GEN_DIRECTORY: The directory in which generated files are placed. * LF_BIN_DIRECTORY:
-   * The directory into which to put binaries.
+   * <ul>
+   *   <li>{@code: LF_CURRENT_WORKING_DIRECTORY}: The directory in which the command is invoked.
+   *   <li>{@code:LF_SOURCE_DIRECTORY}: The directory containing the .lf file being compiled.
+   *   <li>{@code:LF_PACKAGE_DIRECTORY}: The directory that is the root of the package.
+   *   <li>{@code:LF_SOURCE_GEN_DIRECTORY}: The directory in which generated files are placed.
+   *   <li>{@code:LF_BIN_DIRECTORY}: The directory into which to put binaries.
+   * </ul>
    */
   public static void runBuildCommand(
       FileConfig fileConfig,
@@ -606,8 +615,8 @@ public static void runBuildCommand(
       }
       // For warnings (vs. errors), the return code is 0.
       // But we still want to mark the IDE.
-      if (!cmd.getErrors().isEmpty() && mode == LFGeneratorContext.Mode.EPOCH) {
-        reportCommandErrors.report(cmd.getErrors());
+      if (!cmd.getErrors().toString().isEmpty() && mode == LFGeneratorContext.Mode.EPOCH) {
+        reportCommandErrors.report(cmd.getErrors().toString());
         return; // FIXME: Why do we return here? Even if there are warnings, the build process
         // should proceed.
       }
@@ -719,7 +728,7 @@ private static List<String> multiportWidthTerms(Variable variable) {
             if (term.getParameter() != null) {
               result.add(getTargetReference(term.getParameter()));
             } else {
-              result.add("" + term.getWidth());
+              result.add(String.valueOf(term.getWidth()));
             }
           }
         }
@@ -738,8 +747,11 @@ private static List<String> multiportWidthTerms(Variable variable) {
   public static boolean isTokenType(InferredType type, CTypes types) {
     if (type.isUndefined()) return false;
     // This is a hacky way to do this. It is now considered to be a bug (#657)
-    String targetType = types.getVariableDeclaration(type, "", false);
-    return type.isVariableSizeList || targetType.trim().endsWith("*");
+    return type.isVariableSizeList
+        || type.astType != null
+            && (!type.astType.getStars().isEmpty()
+                || type.astType.getCode() != null
+                    && type.astType.getCode().getBody().stripTrailing().endsWith("*"));
   }
 
   public static String generateWidthVariable(String var) {
diff --git a/org.lflang/src/org/lflang/generator/python/PythonValidator.java b/org.lflang/src/org/lflang/generator/python/PythonValidator.java
index 6ca352134d..dc87417c51 100644
--- a/org.lflang/src/org/lflang/generator/python/PythonValidator.java
+++ b/org.lflang/src/org/lflang/generator/python/PythonValidator.java
@@ -11,7 +11,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import java.util.function.UnaryOperator;
+import java.util.function.Function;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import org.eclipse.lsp4j.DiagnosticSeverity;
@@ -21,7 +21,6 @@
 import org.lflang.generator.DiagnosticReporting;
 import org.lflang.generator.DiagnosticReporting.Strategy;
 import org.lflang.generator.Position;
-import org.lflang.generator.Range;
 import org.lflang.generator.ValidationStrategy;
 import org.lflang.util.LFCommand;
 
@@ -306,12 +305,33 @@ public Strategy getErrorReportingStrategy() {
           @Override
           public Strategy getOutputReportingStrategy() {
             return (validationOutput, errorReporter, codeMaps) -> {
-              if (validationOutput.isBlank()) {
-                return;
-              }
-              PylintMessage[] pylintMessages;
+              if (validationOutput.isBlank()) return;
               try {
-                pylintMessages = mapper.readValue(validationOutput, PylintMessage[].class);
+                for (PylintMessage message :
+                    mapper.readValue(validationOutput, PylintMessage[].class)) {
+                  if (shouldIgnore(message)) continue;
+                  CodeMap map = codeMaps.get(message.getPath(fileConfig.getSrcGenPath()));
+                  if (map != null) {
+                    for (Path lfFile : map.lfSourcePaths()) {
+                      Function<Position, Position> adjust = p -> map.adjusted(lfFile, p);
+                      String humanMessage =
+                          DiagnosticReporting.messageOf(
+                              message.message,
+                              message.getPath(fileConfig.getSrcGenPath()),
+                              message.getStart());
+                      Position lfStart = adjust.apply(message.getStart());
+                      Position lfEnd = adjust.apply(message.getEnd());
+                      bestEffortReport(
+                          errorReporter,
+                          adjust,
+                          lfStart,
+                          lfEnd,
+                          lfFile,
+                          message.getSeverity(),
+                          humanMessage);
+                    }
+                  }
+                }
               } catch (JsonProcessingException e) {
                 System.err.printf("Failed to parse \"%s\":%n", validationOutput);
                 e.printStackTrace();
@@ -319,34 +339,6 @@ public Strategy getOutputReportingStrategy() {
                     "Failed to parse linter output. The Lingua Franca code generator is tested with"
                         + " Pylint version 2.12.2. Consider updating Pylint if you have an older"
                         + " version.");
-                return;
-              }
-              for (PylintMessage message : pylintMessages) {
-                if (shouldIgnore(message)) {
-                  continue;
-                }
-                CodeMap map = codeMaps.get(message.getPath(fileConfig.getSrcGenPath()));
-                if (map == null) {
-                  continue;
-                }
-                for (Path lfFile : map.lfSourcePaths()) {
-                  UnaryOperator<Position> adjust = p -> map.adjusted(lfFile, p);
-                  String humanMessage =
-                      DiagnosticReporting.messageOf(
-                          message.message,
-                          message.getPath(fileConfig.getSrcGenPath()),
-                          message.getStart());
-                  Position lfStart = adjust.apply(message.getStart());
-                  Position lfEnd = adjust.apply(message.getEnd());
-                  bestEffortReport(
-                      errorReporter,
-                      adjust,
-                      lfStart,
-                      lfEnd,
-                      lfFile,
-                      message.getSeverity(),
-                      humanMessage);
-                }
               }
             };
           }
@@ -374,14 +366,14 @@ private boolean shouldIgnore(PylintMessage message) {
           /** Make a best-effort attempt to place the diagnostic on the correct line. */
           private void bestEffortReport(
               ErrorReporter errorReporter,
-              UnaryOperator<Position> adjust,
+              Function<Position, Position> adjust,
               Position lfStart,
               Position lfEnd,
               Path file,
               DiagnosticSeverity severity,
               String humanMessage) {
             if (!lfEnd.equals(Position.ORIGIN) && !lfStart.equals(Position.ORIGIN)) { // Ideal case
-              errorReporter.report(file, severity, humanMessage, new Range(lfStart, lfEnd));
+              errorReporter.report(file, severity, humanMessage, lfStart, lfEnd);
             } else { // Fallback: Try to report on the correct line, or failing that, just line 1.
               if (lfStart.equals(Position.ORIGIN))
                 lfStart =
diff --git a/org.lflang/src/org/lflang/util/LFCommand.java b/org.lflang/src/org/lflang/util/LFCommand.java
index 749c150748..4b4116f264 100644
--- a/org.lflang/src/org/lflang/util/LFCommand.java
+++ b/org.lflang/src/org/lflang/util/LFCommand.java
@@ -29,6 +29,7 @@
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.OutputStream;
 import java.io.PrintStream;
 import java.nio.file.Path;
 import java.nio.file.Paths;
@@ -74,13 +75,13 @@ protected LFCommand(ProcessBuilder pb, boolean quiet) {
   }
 
   /** Get the output collected during command execution */
-  public String getOutput() {
-    return output.toString();
+  public OutputStream getOutput() {
+    return output;
   }
 
   /** Get the error output collected during command execution */
-  public String getErrors() {
-    return errors.toString();
+  public OutputStream getErrors() {
+    return errors;
   }
 
   /** Get this command's program and arguments. */
@@ -148,10 +149,10 @@ private void poll(Process process, CancelIndicator cancelIndicator) {
   /**
    * Execute the command.
    *
-   * <p>Executing a process directly with `processBuilder.start()` could lead to a deadlock as the
-   * subprocess blocks when output or error buffers are full. This method ensures that output and
-   * error messages are continuously read and forwards them to the system output and error streams
-   * as well as to the output and error streams hold in this class.
+   * <p>Executing a process directly with {@code processBuilder.start()} could lead to a deadlock as
+   * the subprocess blocks when output or error buffers are full. This method ensures that output
+   * and error messages are continuously read and forwards them to the system output and error
+   * streams as well as to the output and error streams hold in this class.
    *
    * <p>If the current operation is cancelled (as indicated by <code>cancelIndicator</code>), the
    * subprocess is destroyed. Output and error streams until that point are still collected.
@@ -258,10 +259,10 @@ public static LFCommand get(final String cmd, final List<String> args, boolean q
    * not found, null is returned. In order to find the command, different methods are applied in the
    * following order:
    *
-   * <p>1. Check if the given command `cmd` is an executable file within `dir`. 2. If the above
-   * fails 'which <cmd>' (or 'where <cmd>' on Windows) is executed to see if the command is
-   * available on the PATH. 3. If both points above fail, a third attempt is started using bash to
-   * indirectly execute the command (see below for an explanation).
+   * <p>1. Check if the given command {@code cmd} is an executable file within {@code dir}. 2. If
+   * the above fails 'which <cmd>' (or 'where <cmd>' on Windows) is executed to see if the command
+   * is available on the PATH. 3. If both points above fail, a third attempt is started using bash
+   * to indirectly execute the command (see below for an explanation).
    *
    * <p>A bit more context: If the command cannot be found directly, then a second attempt is made
    * using a Bash shell with the --login option, which sources the user's ~/.bash_profile,

From 117aad0745de5cc2ff90bc58c28678c1a78ff976 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Fournier?= <clement.fournier@tu-dresden.de>
Date: Mon, 12 Jun 2023 17:49:03 +0200
Subject: [PATCH 04/17] Cleanup

---
 .../src/org/lflang/generator/Validator.java    |  8 ++++----
 .../src/org/lflang/generator/c/CCompiler.java  | 18 +++++++++---------
 .../src/org/lflang/generator/c/CUtil.java      |  4 ++--
 .../generator/cpp/CppStandaloneGenerator.kt    |  2 +-
 .../org/lflang/generator/rust/RustValidator.kt |  2 +-
 .../src/org/lflang/generator/ts/TSGenerator.kt |  2 +-
 org.lflang/src/org/lflang/util/LFCommand.java  |  8 ++++----
 7 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/org.lflang/src/org/lflang/generator/Validator.java b/org.lflang/src/org/lflang/generator/Validator.java
index f9ae61f854..51d2e8412e 100644
--- a/org.lflang/src/org/lflang/generator/Validator.java
+++ b/org.lflang/src/org/lflang/generator/Validator.java
@@ -77,11 +77,11 @@ public final void doValidate(LFGeneratorContext context)
       f.get()
           .first
           .getErrorReportingStrategy()
-          .report(f.get().second.getErrors().toString(), errorReporter, codeMaps);
+          .report(f.get().second.getErrors(), errorReporter, codeMaps);
       f.get()
           .first
           .getOutputReportingStrategy()
-          .report(f.get().second.getOutput().toString(), errorReporter, codeMaps);
+          .report(f.get().second.getOutput(), errorReporter, codeMaps);
     }
   }
 
@@ -143,10 +143,10 @@ public final int run(LFCommand command, CancelIndicator cancelIndicator) {
     final int returnCode = command.run(cancelIndicator);
     getBuildReportingStrategies()
         .first
-        .report(command.getErrors().toString(), errorReporter, codeMaps);
+        .report(command.getErrors(), errorReporter, codeMaps);
     getBuildReportingStrategies()
         .second
-        .report(command.getOutput().toString(), errorReporter, codeMaps);
+        .report(command.getOutput(), errorReporter, codeMaps);
     return returnCode;
   }
 
diff --git a/org.lflang/src/org/lflang/generator/c/CCompiler.java b/org.lflang/src/org/lflang/generator/c/CCompiler.java
index f919977ba5..7570cf4fd6 100644
--- a/org.lflang/src/org/lflang/generator/c/CCompiler.java
+++ b/org.lflang/src/org/lflang/generator/c/CCompiler.java
@@ -133,17 +133,17 @@ public boolean runCCompiler(GeneratorBase generator, LFGeneratorContext context)
 
     if (cMakeReturnCode != 0
         && context.getMode() == LFGeneratorContext.Mode.STANDALONE
-        && !outputContainsKnownCMakeErrors(compile.getErrors().toString())) {
+        && !outputContainsKnownCMakeErrors(compile.getErrors())) {
       errorReporter.reportError(
           targetConfig.compiler + " failed with error code " + cMakeReturnCode);
     }
 
     // For warnings (vs. errors), the return code is 0.
     // But we still want to mark the IDE.
-    if (compile.getErrors().toString().length() > 0
+    if (compile.getErrors().length() > 0
         && context.getMode() != LFGeneratorContext.Mode.STANDALONE
-        && !outputContainsKnownCMakeErrors(compile.getErrors().toString())) {
-      generator.reportCommandErrors(compile.getErrors().toString());
+        && !outputContainsKnownCMakeErrors(compile.getErrors())) {
+      generator.reportCommandErrors(compile.getErrors());
     }
 
     int makeReturnCode = 0;
@@ -155,20 +155,20 @@ public boolean runCCompiler(GeneratorBase generator, LFGeneratorContext context)
 
       if (makeReturnCode != 0
           && context.getMode() == LFGeneratorContext.Mode.STANDALONE
-          && !outputContainsKnownCMakeErrors(build.getErrors().toString())) {
+          && !outputContainsKnownCMakeErrors(build.getErrors())) {
         errorReporter.reportError(
             targetConfig.compiler + " failed with error code " + makeReturnCode);
       }
 
       // For warnings (vs. errors), the return code is 0.
       // But we still want to mark the IDE.
-      if (build.getErrors().toString().length() > 0
+      if (build.getErrors().length() > 0
           && context.getMode() != LFGeneratorContext.Mode.STANDALONE
-          && !outputContainsKnownCMakeErrors(build.getErrors().toString())) {
-        generator.reportCommandErrors(build.getErrors().toString());
+          && !outputContainsKnownCMakeErrors(build.getErrors())) {
+        generator.reportCommandErrors(build.getErrors());
       }
 
-      if (makeReturnCode == 0 && build.getErrors().toString().length() == 0) {
+      if (makeReturnCode == 0 && build.getErrors().length() == 0) {
         System.out.println(
             "SUCCESS: Compiling generated code for "
                 + fileConfig.name
diff --git a/org.lflang/src/org/lflang/generator/c/CUtil.java b/org.lflang/src/org/lflang/generator/c/CUtil.java
index 3a7f151a2c..e4bd60bc10 100644
--- a/org.lflang/src/org/lflang/generator/c/CUtil.java
+++ b/org.lflang/src/org/lflang/generator/c/CUtil.java
@@ -615,8 +615,8 @@ public static void runBuildCommand(
       }
       // For warnings (vs. errors), the return code is 0.
       // But we still want to mark the IDE.
-      if (!cmd.getErrors().toString().isEmpty() && mode == LFGeneratorContext.Mode.EPOCH) {
-        reportCommandErrors.report(cmd.getErrors().toString());
+      if (!cmd.getErrors().isEmpty() && mode == LFGeneratorContext.Mode.EPOCH) {
+        reportCommandErrors.report(cmd.getErrors());
         return; // FIXME: Why do we return here? Even if there are warnings, the build process
         // should proceed.
       }
diff --git a/org.lflang/src/org/lflang/generator/cpp/CppStandaloneGenerator.kt b/org.lflang/src/org/lflang/generator/cpp/CppStandaloneGenerator.kt
index 381df52070..bbe3826bb0 100644
--- a/org.lflang/src/org/lflang/generator/cpp/CppStandaloneGenerator.kt
+++ b/org.lflang/src/org/lflang/generator/cpp/CppStandaloneGenerator.kt
@@ -95,7 +95,7 @@ class CppStandaloneGenerator(generator: CppGenerator) :
         var version: String? = null
         if (cmd != null && cmd.run() == 0) {
             val regex = "\\d+(\\.\\d+)+".toRegex()
-            version = regex.find(cmd.output)?.value
+            version = regex.find(cmd.output.toString())?.value
         }
         if (version == null || version.compareVersion("3.5.0") < 0) {
             errorReporter.reportError(
diff --git a/org.lflang/src/org/lflang/generator/rust/RustValidator.kt b/org.lflang/src/org/lflang/generator/rust/RustValidator.kt
index c29b508f7b..ebf449ffa5 100644
--- a/org.lflang/src/org/lflang/generator/rust/RustValidator.kt
+++ b/org.lflang/src/org/lflang/generator/rust/RustValidator.kt
@@ -129,7 +129,7 @@ class RustValidator(
                 ?: return@lazy null
 
         command.run { false }
-        command.output.toString()
+        command.output
             .lines()
             .filter { it.startsWith("{") }
             .firstNotNullOfOrNull {
diff --git a/org.lflang/src/org/lflang/generator/ts/TSGenerator.kt b/org.lflang/src/org/lflang/generator/ts/TSGenerator.kt
index 517a21ff48..af7e445c16 100644
--- a/org.lflang/src/org/lflang/generator/ts/TSGenerator.kt
+++ b/org.lflang/src/org/lflang/generator/ts/TSGenerator.kt
@@ -323,7 +323,7 @@ class TSGenerator(
             if (npmInstall.run(context.cancelIndicator) != 0) {
                 errorReporter.reportError(
                     GeneratorUtils.findTargetDecl(resource),
-                    "ERROR: npm install command failed: " + npmInstall.errors.toString())
+                    "ERROR: npm install command failed: " + npmInstall.errors)
                 errorReporter.reportError(
                     GeneratorUtils.findTargetDecl(resource), "ERROR: npm install command failed." +
                         "\nFor installation instructions, see: https://www.npmjs.com/get-npm")
diff --git a/org.lflang/src/org/lflang/util/LFCommand.java b/org.lflang/src/org/lflang/util/LFCommand.java
index 4b4116f264..a064a057e0 100644
--- a/org.lflang/src/org/lflang/util/LFCommand.java
+++ b/org.lflang/src/org/lflang/util/LFCommand.java
@@ -75,13 +75,13 @@ protected LFCommand(ProcessBuilder pb, boolean quiet) {
   }
 
   /** Get the output collected during command execution */
-  public OutputStream getOutput() {
-    return output;
+  public String getOutput() {
+    return output.toString();
   }
 
   /** Get the error output collected during command execution */
-  public OutputStream getErrors() {
-    return errors;
+  public String getErrors() {
+    return errors.toString();
   }
 
   /** Get this command's program and arguments. */

From 12f741bbd50770d347720302f1154d074e334bec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Fournier?= <clement.fournier@tu-dresden.de>
Date: Tue, 13 Jun 2023 14:06:13 +0200
Subject: [PATCH 05/17] Refactor error reporter

---
 .../lflang/cli/StandaloneErrorReporter.java   |  75 ++++-----
 .../kotlin/org/lflang/cli/ReportingUtil.kt    |  16 ++
 .../java/org/lflang/DefaultErrorReporter.java |  65 +++-----
 .../main/java/org/lflang/ErrorReporter.java   | 146 ++++++++++++------
 .../java/org/lflang/ErrorReporterBase.java    |  56 +++++++
 .../util/SynthesisErrorReporter.java          |  48 ++----
 .../generator/LineAdjustingErrorReporter.java |  88 +++--------
 .../generator/SynchronizedErrorReporter.java  |  63 ++------
 .../LanguageServerErrorReporter.java          |  86 +++--------
 .../validation/ValidatorErrorReporter.java    | 141 ++++-------------
 10 files changed, 308 insertions(+), 476 deletions(-)
 create mode 100644 core/src/main/java/org/lflang/ErrorReporterBase.java

diff --git a/cli/base/src/main/java/org/lflang/cli/StandaloneErrorReporter.java b/cli/base/src/main/java/org/lflang/cli/StandaloneErrorReporter.java
index 83e58eb15c..2ac9b48559 100644
--- a/cli/base/src/main/java/org/lflang/cli/StandaloneErrorReporter.java
+++ b/cli/base/src/main/java/org/lflang/cli/StandaloneErrorReporter.java
@@ -28,74 +28,51 @@
 package org.lflang.cli;
 
 import com.google.inject.Inject;
+
 import java.nio.file.Path;
+
 import org.eclipse.emf.ecore.EObject;
+import org.eclipse.lsp4j.DiagnosticSeverity;
 import org.eclipse.xtext.diagnostics.Severity;
+
 import org.lflang.ErrorReporter;
+import org.lflang.ErrorReporterBase;
+import org.lflang.generator.Range;
 
 /**
  * An error reporter that forwards all messages to an {@link IssueCollector}. They'll be sorted out
  * later.
  */
-public class StandaloneErrorReporter implements ErrorReporter {
-
-  @Inject private StandaloneIssueAcceptor issueAcceptor;
-
-  private String reportWithNode(String message, Severity severity, EObject obj) {
-    issueAcceptor.accept(severity, message, obj, null, 0, null);
-    return message;
-  }
-
-  private String reportSimpleFileCtx(String message, Severity severity, Integer line, Path 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;
-  }
-
-  @Override
-  public String reportError(String message) {
-    return reportSimpleFileCtx(message, Severity.ERROR, null, null);
-  }
-
-  @Override
-  public String reportWarning(String message) {
-    return reportSimpleFileCtx(message, Severity.WARNING, null, null);
+public class StandaloneErrorReporter extends ErrorReporterBase {
+
+  @Inject
+  private StandaloneIssueAcceptor issueAcceptor;
+
+  static Severity convertSeverity(DiagnosticSeverity severity) {
+    return switch (severity) {
+      case Error -> Severity.ERROR;
+      case Warning -> Severity.WARNING;
+      case Information -> Severity.INFO;
+      case Hint -> Severity.IGNORE;
+    };
   }
 
   @Override
-  public String reportInfo(String message) {
-    return reportSimpleFileCtx(message, Severity.INFO, null, null);
+  protected void reportOnNode(EObject node, DiagnosticSeverity severity, String message) {
+    issueAcceptor.accept(convertSeverity(severity), message, node, null, 0, null);
   }
 
   @Override
-  public String reportError(EObject obj, String message) {
-    return reportWithNode(message, Severity.ERROR, obj);
-  }
-
-  @Override
-  public String reportWarning(EObject obj, String message) {
-    return reportWithNode(message, Severity.WARNING, obj);
-  }
-
-  @Override
-  public String reportInfo(EObject obj, String message) {
-    return reportWithNode(message, Severity.INFO, obj);
-  }
-
-  @Override
-  public String reportError(Path file, Integer line, String message) {
-    return reportSimpleFileCtx(message, Severity.ERROR, line, file);
+  protected void report(Path path, Range range, DiagnosticSeverity severity, String message) {
+    LfIssue issue = new LfIssue(message, convertSeverity(severity), path, range);
+    issueAcceptor.accept(issue);
   }
 
   @Override
-  public String reportWarning(Path file, Integer line, String message) {
-    return reportSimpleFileCtx(message, Severity.WARNING, line, file);
-  }
+  protected void reportWithoutPosition(DiagnosticSeverity severity, String message) {
+    LfIssue issue = new LfIssue(message, convertSeverity(severity), null, null);
+    issueAcceptor.accept(issue);
 
-  @Override
-  public String reportInfo(Path file, Integer line, String message) {
-    return reportSimpleFileCtx(message, Severity.INFO, line, file);
   }
 
   @Override
diff --git a/cli/base/src/main/kotlin/org/lflang/cli/ReportingUtil.kt b/cli/base/src/main/kotlin/org/lflang/cli/ReportingUtil.kt
index efdd0e731f..b8e94083cf 100644
--- a/cli/base/src/main/kotlin/org/lflang/cli/ReportingUtil.kt
+++ b/cli/base/src/main/kotlin/org/lflang/cli/ReportingUtil.kt
@@ -27,6 +27,7 @@ package org.lflang.cli
 import com.google.inject.Inject
 import com.google.inject.Singleton
 import org.eclipse.xtext.diagnostics.Severity
+import org.lflang.generator.Range
 import java.io.IOException
 import java.io.PrintStream
 import java.lang.Error
@@ -135,6 +136,21 @@ data class LfIssue(
     val file: Path?
 ) : Comparable<LfIssue> {
 
+    constructor(
+        message: String,
+        severity: Severity,
+        path: Path?,
+        range: Range?
+    ) : this(
+        message, severity,
+        line = range?.startInclusive?.oneBasedLine,
+        column = range?.startInclusive?.oneBasedColumn,
+        endLine = range?.endExclusive?.oneBasedLine,
+        endColumn = range?.endExclusive?.oneBasedColumn,
+        length = null,
+        file = path
+    )
+
     override operator fun compareTo(other: LfIssue): Int =
         issueComparator.compare(this, other)
 
diff --git a/core/src/main/java/org/lflang/DefaultErrorReporter.java b/core/src/main/java/org/lflang/DefaultErrorReporter.java
index 2698d2b582..1b245c45c7 100644
--- a/core/src/main/java/org/lflang/DefaultErrorReporter.java
+++ b/core/src/main/java/org/lflang/DefaultErrorReporter.java
@@ -1,68 +1,39 @@
 package org.lflang;
 
 import java.nio.file.Path;
+
 import org.eclipse.emf.ecore.EObject;
+import org.eclipse.lsp4j.DiagnosticSeverity;
+
+import org.lflang.ErrorReporter2.Stage2;
+import org.lflang.generator.Range;
 
 /** Simple implementation of the ErrorReport interface that simply prints to standard out. */
-public class DefaultErrorReporter implements ErrorReporter {
+public class DefaultErrorReporter extends ErrorReporterBase implements ErrorReporter {
 
-  private boolean errorsOccurred = false;
 
-  private String println(String s) {
+  private void println(String s) {
     System.out.println(s);
-    return s;
-  }
-
-  @Override
-  public String reportError(String message) {
-    errorsOccurred = true;
-    return println("ERROR: " + message);
-  }
-
-  @Override
-  public String reportError(EObject object, String message) {
-    errorsOccurred = true;
-    return println("ERROR: " + message);
-  }
-
-  @Override
-  public String reportError(Path file, Integer line, String message) {
-    errorsOccurred = true;
-    return println("ERROR: " + message);
   }
 
   @Override
-  public String reportWarning(String message) {
-    return println("WARNING: " + message);
+  protected void report(Path path, Range range, DiagnosticSeverity severity, String message) {
+    reportWithoutPosition(severity, message);
   }
 
   @Override
-  public String reportInfo(String message) {
-    return println("INFO: " + message);
+  protected void reportOnNode(EObject node, DiagnosticSeverity severity, String message) {
+    reportWithoutPosition(severity, message);
   }
 
   @Override
-  public String reportWarning(EObject object, String message) {
-    return println("WARNING: " + message);
+  protected void reportWithoutPosition(DiagnosticSeverity severity, String message) {
+    switch (severity) {
+    case Error -> println("ERROR: " + message);
+    case Warning -> println("WARNING: " + message);
+    case Information -> println("INFO: " + message);
+    case Hint -> println("HINT: " + message);
+    }
   }
 
-  @Override
-  public String reportInfo(EObject object, String message) {
-    return println("INFO: " + message);
-  }
-
-  @Override
-  public String reportWarning(Path file, Integer line, String message) {
-    return println("WARNING: " + message);
-  }
-
-  @Override
-  public String reportInfo(Path file, Integer line, String message) {
-    return println("INFO: " + message);
-  }
-
-  @Override
-  public boolean getErrorsOccurred() {
-    return errorsOccurred;
-  }
 }
diff --git a/core/src/main/java/org/lflang/ErrorReporter.java b/core/src/main/java/org/lflang/ErrorReporter.java
index f7fe6dcb31..7fec74e434 100644
--- a/core/src/main/java/org/lflang/ErrorReporter.java
+++ b/core/src/main/java/org/lflang/ErrorReporter.java
@@ -1,9 +1,13 @@
 package org.lflang;
 
 import java.nio.file.Path;
+
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.lsp4j.DiagnosticSeverity;
+
+import org.lflang.Stage2;
 import org.lflang.generator.Position;
+import org.lflang.generator.Range;
 
 /**
  * Interface for reporting errors.
@@ -14,13 +18,76 @@
  */
 public interface ErrorReporter {
 
+  Stage2 at(Path file, Range range);
+
+  Stage2 at(EObject object);
+
+  default Stage2 at(Path file) {
+    return at(file, 1);
+  }
+
+  default Stage2 at(Path file, int line) {
+    return at(file, Position.fromOneBased(line, 1));
+  }
+
+  default Stage2 at(Path file, Position pos) {
+    return at(file, Range.degenerateRange(pos));
+  }
+
+  Stage2 nowhere();
+
+
+  interface Stage2 {
+
+    /**
+     * Report an error.
+     *
+     * @param message The error message.
+     */
+    default void error(String message) {
+      report(DiagnosticSeverity.Error, message);
+    }
+
+    /**
+     * Report a warning.
+     *
+     * @param message The warning message.
+     */
+    default void warning(String message) {
+      report(DiagnosticSeverity.Warning, message);
+    }
+
+    /**
+     * Report an informational message.
+     *
+     * @param message The message to report
+     */
+    default void info(String message) {
+      report(DiagnosticSeverity.Information, message);
+    }
+
+
+    /**
+     * Report a message with the given severity
+     *
+     * @param severity The severity
+     * @param message The message to report
+     */
+    void report(DiagnosticSeverity severity, String message);
+
+  }
+
+
   /**
    * Report an error.
    *
    * @param message The error message.
    * @return a string that describes the error.
    */
-  String reportError(String message);
+  default String reportError(String message) {
+    nowhere().error(message);
+    return message;
+  }
 
   /**
    * Report a warning.
@@ -28,7 +95,10 @@ public interface ErrorReporter {
    * @param message The warning message.
    * @return a string that describes the warning.
    */
-  String reportWarning(String message);
+  default String reportWarning(String message) {
+    nowhere().warning(message);
+    return message;
+  }
 
   /**
    * Report an informational message.
@@ -36,7 +106,10 @@ public interface ErrorReporter {
    * @param message The message to report
    * @return a string that describes the error
    */
-  String reportInfo(String message);
+  default String reportInfo(String message) {
+    nowhere().info(message);
+    return message;
+  }
 
   /**
    * Report an error on the specified parse tree object.
@@ -45,7 +118,10 @@ public interface ErrorReporter {
    * @param message The error message.
    * @return a string that describes the error.
    */
-  String reportError(EObject object, String message);
+  default String reportError(EObject object, String message) {
+    at(object).error(message);
+    return message;
+  }
 
   /**
    * Report a warning on the specified parse tree object.
@@ -54,17 +130,11 @@ public interface ErrorReporter {
    * @param message The error message.
    * @return a string that describes the warning.
    */
-  String reportWarning(EObject object, String message);
-
-  /**
-   * Report an informational message on the specified parse tree object.
-   *
-   * @param object The parse tree object.
-   * @param message The informational message
-   * @return a string that describes the info
-   */
-  String reportInfo(EObject object, String message);
-
+  default String reportWarning(EObject object, String message) {
+    at(object).warning(message);
+    return message;
+  }
+  
   /**
    * Report an error at the specified line within a file.
    *
@@ -73,7 +143,11 @@ public interface ErrorReporter {
    * @param file The file to report at.
    * @return a string that describes the error.
    */
-  String reportError(Path file, Integer line, String message);
+  default String reportError(Path file, Integer line, String message) {
+    Stage2 stage2 = line != null ? at(file, line) : at(file);
+    stage2.report(DiagnosticSeverity.Error, message);
+    return message;
+  }
 
   /**
    * Report a warning at the specified line within a file.
@@ -83,17 +157,12 @@ public interface ErrorReporter {
    * @param file The file to report at.
    * @return a string that describes the warning.
    */
-  String reportWarning(Path file, Integer line, String message);
+  default String reportWarning(Path file, Integer line, String message) {
+    Stage2 stage2 = line!=null? at(file,line):at(file);
+    stage2.report(DiagnosticSeverity.Warning, message);
+    return message;
+  }
 
-  /**
-   * Report an informational message at the specified line within a file.
-   *
-   * @param file The file to report at.
-   * @param line The one-based line number to report at.
-   * @param message The error message.
-   * @return
-   */
-  String reportInfo(Path file, Integer line, String message);
 
   /**
    * Report a message of severity {@code severity}.
@@ -104,16 +173,8 @@ public interface ErrorReporter {
    * @return a string that describes the diagnostic
    */
   default String report(Path file, DiagnosticSeverity severity, String message) {
-    switch (severity) {
-      case Error:
-        return reportError(message);
-      case Warning:
-      case Hint:
-      case Information:
-        return reportInfo(message);
-      default:
-        return reportWarning(message);
-    }
+    at(file).report(severity, message);
+    return message;
   }
 
   /**
@@ -127,16 +188,8 @@ default String report(Path file, DiagnosticSeverity severity, String message) {
    * @return a string that describes the diagnostic
    */
   default String report(Path file, DiagnosticSeverity severity, String message, int line) {
-    switch (severity) {
-      case Error:
-        return reportError(file, line, message);
-      case Warning:
-      case Hint:
-      case Information:
-        return reportInfo(file, line, message);
-      default:
-        return reportWarning(file, line, message);
-    }
+    at(file, line).report(severity, message);
+    return message;
   }
 
   /**
@@ -155,6 +208,7 @@ default String report(
     return report(file, severity, message, startPos.getOneBasedLine());
   }
 
+
   /**
    * Check if errors where reported.
    *
diff --git a/core/src/main/java/org/lflang/ErrorReporterBase.java b/core/src/main/java/org/lflang/ErrorReporterBase.java
new file mode 100644
index 0000000000..c376f8a547
--- /dev/null
+++ b/core/src/main/java/org/lflang/ErrorReporterBase.java
@@ -0,0 +1,56 @@
+package org.lflang;
+
+import java.nio.file.Path;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.lsp4j.DiagnosticSeverity;
+
+import org.lflang.generator.Range;
+
+/** Simple implementation of the ErrorReport interface that simply prints to standard out. */
+public abstract class ErrorReporterBase implements ErrorReporter {
+
+  private boolean errorsOccurred = false;
+
+  @Override
+  public boolean getErrorsOccurred() {
+    return errorsOccurred;
+  }
+
+  @Override
+  public void clearHistory() {
+    errorsOccurred = false;
+  }
+
+  /** A wrapper that takes care of setting the error flag if needed. */
+  protected Stage2 wrap(Stage2 e) {
+    return (severity, message) -> {
+      if (severity == DiagnosticSeverity.Error) {
+        errorsOccurred = true;
+      }
+      e.report(severity, message);
+    };
+  }
+
+  @Override
+  public Stage2 at(Path file, Range range) {
+    return wrap((severity, message) -> report(file, range, severity, message));
+  }
+
+  @Override
+  public Stage2 at(EObject object) {
+    return wrap((severity, message) -> reportOnNode(object, severity, message));
+  }
+
+  @Override
+  public Stage2 nowhere() {
+    return wrap(this::reportWithoutPosition);
+  }
+
+  protected abstract void report(Path path, Range range, DiagnosticSeverity severity, String message);
+
+  protected abstract void reportOnNode(EObject node, DiagnosticSeverity severity, String message);
+
+  protected abstract void reportWithoutPosition(DiagnosticSeverity severity, String message);
+
+}
diff --git a/core/src/main/java/org/lflang/diagram/synthesis/util/SynthesisErrorReporter.java b/core/src/main/java/org/lflang/diagram/synthesis/util/SynthesisErrorReporter.java
index a249c009fd..c2488dbac2 100644
--- a/core/src/main/java/org/lflang/diagram/synthesis/util/SynthesisErrorReporter.java
+++ b/core/src/main/java/org/lflang/diagram/synthesis/util/SynthesisErrorReporter.java
@@ -25,56 +25,32 @@
 package org.lflang.diagram.synthesis.util;
 
 import java.nio.file.Path;
+
 import org.eclipse.emf.ecore.EObject;
+import org.eclipse.lsp4j.DiagnosticSeverity;
+
 import org.lflang.ErrorReporter;
+import org.lflang.ErrorReporterBase;
+import org.lflang.generator.Range;
 
 /**
  * @author Alexander Schulz-Rosengarten
  */
-public class SynthesisErrorReporter implements ErrorReporter {
-  @Override
-  public String reportError(String message) {
-    return null;
-  }
-
-  @Override
-  public String reportError(EObject object, String message) {
-    return null;
-  }
-
-  @Override
-  public String reportError(Path file, Integer line, String message) {
-    return null;
-  }
-
-  @Override
-  public String reportWarning(String message) {
-    return null;
-  }
-
-  @Override
-  public String reportWarning(EObject object, String message) {
-    return null;
-  }
-
-  @Override
-  public String reportWarning(Path file, Integer line, String message) {
-    return null;
-  }
+public class SynthesisErrorReporter extends ErrorReporterBase {
 
   @Override
-  public String reportInfo(String message) {
-    return null;
+  protected void reportWithoutPosition(DiagnosticSeverity severity, String message) {
+    // ignore
   }
 
   @Override
-  public String reportInfo(EObject object, String message) {
-    return null;
+  protected void report(Path path, Range range, DiagnosticSeverity severity, String message) {
+    // ignore
   }
 
   @Override
-  public String reportInfo(Path file, Integer line, String message) {
-    return null;
+  protected void reportOnNode(EObject node, DiagnosticSeverity severity, String message) {
+    // ignore
   }
 
   @Override
diff --git a/core/src/main/java/org/lflang/federated/generator/LineAdjustingErrorReporter.java b/core/src/main/java/org/lflang/federated/generator/LineAdjustingErrorReporter.java
index aa2f49b6da..8b00c1ae08 100644
--- a/core/src/main/java/org/lflang/federated/generator/LineAdjustingErrorReporter.java
+++ b/core/src/main/java/org/lflang/federated/generator/LineAdjustingErrorReporter.java
@@ -5,6 +5,7 @@
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.lsp4j.DiagnosticSeverity;
 import org.lflang.ErrorReporter;
+import org.lflang.ErrorReporterBase;
 import org.lflang.generator.CodeMap;
 import org.lflang.generator.Position;
 import org.lflang.generator.Range;
@@ -19,92 +20,43 @@ public LineAdjustingErrorReporter(ErrorReporter parent, Map<Path, CodeMap> codeM
     this.codeMapMap = codeMapMap;
   }
 
-  @Override
-  public String reportError(String message) {
-    return parent.reportError(message);
-  }
-
-  @Override
-  public String reportWarning(String message) {
-    return parent.reportWarning(message);
-  }
-
-  @Override
-  public String reportInfo(String message) {
-    return parent.reportInfo(message);
-  }
-
-  @Override
-  public String reportError(EObject object, String message) {
-    return parent.reportError(object, message);
-  }
-
-  @Override
-  public String reportWarning(EObject object, String message) {
-    return parent.reportWarning(object, message);
-  }
 
   @Override
-  public String reportInfo(EObject object, String message) {
-    return parent.reportInfo(object, message);
+  public Stage2 at(EObject object) {
+    return parent.at(object);
   }
 
   @Override
-  public String reportError(Path file, Integer line, String message) {
-    return report(file, line, message, DiagnosticSeverity.Error);
+  public Stage2 nowhere() {
+    return parent.nowhere();
   }
 
   @Override
-  public String reportWarning(Path file, Integer line, String message) {
-    return report(file, line, message, DiagnosticSeverity.Warning);
+  public Stage2 at(Path file, int line) {
+    // encompass the whole line
+    var endOfLine = Position.fromOneBased(line, Integer.MAX_VALUE);
+    var startOfLine = Position.fromOneBased(line, 1);
+    return at(file, new Range(startOfLine, endOfLine));
   }
 
   @Override
-  public String reportInfo(Path file, Integer line, String message) {
-    return report(file, line, message, DiagnosticSeverity.Information);
-  }
-
-  private String report(Path file, Integer line, String message, DiagnosticSeverity severity) {
-    if (line == null) return report(file, severity, message);
-    var position = Position.fromOneBased(line, Integer.MAX_VALUE);
-    return report(
-        file, severity, message, Position.fromZeroBased(position.getZeroBasedLine(), 0), position);
-  }
-
-  @Override
-  public String report(Path file, DiagnosticSeverity severity, String message) {
-    return ErrorReporter.super.report(file, severity, message);
-  }
-
-  @Override
-  public String report(Path file, DiagnosticSeverity severity, String message, int line) {
-    return ErrorReporter.super.report(file, severity, message, line);
-  }
-
-  @Override
-  public String report(
-      Path file, DiagnosticSeverity severity, String message, Position startPos, Position endPos) {
-    String ret = null;
+  public Stage2 at(Path file, Range range) {
     if (codeMapMap.containsKey(file)) {
       var relevantMap = codeMapMap.get(file);
       for (Path lfSource : relevantMap.lfSourcePaths()) {
-        var adjustedRange = relevantMap.adjusted(lfSource, new Range(startPos, endPos));
-        ret =
-            parent.report(
-                lfSource,
-                severity,
-                message,
-                adjustedRange.getStartInclusive().equals(Position.ORIGIN)
-                    ? Position.fromZeroBased(adjustedRange.getEndExclusive().getZeroBasedLine(), 0)
-                    : adjustedRange.getStartInclusive(),
-                adjustedRange.getEndExclusive());
+        var adjustedRange = relevantMap.adjusted(lfSource, range);
+        adjustedRange = new Range(
+            adjustedRange.getStartInclusive().equals(Position.ORIGIN)
+                ? Position.fromZeroBased(adjustedRange.getEndExclusive().getZeroBasedLine(), 0)
+                : adjustedRange.getStartInclusive(),
+            adjustedRange.getEndExclusive());
+        return parent.at(lfSource, adjustedRange);
       }
     }
-    if (ret == null)
-      return severity == DiagnosticSeverity.Error ? reportError(message) : reportWarning(message);
-    return ret;
+    return nowhere();
   }
 
+
   @Override
   public boolean getErrorsOccurred() {
     return parent.getErrorsOccurred();
diff --git a/core/src/main/java/org/lflang/federated/generator/SynchronizedErrorReporter.java b/core/src/main/java/org/lflang/federated/generator/SynchronizedErrorReporter.java
index 08c47c4cd3..e371499fbd 100644
--- a/core/src/main/java/org/lflang/federated/generator/SynchronizedErrorReporter.java
+++ b/core/src/main/java/org/lflang/federated/generator/SynchronizedErrorReporter.java
@@ -4,9 +4,11 @@
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.lsp4j.DiagnosticSeverity;
 import org.lflang.ErrorReporter;
+import org.lflang.ErrorReporterBase;
 import org.lflang.generator.Position;
+import org.lflang.generator.Range;
 
-public class SynchronizedErrorReporter implements ErrorReporter {
+public class SynchronizedErrorReporter extends ErrorReporterBase {
 
   private final ErrorReporter parent;
 
@@ -15,65 +17,18 @@ public SynchronizedErrorReporter(ErrorReporter parent) {
   }
 
   @Override
-  public synchronized String reportError(String message) {
-    return parent.reportError(message);
+  protected synchronized void reportOnNode(EObject node, DiagnosticSeverity severity, String message) {
+    parent.at(node).report(severity, message);
   }
 
   @Override
-  public synchronized String reportWarning(String message) {
-    return parent.reportWarning(message);
+  protected synchronized void report(Path path, Range range, DiagnosticSeverity severity, String message) {
+    parent.at(path, range).report(severity, message);
   }
 
   @Override
-  public synchronized String reportInfo(String message) {
-    return parent.reportInfo(message);
-  }
-
-  @Override
-  public synchronized String reportError(EObject object, String message) {
-    return parent.reportError(object, message);
-  }
-
-  @Override
-  public synchronized String reportWarning(EObject object, String message) {
-    return parent.reportWarning(object, message);
-  }
-
-  @Override
-  public synchronized String reportInfo(EObject object, String message) {
-    return parent.reportInfo(object, message);
-  }
-
-  @Override
-  public synchronized String reportError(Path file, Integer line, String message) {
-    return parent.reportError(file, line, message);
-  }
-
-  @Override
-  public synchronized String reportWarning(Path file, Integer line, String message) {
-    return parent.reportWarning(file, line, message);
-  }
-
-  @Override
-  public synchronized String reportInfo(Path file, Integer line, String message) {
-    return parent.reportInfo(file, line, message);
-  }
-
-  @Override
-  public synchronized String report(Path file, DiagnosticSeverity severity, String message) {
-    return parent.report(file, severity, message);
-  }
-
-  @Override
-  public synchronized String report(
-      Path file, DiagnosticSeverity severity, String message, int line) {
-    return parent.report(file, severity, message, line);
-  }
-
-  @Override
-  public synchronized String report(
-      Path file, DiagnosticSeverity severity, String message, Position startPos, Position endPos) {
-    return parent.report(file, severity, message, startPos, endPos);
+  protected synchronized void reportWithoutPosition(DiagnosticSeverity severity, String message) {
+    parent.nowhere().report(severity, message);
   }
 
   @Override
diff --git a/core/src/main/java/org/lflang/generator/LanguageServerErrorReporter.java b/core/src/main/java/org/lflang/generator/LanguageServerErrorReporter.java
index 31304f43c9..b1cb30f1f0 100644
--- a/core/src/main/java/org/lflang/generator/LanguageServerErrorReporter.java
+++ b/core/src/main/java/org/lflang/generator/LanguageServerErrorReporter.java
@@ -6,6 +6,8 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
+import java.util.OptionalInt;
+
 import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.lsp4j.Diagnostic;
@@ -15,13 +17,14 @@
 import org.eclipse.lsp4j.services.LanguageClient;
 import org.eclipse.xtext.nodemodel.util.NodeModelUtils;
 import org.lflang.ErrorReporter;
+import org.lflang.ErrorReporterBase;
 
 /**
  * Report diagnostics to the language client.
  *
  * @author Peter Donovan
  */
-public class LanguageServerErrorReporter implements ErrorReporter {
+public class LanguageServerErrorReporter extends ErrorReporterBase {
 
   /**
    * The language client to which errors should be reported, if such a client is available. FIXME:
@@ -47,52 +50,38 @@ public LanguageServerErrorReporter(EObject parseRoot) {
     this.diagnostics = new HashMap<>();
   }
 
-  /* -----------------------  PUBLIC METHODS  ------------------------- */
-
-  @Override
-  public String reportError(String message) {
-    return report(getMainFile(), DiagnosticSeverity.Error, message);
-  }
-
-  @Override
-  public String reportWarning(String message) {
-    return report(getMainFile(), DiagnosticSeverity.Warning, message);
-  }
-
-  @Override
-  public String reportInfo(String message) {
-    return report(getMainFile(), DiagnosticSeverity.Information, message);
-  }
-
   @Override
-  public String reportError(EObject object, String message) {
-    return reportError(message);
+  protected void reportOnNode(EObject node, DiagnosticSeverity severity, String message) {
+    reportWithoutPosition(severity, message);
   }
 
   @Override
-  public String reportWarning(EObject object, String message) {
-    return reportWarning(message);
+  protected void reportWithoutPosition(DiagnosticSeverity severity, String message) {
+    report(getMainFile(), org.lflang.generator.Range.degenerateRange(Position.ORIGIN), severity, message);
   }
 
   @Override
-  public String reportInfo(EObject object, String message) {
-    return reportInfo(message);
-  }
-
-  @Override
-  public String reportError(Path file, Integer line, String message) {
-    return report(file, DiagnosticSeverity.Error, message, line != null ? line : 1);
+  public Stage2 at(Path file, int line) {
+    // Create a range for the whole line
+    Optional<String> text = getLine(line - 1);
+    org.lflang.generator.Range range = new org.lflang.generator.Range(
+        Position.fromOneBased(line, 1),
+        Position.fromOneBased(line, 1 + text.map(String::length).orElse(0))
+    );
+    return at(file, range);
   }
 
   @Override
-  public String reportWarning(Path file, Integer line, String message) {
-    return report(file, DiagnosticSeverity.Warning, message, line != null ? line : 1);
-  }
+  protected void report(Path path, org.lflang.generator.Range range, DiagnosticSeverity severity, String message) {
+    if (path == null) {
+      path = getMainFile();
+    }
+    diagnostics.computeIfAbsent(path, p -> new ArrayList<>())
+        .add(new Diagnostic(toRange(range.getStartInclusive(), range.getEndExclusive()),
+            message, severity, "LF Language Server"));
 
-  @Override
-  public String reportInfo(Path file, Integer line, String message) {
-    return report(file, DiagnosticSeverity.Information, message, line != null ? line : 1);
   }
+  /* -----------------------  PUBLIC METHODS  ------------------------- */
 
   @Override
   public boolean getErrorsOccurred() {
@@ -103,33 +92,6 @@ public boolean getErrorsOccurred() {
                     .anyMatch(diagnostic -> diagnostic.getSeverity() == DiagnosticSeverity.Error));
   }
 
-  @Override
-  public String report(Path file, DiagnosticSeverity severity, String message) {
-    return report(file, severity, message, 1);
-  }
-
-  @Override
-  public String report(Path file, DiagnosticSeverity severity, String message, int line) {
-    Optional<String> text = getLine(line - 1);
-    return report(
-        file,
-        severity,
-        message,
-        Position.fromOneBased(line, 1),
-        Position.fromOneBased(line, 1 + (text.isEmpty() ? 0 : text.get().length())));
-  }
-
-  @Override
-  public String report(
-      Path file, DiagnosticSeverity severity, String message, Position startPos, Position endPos) {
-    if (file == null) file = getMainFile();
-    diagnostics.putIfAbsent(file, new ArrayList<>());
-    diagnostics
-        .get(file)
-        .add(new Diagnostic(toRange(startPos, endPos), message, severity, "LF Language Server"));
-    return "" + severity + ": " + message;
-  }
-
   /**
    * Save a reference to the language client.
    *
diff --git a/core/src/main/java/org/lflang/validation/ValidatorErrorReporter.java b/core/src/main/java/org/lflang/validation/ValidatorErrorReporter.java
index d21458a3a9..bc8876bc5a 100644
--- a/core/src/main/java/org/lflang/validation/ValidatorErrorReporter.java
+++ b/core/src/main/java/org/lflang/validation/ValidatorErrorReporter.java
@@ -27,9 +27,13 @@
 package org.lflang.validation;
 
 import java.nio.file.Path;
+
 import org.eclipse.emf.ecore.EObject;
+import org.eclipse.lsp4j.DiagnosticSeverity;
 import org.eclipse.xtext.validation.ValidationMessageAcceptor;
-import org.lflang.ErrorReporter;
+
+import org.lflang.ErrorReporterBase;
+import org.lflang.generator.Range;
 
 /**
  * This class translates messages reported via the ErrorReporrter interface to the interface of a
@@ -45,11 +49,10 @@
  *
  * @author Christian Menard
  */
-public class ValidatorErrorReporter implements ErrorReporter {
+public class ValidatorErrorReporter extends ErrorReporterBase {
 
-  private ValidationMessageAcceptor acceptor;
-  private BaseLFValidator.ValidatorStateAccess validatorState;
-  private boolean errorsOccurred = false;
+  private final ValidationMessageAcceptor acceptor;
+  private final BaseLFValidator.ValidatorStateAccess validatorState;
 
   public ValidatorErrorReporter(
       ValidationMessageAcceptor acceptor, BaseLFValidator.ValidatorStateAccess stateAccess) {
@@ -57,26 +60,9 @@ public ValidatorErrorReporter(
     this.validatorState = stateAccess;
   }
 
-  /** Report the given message as an error on the object currently under validation. */
-  @Override
-  public String reportError(String message) {
-    errorsOccurred = true;
-    acceptor.acceptError(
-        message,
-        validatorState.getCurrentObject(),
-        null,
-        ValidationMessageAcceptor.INSIGNIFICANT_INDEX,
-        null);
-    return message;
-  }
-
-  /** Report the given message as an error on the given object. */
   @Override
-  public String reportError(EObject object, String message) {
-    errorsOccurred = true;
-    acceptor.acceptError(
-        message, object, null, ValidationMessageAcceptor.INSIGNIFICANT_INDEX, null);
-    return message;
+  protected void reportWithoutPosition(DiagnosticSeverity severity, String message) {
+    reportOnNode(validatorState.getCurrentObject(), severity, message);
   }
 
   /**
@@ -84,103 +70,30 @@ public String reportError(EObject object, String message) {
    *
    * <p>Unfortunately, there is no way to provide a path and a line number to the
    * ValidationMessageAcceptor as messages can only be reported directly as EObjects. While it is
-   * not an ideal solution, this method composes a messages indicating the location of the error and
-   * reports this on the object currently under validation. This way, the error message is not lost,
+   * not an ideal solution, this method composes a messages indicating the location of the error
+   * and
+   * reports this on the object currently under validation. This way, the error message is not
+   * lost,
    * but it is not necessarily reported precisely at the location of the actual error.
    */
   @Override
-  public String reportError(Path file, Integer line, String message) {
-    errorsOccurred = true;
-    String fullMessage =
-        message + " (Reported from " + file.toString() + " on line " + line.toString() + ")";
-    acceptor.acceptError(
-        fullMessage,
-        validatorState.getCurrentObject(),
-        null,
-        ValidationMessageAcceptor.INSIGNIFICANT_INDEX,
-        null);
-    return fullMessage;
-  }
-
-  /** Report the given message as a waring on the object currently under validation. */
-  @Override
-  public String reportWarning(String message) {
-    acceptor.acceptWarning(
-        message,
-        validatorState.getCurrentObject(),
-        null,
-        ValidationMessageAcceptor.INSIGNIFICANT_INDEX,
-        null);
-    return message;
-  }
-
-  @Override
-  public String reportInfo(String message) {
-    acceptor.acceptInfo(
-        message,
-        validatorState.getCurrentObject(),
-        null,
-        ValidationMessageAcceptor.INSIGNIFICANT_INDEX,
-        null);
-    return message;
-  }
-
-  /** Report the given message as a warning on the given object. */
-  @Override
-  public String reportWarning(EObject object, String message) {
-    acceptor.acceptWarning(
-        message, object, null, ValidationMessageAcceptor.INSIGNIFICANT_INDEX, null);
-    return message;
-  }
-
-  @Override
-  public String reportInfo(EObject object, String message) {
-    acceptor.acceptInfo(message, object, null, ValidationMessageAcceptor.INSIGNIFICANT_INDEX, null);
-    return message;
-  }
-
-  /**
-   * Report the given message as an warning on the current object.
-   *
-   * <p>Unfortunately, there is no way to provide a path and a line number to the
-   * ValidationMessageAcceptor as messages can only be reported directly as EObjects. While it is
-   * not an ideal solution, this method composes a messages indicating the location of the warning
-   * and reports this on the object currently under validation. This way, the warning message is not
-   * lost, but it is not necessarily reported precisely at the location of the actual warning.
-   */
-  @Override
-  public String reportWarning(Path file, Integer line, String message) {
+  protected void report(Path path, Range range, DiagnosticSeverity severity, String message) {
     String fullMessage =
-        message + " (Reported from " + file.toString() + " on line " + line.toString() + ")";
-    acceptor.acceptWarning(
-        fullMessage,
-        validatorState.getCurrentObject(),
-        null,
-        ValidationMessageAcceptor.INSIGNIFICANT_INDEX,
-        null);
-    return fullMessage;
+        message + " (Reported from " + path + " on line "
+            + range.getStartInclusive().getOneBasedLine() + ")";
+    reportOnNode(validatorState.getCurrentObject(), severity, fullMessage);
   }
 
   @Override
-  public String reportInfo(Path file, Integer line, String message) {
-    String fullMessage =
-        message + " (Reported from " + file.toString() + " on line " + line.toString() + ")";
-    acceptor.acceptInfo(
-        fullMessage,
-        validatorState.getCurrentObject(),
-        null,
-        ValidationMessageAcceptor.INSIGNIFICANT_INDEX,
-        null);
-    return fullMessage;
+  protected void reportOnNode(EObject node, DiagnosticSeverity severity, String message) {
+    switch (severity) {
+    case Error -> acceptor.acceptError(
+        message, node, null, ValidationMessageAcceptor.INSIGNIFICANT_INDEX, null);
+    case Warning -> acceptor.acceptWarning(
+        message, node, null, ValidationMessageAcceptor.INSIGNIFICANT_INDEX, null);
+    case Information, Hint -> acceptor.acceptInfo(
+        message, node, null, ValidationMessageAcceptor.INSIGNIFICANT_INDEX, null);
+    }
   }
 
-  /**
-   * Check if errors where reported.
-   *
-   * @return true if errors where reported
-   */
-  @Override
-  public boolean getErrorsOccurred() {
-    return errorsOccurred;
-  }
 }

From 214e45bec2e103ed3d9a0e2d2126f8fcf9c060ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Fournier?= <clement.fournier@tu-dresden.de>
Date: Tue, 13 Jun 2023 14:09:22 +0200
Subject: [PATCH 06/17] Update usages

---
 .../main/java/org/lflang/ErrorReporter.java   | 35 +-------------
 .../main/java/org/lflang/TargetProperty.java  |  4 +-
 .../federated/generator/FedGenerator.java     | 18 ++++----
 .../launcher/FedLauncherGenerator.java        | 14 +++---
 .../FedROS2CPPSerialization.java              | 11 ++---
 .../org/lflang/generator/GeneratorBase.java   | 11 ++---
 .../generator/GeneratorCommandFactory.java    |  4 +-
 .../org/lflang/generator/GeneratorUtils.java  |  6 +--
 .../lflang/generator/c/CCmakeGenerator.java   |  8 ++--
 .../org/lflang/generator/c/CCompiler.java     | 46 +++++++++----------
 .../org/lflang/generator/c/CGenerator.java    | 29 ++++++------
 .../java/org/lflang/generator/c/CUtil.java    | 15 +++---
 .../generator/python/PythonGenerator.java     |  6 +--
 .../generator/python/PythonValidator.java     |  6 +--
 .../java/org/lflang/util/ArduinoUtil.java     | 11 +++--
 .../main/java/org/lflang/util/FileUtil.java   | 20 ++++----
 .../org/lflang/validation/LFValidator.java    |  2 +-
 .../lflang/generator/cpp/CppRos2Generator.kt  |  5 +-
 .../generator/cpp/CppStandaloneGenerator.kt   |  9 ++--
 .../lflang/generator/rust/RustGenerator.kt    | 10 ++--
 .../org/lflang/generator/rust/RustModel.kt    |  4 +-
 .../org/lflang/generator/ts/TSGenerator.kt    | 16 ++++---
 .../generator/ts/TSReactionGenerator.kt       |  8 +++-
 23 files changed, 138 insertions(+), 160 deletions(-)

diff --git a/core/src/main/java/org/lflang/ErrorReporter.java b/core/src/main/java/org/lflang/ErrorReporter.java
index 7fec74e434..b45a5e171e 100644
--- a/core/src/main/java/org/lflang/ErrorReporter.java
+++ b/core/src/main/java/org/lflang/ErrorReporter.java
@@ -78,39 +78,6 @@ default void info(String message) {
   }
 
 
-  /**
-   * Report an error.
-   *
-   * @param message The error message.
-   * @return a string that describes the error.
-   */
-  default String reportError(String message) {
-    nowhere().error(message);
-    return message;
-  }
-
-  /**
-   * Report a warning.
-   *
-   * @param message The warning message.
-   * @return a string that describes the warning.
-   */
-  default String reportWarning(String message) {
-    nowhere().warning(message);
-    return message;
-  }
-
-  /**
-   * Report an informational message.
-   *
-   * @param message The message to report
-   * @return a string that describes the error
-   */
-  default String reportInfo(String message) {
-    nowhere().info(message);
-    return message;
-  }
-
   /**
    * Report an error on the specified parse tree object.
    *
@@ -134,7 +101,7 @@ default String reportWarning(EObject object, String message) {
     at(object).warning(message);
     return message;
   }
-  
+
   /**
    * Report an error at the specified line within a file.
    *
diff --git a/core/src/main/java/org/lflang/TargetProperty.java b/core/src/main/java/org/lflang/TargetProperty.java
index 4a68fc3796..92832e6214 100644
--- a/core/src/main/java/org/lflang/TargetProperty.java
+++ b/core/src/main/java/org/lflang/TargetProperty.java
@@ -472,8 +472,8 @@ public enum TargetProperty {
                   String s =
                       "Unidentified Platform Type, LF supports the following platform types: "
                           + Arrays.asList(Platform.values()).toString();
-                  err.reportError(s);
-                  throw new AssertionError(s);
+                    err.nowhere().error(s);
+                    throw new AssertionError(s);
                 }
                 config.platformOptions.platform = p;
                 break;
diff --git a/core/src/main/java/org/lflang/federated/generator/FedGenerator.java b/core/src/main/java/org/lflang/federated/generator/FedGenerator.java
index 6656a489f8..acbec3dadf 100644
--- a/core/src/main/java/org/lflang/federated/generator/FedGenerator.java
+++ b/core/src/main/java/org/lflang/federated/generator/FedGenerator.java
@@ -164,10 +164,10 @@ public boolean doGenerate(Resource resource, LFGeneratorContext context) throws
               subContexts.forEach(
                   c -> {
                     if (c.getErrorReporter().getErrorsOccurred()) {
-                      context
-                          .getErrorReporter()
-                          .reportError(
-                              "Failure during code generation of " + c.getFileConfig().srcFile);
+                      ErrorReporter errorReporter1 = context
+                          .getErrorReporter();
+                      errorReporter1.at(c.getFileConfig().srcFile).error(
+                          "Failure during code generation of " + c.getFileConfig().srcFile);
                     }
                   });
             });
@@ -231,11 +231,11 @@ private boolean federatedExecutionIsSupported(Resource resource) {
     var targetOK =
         List.of(Target.C, Target.Python, Target.TS, Target.CPP, Target.CCPP).contains(target);
     if (!targetOK) {
-      errorReporter.reportError("Federated execution is not supported with target " + target + ".");
+      errorReporter.nowhere().error(
+          "Federated execution is not supported with target " + target + ".");
     }
     if (target.equals(Target.C) && GeneratorUtils.isHostWindows()) {
-      errorReporter.reportError(
-          "Federated LF programs with a C target are currently not supported on Windows.");
+      errorReporter.nowhere().error("Federated LF programs with a C target are currently not supported on Windows.");
       targetOK = false;
     }
 
@@ -330,7 +330,9 @@ public TargetConfig getTargetConfig() {
     try {
       compileThreadPool.awaitTermination(Long.MAX_VALUE, TimeUnit.NANOSECONDS);
     } catch (Exception e) {
-      context.getErrorReporter().reportError("Failure during code generation: " + e.getMessage());
+      ErrorReporter errorReporter1 = context.getErrorReporter();
+      String message = "Failure during code generation: " + e.getMessage();
+      errorReporter1.nowhere().error(message);
       e.printStackTrace();
     } finally {
       finalizer.accept(subContexts);
diff --git a/core/src/main/java/org/lflang/federated/launcher/FedLauncherGenerator.java b/core/src/main/java/org/lflang/federated/launcher/FedLauncherGenerator.java
index b3be6acad0..b93a7bee03 100644
--- a/core/src/main/java/org/lflang/federated/launcher/FedLauncherGenerator.java
+++ b/core/src/main/java/org/lflang/federated/launcher/FedLauncherGenerator.java
@@ -214,7 +214,7 @@ public void doGenerate(List<FederateInstance> federates, RtiConfig rtiConfig) {
       try {
         Files.createDirectories(fileConfig.binPath);
       } catch (IOException e) {
-        errorReporter.reportError("Unable to create directory: " + fileConfig.binPath);
+        errorReporter.nowhere().error("Unable to create directory: " + fileConfig.binPath);
       }
     }
 
@@ -232,17 +232,17 @@ public void doGenerate(List<FederateInstance> federates, RtiConfig rtiConfig) {
     try {
       fOut = new FileOutputStream(file);
     } catch (FileNotFoundException e) {
-      errorReporter.reportError("Unable to find file: " + file);
+      errorReporter.nowhere().error("Unable to find file: " + file);
     }
     try {
       fOut.write(shCode.toString().getBytes());
       fOut.close();
     } catch (IOException e) {
-      errorReporter.reportError("Unable to write to file: " + file);
+      errorReporter.nowhere().error("Unable to write to file: " + file);
     }
 
     if (!file.setExecutable(true, false)) {
-      errorReporter.reportWarning("Unable to make launcher script executable.");
+      errorReporter.nowhere().warning("Unable to make launcher script executable.");
     }
 
     // Write the distributor file.
@@ -257,12 +257,12 @@ public void doGenerate(List<FederateInstance> federates, RtiConfig rtiConfig) {
         fOut.write(distCode.toString().getBytes());
         fOut.close();
         if (!file.setExecutable(true, false)) {
-          errorReporter.reportWarning("Unable to make file executable: " + file);
+          errorReporter.nowhere().warning("Unable to make file executable: " + file);
         }
       } catch (FileNotFoundException e) {
-        errorReporter.reportError("Unable to find file: " + file);
+        errorReporter.nowhere().error("Unable to find file: " + file);
       } catch (IOException e) {
-        errorReporter.reportError("Unable to write to file " + file);
+        errorReporter.nowhere().error("Unable to write to file " + file);
       }
     }
   }
diff --git a/core/src/main/java/org/lflang/federated/serialization/FedROS2CPPSerialization.java b/core/src/main/java/org/lflang/federated/serialization/FedROS2CPPSerialization.java
index 1384d11517..ae0449f9e7 100644
--- a/core/src/main/java/org/lflang/federated/serialization/FedROS2CPPSerialization.java
+++ b/core/src/main/java/org/lflang/federated/serialization/FedROS2CPPSerialization.java
@@ -47,13 +47,12 @@ public class FedROS2CPPSerialization implements FedSerialization {
   @Override
   public boolean isCompatible(GeneratorBase generator) {
     if (generator.getTarget() != Target.C) {
-      generator.errorReporter.reportError(
-          "ROS serialization is currently only supported for the C target.");
-      return false;
+        generator.errorReporter.nowhere().error("ROS serialization is currently only supported for the C target.");
+        return false;
     } else if (!generator.getTargetConfig().compiler.equalsIgnoreCase("g++")) {
-      generator.errorReporter.reportError(
-          "Please use the 'compiler: \"g++\"' target property \n" + "for ROS serialization");
-      return false;
+        generator.errorReporter.nowhere().error(
+            "Please use the 'compiler: \"g++\"' target property \n" + "for ROS serialization");
+        return false;
     }
     return true;
   }
diff --git a/core/src/main/java/org/lflang/generator/GeneratorBase.java b/core/src/main/java/org/lflang/generator/GeneratorBase.java
index c8ebbc38a2..6a5c189744 100644
--- a/core/src/main/java/org/lflang/generator/GeneratorBase.java
+++ b/core/src/main/java/org/lflang/generator/GeneratorBase.java
@@ -425,9 +425,8 @@ public int getReactionBankIndex(Reaction reaction) {
    */
   protected void checkModalReactorSupport(boolean isSupported) {
     if (hasModalReactors && !isSupported) {
-      errorReporter.reportError(
-          "The currently selected code generation or "
-              + "target configuration does not support modal reactors!");
+      errorReporter.nowhere().error("The currently selected code generation or "
+                + "target configuration does not support modal reactors!");
     }
   }
 
@@ -439,8 +438,7 @@ protected void checkModalReactorSupport(boolean isSupported) {
    */
   protected void checkWatchdogSupport(boolean isSupported) {
     if (hasWatchdogs && !isSupported) {
-      errorReporter.reportError(
-          "Watchdogs are currently only supported for threaded programs in the C target.");
+      errorReporter.nowhere().error("Watchdogs are currently only supported for threaded programs in the C target.");
     }
   }
 
@@ -498,8 +496,7 @@ private void transformConflictingConnectionsInModalReactors() {
    * reactors.
    */
   protected String getConflictingConnectionsInModalReactorsBody(String source, String dest) {
-    errorReporter.reportError(
-        "The currently selected code generation "
+    errorReporter.nowhere().error("The currently selected code generation "
             + "is missing an implementation for conflicting "
             + "transforming connections in modal reactors.");
     return "MODAL MODELS NOT SUPPORTED";
diff --git a/core/src/main/java/org/lflang/generator/GeneratorCommandFactory.java b/core/src/main/java/org/lflang/generator/GeneratorCommandFactory.java
index b1dc44e094..471e85aa89 100644
--- a/core/src/main/java/org/lflang/generator/GeneratorCommandFactory.java
+++ b/core/src/main/java/org/lflang/generator/GeneratorCommandFactory.java
@@ -145,9 +145,9 @@ public LFCommand createCommand(String cmd, List<String> args, Path dir, boolean
               + " is installed. "
               + "You can set PATH in ~/.bash_profile on Linux or Mac.";
       if (failOnError) {
-        errorReporter.reportError(message);
+        errorReporter.nowhere().error(message);
       } else {
-        errorReporter.reportWarning(message);
+          errorReporter.nowhere().warning(message);
       }
     }
 
diff --git a/core/src/main/java/org/lflang/generator/GeneratorUtils.java b/core/src/main/java/org/lflang/generator/GeneratorUtils.java
index 04ae33ba0c..6f0e217c48 100644
--- a/core/src/main/java/org/lflang/generator/GeneratorUtils.java
+++ b/core/src/main/java/org/lflang/generator/GeneratorUtils.java
@@ -175,9 +175,9 @@ public static boolean canGenerate(
     }
     // abort if there is no main reactor
     if (mainDef == null) {
-      errorReporter.reportInfo(
-          "INFO: The given Lingua Franca program does not define a main reactor. Therefore, no code"
-              + " was generated.");
+      errorReporter.nowhere().info(
+          "The given Lingua Franca program does not define a main reactor. Therefore, no code"
+                + " was generated.");
       context.finish(GeneratorResult.NOTHING);
       return false;
     }
diff --git a/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java b/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java
index fd818b45a5..061ba50d38 100644
--- a/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java
@@ -312,10 +312,10 @@ CodeBuilder generateCMakeCode(
             break;
           }
         default:
-          errorReporter.reportWarning(
-              "Using the flags target property with cmake is dangerous.\n"
-                  + " Use cmake-include instead.");
-          cMakeCode.pr("add_compile_options( " + compilerFlag + " )");
+            errorReporter.nowhere().warning(
+                "Using the flags target property with cmake is dangerous.\n"
+                          + " Use cmake-include instead.");
+            cMakeCode.pr("add_compile_options( " + compilerFlag + " )");
           cMakeCode.pr("add_link_options( " + compilerFlag + ")");
       }
     }
diff --git a/core/src/main/java/org/lflang/generator/c/CCompiler.java b/core/src/main/java/org/lflang/generator/c/CCompiler.java
index 7570cf4fd6..2af631b349 100644
--- a/core/src/main/java/org/lflang/generator/c/CCompiler.java
+++ b/core/src/main/java/org/lflang/generator/c/CCompiler.java
@@ -134,8 +134,8 @@ public boolean runCCompiler(GeneratorBase generator, LFGeneratorContext context)
     if (cMakeReturnCode != 0
         && context.getMode() == LFGeneratorContext.Mode.STANDALONE
         && !outputContainsKnownCMakeErrors(compile.getErrors())) {
-      errorReporter.reportError(
-          targetConfig.compiler + " failed with error code " + cMakeReturnCode);
+        errorReporter.nowhere().error(
+            targetConfig.compiler + " failed with error code " + cMakeReturnCode);
     }
 
     // For warnings (vs. errors), the return code is 0.
@@ -156,8 +156,8 @@ public boolean runCCompiler(GeneratorBase generator, LFGeneratorContext context)
       if (makeReturnCode != 0
           && context.getMode() == LFGeneratorContext.Mode.STANDALONE
           && !outputContainsKnownCMakeErrors(build.getErrors())) {
-        errorReporter.reportError(
-            targetConfig.compiler + " failed with error code " + makeReturnCode);
+          errorReporter.nowhere().error(
+              targetConfig.compiler + " failed with error code " + makeReturnCode);
       }
 
       // For warnings (vs. errors), the return code is 0.
@@ -181,7 +181,7 @@ public boolean runCCompiler(GeneratorBase generator, LFGeneratorContext context)
         LFCommand flash = buildWestFlashCommand();
         int flashRet = flash.run();
         if (flashRet != 0) {
-          errorReporter.reportError("West flash command failed with error code " + flashRet);
+            errorReporter.nowhere().error("West flash command failed with error code " + flashRet);
         } else {
           System.out.println("SUCCESS: Flashed application with west");
         }
@@ -201,11 +201,10 @@ public LFCommand compileCmakeCommand() {
     LFCommand command =
         commandFactory.createCommand("cmake", cmakeOptions(targetConfig, fileConfig), buildPath);
     if (command == null) {
-      errorReporter.reportError(
-          "The C/CCpp target requires CMAKE >= "
-              + CCmakeGenerator.MIN_CMAKE_VERSION
-              + " to compile the generated code. "
-              + "Auto-compiling can be disabled using the \"no-compile: true\" target property.");
+        errorReporter.nowhere().error("The C/CCpp target requires CMAKE >= "
+                  + CCmakeGenerator.MIN_CMAKE_VERSION
+                  + " to compile the generated code. "
+                  + "Auto-compiling can be disabled using the \"no-compile: true\" target property.");
     }
     return command;
   }
@@ -292,9 +291,9 @@ public LFCommand buildCmakeCommand() {
                 buildTypeToCmakeConfig(targetConfig.cmakeBuildType)),
             buildPath);
     if (command == null) {
-      errorReporter.reportError(
-          "The C/CCpp target requires CMAKE >= 3.5 to compile the generated code. "
-              + "Auto-compiling can be disabled using the \"no-compile: true\" target property.");
+        errorReporter.nowhere().error(
+            "The C/CCpp target requires CMAKE >= 3.5 to compile the generated code. "
+                  + "Auto-compiling can be disabled using the \"no-compile: true\" target property.");
     }
     return command;
   }
@@ -315,7 +314,7 @@ public LFCommand buildWestFlashCommand() {
       cmd = commandFactory.createCommand("west", List.of("flash"), buildPath);
     }
     if (cmd == null) {
-      errorReporter.reportError("Could not create west flash command.");
+        errorReporter.nowhere().error("Could not create west flash command.");
     }
 
     return cmd;
@@ -341,14 +340,13 @@ private boolean outputContainsKnownCMakeErrors(String CMakeOutput) {
     if (CMakeOutput.contains("The CMAKE_C_COMPILER is set to a C++ compiler")) {
       // If so, print an appropriate error message
       if (targetConfig.compiler != null) {
-        errorReporter.reportError(
-            "A C++ compiler was requested in the compiler target property."
-                + " Use the CCpp or the Cpp target instead.");
+          errorReporter.nowhere().error(
+              "A C++ compiler was requested in the compiler target property."
+                      + " Use the CCpp or the Cpp target instead.");
       } else {
-        errorReporter.reportError(
-            "\"A C++ compiler was detected."
-                + " The C target works best with a C compiler."
-                + " Use the CCpp or the Cpp target instead.\"");
+          errorReporter.nowhere().error("\"A C++ compiler was detected."
+                      + " The C target works best with a C compiler."
+                      + " Use the CCpp or the Cpp target instead.\"");
       }
       return true;
     }
@@ -416,9 +414,9 @@ public LFCommand compileCCommand(String fileToCompile, boolean noBinary) {
     LFCommand command =
         commandFactory.createCommand(targetConfig.compiler, compileArgs, fileConfig.getOutPath());
     if (command == null) {
-      errorReporter.reportError(
-          "The C/CCpp target requires GCC >= 7 to compile the generated code. "
-              + "Auto-compiling can be disabled using the \"no-compile: true\" target property.");
+        errorReporter.nowhere().error(
+            "The C/CCpp target requires GCC >= 7 to compile the generated code. "
+                  + "Auto-compiling can be disabled using the \"no-compile: true\" target property.");
     }
     return command;
   }
diff --git a/core/src/main/java/org/lflang/generator/c/CGenerator.java b/core/src/main/java/org/lflang/generator/c/CGenerator.java
index 7bed894341..cf1aee06a8 100644
--- a/core/src/main/java/org/lflang/generator/c/CGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CGenerator.java
@@ -49,6 +49,7 @@
 import org.eclipse.xtext.xbase.lib.Exceptions;
 import org.eclipse.xtext.xbase.lib.IterableExtensions;
 import org.eclipse.xtext.xbase.lib.StringExtensions;
+
 import org.lflang.FileConfig;
 import org.lflang.Target;
 import org.lflang.TargetConfig;
@@ -374,9 +375,9 @@ public void accommodatePhysicalActionsIfPresent() {
   protected boolean isOSCompatible() {
     if (GeneratorUtils.isHostWindows()) {
       if (CCppMode) {
-        errorReporter.reportError(
+        errorReporter.nowhere().error(
             "LF programs with a CCpp target are currently not supported on Windows. "
-                + "Exiting code generation.");
+                    + "Exiting code generation.");
         return false;
       }
     }
@@ -415,9 +416,11 @@ public void doGenerate(Resource resource, LFGeneratorContext context) {
       generateHeaders();
       code.writeToFile(targetFile);
     } catch (IOException e) {
-      errorReporter.reportError(e.getMessage());
+      String message = e.getMessage();
+      errorReporter.nowhere().error(message);
     } catch (RuntimeException e) {
-      errorReporter.reportError(e.getMessage());
+      String message = e.getMessage();
+      errorReporter.nowhere().error(message);
       throw e;
     }
 
@@ -827,7 +830,7 @@ protected void copyUserFiles(TargetConfig targetConfig, FileConfig fileConfig) {
             fileConfig.srcFile.getParent().resolve(targetConfig.fedSetupPreamble),
             destination.resolve(targetConfig.fedSetupPreamble));
       } catch (IOException e) {
-        errorReporter.reportError(
+        errorReporter.nowhere().error(
             "Failed to find _fed_setup file " + targetConfig.fedSetupPreamble);
       }
     }
@@ -938,7 +941,7 @@ private void pickCompilePlatform() {
     if (targetConfig.platformOptions.platform != Platform.AUTO) {
       osName = targetConfig.platformOptions.platform.toString();
     } else if (Stream.of("mac", "darwin", "win", "nux").noneMatch(osName::contains)) {
-      errorReporter.reportError("Platform " + osName + " is not supported");
+      errorReporter.nowhere().error("Platform " + osName + " is not supported");
     }
   }
 
@@ -1631,7 +1634,7 @@ public void processProtoFile(String filename) {
             List.of("--c_out=" + this.fileConfig.getSrcGenPath(), filename),
             fileConfig.srcPath);
     if (protoc == null) {
-      errorReporter.reportError("Processing .proto files requires protoc-c >= 1.3.3.");
+      errorReporter.nowhere().error("Processing .proto files requires protoc-c >= 1.3.3.");
       return;
     }
     var returnCode = protoc.run();
@@ -1644,7 +1647,7 @@ public void processProtoFile(String filename) {
       targetConfig.compileLibraries.add("protobuf-c");
       targetConfig.compilerFlags.add("-lprotobuf-c");
     } else {
-      errorReporter.reportError("protoc-c returns error code " + returnCode);
+      errorReporter.nowhere().error("protoc-c returns error code " + returnCode);
     }
   }
 
@@ -1979,9 +1982,9 @@ protected void setUpGeneralParameters() {
           PlatformOption.USER_THREADS.name(),
           String.valueOf(targetConfig.platformOptions.userThreads));
     } else if (targetConfig.platformOptions.userThreads > 0) {
-      errorReporter.reportWarning(
-          "Specifying user threads is only for threaded Lingua Franca on the Zephyr platform. This"
-              + " option will be ignored.");
+        errorReporter.nowhere().warning(
+            "Specifying user threads is only for threaded Lingua Franca on the Zephyr platform. This"
+                  + " option will be ignored.");
     }
 
     if (targetConfig.threading) { // FIXME: This logic is duplicated in CMake
@@ -2099,7 +2102,7 @@ private void createMainReactorInstance() {
             new ReactorInstance(toDefinition(mainDef.getReactorClass()), errorReporter, reactors);
         var reactionInstanceGraph = this.main.assignLevels();
         if (reactionInstanceGraph.nodeCount() > 0) {
-          errorReporter.reportError("Main reactor has causality cycles. Skipping code generation.");
+          errorReporter.nowhere().error("Main reactor has causality cycles. Skipping code generation.");
           return;
         }
         if (hasDeadlines) {
@@ -2108,7 +2111,7 @@ private void createMainReactorInstance() {
         // Inform the run-time of the breadth/parallelism of the reaction graph
         var breadth = reactionInstanceGraph.getBreadth();
         if (breadth == 0) {
-          errorReporter.reportWarning("The program has no reactions");
+            errorReporter.nowhere().warning("The program has no reactions");
         } else {
           targetConfig.compileDefinitions.put(
               "LF_REACTION_GRAPH_BREADTH", String.valueOf(reactionInstanceGraph.getBreadth()));
diff --git a/core/src/main/java/org/lflang/generator/c/CUtil.java b/core/src/main/java/org/lflang/generator/c/CUtil.java
index f526bb76f1..590797a769 100644
--- a/core/src/main/java/org/lflang/generator/c/CUtil.java
+++ b/core/src/main/java/org/lflang/generator/c/CUtil.java
@@ -619,13 +619,14 @@ public static void runBuildCommand(
     for (LFCommand cmd : commands) {
       int returnCode = cmd.run();
       if (returnCode != 0 && mode != LFGeneratorContext.Mode.EPOCH) {
-        errorReporter.reportError(
-            String.format(
-                // FIXME: Why is the content of stderr not provided to the user in this error
-                // message?
-                "Build command \"%s\" failed with error code %d.",
-                targetConfig.buildCommands, returnCode));
-        return;
+          // FIXME: Why is the content of stderr not provided to the user in this error
+          // message?
+          errorReporter.nowhere().error(String.format(
+                      // FIXME: Why is the content of stderr not provided to the user in this error
+                      // message?
+                      "Build command \"%s\" failed with error code %d.",
+                      targetConfig.buildCommands, returnCode));
+          return;
       }
       // For warnings (vs. errors), the return code is 0.
       // But we still want to mark the IDE.
diff --git a/core/src/main/java/org/lflang/generator/python/PythonGenerator.java b/core/src/main/java/org/lflang/generator/python/PythonGenerator.java
index 91fdfaffad..6da6e6a8c5 100644
--- a/core/src/main/java/org/lflang/generator/python/PythonGenerator.java
+++ b/core/src/main/java/org/lflang/generator/python/PythonGenerator.java
@@ -303,14 +303,14 @@ public void processProtoFile(String filename) {
             fileConfig.srcPath);
 
     if (protoc == null) {
-      errorReporter.reportError("Processing .proto files requires libprotoc >= 3.6.1");
-      return;
+        errorReporter.nowhere().error("Processing .proto files requires libprotoc >= 3.6.1");
+        return;
     }
     int returnCode = protoc.run();
     if (returnCode == 0) {
       pythonRequiredModules.add("google-api-python-client");
     } else {
-      errorReporter.reportError("protoc returns error code " + returnCode);
+        errorReporter.nowhere().error("protoc returns error code " + returnCode);
     }
   }
 
diff --git a/core/src/main/java/org/lflang/generator/python/PythonValidator.java b/core/src/main/java/org/lflang/generator/python/PythonValidator.java
index 7d040bace0..fa2584ce4c 100644
--- a/core/src/main/java/org/lflang/generator/python/PythonValidator.java
+++ b/core/src/main/java/org/lflang/generator/python/PythonValidator.java
@@ -337,10 +337,10 @@ public Strategy getOutputReportingStrategy() {
               } catch (JsonProcessingException e) {
                 System.err.printf("Failed to parse \"%s\":%n", validationOutput);
                 e.printStackTrace();
-                errorReporter.reportWarning(
+                errorReporter.nowhere().warning(
                     "Failed to parse linter output. The Lingua Franca code generator is tested with"
-                        + " Pylint version 2.12.2. Consider updating Pylint if you have an older"
-                        + " version.");
+                                    + " Pylint version 2.12.2. Consider updating Pylint if you have an older"
+                                    + " version.");
               }
             };
           }
diff --git a/core/src/main/java/org/lflang/util/ArduinoUtil.java b/core/src/main/java/org/lflang/util/ArduinoUtil.java
index af741da7f2..e749a0568a 100644
--- a/core/src/main/java/org/lflang/util/ArduinoUtil.java
+++ b/core/src/main/java/org/lflang/util/ArduinoUtil.java
@@ -110,8 +110,8 @@ public void buildArduino(FileConfig fileConfig, TargetConfig targetConfig) {
       int retCode = 0;
       retCode = command.run(context.getCancelIndicator());
       if (retCode != 0 && context.getMode() == LFGeneratorContext.Mode.STANDALONE) {
-        errorReporter.reportError("arduino-cli failed with error code " + retCode);
-        throw new IOException("arduino-cli failure");
+          errorReporter.nowhere().error("arduino-cli failed with error code " + retCode);
+          throw new IOException("arduino-cli failure");
       }
     } catch (IOException e) {
       Exceptions.sneakyThrow(e);
@@ -132,16 +132,17 @@ public void buildArduino(FileConfig fileConfig, TargetConfig targetConfig) {
                     targetConfig.platformOptions.port),
                 fileConfig.getSrcGenPath());
         if (flash == null) {
-          errorReporter.reportError("Could not create arduino-cli flash command.");
+            errorReporter.nowhere().error("Could not create arduino-cli flash command.");
         }
         int flashRet = flash.run();
         if (flashRet != 0) {
-          errorReporter.reportError("arduino-cli flash command failed with error code " + flashRet);
+            errorReporter.nowhere().error(
+                "arduino-cli flash command failed with error code " + flashRet);
         } else {
           System.out.println("SUCCESS: Flashed board using arduino-cli");
         }
       } else {
-        errorReporter.reportError("Need to provide a port on which to automatically flash.");
+          errorReporter.nowhere().error("Need to provide a port on which to automatically flash.");
       }
     } else {
       System.out.println("********");
diff --git a/core/src/main/java/org/lflang/util/FileUtil.java b/core/src/main/java/org/lflang/util/FileUtil.java
index 23108c7375..0b12105dfc 100644
--- a/core/src/main/java/org/lflang/util/FileUtil.java
+++ b/core/src/main/java/org/lflang/util/FileUtil.java
@@ -327,11 +327,11 @@ public static void copyFilesOrDirectories(
           }
           System.out.println("Copied '" + fileOrDirectory + "' from the file system.");
         } catch (IOException e) {
-          errorReporter.reportError(
-              "Unable to copy '"
-                  + fileOrDirectory
-                  + "' from the file system. Reason: "
-                  + e.toString());
+            String message = "Unable to copy '"
+                + fileOrDirectory
+                + "' from the file system. Reason: "
+                + e.toString();
+            errorReporter.nowhere().error(message);
         }
       } else {
         try {
@@ -342,11 +342,11 @@ public static void copyFilesOrDirectories(
             System.out.println("Copied '" + fileOrDirectory + "' from the class path.");
           }
         } catch (IOException e) {
-          errorReporter.reportError(
-              "Unable to copy '"
-                  + fileOrDirectory
-                  + "' from the class path. Reason: "
-                  + e.toString());
+            String message = "Unable to copy '"
+                + fileOrDirectory
+                + "' from the class path. Reason: "
+                + e.toString();
+            errorReporter.nowhere().error(message);
         }
       }
     }
diff --git a/core/src/main/java/org/lflang/validation/LFValidator.java b/core/src/main/java/org/lflang/validation/LFValidator.java
index d228a2dba6..31afa8e1ac 100644
--- a/core/src/main/java/org/lflang/validation/LFValidator.java
+++ b/core/src/main/java/org/lflang/validation/LFValidator.java
@@ -1076,7 +1076,7 @@ public void checkTargetDecl(TargetDecl target) throws IOException {
     }
     String lfFileName = FileUtil.nameWithoutExtension(target.eResource());
     if (Character.isDigit(lfFileName.charAt(0))) {
-      errorReporter.reportError("LF file names must not start with a number");
+        errorReporter.nowhere().error("LF file names must not start with a number");
     }
   }
 
diff --git a/core/src/main/kotlin/org/lflang/generator/cpp/CppRos2Generator.kt b/core/src/main/kotlin/org/lflang/generator/cpp/CppRos2Generator.kt
index a689a53c88..ac0184707b 100644
--- a/core/src/main/kotlin/org/lflang/generator/cpp/CppRos2Generator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/cpp/CppRos2Generator.kt
@@ -39,7 +39,8 @@ class CppRos2Generator(generator: CppGenerator) : CppPlatformGenerator(generator
         val ros2Version = System.getenv("ROS_DISTRO")
 
         if (ros2Version.isNullOrBlank()) {
-            errorReporter.reportError(
+            errorReporter.nowhere(
+            ).error(
                 "Could not find a ROS2 installation! Please install ROS2 and source the setup script. " +
                         "Also see https://docs.ros.org/en/galactic/Installation.html"
             )
@@ -61,7 +62,7 @@ class CppRos2Generator(generator: CppGenerator) : CppPlatformGenerator(generator
         val returnCode = colconCommand?.run(context.cancelIndicator);
         if (returnCode != 0 && !errorReporter.errorsOccurred) {
             // If errors occurred but none were reported, then the following message is the best we can do.
-            errorReporter.reportError("colcon failed with error code $returnCode")
+            errorReporter.nowhere().error("colcon failed with error code $returnCode")
         }
 
         return !errorReporter.errorsOccurred
diff --git a/core/src/main/kotlin/org/lflang/generator/cpp/CppStandaloneGenerator.kt b/core/src/main/kotlin/org/lflang/generator/cpp/CppStandaloneGenerator.kt
index bbe3826bb0..7d470bc2bf 100644
--- a/core/src/main/kotlin/org/lflang/generator/cpp/CppStandaloneGenerator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/cpp/CppStandaloneGenerator.kt
@@ -79,11 +79,11 @@ class CppStandaloneGenerator(generator: CppGenerator) :
                 }
                 if ((makeReturnCode != 0 || installReturnCode != 0) && !errorReporter.errorsOccurred) {
                     // If errors occurred but none were reported, then the following message is the best we can do.
-                    errorReporter.reportError("make failed with error code $makeReturnCode")
+                    errorReporter.nowhere().error("make failed with error code $makeReturnCode")
                 }
             }
             if (cmakeReturnCode != 0) {
-                errorReporter.reportError("cmake failed with error code $cmakeReturnCode")
+                errorReporter.nowhere().error("cmake failed with error code $cmakeReturnCode")
             }
         }
         return !errorReporter.errorsOccurred
@@ -98,7 +98,8 @@ class CppStandaloneGenerator(generator: CppGenerator) :
             version = regex.find(cmd.output.toString())?.value
         }
         if (version == null || version.compareVersion("3.5.0") < 0) {
-            errorReporter.reportError(
+            errorReporter.nowhere(
+            ).error(
                 "The C++ target requires CMAKE >= 3.5.0 to compile the generated code. " +
                         "Auto-compiling can be disabled using the \"no-compile: true\" target property."
             )
@@ -138,7 +139,7 @@ class CppStandaloneGenerator(generator: CppGenerator) :
     private fun createMakeCommand(buildPath: Path, version: String, target: String): LFCommand {
         val makeArgs: List<String>
         if (version.compareVersion("3.12.0") < 0) {
-            errorReporter.reportWarning("CMAKE is older than version 3.12. Parallel building is not supported.")
+            errorReporter.nowhere().warning("CMAKE is older than version 3.12. Parallel building is not supported.")
             makeArgs =
                 listOf("--build", ".", "--target", target, "--config", targetConfig.cmakeBuildType?.toString() ?: "Release")
         } else {
diff --git a/core/src/main/kotlin/org/lflang/generator/rust/RustGenerator.kt b/core/src/main/kotlin/org/lflang/generator/rust/RustGenerator.kt
index c8f50d9b56..007d606620 100644
--- a/core/src/main/kotlin/org/lflang/generator/rust/RustGenerator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/rust/RustGenerator.kt
@@ -25,7 +25,6 @@
 package org.lflang.generator.rust
 
 import org.eclipse.emf.ecore.resource.Resource
-import org.lflang.ErrorReporter
 import org.lflang.Target
 import org.lflang.TargetProperty.BuildType
 import org.lflang.generator.GeneratorUtils.canGenerate
@@ -143,9 +142,12 @@ class RustGenerator(
         } else if (context.cancelIndicator.isCanceled) {
             context.finish(GeneratorResult.CANCELLED)
         } else {
-            if (!errorsOccurred()) errorReporter.reportError(
-                "cargo failed with error code $cargoReturnCode and reported the following error(s):\n${cargoCommand.errors}"
-            )
+            if (!errorsOccurred()) {
+                errorReporter.nowhere(
+                ).error(
+                    "cargo failed with error code $cargoReturnCode and reported the following error(s):\n${cargoCommand.errors}"
+                )
+            }
             context.finish(GeneratorResult.FAILED)
         }
     }
diff --git a/core/src/main/kotlin/org/lflang/generator/rust/RustModel.kt b/core/src/main/kotlin/org/lflang/generator/rust/RustModel.kt
index 0238beca0c..e5f58e40c2 100644
--- a/core/src/main/kotlin/org/lflang/generator/rust/RustModel.kt
+++ b/core/src/main/kotlin/org/lflang/generator/rust/RustModel.kt
@@ -465,7 +465,7 @@ object RustModelBuilder {
                 // Print info to reduce surprise. If the env var is not set,
                 // the runtime will be fetched from the internet by Cargo. If
                 // the value is incorrect, Cargo will crash.
-                errorReporter.reportInfo("Using the Rust runtime from environment variable LOCAL_RUST_REACTOR_RT=$it")
+                errorReporter.nowhere().info("Using the Rust runtime from environment variable LOCAL_RUST_REACTOR_RT=$it")
             }
 
             if (localPath == null) {
@@ -510,7 +510,7 @@ object RustModelBuilder {
             }
 
             if (!targetConfig.threading && PARALLEL_RT_FEATURE in userSpec.features) {
-                errorReporter.reportWarning("Threading cannot be disabled as it was enabled manually as a runtime feature.")
+                errorReporter.nowhere().warning("Threading cannot be disabled as it was enabled manually as a runtime feature.")
             }
 
             return userSpec
diff --git a/core/src/main/kotlin/org/lflang/generator/ts/TSGenerator.kt b/core/src/main/kotlin/org/lflang/generator/ts/TSGenerator.kt
index af7e445c16..ba17bbc769 100644
--- a/core/src/main/kotlin/org/lflang/generator/ts/TSGenerator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/ts/TSGenerator.kt
@@ -309,14 +309,16 @@ class TSGenerator(
             }
             installProtoBufsIfNeeded(true, path, context.cancelIndicator)
         } else {
-            errorReporter.reportWarning(
+            errorReporter.nowhere(
+            ).warning(
                 "Falling back on npm. To prevent an accumulation of replicated dependencies, " +
-                        "it is highly recommended to install pnpm globally (npm install -g pnpm).")
+                        "it is highly recommended to install pnpm globally (npm install -g pnpm)."
+            )
 
             val npmInstall = commandFactory.createCommand("npm", if (production) listOf("install", "--production") else listOf("install"), path)
 
             if (npmInstall == null) {
-                errorReporter.reportError(NO_NPM_MESSAGE)
+                errorReporter.nowhere().error(NO_NPM_MESSAGE)
                 return
             }
 
@@ -378,7 +380,7 @@ class TSGenerator(
         val protoc = commandFactory.createCommand("protoc", protocArgs, fileConfig.srcPath)
 
         if (protoc == null) {
-            errorReporter.reportError("Processing .proto files requires libprotoc >= 3.6.1.")
+            errorReporter.nowhere().error("Processing .proto files requires libprotoc >= 3.6.1.")
             return
         }
 
@@ -393,7 +395,7 @@ class TSGenerator(
 //                targetConfig.compileLibraries.add('-l')
 //                targetConfig.compileLibraries.add('protobuf-c')
         } else {
-            errorReporter.reportError("protoc failed with error code $returnCode.")
+            errorReporter.nowhere().error("protoc failed with error code $returnCode.")
         }
         // FIXME: report errors from this command.
     }
@@ -419,14 +421,14 @@ class TSGenerator(
         val tsc = commandFactory.createCommand("npm", listOf("run", "build"), fileConfig.srcGenPkgPath)
 
         if (tsc == null) {
-            errorReporter.reportError(NO_NPM_MESSAGE)
+            errorReporter.nowhere().error(NO_NPM_MESSAGE)
             return
         }
 
         if (validator.run(tsc, cancelIndicator) == 0) {
             println("SUCCESS (compiling generated TypeScript code)")
         } else {
-            errorReporter.reportError("Compiler failed with the following errors:\n${tsc.errors}")
+            errorReporter.nowhere().error("Compiler failed with the following errors:\n${tsc.errors}")
         }
     }
 
diff --git a/core/src/main/kotlin/org/lflang/generator/ts/TSReactionGenerator.kt b/core/src/main/kotlin/org/lflang/generator/ts/TSReactionGenerator.kt
index b82e1d20af..d32e0a9860 100644
--- a/core/src/main/kotlin/org/lflang/generator/ts/TSReactionGenerator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/ts/TSReactionGenerator.kt
@@ -136,7 +136,11 @@ class TSReactionGenerator(
             is Timer  -> "__Tag"
             is Action -> (trigOrSource.variable as Action).tsActionType
             is Port   -> (trigOrSource.variable as Port).tsPortType
-            else      -> errorReporter.reportError("Invalid trigger: ${trigOrSource.variable.name}")
+            else      -> {
+                val message = "Invalid trigger: ${trigOrSource.variable.name}"
+                errorReporter.nowhere().error(message)
+                message
+            }
         }
 
         val portClassType = if (trigOrSource.variable.isMultiport) {
@@ -298,7 +302,7 @@ class TSReactionGenerator(
             val functArg = effect.generateVarRef()
             when (val effectVar = effect.variable) {
                 is Timer  -> {
-                    errorReporter.reportError("A timer cannot be an effect of a reaction")
+                    errorReporter.nowhere().error("A timer cannot be an effect of a reaction")
                 }
 
                 is Action -> {

From f4c249eed3bef3e8399030939cae043b5b0f72b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Fournier?= <clement.fournier@tu-dresden.de>
Date: Tue, 13 Jun 2023 14:14:29 +0200
Subject: [PATCH 07/17] More updates...

---
 .../main/java/org/lflang/ErrorReporter.java   | 12 ----------
 core/src/main/java/org/lflang/ModelInfo.java  |  4 ++--
 .../main/java/org/lflang/TargetProperty.java  |  8 ++++---
 .../federated/generator/FedGenerator.java     |  8 +++----
 .../federated/generator/FedMainEmitter.java   |  5 ++--
 .../federated/generator/FederateInstance.java |  5 ++--
 .../federated/validation/FedValidator.java    |  6 ++---
 .../org/lflang/generator/GeneratorBase.java   |  9 ++++----
 .../org/lflang/generator/PortInstance.java    |  5 ++--
 .../org/lflang/generator/ReactorInstance.java | 11 +++++----
 .../org/lflang/generator/TimerInstance.java   |  8 +++++--
 .../lflang/generator/c/CPortGenerator.java    |  5 ++--
 .../generator/c/CReactionGenerator.java       | 12 +++++-----
 .../generator/c/CWatchdogGenerator.java       |  9 ++++----
 .../python/PythonReactionGenerator.java       | 10 ++++----
 .../generator/rust/CargoDependencySpec.java   |  9 +++++++-
 .../generator/rust/RustTargetConfig.java      | 10 ++++----
 .../generator/cpp/CppActionGenerator.kt       | 12 ++++++----
 .../generator/cpp/CppInstanceGenerator.kt     |  4 ++--
 .../org/lflang/generator/ts/TSGenerator.kt    | 23 +++++++++----------
 .../lflang/generator/ts/TSReactorGenerator.kt | 12 ----------
 21 files changed, 89 insertions(+), 98 deletions(-)

diff --git a/core/src/main/java/org/lflang/ErrorReporter.java b/core/src/main/java/org/lflang/ErrorReporter.java
index b45a5e171e..0f8e7509f9 100644
--- a/core/src/main/java/org/lflang/ErrorReporter.java
+++ b/core/src/main/java/org/lflang/ErrorReporter.java
@@ -78,18 +78,6 @@ default void info(String message) {
   }
 
 
-  /**
-   * Report an error on the specified parse tree object.
-   *
-   * @param object The parse tree object.
-   * @param message The error message.
-   * @return a string that describes the error.
-   */
-  default String reportError(EObject object, String message) {
-    at(object).error(message);
-    return message;
-  }
-
   /**
    * Report a warning on the specified parse tree object.
    *
diff --git a/core/src/main/java/org/lflang/ModelInfo.java b/core/src/main/java/org/lflang/ModelInfo.java
index 17ee7cfb76..6bacd33a0e 100644
--- a/core/src/main/java/org/lflang/ModelInfo.java
+++ b/core/src/main/java/org/lflang/ModelInfo.java
@@ -35,6 +35,7 @@
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Set;
+
 import org.lflang.ast.ASTUtils;
 import org.lflang.generator.NamedInstance;
 import org.lflang.generator.ReactorInstance;
@@ -145,8 +146,7 @@ public void checkCaseInsensitiveNameCollisions(Model model, ErrorReporter report
           .filter(it -> getName(it).toLowerCase().equals(badName))
           .forEach(
               it ->
-                  reporter.reportError(
-                      it, "Multiple reactors have the same name up to case differences."));
+                  reporter.at(it).error("Multiple reactors have the same name up to case differences."));
     }
   }
 
diff --git a/core/src/main/java/org/lflang/TargetProperty.java b/core/src/main/java/org/lflang/TargetProperty.java
index 92832e6214..00aefd43b2 100644
--- a/core/src/main/java/org/lflang/TargetProperty.java
+++ b/core/src/main/java/org/lflang/TargetProperty.java
@@ -35,6 +35,8 @@
 import java.util.Optional;
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
+
+import org.eclipse.emf.ecore.EObject;
 import org.eclipse.xtext.util.RuntimeIOException;
 import org.lflang.TargetConfig.DockerOptions;
 import org.lflang.TargetConfig.PlatformOptions;
@@ -718,8 +720,8 @@ else if (paths.size() == 1) {
         try {
           referencePath = FileUtil.toPath(value.eResource().getURI()).toAbsolutePath();
         } catch (IOException e) {
-          err.reportError(value, "Invalid path? " + e.getMessage());
-          throw new RuntimeIOException(e);
+            err.at(value).error("Invalid path? " + e.getMessage());
+            throw new RuntimeIOException(e);
         }
 
         // we'll resolve relative paths to check that the files
@@ -951,7 +953,7 @@ public static void set(TargetConfig config, List<KeyValuePair> properties, Error
             try {
               p.setter.parseIntoTargetConfig(config, property.getValue(), err);
             } catch (InvalidLfSourceException e) {
-              err.reportError(e.getNode(), e.getProblem());
+                err.at(e.getNode()).error(e.getProblem());
             }
           }
         });
diff --git a/core/src/main/java/org/lflang/federated/generator/FedGenerator.java b/core/src/main/java/org/lflang/federated/generator/FedGenerator.java
index acbec3dadf..f97b81cf05 100644
--- a/core/src/main/java/org/lflang/federated/generator/FedGenerator.java
+++ b/core/src/main/java/org/lflang/federated/generator/FedGenerator.java
@@ -21,6 +21,7 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.xtext.generator.JavaIoFileSystemAccess;
 import org.eclipse.xtext.resource.XtextResource;
@@ -414,8 +415,7 @@ private void analyzeFederates(Reactor federation, LFGeneratorContext context) {
     for (Instantiation instantiation : ASTUtils.allInstantiations(federation)) {
       int bankWidth = ASTUtils.width(instantiation.getWidthSpec(), mainReactorContext);
       if (bankWidth < 0) {
-        errorReporter.reportError(
-            instantiation, "Cannot determine bank width! Assuming width of 1.");
+        errorReporter.at(instantiation).error("Cannot determine bank width! Assuming width of 1.");
         // Continue with a bank width of 1.
         bankWidth = 1;
       }
@@ -509,8 +509,8 @@ private void replaceConnectionFromOutputPort(PortInstance output) {
     for (SendRange srcRange : output.getDependentPorts()) {
       if (srcRange.connection == null) {
         // This should not happen.
-        errorReporter.reportError(
-            output.getDefinition(), "Unexpected error. Cannot find output connection for port");
+        EObject object = output.getDefinition();
+        errorReporter.at(object).error("Unexpected error. Cannot find output connection for port");
         continue;
       }
       // Iterate through destinations
diff --git a/core/src/main/java/org/lflang/federated/generator/FedMainEmitter.java b/core/src/main/java/org/lflang/federated/generator/FedMainEmitter.java
index 86ce4f02b9..9d132d412a 100644
--- a/core/src/main/java/org/lflang/federated/generator/FedMainEmitter.java
+++ b/core/src/main/java/org/lflang/federated/generator/FedMainEmitter.java
@@ -24,9 +24,8 @@ String generateMainReactor(
       FederateInstance federate, Reactor originalMainReactor, ErrorReporter errorReporter) {
     // FIXME: Handle modes at the top-level
     if (!ASTUtils.allModes(originalMainReactor).isEmpty()) {
-      errorReporter.reportError(
-          ASTUtils.allModes(originalMainReactor).stream().findFirst().get(),
-          "Modes at the top level are not supported under federated execution.");
+        errorReporter.at(ASTUtils.allModes(originalMainReactor).stream().findFirst().get())
+            .error("Modes at the top level are not supported under federated execution.");
     }
     var renderer = FormattingUtils.renderer(federate.targetConfig.target);
 
diff --git a/core/src/main/java/org/lflang/federated/generator/FederateInstance.java b/core/src/main/java/org/lflang/federated/generator/FederateInstance.java
index ee3c0a46f0..f59085cc00 100644
--- a/core/src/main/java/org/lflang/federated/generator/FederateInstance.java
+++ b/core/src/main/java/org/lflang/federated/generator/FederateInstance.java
@@ -510,9 +510,8 @@ private boolean containsAllVarRefs(Iterable<VarRef> varRefs) {
         referencesFederate = true;
       } else {
         if (referencesFederate) {
-          errorReporter.reportError(
-              varRef,
-              "Mixed triggers and effects from" + " different federates. This is not permitted");
+            errorReporter.at(varRef).error(
+                "Mixed triggers and effects from" + " different federates. This is not permitted");
         }
         inFederate = false;
       }
diff --git a/core/src/main/java/org/lflang/federated/validation/FedValidator.java b/core/src/main/java/org/lflang/federated/validation/FedValidator.java
index 9aeb535d2f..40c9d4bdcb 100644
--- a/core/src/main/java/org/lflang/federated/validation/FedValidator.java
+++ b/core/src/main/java/org/lflang/federated/validation/FedValidator.java
@@ -3,6 +3,7 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Stream;
+
 import org.lflang.ErrorReporter;
 import org.lflang.ast.ASTUtils;
 import org.lflang.lf.Input;
@@ -57,9 +58,8 @@ private static void containsAllVarRefs(List<VarRef> varRefs, ErrorReporter error
         instantiation = varRef.getContainer();
         referencesFederate = true;
       } else if (!varRef.getContainer().equals(instantiation)) {
-        errorReporter.reportError(
-            varRef,
-            "Mixed triggers and effects from" + " different federates. This is not permitted");
+          errorReporter.at(varRef).error(
+              "Mixed triggers and effects from" + " different federates. This is not permitted");
       }
     }
   }
diff --git a/core/src/main/java/org/lflang/generator/GeneratorBase.java b/core/src/main/java/org/lflang/generator/GeneratorBase.java
index 6a5c189744..c35b1531d9 100644
--- a/core/src/main/java/org/lflang/generator/GeneratorBase.java
+++ b/core/src/main/java/org/lflang/generator/GeneratorBase.java
@@ -228,8 +228,8 @@ public void doGenerate(Resource resource, LFGeneratorContext context) {
     // Check if there are any conflicting main reactors elsewhere in the package.
     if (Objects.equal(context.getMode(), LFGeneratorContext.Mode.STANDALONE) && mainDef != null) {
       for (String conflict : new MainConflictChecker(context.getFileConfig()).conflicts) {
-        errorReporter.reportError(
-            this.mainDef.getReactorClass(), "Conflicting main reactor in " + conflict);
+        EObject object = this.mainDef.getReactorClass();
+        errorReporter.at(object).error("Conflicting main reactor in " + conflict);
       }
     }
 
@@ -458,10 +458,9 @@ private void transformConflictingConnectionsInModalReactors() {
               || connection.isIterated()
               || connection.getLeftPorts().size() > 1
               || connection.getRightPorts().size() > 1) {
-            errorReporter.reportError(
-                connection,
+            errorReporter.at(connection).error(
                 "Cannot transform connection in modal reactor. Connection uses currently not"
-                    + " supported features.");
+                            + " supported features.");
           } else {
             var reaction = factory.createReaction();
             ((Mode) connection.eContainer()).getReactions().add(reaction);
diff --git a/core/src/main/java/org/lflang/generator/PortInstance.java b/core/src/main/java/org/lflang/generator/PortInstance.java
index 60a904ef5b..7d88cdd28d 100644
--- a/core/src/main/java/org/lflang/generator/PortInstance.java
+++ b/core/src/main/java/org/lflang/generator/PortInstance.java
@@ -29,6 +29,7 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.PriorityQueue;
+
 import org.lflang.ErrorReporter;
 import org.lflang.lf.Input;
 import org.lflang.lf.Output;
@@ -396,8 +397,8 @@ private void setInitialWidth(ErrorReporter errorReporter) {
 
     if (widthSpec != null) {
       if (widthSpec.isOfVariableLength()) {
-        errorReporter.reportError(
-            definition, "Variable-width multiports not supported (yet): " + definition.getName());
+          String message = "Variable-width multiports not supported (yet): " + definition.getName();
+          errorReporter.at(definition).error(message);
       } else {
         isMultiport = true;
 
diff --git a/core/src/main/java/org/lflang/generator/ReactorInstance.java b/core/src/main/java/org/lflang/generator/ReactorInstance.java
index 5a1fdf4b8d..a2d98ab7b5 100644
--- a/core/src/main/java/org/lflang/generator/ReactorInstance.java
+++ b/core/src/main/java/org/lflang/generator/ReactorInstance.java
@@ -35,6 +35,7 @@
 import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
+
 import org.lflang.AttributeUtils;
 import org.lflang.ErrorReporter;
 import org.lflang.TimeValue;
@@ -829,14 +830,14 @@ public ReactorInstance(
 
     this.recursive = foundSelfAsParent;
     if (recursive) {
-      reporter.reportError(definition, "Recursive reactor instantiation.");
+        reporter.at(definition).error("Recursive reactor instantiation.");
     }
 
     // If the reactor definition is null, give up here. Otherwise, diagram generation
     // will fail an NPE.
     if (reactorDefinition == null) {
-      reporter.reportError(definition, "Reactor instantiation has no matching reactor definition.");
-      return;
+        reporter.at(definition).error("Reactor instantiation has no matching reactor definition.");
+        return;
     }
 
     setInitialWidth();
@@ -1053,8 +1054,8 @@ private List<RuntimeRange<PortInstance>> listPortInstances(
     for (VarRef portRef : references) {
       // Simple error checking first.
       if (!(portRef.getVariable() instanceof Port)) {
-        reporter.reportError(portRef, "Not a port.");
-        return result;
+          reporter.at(portRef).error("Not a port.");
+          return result;
       }
       // First, figure out which reactor we are dealing with.
       // The reactor we want is the container of the port.
diff --git a/core/src/main/java/org/lflang/generator/TimerInstance.java b/core/src/main/java/org/lflang/generator/TimerInstance.java
index b25552bb6c..38dc374bf6 100644
--- a/core/src/main/java/org/lflang/generator/TimerInstance.java
+++ b/core/src/main/java/org/lflang/generator/TimerInstance.java
@@ -26,6 +26,8 @@
 
 package org.lflang.generator;
 
+import org.eclipse.emf.ecore.EObject;
+
 import org.lflang.TimeValue;
 import org.lflang.lf.Timer;
 
@@ -63,14 +65,16 @@ public TimerInstance(Timer definition, ReactorInstance parent) {
         try {
           this.offset = parent.getTimeValue(definition.getOffset());
         } catch (IllegalArgumentException ex) {
-          parent.reporter.reportError(definition.getOffset(), "Invalid time.");
+            EObject object = definition.getOffset();
+            parent.reporter.at(object).error("Invalid time.");
         }
       }
       if (definition.getPeriod() != null) {
         try {
           this.period = parent.getTimeValue(definition.getPeriod());
         } catch (IllegalArgumentException ex) {
-          parent.reporter.reportError(definition.getPeriod(), "Invalid time.");
+            EObject object = definition.getPeriod();
+            parent.reporter.at(object).error("Invalid time.");
         }
       }
     }
diff --git a/core/src/main/java/org/lflang/generator/c/CPortGenerator.java b/core/src/main/java/org/lflang/generator/c/CPortGenerator.java
index 53ccc24af3..e8a195b98f 100644
--- a/core/src/main/java/org/lflang/generator/c/CPortGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CPortGenerator.java
@@ -197,8 +197,9 @@ private static String valueDeclaration(
       CTypes types) {
     if (port.getType() == null && target.requiresTypes) {
       // This should have been caught by the validator.
-      errorReporter.reportError(port, "Port is required to have a type: " + port.getName());
-      return "";
+        String message = "Port is required to have a type: " + port.getName();
+        errorReporter.at(port).error(message);
+        return "";
     }
     // Do not convert to lf_token_t* using lfTypeToTokenType because there
     // will be a separate field pointing to the token.
diff --git a/core/src/main/java/org/lflang/generator/c/CReactionGenerator.java b/core/src/main/java/org/lflang/generator/c/CReactionGenerator.java
index 824dc97ee6..5aaa6599e8 100644
--- a/core/src/main/java/org/lflang/generator/c/CReactionGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CReactionGenerator.java
@@ -9,6 +9,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+
 import org.lflang.ErrorReporter;
 import org.lflang.InferredType;
 import org.lflang.TargetConfig;
@@ -189,8 +190,8 @@ public static String generateInitializationForReaction(
                         : "reset_transition")
                     + ";");
           } else {
-            errorReporter.reportError(
-                reaction, "In generateReaction(): " + name + " not a valid mode of this reactor.");
+              errorReporter.at(reaction).error(
+                  "In generateReaction(): " + name + " not a valid mode of this reactor.");
           }
         } else {
           if (variable instanceof Output) {
@@ -207,8 +208,7 @@ public static String generateInitializationForReaction(
           } else if (variable instanceof Watchdog) {
             reactionInitialization.pr(generateWatchdogVariablesInReaction(effect));
           } else {
-            errorReporter.reportError(
-                reaction, "In generateReaction(): effect is not an input, output, or watchdog.");
+              errorReporter.at(reaction).error("In generateReaction(): effect is not an input, output, or watchdog.");
           }
         }
       }
@@ -767,8 +767,8 @@ public static String generateOutputVariablesInReaction(
     String outputName = output.getName();
     String outputWidth = generateWidthVariable(outputName);
     if (output.getType() == null && requiresTypes) {
-      errorReporter.reportError(output, "Output is required to have a type: " + outputName);
-      return "";
+        errorReporter.at(output).error("Output is required to have a type: " + outputName);
+        return "";
     } else {
       // The container of the output may be a contained reactor or
       // the reactor containing the reaction.
diff --git a/core/src/main/java/org/lflang/generator/c/CWatchdogGenerator.java b/core/src/main/java/org/lflang/generator/c/CWatchdogGenerator.java
index f864ca2661..7379bce5ee 100644
--- a/core/src/main/java/org/lflang/generator/c/CWatchdogGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CWatchdogGenerator.java
@@ -9,6 +9,7 @@
 package org.lflang.generator.c;
 
 import java.util.List;
+
 import org.lflang.ErrorReporter;
 import org.lflang.ast.ASTUtils;
 import org.lflang.generator.CodeBuilder;
@@ -225,11 +226,9 @@ private static String generateInitializationForWatchdog(
                         : "reset_transition")
                     + ";");
           } else {
-            errorReporter.reportError(
-                watchdog,
-                "In generateInitializationForWatchdog(): "
-                    + name
-                    + " not a valid mode of this reactor.");
+              errorReporter.at(watchdog).error("In generateInitializationForWatchdog(): "
+                              + name
+                              + " not a valid mode of this reactor.");
           }
         }
       }
diff --git a/core/src/main/java/org/lflang/generator/python/PythonReactionGenerator.java b/core/src/main/java/org/lflang/generator/python/PythonReactionGenerator.java
index 87f594a71a..07c1b498eb 100644
--- a/core/src/main/java/org/lflang/generator/python/PythonReactionGenerator.java
+++ b/core/src/main/java/org/lflang/generator/python/PythonReactionGenerator.java
@@ -4,6 +4,7 @@
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Set;
+
 import org.lflang.AttributeUtils;
 import org.lflang.ErrorReporter;
 import org.lflang.Target;
@@ -269,11 +270,10 @@ private static String generateCPythonInitializers(
                 PythonPortGenerator.generateVariablesForSendingToContainedReactors(
                     pyObjects, effect.getContainer(), (Input) effect.getVariable()));
           } else {
-            errorReporter.reportError(
-                reaction,
-                "In generateReaction(): "
-                    + effect.getVariable().getName()
-                    + " is neither an input nor an output.");
+              String message = "In generateReaction(): "
+                  + effect.getVariable().getName()
+                  + " is neither an input nor an output.";
+              errorReporter.at(reaction).error(message);
           }
         }
       }
diff --git a/core/src/main/java/org/lflang/generator/rust/CargoDependencySpec.java b/core/src/main/java/org/lflang/generator/rust/CargoDependencySpec.java
index ff97860970..4dc3593f77 100644
--- a/core/src/main/java/org/lflang/generator/rust/CargoDependencySpec.java
+++ b/core/src/main/java/org/lflang/generator/rust/CargoDependencySpec.java
@@ -31,6 +31,10 @@
 import java.util.Objects;
 import java.util.Set;
 import java.util.stream.Collectors;
+
+import org.eclipse.emf.ecore.EObject;
+
+import org.lflang.ErrorReporter;
 import org.lflang.TargetProperty;
 import org.lflang.TargetProperty.TargetPropertyType;
 import org.lflang.ast.ASTUtils;
@@ -281,7 +285,10 @@ public void check(Element element, String name, LFValidator v) {
         try {
           parseValue(pair);
         } catch (InvalidLfSourceException e) {
-          v.getErrorReporter().reportError(e.getNode(), e.getProblem());
+            ErrorReporter errorReporter = v.getErrorReporter();
+            EObject object = e.getNode();
+            String message = e.getProblem();
+            errorReporter.at(object).error(message);
         }
       }
     }
diff --git a/core/src/main/java/org/lflang/generator/rust/RustTargetConfig.java b/core/src/main/java/org/lflang/generator/rust/RustTargetConfig.java
index b4e9a1778b..db249c442b 100644
--- a/core/src/main/java/org/lflang/generator/rust/RustTargetConfig.java
+++ b/core/src/main/java/org/lflang/generator/rust/RustTargetConfig.java
@@ -64,15 +64,15 @@ public void setCargoDependencies(Map<String, CargoDependencySpec> cargoDependenc
   public void addAndCheckTopLevelModule(Path path, EObject errorOwner, ErrorReporter err) {
     String fileName = path.getFileName().toString();
     if (!Files.exists(path)) {
-      err.reportError(errorOwner, "File not found");
+        err.at(errorOwner).error("File not found");
     } else if (Files.isRegularFile(path) && !fileName.endsWith(".rs")) {
-      err.reportError(errorOwner, "Not a rust file");
+        err.at(errorOwner).error("Not a rust file");
     } else if (fileName.equals("main.rs")) {
-      err.reportError(errorOwner, "Cannot use 'main.rs' as a module name (reserved)");
+        err.at(errorOwner).error("Cannot use 'main.rs' as a module name (reserved)");
     } else if (fileName.equals("reactors") || fileName.equals("reactors.rs")) {
-      err.reportError(errorOwner, "Cannot use 'reactors' as a module name (reserved)");
+        err.at(errorOwner).error("Cannot use 'reactors' as a module name (reserved)");
     } else if (Files.isDirectory(path) && !Files.exists(path.resolve("mod.rs"))) {
-      err.reportError(errorOwner, "Cannot find module descriptor in directory");
+        err.at(errorOwner).error("Cannot find module descriptor in directory");
     }
     this.rustTopLevelModules.add(path);
   }
diff --git a/core/src/main/kotlin/org/lflang/generator/cpp/CppActionGenerator.kt b/core/src/main/kotlin/org/lflang/generator/cpp/CppActionGenerator.kt
index 27ad6380cd..632b3cab39 100644
--- a/core/src/main/kotlin/org/lflang/generator/cpp/CppActionGenerator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/cpp/CppActionGenerator.kt
@@ -55,10 +55,12 @@ class CppActionGenerator(private val reactor: Reactor, private val errorReporter
 
     private fun generateLogicalInitializer(action: Action): String {
         return if (action.minSpacing != null || !action.policy.isNullOrEmpty()) {
-            errorReporter.reportError(
-                action,
+            errorReporter.at(
+                action
+            ).error(
                 "minSpacing and spacing violation policies are not yet supported for logical actions in reactor-ccp!"
             )
+            "minSpacing and spacing violation policies are not yet supported for logical actions in reactor-ccp!"
         } else {
             val time = action.minDelay.orZero().toCppTime()
             """, ${action.name}{"${action.name}", this, $time}"""
@@ -67,10 +69,12 @@ class CppActionGenerator(private val reactor: Reactor, private val errorReporter
 
     private fun initializePhysicalInitializer(action: Action): String {
         return if (action.minDelay != null || action.minSpacing != null || !action.policy.isNullOrEmpty()) {
-            errorReporter.reportError(
-                action,
+            errorReporter.at(
+                action
+            ).error(
                 "minDelay, minSpacing and spacing violation policies are not yet supported for physical actions in reactor-ccp!"
             )
+            "minDelay, minSpacing and spacing violation policies are not yet supported for physical actions in reactor-ccp!"
         } else {
             """, ${action.name}{"${action.name}", this}"""
         }
diff --git a/core/src/main/kotlin/org/lflang/generator/cpp/CppInstanceGenerator.kt b/core/src/main/kotlin/org/lflang/generator/cpp/CppInstanceGenerator.kt
index 19622f9ef7..88a66ef558 100644
--- a/core/src/main/kotlin/org/lflang/generator/cpp/CppInstanceGenerator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/cpp/CppInstanceGenerator.kt
@@ -87,12 +87,12 @@ class CppInstanceGenerator(
         val assignments = parameters.mapNotNull {
             when {
                 it.rhs.isParens || it.rhs.isBraces -> {
-                    errorReporter.reportError(it, "Parenthesis based initialization is not allowed here!")
+                    errorReporter.at(it).error("Parenthesis based initialization is not allowed here!")
                     null
                 }
 
                 it.rhs.exprs.size != 1             -> {
-                    errorReporter.reportError(it, "Expected exactly one expression.")
+                    errorReporter.at(it).error("Expected exactly one expression.")
                     null
                 }
 
diff --git a/core/src/main/kotlin/org/lflang/generator/ts/TSGenerator.kt b/core/src/main/kotlin/org/lflang/generator/ts/TSGenerator.kt
index ba17bbc769..4afa183152 100644
--- a/core/src/main/kotlin/org/lflang/generator/ts/TSGenerator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/ts/TSGenerator.kt
@@ -303,9 +303,8 @@ class TSGenerator(
             val ret = pnpmInstall.run(context.cancelIndicator)
             if (ret != 0) {
                 val errors: String = pnpmInstall.errors
-                errorReporter.reportError(
-                    GeneratorUtils.findTargetDecl(resource),
-                    "ERROR: pnpm install command failed" + if (errors.isBlank()) "." else ":\n$errors")
+                errorReporter.at(GeneratorUtils.findTargetDecl(resource))
+                    .error("pnpm install command failed" + if (errors.isBlank()) "." else ":\n$errors")
             }
             installProtoBufsIfNeeded(true, path, context.cancelIndicator)
         } else {
@@ -323,12 +322,13 @@ class TSGenerator(
             }
 
             if (npmInstall.run(context.cancelIndicator) != 0) {
-                errorReporter.reportError(
-                    GeneratorUtils.findTargetDecl(resource),
-                    "ERROR: npm install command failed: " + npmInstall.errors)
-                errorReporter.reportError(
-                    GeneratorUtils.findTargetDecl(resource), "ERROR: npm install command failed." +
-                        "\nFor installation instructions, see: https://www.npmjs.com/get-npm")
+                errorReporter.at(GeneratorUtils.findTargetDecl(resource))
+                    .error("npm install command failed: " + npmInstall.errors)
+                errorReporter.at(GeneratorUtils.findTargetDecl(resource))
+                    .error(
+                    "npm install command failed." +
+                            "\nFor installation instructions, see: https://www.npmjs.com/get-npm"
+                )
                 return
             }
 
@@ -338,9 +338,8 @@ class TSGenerator(
                 val rtPath = path.resolve("node_modules").resolve("@lf-lang").resolve("reactor-ts")
                 val buildRuntime = commandFactory.createCommand("npm", listOf("run", "build"), rtPath)
                 if (buildRuntime.run(context.cancelIndicator) != 0) {
-                    errorReporter.reportError(
-                        GeneratorUtils.findTargetDecl(resource),
-                        "ERROR: unable to build runtime in dev mode: " + buildRuntime.errors.toString())
+                    errorReporter.at(GeneratorUtils.findTargetDecl(resource))
+                        .error("Unable to build runtime in dev mode: " + buildRuntime.errors.toString())
                 }
             }
 
diff --git a/core/src/main/kotlin/org/lflang/generator/ts/TSReactorGenerator.kt b/core/src/main/kotlin/org/lflang/generator/ts/TSReactorGenerator.kt
index 4d537f5a19..4a0ef62092 100644
--- a/core/src/main/kotlin/org/lflang/generator/ts/TSReactorGenerator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/ts/TSReactorGenerator.kt
@@ -30,18 +30,6 @@ class TSReactorGenerator(
             """
     }
 
-    // Initializer functions
-    fun getTargetInitializerHelper(param: Parameter,
-                                   list: List<String>): String {
-        return if (list.isEmpty()) {
-            errorReporter.reportError(param, "Parameters must have a default value!")
-        } else if (list.size == 1) {
-            list[0]
-        } else {
-            list.joinToString(", ", "[", "]")
-        }
-    }
-
     /** Generate the main app instance. This function is only used once
      *  because all other reactors are instantiated as properties of the
      *  main one.

From 7c76d5c404a8ea21af8bbd856e8b42ca68ff6bf0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Fournier?= <clement.fournier@tu-dresden.de>
Date: Tue, 13 Jun 2023 14:15:19 +0200
Subject: [PATCH 08/17] More updates...

---
 .../main/java/org/lflang/ErrorReporter.java   | 12 -------
 .../federated/extensions/CExtension.java      | 32 +++++++++----------
 .../federated/extensions/TSExtension.java     | 32 +++++++++----------
 .../org/lflang/generator/GeneratorUtils.java  |  9 +++---
 .../org/lflang/generator/ReactorInstance.java | 22 ++++++-------
 .../org/lflang/generator/c/CGenerator.java    | 13 ++++----
 6 files changed, 52 insertions(+), 68 deletions(-)

diff --git a/core/src/main/java/org/lflang/ErrorReporter.java b/core/src/main/java/org/lflang/ErrorReporter.java
index 0f8e7509f9..6334d21dd1 100644
--- a/core/src/main/java/org/lflang/ErrorReporter.java
+++ b/core/src/main/java/org/lflang/ErrorReporter.java
@@ -78,18 +78,6 @@ default void info(String message) {
   }
 
 
-  /**
-   * Report a warning on the specified parse tree object.
-   *
-   * @param object The parse tree object.
-   * @param message The error message.
-   * @return a string that describes the warning.
-   */
-  default String reportWarning(EObject object, String message) {
-    at(object).warning(message);
-    return message;
-  }
-
   /**
    * Report an error at the specified line within a file.
    *
diff --git a/core/src/main/java/org/lflang/federated/extensions/CExtension.java b/core/src/main/java/org/lflang/federated/extensions/CExtension.java
index 121cf5d817..639da88033 100644
--- a/core/src/main/java/org/lflang/federated/extensions/CExtension.java
+++ b/core/src/main/java/org/lflang/federated/extensions/CExtension.java
@@ -33,6 +33,7 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.List;
+
 import org.lflang.ErrorReporter;
 import org.lflang.InferredType;
 import org.lflang.Target;
@@ -788,22 +789,21 @@ private String generateCodeForPhysicalActions(
       if (minDelay != TimeValue.MAX_VALUE) {
         // Unless silenced, issue a warning.
         if (federate.targetConfig.coordinationOptions.advance_message_interval == null) {
-          errorReporter.reportWarning(
-              outputFound,
-              String.join(
-                  "\n",
-                  "Found a path from a physical action to output for reactor "
-                      + addDoubleQuotes(instance.getName())
-                      + ". ",
-                  "The amount of delay is " + minDelay + ".",
-                  "With centralized coordination, this can result in a large number of messages to"
-                      + " the RTI.",
-                  "Consider refactoring the code so that the output does not depend on the physical"
-                      + " action,",
-                  "or consider using decentralized coordination. To silence this warning, set the"
-                      + " target",
-                  "parameter coordination-options with a value like {advance-message-interval: 10"
-                      + " msec}"));
+          String message = String.join(
+              "\n",
+              "Found a path from a physical action to output for reactor "
+                  + addDoubleQuotes(instance.getName())
+                  + ". ",
+              "The amount of delay is " + minDelay + ".",
+              "With centralized coordination, this can result in a large number of messages to"
+                  + " the RTI.",
+              "Consider refactoring the code so that the output does not depend on the physical"
+                  + " action,",
+              "or consider using decentralized coordination. To silence this warning, set the"
+                  + " target",
+              "parameter coordination-options with a value like {advance-message-interval: 10"
+                  + " msec}");
+          errorReporter.at(outputFound).warning(message);
         }
         code.pr(
             "_fed.min_delay_from_physical_action_to_federate_output = "
diff --git a/core/src/main/java/org/lflang/federated/extensions/TSExtension.java b/core/src/main/java/org/lflang/federated/extensions/TSExtension.java
index 14df96afb5..ea6895022c 100644
--- a/core/src/main/java/org/lflang/federated/extensions/TSExtension.java
+++ b/core/src/main/java/org/lflang/federated/extensions/TSExtension.java
@@ -6,6 +6,7 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
+
 import org.lflang.ErrorReporter;
 import org.lflang.InferredType;
 import org.lflang.TargetProperty.CoordinationType;
@@ -174,22 +175,21 @@ private TimeValue getMinOutputDelay(
       if (minOutputDelay != TimeValue.MAX_VALUE) {
         // Unless silenced, issue a warning.
         if (federate.targetConfig.coordinationOptions.advance_message_interval == null) {
-          errorReporter.reportWarning(
-              outputFound,
-              String.join(
-                  "\n",
-                  "Found a path from a physical action to output for reactor "
-                      + addDoubleQuotes(instance.getName())
-                      + ". ",
-                  "The amount of delay is " + minOutputDelay + ".",
-                  "With centralized coordination, this can result in a large number of messages to"
-                      + " the RTI.",
-                  "Consider refactoring the code so that the output does not depend on the physical"
-                      + " action,",
-                  "or consider using decentralized coordination. To silence this warning, set the"
-                      + " target",
-                  "parameter coordination-options with a value like {advance-message-interval: 10"
-                      + " msec}"));
+            String message = String.join(
+                "\n",
+                "Found a path from a physical action to output for reactor "
+                    + addDoubleQuotes(instance.getName())
+                    + ". ",
+                "The amount of delay is " + minOutputDelay + ".",
+                "With centralized coordination, this can result in a large number of messages to"
+                    + " the RTI.",
+                "Consider refactoring the code so that the output does not depend on the physical"
+                    + " action,",
+                "or consider using decentralized coordination. To silence this warning, set the"
+                    + " target",
+                "parameter coordination-options with a value like {advance-message-interval: 10"
+                    + " msec}");
+            errorReporter.at(outputFound).warning(message);
         }
         return minOutputDelay;
       }
diff --git a/core/src/main/java/org/lflang/generator/GeneratorUtils.java b/core/src/main/java/org/lflang/generator/GeneratorUtils.java
index 6f0e217c48..d16c9c3270 100644
--- a/core/src/main/java/org/lflang/generator/GeneratorUtils.java
+++ b/core/src/main/java/org/lflang/generator/GeneratorUtils.java
@@ -61,11 +61,10 @@ public static void accommodatePhysicalActionsIfPresent(
             && !targetConfig.keepalive) {
           // If not, set it to true
           targetConfig.keepalive = true;
-          errorReporter.reportWarning(
-              action,
-              String.format(
-                  "Setting %s to true because of the physical action %s.",
-                  TargetProperty.KEEPALIVE.getDisplayName(), action.getName()));
+          String message = String.format(
+              "Setting %s to true because of the physical action %s.",
+              TargetProperty.KEEPALIVE.getDisplayName(), action.getName());
+          errorReporter.at(action).warning(message);
           return;
         }
       }
diff --git a/core/src/main/java/org/lflang/generator/ReactorInstance.java b/core/src/main/java/org/lflang/generator/ReactorInstance.java
index a2d98ab7b5..8599b43ad9 100644
--- a/core/src/main/java/org/lflang/generator/ReactorInstance.java
+++ b/core/src/main/java/org/lflang/generator/ReactorInstance.java
@@ -935,12 +935,12 @@ private void establishPortConnections() {
       // Check for empty lists.
       if (!srcRanges.hasNext()) {
         if (dstRanges.hasNext()) {
-          reporter.reportWarning(connection, "No sources to provide inputs.");
+            reporter.at(connection).warning("No sources to provide inputs.");
         }
         return;
       } else if (!dstRanges.hasNext()) {
-        reporter.reportWarning(connection, "No destination. Outputs will be lost.");
-        return;
+          reporter.at(connection).warning("No destination. Outputs will be lost.");
+          return;
       }
 
       RuntimeRange<PortInstance> src = srcRanges.next();
@@ -952,8 +952,7 @@ private void establishPortConnections() {
           if (!dstRanges.hasNext()) {
             if (srcRanges.hasNext()) {
               // Should not happen (checked by the validator).
-              reporter.reportWarning(
-                  connection, "Source is wider than the destination. Outputs will be lost.");
+                reporter.at(connection).warning("Source is wider than the destination. Outputs will be lost.");
             }
             break;
           }
@@ -963,8 +962,7 @@ private void establishPortConnections() {
             } else {
               if (dstRanges.hasNext()) {
                 // Should not happen (checked by the validator).
-                reporter.reportWarning(
-                    connection, "Destination is wider than the source. Inputs will be missing.");
+                  reporter.at(connection).warning("Destination is wider than the source. Inputs will be missing.");
               }
               break;
             }
@@ -977,9 +975,8 @@ private void establishPortConnections() {
           src = src.tail(dst.width);
           if (!dstRanges.hasNext()) {
             // Should not happen (checked by the validator).
-            reporter.reportWarning(
-                connection, "Source is wider than the destination. Outputs will be lost.");
-            break;
+              reporter.at(connection).warning("Source is wider than the destination. Outputs will be lost.");
+              break;
           }
           dst = dstRanges.next();
         } else if (src.width < dst.width) {
@@ -990,9 +987,8 @@ private void establishPortConnections() {
             if (connection.isIterated()) {
               srcRanges = leftPorts.iterator();
             } else {
-              reporter.reportWarning(
-                  connection, "Destination is wider than the source. Inputs will be missing.");
-              break;
+                reporter.at(connection).warning("Destination is wider than the source. Inputs will be missing.");
+                break;
             }
           }
           src = srcRanges.next();
diff --git a/core/src/main/java/org/lflang/generator/c/CGenerator.java b/core/src/main/java/org/lflang/generator/c/CGenerator.java
index cf1aee06a8..5c4993b8aa 100644
--- a/core/src/main/java/org/lflang/generator/c/CGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CGenerator.java
@@ -45,6 +45,7 @@
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
+
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.xtext.xbase.lib.Exceptions;
 import org.eclipse.xtext.xbase.lib.IterableExtensions;
@@ -356,12 +357,12 @@ public void accommodatePhysicalActionsIfPresent() {
           if (!targetConfig.threading
               && !targetConfig.setByUser.contains(TargetProperty.THREADING)) {
             targetConfig.threading = true;
-            errorReporter.reportWarning(
-                action,
-                "Using the threaded C runtime to allow for asynchronous handling of physical action"
-                    + " "
-                    + action.getName());
-            return;
+              String message =
+                  "Using the threaded C runtime to allow for asynchronous handling of physical action"
+                      + " "
+                      + action.getName();
+              errorReporter.at(action).warning(message);
+              return;
           }
         }
       }

From d6befa3904fd4effdf4714b4f74fc69ec4745db8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Fournier?= <clement.fournier@tu-dresden.de>
Date: Tue, 13 Jun 2023 14:34:41 +0200
Subject: [PATCH 09/17] Finish cleaning up ErrorReporter

---
 .../main/java/org/lflang/ErrorReporter.java   | 64 ++-----------------
 .../org/lflang/generator/GeneratorBase.java   | 29 +++++----
 .../HumanReadableReportingStrategy.java       |  6 +-
 .../lflang/generator/IntegratedBuilder.java   | 33 ++++------
 .../generator/python/PythonValidator.java     | 26 ++++----
 .../lflang/generator/rust/RustValidator.kt    |  8 +--
 .../org/lflang/generator/ts/TSValidator.kt    | 28 +++-----
 7 files changed, 62 insertions(+), 132 deletions(-)

diff --git a/core/src/main/java/org/lflang/ErrorReporter.java b/core/src/main/java/org/lflang/ErrorReporter.java
index 6334d21dd1..dfe32c4845 100644
--- a/core/src/main/java/org/lflang/ErrorReporter.java
+++ b/core/src/main/java/org/lflang/ErrorReporter.java
@@ -26,6 +26,13 @@ default Stage2 at(Path file) {
     return at(file, 1);
   }
 
+  default Stage2 atNullableLine(Path file, Integer line) {
+    if (line != null) {
+      return at(file, line);
+    }
+    return at(file);
+  }
+
   default Stage2 at(Path file, int line) {
     return at(file, Position.fromOneBased(line, 1));
   }
@@ -78,47 +85,6 @@ default void info(String message) {
   }
 
 
-  /**
-   * Report an error at the specified line within a file.
-   *
-   * @param message The error message.
-   * @param line The one-based line number to report at.
-   * @param file The file to report at.
-   * @return a string that describes the error.
-   */
-  default String reportError(Path file, Integer line, String message) {
-    Stage2 stage2 = line != null ? at(file, line) : at(file);
-    stage2.report(DiagnosticSeverity.Error, message);
-    return message;
-  }
-
-  /**
-   * Report a warning at the specified line within a file.
-   *
-   * @param message The error message.
-   * @param line The one-based line number to report at.
-   * @param file The file to report at.
-   * @return a string that describes the warning.
-   */
-  default String reportWarning(Path file, Integer line, String message) {
-    Stage2 stage2 = line!=null? at(file,line):at(file);
-    stage2.report(DiagnosticSeverity.Warning, message);
-    return message;
-  }
-
-
-  /**
-   * Report a message of severity {@code severity}.
-   *
-   * @param file The file to which the message pertains, or {@code null} if the file is unknown.
-   * @param severity the severity of the message
-   * @param message the message to send to the IDE
-   * @return a string that describes the diagnostic
-   */
-  default String report(Path file, DiagnosticSeverity severity, String message) {
-    at(file).report(severity, message);
-    return message;
-  }
 
   /**
    * Report a message of severity {@code severity} that pertains to line {@code line} of an LF
@@ -135,22 +101,6 @@ default String report(Path file, DiagnosticSeverity severity, String message, in
     return message;
   }
 
-  /**
-   * Report a message of severity {@code severity} that pertains to the range [{@code startPos},
-   * {@code endPos}) of an LF source file.
-   *
-   * @param file The file to which the message pertains, or {@code null} if the file is unknown.
-   * @param severity the severity of the message
-   * @param message the message to send to the IDE
-   * @param startPos the position of the first character of the range of interest
-   * @param endPos the position immediately AFTER the final character of the range of interest
-   * @return a string that describes the diagnostic
-   */
-  default String report(
-      Path file, DiagnosticSeverity severity, String message, Position startPos, Position endPos) {
-    return report(file, severity, message, startPos.getOneBasedLine());
-  }
-
 
   /**
    * Check if errors where reported.
diff --git a/core/src/main/java/org/lflang/generator/GeneratorBase.java b/core/src/main/java/org/lflang/generator/GeneratorBase.java
index c35b1531d9..2edb4c09a7 100644
--- a/core/src/main/java/org/lflang/generator/GeneratorBase.java
+++ b/core/src/main/java/org/lflang/generator/GeneratorBase.java
@@ -39,9 +39,12 @@
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.lsp4j.DiagnosticSeverity;
 import org.eclipse.xtext.xbase.lib.IterableExtensions;
 import org.eclipse.xtext.xbase.lib.IteratorExtensions;
+
 import org.lflang.ErrorReporter;
+import org.lflang.ErrorReporter.Stage2;
 import org.lflang.FileConfig;
 import org.lflang.MainConflictChecker;
 import org.lflang.Target;
@@ -569,9 +572,7 @@ public void reportCommandErrors(String stderr) {
         // Found a new line number designator.
         // If there is a previously accumulated message, report it.
         if (message.length() > 0) {
-          if (severity == IMarker.SEVERITY_ERROR)
-            errorReporter.reportError(path, lineNumber, message.toString());
-          else errorReporter.reportWarning(path, lineNumber, message.toString());
+          reportIssue(message, lineNumber, path, severity);
 
           if (!Objects.equal(originalPath.toFile(), path.toFile())) {
             // Report an error also in the top-level resource.
@@ -579,9 +580,9 @@ public void reportCommandErrors(String stderr) {
             // statements to find which one matches and mark all the
             // import statements down the chain. But what a pain!
             if (severity == IMarker.SEVERITY_ERROR) {
-              errorReporter.reportError(originalPath, 1, "Error in imported file: " + path);
+              errorReporter.at(originalPath).error("Error in imported file: " + path);
             } else {
-              errorReporter.reportWarning(originalPath, 1, "Warning in imported file: " + path);
+              errorReporter.at(originalPath).warning("Warning in imported file: " + path);
             }
           }
         }
@@ -619,11 +620,7 @@ public void reportCommandErrors(String stderr) {
       }
     }
     if (message.length() > 0) {
-      if (severity == IMarker.SEVERITY_ERROR) {
-        errorReporter.reportError(path, lineNumber, message.toString());
-      } else {
-        errorReporter.reportWarning(path, lineNumber, message.toString());
-      }
+      reportIssue(message, lineNumber, path, severity);
 
       if (originalPath.toFile() != path.toFile()) {
         // Report an error also in the top-level resource.
@@ -631,14 +628,22 @@ public void reportCommandErrors(String stderr) {
         // statements to find which one matches and mark all the
         // import statements down the chain. But what a pain!
         if (severity == IMarker.SEVERITY_ERROR) {
-          errorReporter.reportError(originalPath, 1, "Error in imported file: " + path);
+          errorReporter.at(originalPath).error("Error in imported file: " + path);
         } else {
-          errorReporter.reportWarning(originalPath, 1, "Warning in imported file: " + path);
+          errorReporter.at(originalPath).warning("Warning in imported file: " + path);
         }
       }
     }
   }
 
+  private void reportIssue(StringBuilder message, Integer lineNumber, Path path, int severity) {
+    DiagnosticSeverity convertedSeverity = severity == IMarker.SEVERITY_ERROR
+        ? DiagnosticSeverity.Error
+        : DiagnosticSeverity.Warning;
+    errorReporter.atNullableLine(path, lineNumber)
+        .report(convertedSeverity, message.toString());
+  }
+
   // //////////////////////////////////////////////////
   // // Private functions
 
diff --git a/core/src/main/java/org/lflang/generator/HumanReadableReportingStrategy.java b/core/src/main/java/org/lflang/generator/HumanReadableReportingStrategy.java
index 320c2b109f..42923fb7a9 100644
--- a/core/src/main/java/org/lflang/generator/HumanReadableReportingStrategy.java
+++ b/core/src/main/java/org/lflang/generator/HumanReadableReportingStrategy.java
@@ -108,16 +108,16 @@ private void reportErrorLine(
       final CodeMap map = maps.get(relativeTo != null ? relativeTo.resolve(path) : path);
       final DiagnosticSeverity severity = DiagnosticReporting.severityOf(matcher.group("severity"));
       if (map == null) {
-        errorReporter.report(null, severity, message);
+        errorReporter.nowhere().report(severity, message);
         return;
       }
       for (Path srcFile : map.lfSourcePaths()) {
         Position lfFilePosition = map.adjusted(srcFile, generatedFilePosition);
         if (matcher.group("column") != null) {
           reportAppropriateRange(
-              range -> errorReporter.report(srcFile, severity, message, range), lfFilePosition, it);
+              range -> errorReporter.at(srcFile, range).report(severity, message), lfFilePosition, it);
         } else {
-          errorReporter.report(srcFile, severity, message, lfFilePosition.getOneBasedLine());
+          errorReporter.at(srcFile, lfFilePosition.getOneBasedLine()).report(severity, message);
         }
       }
     }
diff --git a/core/src/main/java/org/lflang/generator/IntegratedBuilder.java b/core/src/main/java/org/lflang/generator/IntegratedBuilder.java
index f87c81728d..e243b30de3 100644
--- a/core/src/main/java/org/lflang/generator/IntegratedBuilder.java
+++ b/core/src/main/java/org/lflang/generator/IntegratedBuilder.java
@@ -9,6 +9,7 @@
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.emf.ecore.resource.ResourceSet;
+import org.eclipse.lsp4j.DiagnosticSeverity;
 import org.eclipse.xtext.diagnostics.Severity;
 import org.eclipse.xtext.generator.GeneratorDelegate;
 import org.eclipse.xtext.generator.JavaIoFileSystemAccess;
@@ -16,7 +17,9 @@
 import org.eclipse.xtext.validation.CheckMode;
 import org.eclipse.xtext.validation.IResourceValidator;
 import org.eclipse.xtext.validation.Issue;
+
 import org.lflang.ErrorReporter;
+import org.lflang.ErrorReporter.Stage2;
 import org.lflang.FileConfig;
 import org.lflang.generator.LFGeneratorContext.Mode;
 
@@ -36,15 +39,6 @@ public interface ReportProgress {
     void apply(String message, Integer percentage);
   }
 
-  // Note: This class is not currently used in response to
-  //  document edits, even though the validator and code
-  //  generator are invoked by Xtext in response to
-  //  document edits.
-  /** A {@code ReportMethod} is a way of reporting issues. */
-  private interface ReportMethod {
-    void apply(Path file, Integer line, String message);
-  }
-
   /* ---------------------- INJECTED DEPENDENCIES ---------------------- */
 
   @Inject private IResourceValidator validator;
@@ -93,8 +87,9 @@ public GeneratorResult run(
   private void validate(URI uri, ErrorReporter errorReporter) {
     for (Issue issue :
         validator.validate(getResource(uri), CheckMode.ALL, CancelIndicator.NullImpl)) {
-      getReportMethod(errorReporter, issue.getSeverity())
-          .apply(Path.of(uri.path()), issue.getLineNumber(), issue.getMessage());
+      errorReporter.atNullableLine(Path.of(uri.path()), issue.getLineNumber())
+              .report(convertSeverity(issue.getSeverity()),
+                  issue.getMessage());
     }
   }
 
@@ -135,14 +130,12 @@ private Resource getResource(URI uri) {
     return resourceSetProvider.get().getResource(uri, true);
   }
 
-  /**
-   * Returns the appropriate reporting method for the given {@code Severity}.
-   *
-   * @param severity An arbitrary {@code Severity}.
-   * @return The appropriate reporting method for {@code severity}.
-   */
-  private ReportMethod getReportMethod(ErrorReporter errorReporter, Severity severity) {
-    if (severity == Severity.ERROR) return errorReporter::reportError;
-    return errorReporter::reportWarning;
+  static DiagnosticSeverity convertSeverity(Severity severity) {
+    return switch (severity) {
+      case ERROR -> DiagnosticSeverity.Error;
+      case WARNING -> DiagnosticSeverity.Warning;
+      case INFO -> DiagnosticSeverity.Information;
+      case IGNORE -> DiagnosticSeverity.Hint;
+    };
   }
 }
diff --git a/core/src/main/java/org/lflang/generator/python/PythonValidator.java b/core/src/main/java/org/lflang/generator/python/PythonValidator.java
index fa2584ce4c..9b3b80de05 100644
--- a/core/src/main/java/org/lflang/generator/python/PythonValidator.java
+++ b/core/src/main/java/org/lflang/generator/python/PythonValidator.java
@@ -21,6 +21,7 @@
 import org.lflang.generator.DiagnosticReporting;
 import org.lflang.generator.DiagnosticReporting.Strategy;
 import org.lflang.generator.Position;
+import org.lflang.generator.Range;
 import org.lflang.generator.ValidationStrategy;
 import org.lflang.util.LFCommand;
 
@@ -232,16 +233,14 @@ private boolean tryReportTypical(String[] lines, int i) {
               Position genPosition =
                   Position.fromOneBased(line, Integer.MAX_VALUE); // Column is just a placeholder.
               if (map == null) {
-                errorReporter.report(
-                    null, DiagnosticSeverity.Error, message, 1); // Undesirable fallback
+                errorReporter.nowhere().error(message); // Undesirable fallback
               } else {
                 for (Path lfFile : map.lfSourcePaths()) {
                   Position lfPosition = map.adjusted(lfFile, genPosition);
                   // TODO: We could be more precise than just getting the right line, but the way
                   // the output
                   //  is formatted (with leading whitespace possibly trimmed) does not make it easy.
-                  errorReporter.report(
-                      lfFile, DiagnosticSeverity.Error, message, lfPosition.getOneBasedLine());
+                  errorReporter.at(lfFile, lfPosition).error(message);
                 }
               }
               return true;
@@ -264,16 +263,12 @@ private void tryReportAlternative(String[] lines, int i) {
                           .filter(p -> main.group().contains(p.getFileName().toString()))
                           .map(codeMaps::get)
                       ::iterator;
-              for (CodeMap map :
-                  relevantMaps) { // There should almost always be exactly one of these
+              for (CodeMap map : relevantMaps) { // There should almost always be exactly one of these
                 for (Path lfFile : map.lfSourcePaths()) {
-                  errorReporter.report(
-                      lfFile,
-                      DiagnosticSeverity.Error,
-                      main.group().replace("*** ", "").replace("Sorry: ", ""),
-                      map.adjusted(
-                              lfFile, Position.fromOneBased(line, map.firstNonWhitespace(line)))
-                          .getOneBasedLine());
+                  Position pos = map.adjusted(
+                      lfFile, Position.fromOneBased(line, map.firstNonWhitespace(line)));
+                  errorReporter.at(lfFile, pos)
+                      .error(main.group().replace("*** ", "").replace("Sorry: ", ""));
                 }
               }
             }
@@ -375,7 +370,8 @@ private void bestEffortReport(
               DiagnosticSeverity severity,
               String humanMessage) {
             if (!lfEnd.equals(Position.ORIGIN) && !lfStart.equals(Position.ORIGIN)) { // Ideal case
-              errorReporter.report(file, severity, humanMessage, lfStart, lfEnd);
+              errorReporter.at(file, new Range(lfStart, lfEnd))
+                  .report(severity, humanMessage);
             } else { // Fallback: Try to report on the correct line, or failing that, just line 1.
               if (lfStart.equals(Position.ORIGIN))
                 lfStart =
@@ -384,7 +380,7 @@ private void bestEffortReport(
               // FIXME: It might be better to improve style of generated code instead of quietly
               // returning here.
               if (lfStart.equals(Position.ORIGIN) && severity != DiagnosticSeverity.Error) return;
-              errorReporter.report(file, severity, humanMessage, lfStart.getOneBasedLine());
+              errorReporter.at(file, lfStart).report(severity, humanMessage);
             }
           }
 
diff --git a/core/src/main/kotlin/org/lflang/generator/rust/RustValidator.kt b/core/src/main/kotlin/org/lflang/generator/rust/RustValidator.kt
index ebf449ffa5..88ad8b6261 100644
--- a/core/src/main/kotlin/org/lflang/generator/rust/RustValidator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/rust/RustValidator.kt
@@ -161,17 +161,15 @@ class RustValidator(
 
                 val message = mapper.readValue(messageLine, RustCompilerMessage::class.java).message
 
-                if (message.spans.isEmpty()) errorReporter.report(null, message.severity, message.message)
+                if (message.spans.isEmpty()) errorReporter.nowhere().report(message.severity, message.message)
                 for (span in message.spans) {
                     val genFilePath = metadata?.workspaceRoot?.resolve(span.fileName)
                     val codeMap = map[genFilePath] ?: continue
 
                     for (lfSourcePath in codeMap.lfSourcePaths()) { // fixme error is reported several times
-                        errorReporter.report(
-                            lfSourcePath,
+                        errorReporter.at(lfSourcePath, codeMap.adjusted(lfSourcePath, span.range)).report(
                             message.severity,
-                            DiagnosticReporting.messageOf(message.message, genFilePath, span.start),
-                            codeMap.adjusted(lfSourcePath, span.range),
+                            DiagnosticReporting.messageOf(message.message, genFilePath, span.start)
                         )
                     }
                 }
diff --git a/core/src/main/kotlin/org/lflang/generator/ts/TSValidator.kt b/core/src/main/kotlin/org/lflang/generator/ts/TSValidator.kt
index 420dd71f09..e60c1a99df 100644
--- a/core/src/main/kotlin/org/lflang/generator/ts/TSValidator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/ts/TSValidator.kt
@@ -4,17 +4,9 @@ import com.fasterxml.jackson.annotation.JsonProperty
 import com.fasterxml.jackson.databind.DeserializationFeature
 import com.fasterxml.jackson.databind.ObjectMapper
 import org.eclipse.lsp4j.DiagnosticSeverity
-import org.eclipse.xtext.util.CancelIndicator
 import org.lflang.ErrorReporter
 import org.lflang.FileConfig
-import org.lflang.generator.CodeMap
-import org.lflang.generator.DiagnosticReporting
-import org.lflang.generator.HumanReadableReportingStrategy
-import org.lflang.generator.LFGeneratorContext
-import org.lflang.generator.Position
-import org.lflang.generator.Range
-import org.lflang.generator.ValidationStrategy
-import org.lflang.generator.Validator
+import org.lflang.generator.*
 import org.lflang.util.LFCommand
 import java.nio.file.Path
 import java.util.regex.Pattern
@@ -71,6 +63,7 @@ class TSValidator(
         ) {
             val start: Position = Position.fromOneBased(line, column)
             val end: Position = if (endLine >= line) Position.fromOneBased(endLine, endColumn) else start.plus(" ")
+            val range: Range get() = Range(start, end)
             val severity: DiagnosticSeverity = when (_severity) {
                 0 -> DiagnosticSeverity.Information
                 1 -> DiagnosticSeverity.Warning
@@ -103,18 +96,13 @@ class TSValidator(
                             val codeMap = map[genPath] ?: continue
 
                             for (path in codeMap.lfSourcePaths()) {
-                                val lfStart = codeMap.adjusted(path, message.start)
-                                val lfEnd = codeMap.adjusted(path, message.end)
-                                if (lfStart != Position.ORIGIN) {  // Ignore linting errors in non-user-supplied code.
-                                    errorReporter.report(
-                                        path,
-                                        message.severity,
-                                        DiagnosticReporting.messageOf(message.message, genPath, message.start),
-                                        Range(
-                                            lfStart,
-                                            if (lfEnd > lfStart) lfEnd else lfStart + " ",
+                                val range = codeMap.adjusted(path, message.range)
+                                if (range.startInclusive != Position.ORIGIN) {  // Ignore linting errors in non-user-supplied code.
+                                    errorReporter.at(path, range)
+                                        .report(
+                                            message.severity,
+                                            DiagnosticReporting.messageOf(message.message, genPath, message.start)
                                         )
-                                    )
                                 }
                             }
                         }

From 6b11edd68f34d28906f3d57a2a80e19a1324b954 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Fournier?= <clement.fournier@tu-dresden.de>
Date: Tue, 13 Jun 2023 14:48:30 +0200
Subject: [PATCH 10/17] Doc

---
 .../java/org/lflang/DefaultErrorReporter.java |  1 -
 .../main/java/org/lflang/ErrorReporter.java   | 81 ++++++++++++-------
 .../java/org/lflang/ErrorReporterBase.java    | 25 +++++-
 3 files changed, 74 insertions(+), 33 deletions(-)

diff --git a/core/src/main/java/org/lflang/DefaultErrorReporter.java b/core/src/main/java/org/lflang/DefaultErrorReporter.java
index 1b245c45c7..bc66b78ab7 100644
--- a/core/src/main/java/org/lflang/DefaultErrorReporter.java
+++ b/core/src/main/java/org/lflang/DefaultErrorReporter.java
@@ -5,7 +5,6 @@
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.lsp4j.DiagnosticSeverity;
 
-import org.lflang.ErrorReporter2.Stage2;
 import org.lflang.generator.Range;
 
 /** Simple implementation of the ErrorReport interface that simply prints to standard out. */
diff --git a/core/src/main/java/org/lflang/ErrorReporter.java b/core/src/main/java/org/lflang/ErrorReporter.java
index dfe32c4845..89b810c7ed 100644
--- a/core/src/main/java/org/lflang/ErrorReporter.java
+++ b/core/src/main/java/org/lflang/ErrorReporter.java
@@ -1,49 +1,89 @@
 package org.lflang;
 
 import java.nio.file.Path;
+import java.util.OptionalInt;
 
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.lsp4j.DiagnosticSeverity;
 
-import org.lflang.Stage2;
 import org.lflang.generator.Position;
 import org.lflang.generator.Range;
 
 /**
  * Interface for reporting errors.
+ * This interface is a staged builder: first call one of the {@code at}
+ * methods to specify the position of the message, then use one
+ * of the report methods on the returned {@link Stage2} instance.
+ *
+ * <p>Examples:
+ * <pre>{@code
+ * errorReporter.at(file, line).error("an error")
+ * errorReporter.at(node).warning("a warning reported on a node")
+ * errorReporter.nowhere().error("Some error that has no specific position")
+ * }</pre>
+ *
+ * @see ErrorReporterBase
  *
  * @author Edward A. Lee
  * @author Marten Lohstroh
  * @author Christian Menard
+ * @author Clément Fournier
  */
 public interface ErrorReporter {
 
+  /** Position the message on the given range in a given file. */
+
   Stage2 at(Path file, Range range);
 
+  /** Position the message on the given node. */
   Stage2 at(EObject object);
 
+  /**
+   * Position the message in the file, at an unknown line.
+   * Implementations usually will report on the first line of the file.
+   */
   default Stage2 at(Path file) {
     return at(file, 1);
   }
 
-  default Stage2 atNullableLine(Path file, Integer line) {
-    if (line != null) {
-      return at(file, line);
-    }
-    return at(file);
-  }
-
+  /**
+   * Position the message in the file, on the given line.
+   */
   default Stage2 at(Path file, int line) {
     return at(file, Position.fromOneBased(line, 1));
   }
 
+  /**
+   * Position the message in the file, using a position object.
+   */
   default Stage2 at(Path file, Position pos) {
     return at(file, Range.degenerateRange(pos));
   }
 
+  /**
+   * Specify that the message has no relevant position, ie
+   * it does not belong to a particular file.
+   */
   Stage2 nowhere();
 
+  /**
+   * Position the message in the given file. The line may be
+   * null. This is a convenience wrapper that calls either
+   * {@link #at(Path, int)} or {@link #at(Path)}.
+   */
+  default Stage2 atNullableLine(Path file, Integer line) {
+    if (line != null) {
+      return at(file, line);
+    }
+    return at(file);
+  }
 
+
+  /**
+   * Interface to report a message with a specific severity.
+   * This is returned by one of the positioning functions like
+   * {@link #at(Path)}. This instance holds an implicit position.
+   */
   interface Stage2 {
 
     /**
@@ -75,7 +115,8 @@ default void info(String message) {
 
 
     /**
-     * Report a message with the given severity
+     * Report a message with the given severity. This is the only
+     * member that needs to be implemented.
      *
      * @param severity The severity
      * @param message The message to report
@@ -84,24 +125,6 @@ default void info(String message) {
 
   }
 
-
-
-  /**
-   * Report a message of severity {@code severity} that pertains to line {@code line} of an LF
-   * source file.
-   *
-   * @param file The file to which the message pertains, or {@code null} if the file is unknown.
-   * @param severity the severity of the message
-   * @param message the message to send to the IDE
-   * @param line the one-based line number associated with the message
-   * @return a string that describes the diagnostic
-   */
-  default String report(Path file, DiagnosticSeverity severity, String message, int line) {
-    at(file, line).report(severity, message);
-    return message;
-  }
-
-
   /**
    * Check if errors where reported.
    *
@@ -110,8 +133,8 @@ default String report(Path file, DiagnosticSeverity severity, String message, in
   boolean getErrorsOccurred();
 
   /**
-   * Clear error history, if exists. This is usually only the case for error markers in Epoch
-   * (Eclipse).
+   * Clear error history, if exists. This is usually only the
+   * case for error markers in Epoch (Eclipse).
    */
   default void clearHistory() {}
 }
diff --git a/core/src/main/java/org/lflang/ErrorReporterBase.java b/core/src/main/java/org/lflang/ErrorReporterBase.java
index c376f8a547..de51d5785e 100644
--- a/core/src/main/java/org/lflang/ErrorReporterBase.java
+++ b/core/src/main/java/org/lflang/ErrorReporterBase.java
@@ -7,11 +7,16 @@
 
 import org.lflang.generator.Range;
 
-/** Simple implementation of the ErrorReport interface that simply prints to standard out. */
+/**
+ * Base implementation of the {@link ErrorReporter} interface.
+ */
 public abstract class ErrorReporterBase implements ErrorReporter {
 
   private boolean errorsOccurred = false;
 
+  protected ErrorReporterBase() {
+  }
+
   @Override
   public boolean getErrorsOccurred() {
     return errorsOccurred;
@@ -38,8 +43,8 @@ public Stage2 at(Path file, Range range) {
   }
 
   @Override
-  public Stage2 at(EObject object) {
-    return wrap((severity, message) -> reportOnNode(object, severity, message));
+  public Stage2 at(EObject node) {
+    return wrap((severity, message) -> reportOnNode(node, severity, message));
   }
 
   @Override
@@ -47,10 +52,24 @@ public Stage2 nowhere() {
     return wrap(this::reportWithoutPosition);
   }
 
+
+  // These methods are the terminal ones that are called when a call to
+  // Stage2#report is issued by a caller.
+
+
+  /**
+   * Implementation of the reporting methods that use a path and range as position.
+   */
   protected abstract void report(Path path, Range range, DiagnosticSeverity severity, String message);
 
+  /**
+   * Implementation of the reporting methods that use a node as position.
+   */
   protected abstract void reportOnNode(EObject node, DiagnosticSeverity severity, String message);
 
+  /**
+   * Implementation of the reporting methods for {@link #nowhere()}.
+   */
   protected abstract void reportWithoutPosition(DiagnosticSeverity severity, String message);
 
 }

From d0500d80e4401fa1bf76195423239136ce7f7dba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Fournier?= <clement.fournier@tu-dresden.de>
Date: Tue, 13 Jun 2023 15:00:06 +0200
Subject: [PATCH 11/17] Cleanups

---
 .../main/java/org/lflang/ErrorReporter.java   |  8 +++----
 .../federated/generator/FedGenerator.java     | 24 +++++++++----------
 .../federated/generator/FederateInstance.java |  4 ++--
 .../generator/GeneratorCommandFactory.java    | 14 +++++++----
 .../LanguageServerErrorReporter.java          |  2 --
 .../org/lflang/generator/TimerInstance.java   |  8 ++-----
 .../org/lflang/generator/c/CCompiler.java     |  8 +++----
 7 files changed, 33 insertions(+), 35 deletions(-)

diff --git a/core/src/main/java/org/lflang/ErrorReporter.java b/core/src/main/java/org/lflang/ErrorReporter.java
index 89b810c7ed..fed2e58752 100644
--- a/core/src/main/java/org/lflang/ErrorReporter.java
+++ b/core/src/main/java/org/lflang/ErrorReporter.java
@@ -31,15 +31,15 @@
  */
 public interface ErrorReporter {
 
-  /** Position the message on the given range in a given file. */
+  /** Position the message on the given range in a given file (both must be non-null). */
 
   Stage2 at(Path file, Range range);
 
-  /** Position the message on the given node. */
+  /** Position the message on the given node (must be non-null). */
   Stage2 at(EObject object);
 
   /**
-   * Position the message in the file, at an unknown line.
+   * Position the message in the file (non-null), at an unknown line.
    * Implementations usually will report on the first line of the file.
    */
   default Stage2 at(Path file) {
@@ -47,7 +47,7 @@ default Stage2 at(Path file) {
   }
 
   /**
-   * Position the message in the file, on the given line.
+   * Position the message in the file (non-null), on the given line.
    */
   default Stage2 at(Path file, int line) {
     return at(file, Position.fromOneBased(line, 1));
diff --git a/core/src/main/java/org/lflang/federated/generator/FedGenerator.java b/core/src/main/java/org/lflang/federated/generator/FedGenerator.java
index f97b81cf05..29b49a50ce 100644
--- a/core/src/main/java/org/lflang/federated/generator/FedGenerator.java
+++ b/core/src/main/java/org/lflang/federated/generator/FedGenerator.java
@@ -55,6 +55,7 @@
 import org.lflang.lf.Instantiation;
 import org.lflang.lf.LfFactory;
 import org.lflang.lf.Reactor;
+import org.lflang.lf.TargetDecl;
 import org.lflang.util.Averager;
 
 public class FedGenerator {
@@ -165,10 +166,9 @@ public boolean doGenerate(Resource resource, LFGeneratorContext context) throws
               subContexts.forEach(
                   c -> {
                     if (c.getErrorReporter().getErrorsOccurred()) {
-                      ErrorReporter errorReporter1 = context
-                          .getErrorReporter();
-                      errorReporter1.at(c.getFileConfig().srcFile).error(
-                          "Failure during code generation of " + c.getFileConfig().srcFile);
+                      context.getErrorReporter()
+                          .at(c.getFileConfig().srcFile)
+                          .error("Failure during code generation of " + c.getFileConfig().srcFile);
                     }
                   });
             });
@@ -228,15 +228,16 @@ private void cleanIfNeeded(LFGeneratorContext context) {
 
   /** Return whether federated execution is supported for {@code resource}. */
   private boolean federatedExecutionIsSupported(Resource resource) {
-    var target = Target.fromDecl(GeneratorUtils.findTargetDecl(resource));
+    TargetDecl targetDecl = GeneratorUtils.findTargetDecl(resource);
+    var target = Target.fromDecl(targetDecl);
     var targetOK =
         List.of(Target.C, Target.Python, Target.TS, Target.CPP, Target.CCPP).contains(target);
     if (!targetOK) {
-      errorReporter.nowhere().error(
+      errorReporter.at(targetDecl).error(
           "Federated execution is not supported with target " + target + ".");
     }
     if (target.equals(Target.C) && GeneratorUtils.isHostWindows()) {
-      errorReporter.nowhere().error("Federated LF programs with a C target are currently not supported on Windows.");
+      errorReporter.at(targetDecl).error("Federated LF programs with a C target are currently not supported on Windows.");
       targetOK = false;
     }
 
@@ -331,9 +332,8 @@ public TargetConfig getTargetConfig() {
     try {
       compileThreadPool.awaitTermination(Long.MAX_VALUE, TimeUnit.NANOSECONDS);
     } catch (Exception e) {
-      ErrorReporter errorReporter1 = context.getErrorReporter();
-      String message = "Failure during code generation: " + e.getMessage();
-      errorReporter1.nowhere().error(message);
+      context.getErrorReporter().nowhere().error(
+          "Failure during code generation: " + e.getMessage());
       e.printStackTrace();
     } finally {
       finalizer.accept(subContexts);
@@ -509,8 +509,8 @@ private void replaceConnectionFromOutputPort(PortInstance output) {
     for (SendRange srcRange : output.getDependentPorts()) {
       if (srcRange.connection == null) {
         // This should not happen.
-        EObject object = output.getDefinition();
-        errorReporter.at(object).error("Unexpected error. Cannot find output connection for port");
+        errorReporter.at(output.getDefinition())
+            .error("Cannot find output connection for port");
         continue;
       }
       // Iterate through destinations
diff --git a/core/src/main/java/org/lflang/federated/generator/FederateInstance.java b/core/src/main/java/org/lflang/federated/generator/FederateInstance.java
index f59085cc00..3a0ba7d488 100644
--- a/core/src/main/java/org/lflang/federated/generator/FederateInstance.java
+++ b/core/src/main/java/org/lflang/federated/generator/FederateInstance.java
@@ -510,8 +510,8 @@ private boolean containsAllVarRefs(Iterable<VarRef> varRefs) {
         referencesFederate = true;
       } else {
         if (referencesFederate) {
-            errorReporter.at(varRef).error(
-                "Mixed triggers and effects from" + " different federates. This is not permitted");
+            errorReporter.at(varRef)
+                .error("Mixed triggers and effects from different federates. This is not permitted");
         }
         inFederate = false;
       }
diff --git a/core/src/main/java/org/lflang/generator/GeneratorCommandFactory.java b/core/src/main/java/org/lflang/generator/GeneratorCommandFactory.java
index 471e85aa89..a53c9b90b1 100644
--- a/core/src/main/java/org/lflang/generator/GeneratorCommandFactory.java
+++ b/core/src/main/java/org/lflang/generator/GeneratorCommandFactory.java
@@ -25,10 +25,16 @@
 
 package org.lflang.generator;
 
+import static org.eclipse.lsp4j.DiagnosticSeverity.Error;
+import static org.eclipse.lsp4j.DiagnosticSeverity.Warning;
+
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.List;
 import java.util.Objects;
+
+import org.eclipse.lsp4j.DiagnosticSeverity;
+
 import org.lflang.ErrorReporter;
 import org.lflang.FileConfig;
 import org.lflang.util.LFCommand;
@@ -144,11 +150,9 @@ public LFCommand createCommand(String cmd, List<String> args, Path dir, boolean
               + cmd
               + " is installed. "
               + "You can set PATH in ~/.bash_profile on Linux or Mac.";
-      if (failOnError) {
-        errorReporter.nowhere().error(message);
-      } else {
-          errorReporter.nowhere().warning(message);
-      }
+
+      DiagnosticSeverity severity = failOnError ? Error : Warning;
+      errorReporter.nowhere().report(severity, message);
     }
 
     return command;
diff --git a/core/src/main/java/org/lflang/generator/LanguageServerErrorReporter.java b/core/src/main/java/org/lflang/generator/LanguageServerErrorReporter.java
index b1cb30f1f0..3fe1a2907e 100644
--- a/core/src/main/java/org/lflang/generator/LanguageServerErrorReporter.java
+++ b/core/src/main/java/org/lflang/generator/LanguageServerErrorReporter.java
@@ -37,7 +37,6 @@ public class LanguageServerErrorReporter extends ErrorReporterBase {
   /** The list of all diagnostics since the last reset. */
   private final Map<Path, List<Diagnostic>> diagnostics;
 
-  /* ------------------------  CONSTRUCTORS  -------------------------- */
 
   /**
    * Initialize a {@code DiagnosticAcceptor} for the document whose parse tree root node is {@code
@@ -81,7 +80,6 @@ protected void report(Path path, org.lflang.generator.Range range, DiagnosticSev
             message, severity, "LF Language Server"));
 
   }
-  /* -----------------------  PUBLIC METHODS  ------------------------- */
 
   @Override
   public boolean getErrorsOccurred() {
diff --git a/core/src/main/java/org/lflang/generator/TimerInstance.java b/core/src/main/java/org/lflang/generator/TimerInstance.java
index 38dc374bf6..1f4626f5be 100644
--- a/core/src/main/java/org/lflang/generator/TimerInstance.java
+++ b/core/src/main/java/org/lflang/generator/TimerInstance.java
@@ -26,8 +26,6 @@
 
 package org.lflang.generator;
 
-import org.eclipse.emf.ecore.EObject;
-
 import org.lflang.TimeValue;
 import org.lflang.lf.Timer;
 
@@ -65,16 +63,14 @@ public TimerInstance(Timer definition, ReactorInstance parent) {
         try {
           this.offset = parent.getTimeValue(definition.getOffset());
         } catch (IllegalArgumentException ex) {
-            EObject object = definition.getOffset();
-            parent.reporter.at(object).error("Invalid time.");
+          parent.reporter.at(definition.getOffset()).error("Invalid time.");
         }
       }
       if (definition.getPeriod() != null) {
         try {
           this.period = parent.getTimeValue(definition.getPeriod());
         } catch (IllegalArgumentException ex) {
-            EObject object = definition.getPeriod();
-            parent.reporter.at(object).error("Invalid time.");
+          parent.reporter.at(definition.getPeriod()).error("Invalid time.");
         }
       }
     }
diff --git a/core/src/main/java/org/lflang/generator/c/CCompiler.java b/core/src/main/java/org/lflang/generator/c/CCompiler.java
index 2af631b349..858098d9ac 100644
--- a/core/src/main/java/org/lflang/generator/c/CCompiler.java
+++ b/core/src/main/java/org/lflang/generator/c/CCompiler.java
@@ -134,8 +134,8 @@ public boolean runCCompiler(GeneratorBase generator, LFGeneratorContext context)
     if (cMakeReturnCode != 0
         && context.getMode() == LFGeneratorContext.Mode.STANDALONE
         && !outputContainsKnownCMakeErrors(compile.getErrors())) {
-        errorReporter.nowhere().error(
-            targetConfig.compiler + " failed with error code " + cMakeReturnCode);
+        errorReporter.nowhere()
+            .error(targetConfig.compiler + " failed with error code " + cMakeReturnCode);
     }
 
     // For warnings (vs. errors), the return code is 0.
@@ -156,8 +156,8 @@ public boolean runCCompiler(GeneratorBase generator, LFGeneratorContext context)
       if (makeReturnCode != 0
           && context.getMode() == LFGeneratorContext.Mode.STANDALONE
           && !outputContainsKnownCMakeErrors(build.getErrors())) {
-          errorReporter.nowhere().error(
-              targetConfig.compiler + " failed with error code " + makeReturnCode);
+          errorReporter.nowhere()
+              .error(targetConfig.compiler + " failed with error code " + makeReturnCode);
       }
 
       // For warnings (vs. errors), the return code is 0.

From 4f614b2e23fe6d5ff7a0e2ba8d7995b2b1e72869 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Fournier?= <clement.fournier@tu-dresden.de>
Date: Tue, 13 Jun 2023 15:12:30 +0200
Subject: [PATCH 12/17] Another cleanup

---
 .../HumanReadableReportingStrategy.java       | 64 ++++++++-----------
 1 file changed, 26 insertions(+), 38 deletions(-)

diff --git a/core/src/main/java/org/lflang/generator/HumanReadableReportingStrategy.java b/core/src/main/java/org/lflang/generator/HumanReadableReportingStrategy.java
index 42923fb7a9..488b6620dc 100644
--- a/core/src/main/java/org/lflang/generator/HumanReadableReportingStrategy.java
+++ b/core/src/main/java/org/lflang/generator/HumanReadableReportingStrategy.java
@@ -4,12 +4,10 @@
 import java.nio.file.Paths;
 import java.util.Iterator;
 import java.util.Map;
-import java.util.function.Consumer;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 import org.eclipse.lsp4j.DiagnosticSeverity;
-import org.eclipse.xtext.xbase.lib.Procedures.Procedure0;
 
 import org.lflang.ErrorReporter;
 
@@ -95,27 +93,27 @@ private void reportErrorLine(
     Matcher matcher = diagnosticMessagePattern.matcher(stripEscaped(line));
     if (matcher.matches()) {
       final Path path = Paths.get(matcher.group("path"));
+      final DiagnosticSeverity severity = DiagnosticReporting.severityOf(matcher.group("severity"));
+
+      String column = matcher.group("column");
       final Position generatedFilePosition =
           Position.fromOneBased(
               Integer.parseInt(matcher.group("line")),
-              Integer.parseInt(
-                  matcher.group("column") != null
-                      ? matcher.group("column")
-                      : "0") // FIXME: Unreliable heuristic
-              );
+              column == null ? 1 // FIXME: Unreliable heuristic
+                  : Integer.parseInt(column)
+          );
       final String message =
           DiagnosticReporting.messageOf(matcher.group("message"), path, generatedFilePosition);
       final CodeMap map = maps.get(relativeTo != null ? relativeTo.resolve(path) : path);
-      final DiagnosticSeverity severity = DiagnosticReporting.severityOf(matcher.group("severity"));
       if (map == null) {
         errorReporter.nowhere().report(severity, message);
         return;
       }
       for (Path srcFile : map.lfSourcePaths()) {
         Position lfFilePosition = map.adjusted(srcFile, generatedFilePosition);
-        if (matcher.group("column") != null) {
-          reportAppropriateRange(
-              range -> errorReporter.at(srcFile, range).report(severity, message), lfFilePosition, it);
+        if (column != null) {
+          Range range = findAppropriateRange(lfFilePosition, it);
+          errorReporter.at(srcFile, range).report(severity, message);
         } else {
           errorReporter.at(srcFile, lfFilePosition.getOneBasedLine()).report(severity, message);
         }
@@ -124,38 +122,28 @@ private void reportErrorLine(
   }
 
   /**
-   * Report the appropriate range to {@code report}.
+   * Find the appropriate range to {@code report}.
    *
-   * @param report A reporting method whose first and second parameters are the (included) start and
-   *     (excluded) end of the relevant range.
    * @param lfFilePosition The point about which the relevant range is anchored.
    * @param it An iterator over the lines immediately following a diagnostic message.
    */
-  private void reportAppropriateRange(
-      Consumer<Range> report, Position lfFilePosition, Iterator<String> it) {
-    Procedure0 failGracefully =
-        () -> report.accept(new Range(lfFilePosition, lfFilePosition.plus(" ")));
-    if (!it.hasNext()) {
-      failGracefully.apply();
-      return;
-    }
-    String line = it.next();
-    Matcher labelMatcher = labelPattern.matcher(line);
-    if (labelMatcher.find()) {
-      report.accept(
-          new Range(
-              Position.fromZeroBased(
-                  lfFilePosition.getZeroBasedLine(),
-                  lfFilePosition.getZeroBasedColumn() - labelMatcher.group(1).length()),
-              lfFilePosition.plus(labelMatcher.group(2))));
-      return;
-    }
-    if (diagnosticMessagePattern.matcher(line).find()) {
-      failGracefully.apply();
-      bufferedLine = line;
-      return;
+  private Range findAppropriateRange(Position lfFilePosition, Iterator<String> it) {
+    while (it.hasNext()) {
+      String line = it.next();
+      Matcher labelMatcher = labelPattern.matcher(line);
+      if (labelMatcher.find()) {
+        Position start = Position.fromZeroBased(
+            lfFilePosition.getZeroBasedLine(),
+            lfFilePosition.getZeroBasedColumn() - labelMatcher.group(1).length());
+        Position end = lfFilePosition.plus(labelMatcher.group(2));
+        return new Range(start, end);
+      } else if (diagnosticMessagePattern.matcher(line).find()) {
+        bufferedLine = line;
+        break;
+      }
     }
-    reportAppropriateRange(report, lfFilePosition, it);
+    // fallback, we didn't find it.
+    return new Range(lfFilePosition, lfFilePosition.plus(" "));
   }
 
   /**

From a2fa03cdbb4f63e93fa4563846f36433d98d4753 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Fournier?= <clement.fournier@tu-dresden.de>
Date: Wed, 14 Jun 2023 13:18:06 +0200
Subject: [PATCH 13/17] Format

---
 .../lflang/cli/StandaloneErrorReporter.java   |  8 +--
 .../java/org/lflang/DefaultErrorReporter.java | 11 +---
 .../main/java/org/lflang/ErrorReporter.java   | 49 ++++++----------
 .../java/org/lflang/ErrorReporterBase.java    | 27 +++------
 core/src/main/java/org/lflang/ModelInfo.java  |  5 +-
 .../main/java/org/lflang/TargetProperty.java  | 12 ++--
 .../util/SynthesisErrorReporter.java          |  3 -
 .../federated/extensions/CExtension.java      | 30 +++++-----
 .../federated/extensions/TSExtension.java     | 32 +++++------
 .../federated/generator/FedGenerator.java     | 22 ++++---
 .../federated/generator/FedMainEmitter.java   |  5 +-
 .../federated/generator/FederateInstance.java |  5 +-
 .../generator/LineAdjustingErrorReporter.java | 15 ++---
 .../generator/SynchronizedErrorReporter.java  |  7 ++-
 .../FedROS2CPPSerialization.java              | 15 +++--
 .../federated/validation/FedValidator.java    |  7 ++-
 .../org/lflang/generator/GeneratorBase.java   | 38 +++++++------
 .../generator/GeneratorCommandFactory.java    |  2 -
 .../org/lflang/generator/GeneratorUtils.java  | 15 +++--
 .../HumanReadableReportingStrategy.java       | 15 +++--
 .../lflang/generator/IntegratedBuilder.java   |  8 +--
 .../LanguageServerErrorReporter.java          | 33 ++++++-----
 .../org/lflang/generator/PortInstance.java    |  5 +-
 .../org/lflang/generator/ReactorInstance.java | 37 +++++++-----
 .../java/org/lflang/generator/Validator.java  |  8 +--
 .../lflang/generator/c/CCmakeGenerator.java   | 10 ++--
 .../org/lflang/generator/c/CCompiler.java     | 57 ++++++++++++-------
 .../org/lflang/generator/c/CGenerator.java    | 39 +++++++------
 .../lflang/generator/c/CPortGenerator.java    |  6 +-
 .../generator/c/CReactionGenerator.java       | 14 +++--
 .../java/org/lflang/generator/c/CUtil.java    | 19 ++++---
 .../generator/c/CWatchdogGenerator.java       | 10 ++--
 .../generator/python/PythonGenerator.java     |  6 +-
 .../python/PythonReactionGenerator.java       | 10 ++--
 .../generator/python/PythonValidator.java     | 24 ++++----
 .../generator/rust/CargoDependencySpec.java   | 10 ++--
 .../generator/rust/RustTargetConfig.java      | 10 ++--
 .../java/org/lflang/util/ArduinoUtil.java     | 13 +++--
 .../main/java/org/lflang/util/FileUtil.java   | 22 +++----
 .../main/java/org/lflang/util/LFCommand.java  |  1 -
 .../org/lflang/validation/LFValidator.java    |  2 +-
 .../validation/ValidatorErrorReporter.java    | 29 +++++-----
 42 files changed, 353 insertions(+), 343 deletions(-)

diff --git a/cli/base/src/main/java/org/lflang/cli/StandaloneErrorReporter.java b/cli/base/src/main/java/org/lflang/cli/StandaloneErrorReporter.java
index 2ac9b48559..36ce472280 100644
--- a/cli/base/src/main/java/org/lflang/cli/StandaloneErrorReporter.java
+++ b/cli/base/src/main/java/org/lflang/cli/StandaloneErrorReporter.java
@@ -28,14 +28,10 @@
 package org.lflang.cli;
 
 import com.google.inject.Inject;
-
 import java.nio.file.Path;
-
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.lsp4j.DiagnosticSeverity;
 import org.eclipse.xtext.diagnostics.Severity;
-
-import org.lflang.ErrorReporter;
 import org.lflang.ErrorReporterBase;
 import org.lflang.generator.Range;
 
@@ -45,8 +41,7 @@
  */
 public class StandaloneErrorReporter extends ErrorReporterBase {
 
-  @Inject
-  private StandaloneIssueAcceptor issueAcceptor;
+  @Inject private StandaloneIssueAcceptor issueAcceptor;
 
   static Severity convertSeverity(DiagnosticSeverity severity) {
     return switch (severity) {
@@ -72,7 +67,6 @@ protected void report(Path path, Range range, DiagnosticSeverity severity, Strin
   protected void reportWithoutPosition(DiagnosticSeverity severity, String message) {
     LfIssue issue = new LfIssue(message, convertSeverity(severity), null, null);
     issueAcceptor.accept(issue);
-
   }
 
   @Override
diff --git a/core/src/main/java/org/lflang/DefaultErrorReporter.java b/core/src/main/java/org/lflang/DefaultErrorReporter.java
index bc66b78ab7..9be737671b 100644
--- a/core/src/main/java/org/lflang/DefaultErrorReporter.java
+++ b/core/src/main/java/org/lflang/DefaultErrorReporter.java
@@ -1,16 +1,13 @@
 package org.lflang;
 
 import java.nio.file.Path;
-
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.lsp4j.DiagnosticSeverity;
-
 import org.lflang.generator.Range;
 
 /** Simple implementation of the ErrorReport interface that simply prints to standard out. */
 public class DefaultErrorReporter extends ErrorReporterBase implements ErrorReporter {
 
-
   private void println(String s) {
     System.out.println(s);
   }
@@ -28,11 +25,9 @@ protected void reportOnNode(EObject node, DiagnosticSeverity severity, String me
   @Override
   protected void reportWithoutPosition(DiagnosticSeverity severity, String message) {
     switch (severity) {
-    case Error -> println("ERROR: " + message);
-    case Warning -> println("WARNING: " + message);
-    case Information -> println("INFO: " + message);
-    case Hint -> println("HINT: " + message);
+      case Error -> println("ERROR: " + message);
+      case Warning -> println("WARNING: " + message);
+      case Information, Hint -> println("INFO: " + message);
     }
   }
-
 }
diff --git a/core/src/main/java/org/lflang/ErrorReporter.java b/core/src/main/java/org/lflang/ErrorReporter.java
index fed2e58752..3b39b14503 100644
--- a/core/src/main/java/org/lflang/ErrorReporter.java
+++ b/core/src/main/java/org/lflang/ErrorReporter.java
@@ -1,21 +1,18 @@
 package org.lflang;
 
 import java.nio.file.Path;
-import java.util.OptionalInt;
-
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.lsp4j.DiagnosticSeverity;
-
 import org.lflang.generator.Position;
 import org.lflang.generator.Range;
 
 /**
- * Interface for reporting errors.
- * This interface is a staged builder: first call one of the {@code at}
- * methods to specify the position of the message, then use one
- * of the report methods on the returned {@link Stage2} instance.
+ * Interface for reporting errors. This interface is a staged builder: first call one of the {@code
+ * at} methods to specify the position of the message, then use one of the report methods on the
+ * returned {@link Stage2} instance.
  *
  * <p>Examples:
+ *
  * <pre>{@code
  * errorReporter.at(file, line).error("an error")
  * errorReporter.at(node).warning("a warning reported on a node")
@@ -23,7 +20,6 @@
  * }</pre>
  *
  * @see ErrorReporterBase
- *
  * @author Edward A. Lee
  * @author Marten Lohstroh
  * @author Christian Menard
@@ -32,44 +28,37 @@
 public interface ErrorReporter {
 
   /** Position the message on the given range in a given file (both must be non-null). */
-
   Stage2 at(Path file, Range range);
 
   /** Position the message on the given node (must be non-null). */
   Stage2 at(EObject object);
 
   /**
-   * Position the message in the file (non-null), at an unknown line.
-   * Implementations usually will report on the first line of the file.
+   * Position the message in the file (non-null), at an unknown line. Implementations usually will
+   * report on the first line of the file.
    */
   default Stage2 at(Path file) {
     return at(file, 1);
   }
 
-  /**
-   * Position the message in the file (non-null), on the given line.
-   */
+  /** Position the message in the file (non-null), on the given line. */
   default Stage2 at(Path file, int line) {
     return at(file, Position.fromOneBased(line, 1));
   }
 
-  /**
-   * Position the message in the file, using a position object.
-   */
+  /** Position the message in the file, using a position object. */
   default Stage2 at(Path file, Position pos) {
     return at(file, Range.degenerateRange(pos));
   }
 
   /**
-   * Specify that the message has no relevant position, ie
-   * it does not belong to a particular file.
+   * Specify that the message has no relevant position, ie it does not belong to a particular file.
    */
   Stage2 nowhere();
 
   /**
-   * Position the message in the given file. The line may be
-   * null. This is a convenience wrapper that calls either
-   * {@link #at(Path, int)} or {@link #at(Path)}.
+   * Position the message in the given file. The line may be null. This is a convenience wrapper
+   * that calls either {@link #at(Path, int)} or {@link #at(Path)}.
    */
   default Stage2 atNullableLine(Path file, Integer line) {
     if (line != null) {
@@ -78,11 +67,9 @@ default Stage2 atNullableLine(Path file, Integer line) {
     return at(file);
   }
 
-
   /**
-   * Interface to report a message with a specific severity.
-   * This is returned by one of the positioning functions like
-   * {@link #at(Path)}. This instance holds an implicit position.
+   * Interface to report a message with a specific severity. This is returned by one of the
+   * positioning functions like {@link #at(Path)}. This instance holds an implicit position.
    */
   interface Stage2 {
 
@@ -113,16 +100,14 @@ default void info(String message) {
       report(DiagnosticSeverity.Information, message);
     }
 
-
     /**
-     * Report a message with the given severity. This is the only
-     * member that needs to be implemented.
+     * Report a message with the given severity. This is the only member that needs to be
+     * implemented.
      *
      * @param severity The severity
      * @param message The message to report
      */
     void report(DiagnosticSeverity severity, String message);
-
   }
 
   /**
@@ -133,8 +118,8 @@ default void info(String message) {
   boolean getErrorsOccurred();
 
   /**
-   * Clear error history, if exists. This is usually only the
-   * case for error markers in Epoch (Eclipse).
+   * Clear error history, if exists. This is usually only the case for error markers in Epoch
+   * (Eclipse).
    */
   default void clearHistory() {}
 }
diff --git a/core/src/main/java/org/lflang/ErrorReporterBase.java b/core/src/main/java/org/lflang/ErrorReporterBase.java
index de51d5785e..c1364b6308 100644
--- a/core/src/main/java/org/lflang/ErrorReporterBase.java
+++ b/core/src/main/java/org/lflang/ErrorReporterBase.java
@@ -1,21 +1,16 @@
 package org.lflang;
 
 import java.nio.file.Path;
-
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.lsp4j.DiagnosticSeverity;
-
 import org.lflang.generator.Range;
 
-/**
- * Base implementation of the {@link ErrorReporter} interface.
- */
+/** Base implementation of the {@link ErrorReporter} interface. */
 public abstract class ErrorReporterBase implements ErrorReporter {
 
   private boolean errorsOccurred = false;
 
-  protected ErrorReporterBase() {
-  }
+  protected ErrorReporterBase() {}
 
   @Override
   public boolean getErrorsOccurred() {
@@ -52,24 +47,16 @@ public Stage2 nowhere() {
     return wrap(this::reportWithoutPosition);
   }
 
-
   // These methods are the terminal ones that are called when a call to
   // Stage2#report is issued by a caller.
 
+  /** Implementation of the reporting methods that use a path and range as position. */
+  protected abstract void report(
+      Path path, Range range, DiagnosticSeverity severity, String message);
 
-  /**
-   * Implementation of the reporting methods that use a path and range as position.
-   */
-  protected abstract void report(Path path, Range range, DiagnosticSeverity severity, String message);
-
-  /**
-   * Implementation of the reporting methods that use a node as position.
-   */
+  /** Implementation of the reporting methods that use a node as position. */
   protected abstract void reportOnNode(EObject node, DiagnosticSeverity severity, String message);
 
-  /**
-   * Implementation of the reporting methods for {@link #nowhere()}.
-   */
+  /** Implementation of the reporting methods for {@link #nowhere()}. */
   protected abstract void reportWithoutPosition(DiagnosticSeverity severity, String message);
-
 }
diff --git a/core/src/main/java/org/lflang/ModelInfo.java b/core/src/main/java/org/lflang/ModelInfo.java
index 6bacd33a0e..5898e1691a 100644
--- a/core/src/main/java/org/lflang/ModelInfo.java
+++ b/core/src/main/java/org/lflang/ModelInfo.java
@@ -35,7 +35,6 @@
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Set;
-
 import org.lflang.ast.ASTUtils;
 import org.lflang.generator.NamedInstance;
 import org.lflang.generator.ReactorInstance;
@@ -146,7 +145,9 @@ public void checkCaseInsensitiveNameCollisions(Model model, ErrorReporter report
           .filter(it -> getName(it).toLowerCase().equals(badName))
           .forEach(
               it ->
-                  reporter.at(it).error("Multiple reactors have the same name up to case differences."));
+                  reporter
+                      .at(it)
+                      .error("Multiple reactors have the same name up to case differences."));
     }
   }
 
diff --git a/core/src/main/java/org/lflang/TargetProperty.java b/core/src/main/java/org/lflang/TargetProperty.java
index 00aefd43b2..8fd948d2d5 100644
--- a/core/src/main/java/org/lflang/TargetProperty.java
+++ b/core/src/main/java/org/lflang/TargetProperty.java
@@ -35,8 +35,6 @@
 import java.util.Optional;
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
-
-import org.eclipse.emf.ecore.EObject;
 import org.eclipse.xtext.util.RuntimeIOException;
 import org.lflang.TargetConfig.DockerOptions;
 import org.lflang.TargetConfig.PlatformOptions;
@@ -474,8 +472,8 @@ public enum TargetProperty {
                   String s =
                       "Unidentified Platform Type, LF supports the following platform types: "
                           + Arrays.asList(Platform.values()).toString();
-                    err.nowhere().error(s);
-                    throw new AssertionError(s);
+                  err.at(entry).error(s);
+                  throw new AssertionError(s);
                 }
                 config.platformOptions.platform = p;
                 break;
@@ -720,8 +718,8 @@ else if (paths.size() == 1) {
         try {
           referencePath = FileUtil.toPath(value.eResource().getURI()).toAbsolutePath();
         } catch (IOException e) {
-            err.at(value).error("Invalid path? " + e.getMessage());
-            throw new RuntimeIOException(e);
+          err.at(value).error("Invalid path? " + e.getMessage());
+          throw new RuntimeIOException(e);
         }
 
         // we'll resolve relative paths to check that the files
@@ -953,7 +951,7 @@ public static void set(TargetConfig config, List<KeyValuePair> properties, Error
             try {
               p.setter.parseIntoTargetConfig(config, property.getValue(), err);
             } catch (InvalidLfSourceException e) {
-                err.at(e.getNode()).error(e.getProblem());
+              err.at(e.getNode()).error(e.getProblem());
             }
           }
         });
diff --git a/core/src/main/java/org/lflang/diagram/synthesis/util/SynthesisErrorReporter.java b/core/src/main/java/org/lflang/diagram/synthesis/util/SynthesisErrorReporter.java
index c2488dbac2..b6294901de 100644
--- a/core/src/main/java/org/lflang/diagram/synthesis/util/SynthesisErrorReporter.java
+++ b/core/src/main/java/org/lflang/diagram/synthesis/util/SynthesisErrorReporter.java
@@ -25,11 +25,8 @@
 package org.lflang.diagram.synthesis.util;
 
 import java.nio.file.Path;
-
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.lsp4j.DiagnosticSeverity;
-
-import org.lflang.ErrorReporter;
 import org.lflang.ErrorReporterBase;
 import org.lflang.generator.Range;
 
diff --git a/core/src/main/java/org/lflang/federated/extensions/CExtension.java b/core/src/main/java/org/lflang/federated/extensions/CExtension.java
index 639da88033..8f75dd2f44 100644
--- a/core/src/main/java/org/lflang/federated/extensions/CExtension.java
+++ b/core/src/main/java/org/lflang/federated/extensions/CExtension.java
@@ -33,7 +33,6 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.List;
-
 import org.lflang.ErrorReporter;
 import org.lflang.InferredType;
 import org.lflang.Target;
@@ -789,20 +788,21 @@ private String generateCodeForPhysicalActions(
       if (minDelay != TimeValue.MAX_VALUE) {
         // Unless silenced, issue a warning.
         if (federate.targetConfig.coordinationOptions.advance_message_interval == null) {
-          String message = String.join(
-              "\n",
-              "Found a path from a physical action to output for reactor "
-                  + addDoubleQuotes(instance.getName())
-                  + ". ",
-              "The amount of delay is " + minDelay + ".",
-              "With centralized coordination, this can result in a large number of messages to"
-                  + " the RTI.",
-              "Consider refactoring the code so that the output does not depend on the physical"
-                  + " action,",
-              "or consider using decentralized coordination. To silence this warning, set the"
-                  + " target",
-              "parameter coordination-options with a value like {advance-message-interval: 10"
-                  + " msec}");
+          String message =
+              String.join(
+                  "\n",
+                  "Found a path from a physical action to output for reactor "
+                      + addDoubleQuotes(instance.getName())
+                      + ". ",
+                  "The amount of delay is " + minDelay + ".",
+                  "With centralized coordination, this can result in a large number of messages to"
+                      + " the RTI.",
+                  "Consider refactoring the code so that the output does not depend on the physical"
+                      + " action,",
+                  "or consider using decentralized coordination. To silence this warning, set the"
+                      + " target",
+                  "parameter coordination-options with a value like {advance-message-interval: 10"
+                      + " msec}");
           errorReporter.at(outputFound).warning(message);
         }
         code.pr(
diff --git a/core/src/main/java/org/lflang/federated/extensions/TSExtension.java b/core/src/main/java/org/lflang/federated/extensions/TSExtension.java
index ea6895022c..665a322407 100644
--- a/core/src/main/java/org/lflang/federated/extensions/TSExtension.java
+++ b/core/src/main/java/org/lflang/federated/extensions/TSExtension.java
@@ -6,7 +6,6 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
-
 import org.lflang.ErrorReporter;
 import org.lflang.InferredType;
 import org.lflang.TargetProperty.CoordinationType;
@@ -175,21 +174,22 @@ private TimeValue getMinOutputDelay(
       if (minOutputDelay != TimeValue.MAX_VALUE) {
         // Unless silenced, issue a warning.
         if (federate.targetConfig.coordinationOptions.advance_message_interval == null) {
-            String message = String.join(
-                "\n",
-                "Found a path from a physical action to output for reactor "
-                    + addDoubleQuotes(instance.getName())
-                    + ". ",
-                "The amount of delay is " + minOutputDelay + ".",
-                "With centralized coordination, this can result in a large number of messages to"
-                    + " the RTI.",
-                "Consider refactoring the code so that the output does not depend on the physical"
-                    + " action,",
-                "or consider using decentralized coordination. To silence this warning, set the"
-                    + " target",
-                "parameter coordination-options with a value like {advance-message-interval: 10"
-                    + " msec}");
-            errorReporter.at(outputFound).warning(message);
+          String message =
+              String.join(
+                  "\n",
+                  "Found a path from a physical action to output for reactor "
+                      + addDoubleQuotes(instance.getName())
+                      + ". ",
+                  "The amount of delay is " + minOutputDelay + ".",
+                  "With centralized coordination, this can result in a large number of messages to"
+                      + " the RTI.",
+                  "Consider refactoring the code so that the output does not depend on the physical"
+                      + " action,",
+                  "or consider using decentralized coordination. To silence this warning, set the"
+                      + " target",
+                  "parameter coordination-options with a value like {advance-message-interval: 10"
+                      + " msec}");
+          errorReporter.at(outputFound).warning(message);
         }
         return minOutputDelay;
       }
diff --git a/core/src/main/java/org/lflang/federated/generator/FedGenerator.java b/core/src/main/java/org/lflang/federated/generator/FedGenerator.java
index 29b49a50ce..f87cb8705a 100644
--- a/core/src/main/java/org/lflang/federated/generator/FedGenerator.java
+++ b/core/src/main/java/org/lflang/federated/generator/FedGenerator.java
@@ -21,7 +21,6 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.xtext.generator.JavaIoFileSystemAccess;
 import org.eclipse.xtext.resource.XtextResource;
@@ -166,7 +165,8 @@ public boolean doGenerate(Resource resource, LFGeneratorContext context) throws
               subContexts.forEach(
                   c -> {
                     if (c.getErrorReporter().getErrorsOccurred()) {
-                      context.getErrorReporter()
+                      context
+                          .getErrorReporter()
                           .at(c.getFileConfig().srcFile)
                           .error("Failure during code generation of " + c.getFileConfig().srcFile);
                     }
@@ -233,11 +233,14 @@ private boolean federatedExecutionIsSupported(Resource resource) {
     var targetOK =
         List.of(Target.C, Target.Python, Target.TS, Target.CPP, Target.CCPP).contains(target);
     if (!targetOK) {
-      errorReporter.at(targetDecl).error(
-          "Federated execution is not supported with target " + target + ".");
+      errorReporter
+          .at(targetDecl)
+          .error("Federated execution is not supported with target " + target + ".");
     }
     if (target.equals(Target.C) && GeneratorUtils.isHostWindows()) {
-      errorReporter.at(targetDecl).error("Federated LF programs with a C target are currently not supported on Windows.");
+      errorReporter
+          .at(targetDecl)
+          .error("Federated LF programs with a C target are currently not supported on Windows.");
       targetOK = false;
     }
 
@@ -332,8 +335,10 @@ public TargetConfig getTargetConfig() {
     try {
       compileThreadPool.awaitTermination(Long.MAX_VALUE, TimeUnit.NANOSECONDS);
     } catch (Exception e) {
-      context.getErrorReporter().nowhere().error(
-          "Failure during code generation: " + e.getMessage());
+      context
+          .getErrorReporter()
+          .nowhere()
+          .error("Failure during code generation: " + e.getMessage());
       e.printStackTrace();
     } finally {
       finalizer.accept(subContexts);
@@ -509,8 +514,7 @@ private void replaceConnectionFromOutputPort(PortInstance output) {
     for (SendRange srcRange : output.getDependentPorts()) {
       if (srcRange.connection == null) {
         // This should not happen.
-        errorReporter.at(output.getDefinition())
-            .error("Cannot find output connection for port");
+        errorReporter.at(output.getDefinition()).error("Cannot find output connection for port");
         continue;
       }
       // Iterate through destinations
diff --git a/core/src/main/java/org/lflang/federated/generator/FedMainEmitter.java b/core/src/main/java/org/lflang/federated/generator/FedMainEmitter.java
index 9d132d412a..b3aceeafe0 100644
--- a/core/src/main/java/org/lflang/federated/generator/FedMainEmitter.java
+++ b/core/src/main/java/org/lflang/federated/generator/FedMainEmitter.java
@@ -24,8 +24,9 @@ String generateMainReactor(
       FederateInstance federate, Reactor originalMainReactor, ErrorReporter errorReporter) {
     // FIXME: Handle modes at the top-level
     if (!ASTUtils.allModes(originalMainReactor).isEmpty()) {
-        errorReporter.at(ASTUtils.allModes(originalMainReactor).stream().findFirst().get())
-            .error("Modes at the top level are not supported under federated execution.");
+      errorReporter
+          .at(ASTUtils.allModes(originalMainReactor).stream().findFirst().get())
+          .error("Modes at the top level are not supported under federated execution.");
     }
     var renderer = FormattingUtils.renderer(federate.targetConfig.target);
 
diff --git a/core/src/main/java/org/lflang/federated/generator/FederateInstance.java b/core/src/main/java/org/lflang/federated/generator/FederateInstance.java
index 3a0ba7d488..5fbcf93b78 100644
--- a/core/src/main/java/org/lflang/federated/generator/FederateInstance.java
+++ b/core/src/main/java/org/lflang/federated/generator/FederateInstance.java
@@ -510,8 +510,9 @@ private boolean containsAllVarRefs(Iterable<VarRef> varRefs) {
         referencesFederate = true;
       } else {
         if (referencesFederate) {
-            errorReporter.at(varRef)
-                .error("Mixed triggers and effects from different federates. This is not permitted");
+          errorReporter
+              .at(varRef)
+              .error("Mixed triggers and effects from different federates. This is not permitted");
         }
         inFederate = false;
       }
diff --git a/core/src/main/java/org/lflang/federated/generator/LineAdjustingErrorReporter.java b/core/src/main/java/org/lflang/federated/generator/LineAdjustingErrorReporter.java
index 8b00c1ae08..0fde6e0461 100644
--- a/core/src/main/java/org/lflang/federated/generator/LineAdjustingErrorReporter.java
+++ b/core/src/main/java/org/lflang/federated/generator/LineAdjustingErrorReporter.java
@@ -3,9 +3,7 @@
 import java.nio.file.Path;
 import java.util.Map;
 import org.eclipse.emf.ecore.EObject;
-import org.eclipse.lsp4j.DiagnosticSeverity;
 import org.lflang.ErrorReporter;
-import org.lflang.ErrorReporterBase;
 import org.lflang.generator.CodeMap;
 import org.lflang.generator.Position;
 import org.lflang.generator.Range;
@@ -20,7 +18,6 @@ public LineAdjustingErrorReporter(ErrorReporter parent, Map<Path, CodeMap> codeM
     this.codeMapMap = codeMapMap;
   }
 
-
   @Override
   public Stage2 at(EObject object) {
     return parent.at(object);
@@ -45,18 +42,18 @@ public Stage2 at(Path file, Range range) {
       var relevantMap = codeMapMap.get(file);
       for (Path lfSource : relevantMap.lfSourcePaths()) {
         var adjustedRange = relevantMap.adjusted(lfSource, range);
-        adjustedRange = new Range(
-            adjustedRange.getStartInclusive().equals(Position.ORIGIN)
-                ? Position.fromZeroBased(adjustedRange.getEndExclusive().getZeroBasedLine(), 0)
-                : adjustedRange.getStartInclusive(),
-            adjustedRange.getEndExclusive());
+        adjustedRange =
+            new Range(
+                adjustedRange.getStartInclusive().equals(Position.ORIGIN)
+                    ? Position.fromZeroBased(adjustedRange.getEndExclusive().getZeroBasedLine(), 0)
+                    : adjustedRange.getStartInclusive(),
+                adjustedRange.getEndExclusive());
         return parent.at(lfSource, adjustedRange);
       }
     }
     return nowhere();
   }
 
-
   @Override
   public boolean getErrorsOccurred() {
     return parent.getErrorsOccurred();
diff --git a/core/src/main/java/org/lflang/federated/generator/SynchronizedErrorReporter.java b/core/src/main/java/org/lflang/federated/generator/SynchronizedErrorReporter.java
index e371499fbd..7cf7bb0610 100644
--- a/core/src/main/java/org/lflang/federated/generator/SynchronizedErrorReporter.java
+++ b/core/src/main/java/org/lflang/federated/generator/SynchronizedErrorReporter.java
@@ -5,7 +5,6 @@
 import org.eclipse.lsp4j.DiagnosticSeverity;
 import org.lflang.ErrorReporter;
 import org.lflang.ErrorReporterBase;
-import org.lflang.generator.Position;
 import org.lflang.generator.Range;
 
 public class SynchronizedErrorReporter extends ErrorReporterBase {
@@ -17,12 +16,14 @@ public SynchronizedErrorReporter(ErrorReporter parent) {
   }
 
   @Override
-  protected synchronized void reportOnNode(EObject node, DiagnosticSeverity severity, String message) {
+  protected synchronized void reportOnNode(
+      EObject node, DiagnosticSeverity severity, String message) {
     parent.at(node).report(severity, message);
   }
 
   @Override
-  protected synchronized void report(Path path, Range range, DiagnosticSeverity severity, String message) {
+  protected synchronized void report(
+      Path path, Range range, DiagnosticSeverity severity, String message) {
     parent.at(path, range).report(severity, message);
   }
 
diff --git a/core/src/main/java/org/lflang/federated/serialization/FedROS2CPPSerialization.java b/core/src/main/java/org/lflang/federated/serialization/FedROS2CPPSerialization.java
index ae0449f9e7..2e29aacdb4 100644
--- a/core/src/main/java/org/lflang/federated/serialization/FedROS2CPPSerialization.java
+++ b/core/src/main/java/org/lflang/federated/serialization/FedROS2CPPSerialization.java
@@ -47,12 +47,17 @@ public class FedROS2CPPSerialization implements FedSerialization {
   @Override
   public boolean isCompatible(GeneratorBase generator) {
     if (generator.getTarget() != Target.C) {
-        generator.errorReporter.nowhere().error("ROS serialization is currently only supported for the C target.");
-        return false;
+      generator
+          .errorReporter
+          .nowhere()
+          .error("ROS serialization is currently only supported for the C target.");
+      return false;
     } else if (!generator.getTargetConfig().compiler.equalsIgnoreCase("g++")) {
-        generator.errorReporter.nowhere().error(
-            "Please use the 'compiler: \"g++\"' target property \n" + "for ROS serialization");
-        return false;
+      generator
+          .errorReporter
+          .nowhere()
+          .error("Please use the 'compiler: \"g++\"' target property \n" + "for ROS serialization");
+      return false;
     }
     return true;
   }
diff --git a/core/src/main/java/org/lflang/federated/validation/FedValidator.java b/core/src/main/java/org/lflang/federated/validation/FedValidator.java
index 40c9d4bdcb..31e96c80f3 100644
--- a/core/src/main/java/org/lflang/federated/validation/FedValidator.java
+++ b/core/src/main/java/org/lflang/federated/validation/FedValidator.java
@@ -3,7 +3,6 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Stream;
-
 import org.lflang.ErrorReporter;
 import org.lflang.ast.ASTUtils;
 import org.lflang.lf.Input;
@@ -58,8 +57,10 @@ private static void containsAllVarRefs(List<VarRef> varRefs, ErrorReporter error
         instantiation = varRef.getContainer();
         referencesFederate = true;
       } else if (!varRef.getContainer().equals(instantiation)) {
-          errorReporter.at(varRef).error(
-              "Mixed triggers and effects from" + " different federates. This is not permitted");
+        errorReporter
+            .at(varRef)
+            .error(
+                "Mixed triggers and effects from" + " different federates. This is not permitted");
       }
     }
   }
diff --git a/core/src/main/java/org/lflang/generator/GeneratorBase.java b/core/src/main/java/org/lflang/generator/GeneratorBase.java
index 2edb4c09a7..32fe62337b 100644
--- a/core/src/main/java/org/lflang/generator/GeneratorBase.java
+++ b/core/src/main/java/org/lflang/generator/GeneratorBase.java
@@ -42,9 +42,7 @@
 import org.eclipse.lsp4j.DiagnosticSeverity;
 import org.eclipse.xtext.xbase.lib.IterableExtensions;
 import org.eclipse.xtext.xbase.lib.IteratorExtensions;
-
 import org.lflang.ErrorReporter;
-import org.lflang.ErrorReporter.Stage2;
 import org.lflang.FileConfig;
 import org.lflang.MainConflictChecker;
 import org.lflang.Target;
@@ -428,8 +426,11 @@ public int getReactionBankIndex(Reaction reaction) {
    */
   protected void checkModalReactorSupport(boolean isSupported) {
     if (hasModalReactors && !isSupported) {
-      errorReporter.nowhere().error("The currently selected code generation or "
-                + "target configuration does not support modal reactors!");
+      errorReporter
+          .nowhere()
+          .error(
+              "The currently selected code generation or "
+                  + "target configuration does not support modal reactors!");
     }
   }
 
@@ -441,7 +442,9 @@ protected void checkModalReactorSupport(boolean isSupported) {
    */
   protected void checkWatchdogSupport(boolean isSupported) {
     if (hasWatchdogs && !isSupported) {
-      errorReporter.nowhere().error("Watchdogs are currently only supported for threaded programs in the C target.");
+      errorReporter
+          .nowhere()
+          .error("Watchdogs are currently only supported for threaded programs in the C target.");
     }
   }
 
@@ -461,9 +464,11 @@ private void transformConflictingConnectionsInModalReactors() {
               || connection.isIterated()
               || connection.getLeftPorts().size() > 1
               || connection.getRightPorts().size() > 1) {
-            errorReporter.at(connection).error(
-                "Cannot transform connection in modal reactor. Connection uses currently not"
-                            + " supported features.");
+            errorReporter
+                .at(connection)
+                .error(
+                    "Cannot transform connection in modal reactor. Connection uses currently not"
+                        + " supported features.");
           } else {
             var reaction = factory.createReaction();
             ((Mode) connection.eContainer()).getReactions().add(reaction);
@@ -498,9 +503,12 @@ private void transformConflictingConnectionsInModalReactors() {
    * reactors.
    */
   protected String getConflictingConnectionsInModalReactorsBody(String source, String dest) {
-    errorReporter.nowhere().error("The currently selected code generation "
-            + "is missing an implementation for conflicting "
-            + "transforming connections in modal reactors.");
+    errorReporter
+        .nowhere()
+        .error(
+            "The currently selected code generation "
+                + "is missing an implementation for conflicting "
+                + "transforming connections in modal reactors.");
     return "MODAL MODELS NOT SUPPORTED";
   }
 
@@ -637,11 +645,9 @@ public void reportCommandErrors(String stderr) {
   }
 
   private void reportIssue(StringBuilder message, Integer lineNumber, Path path, int severity) {
-    DiagnosticSeverity convertedSeverity = severity == IMarker.SEVERITY_ERROR
-        ? DiagnosticSeverity.Error
-        : DiagnosticSeverity.Warning;
-    errorReporter.atNullableLine(path, lineNumber)
-        .report(convertedSeverity, message.toString());
+    DiagnosticSeverity convertedSeverity =
+        severity == IMarker.SEVERITY_ERROR ? DiagnosticSeverity.Error : DiagnosticSeverity.Warning;
+    errorReporter.atNullableLine(path, lineNumber).report(convertedSeverity, message.toString());
   }
 
   // //////////////////////////////////////////////////
diff --git a/core/src/main/java/org/lflang/generator/GeneratorCommandFactory.java b/core/src/main/java/org/lflang/generator/GeneratorCommandFactory.java
index a53c9b90b1..31cf87ce41 100644
--- a/core/src/main/java/org/lflang/generator/GeneratorCommandFactory.java
+++ b/core/src/main/java/org/lflang/generator/GeneratorCommandFactory.java
@@ -32,9 +32,7 @@
 import java.nio.file.Paths;
 import java.util.List;
 import java.util.Objects;
-
 import org.eclipse.lsp4j.DiagnosticSeverity;
-
 import org.lflang.ErrorReporter;
 import org.lflang.FileConfig;
 import org.lflang.util.LFCommand;
diff --git a/core/src/main/java/org/lflang/generator/GeneratorUtils.java b/core/src/main/java/org/lflang/generator/GeneratorUtils.java
index d16c9c3270..db2e36041e 100644
--- a/core/src/main/java/org/lflang/generator/GeneratorUtils.java
+++ b/core/src/main/java/org/lflang/generator/GeneratorUtils.java
@@ -61,9 +61,10 @@ public static void accommodatePhysicalActionsIfPresent(
             && !targetConfig.keepalive) {
           // If not, set it to true
           targetConfig.keepalive = true;
-          String message = String.format(
-              "Setting %s to true because of the physical action %s.",
-              TargetProperty.KEEPALIVE.getDisplayName(), action.getName());
+          String message =
+              String.format(
+                  "Setting %s to true because of the physical action %s.",
+                  TargetProperty.KEEPALIVE.getDisplayName(), action.getName());
           errorReporter.at(action).warning(message);
           return;
         }
@@ -174,9 +175,11 @@ public static boolean canGenerate(
     }
     // abort if there is no main reactor
     if (mainDef == null) {
-      errorReporter.nowhere().info(
-          "The given Lingua Franca program does not define a main reactor. Therefore, no code"
-                + " was generated.");
+      errorReporter
+          .nowhere()
+          .info(
+              "The given Lingua Franca program does not define a main reactor. Therefore, no code"
+                  + " was generated.");
       context.finish(GeneratorResult.NOTHING);
       return false;
     }
diff --git a/core/src/main/java/org/lflang/generator/HumanReadableReportingStrategy.java b/core/src/main/java/org/lflang/generator/HumanReadableReportingStrategy.java
index 488b6620dc..ca2b75bded 100644
--- a/core/src/main/java/org/lflang/generator/HumanReadableReportingStrategy.java
+++ b/core/src/main/java/org/lflang/generator/HumanReadableReportingStrategy.java
@@ -6,9 +6,7 @@
 import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-
 import org.eclipse.lsp4j.DiagnosticSeverity;
-
 import org.lflang.ErrorReporter;
 
 /**
@@ -99,9 +97,9 @@ private void reportErrorLine(
       final Position generatedFilePosition =
           Position.fromOneBased(
               Integer.parseInt(matcher.group("line")),
-              column == null ? 1 // FIXME: Unreliable heuristic
-                  : Integer.parseInt(column)
-          );
+              column == null
+                  ? 1 // FIXME: Unreliable heuristic
+                  : Integer.parseInt(column));
       final String message =
           DiagnosticReporting.messageOf(matcher.group("message"), path, generatedFilePosition);
       final CodeMap map = maps.get(relativeTo != null ? relativeTo.resolve(path) : path);
@@ -132,9 +130,10 @@ private Range findAppropriateRange(Position lfFilePosition, Iterator<String> it)
       String line = it.next();
       Matcher labelMatcher = labelPattern.matcher(line);
       if (labelMatcher.find()) {
-        Position start = Position.fromZeroBased(
-            lfFilePosition.getZeroBasedLine(),
-            lfFilePosition.getZeroBasedColumn() - labelMatcher.group(1).length());
+        Position start =
+            Position.fromZeroBased(
+                lfFilePosition.getZeroBasedLine(),
+                lfFilePosition.getZeroBasedColumn() - labelMatcher.group(1).length());
         Position end = lfFilePosition.plus(labelMatcher.group(2));
         return new Range(start, end);
       } else if (diagnosticMessagePattern.matcher(line).find()) {
diff --git a/core/src/main/java/org/lflang/generator/IntegratedBuilder.java b/core/src/main/java/org/lflang/generator/IntegratedBuilder.java
index e243b30de3..717f4f7c3c 100644
--- a/core/src/main/java/org/lflang/generator/IntegratedBuilder.java
+++ b/core/src/main/java/org/lflang/generator/IntegratedBuilder.java
@@ -17,9 +17,7 @@
 import org.eclipse.xtext.validation.CheckMode;
 import org.eclipse.xtext.validation.IResourceValidator;
 import org.eclipse.xtext.validation.Issue;
-
 import org.lflang.ErrorReporter;
-import org.lflang.ErrorReporter.Stage2;
 import org.lflang.FileConfig;
 import org.lflang.generator.LFGeneratorContext.Mode;
 
@@ -87,9 +85,9 @@ public GeneratorResult run(
   private void validate(URI uri, ErrorReporter errorReporter) {
     for (Issue issue :
         validator.validate(getResource(uri), CheckMode.ALL, CancelIndicator.NullImpl)) {
-      errorReporter.atNullableLine(Path.of(uri.path()), issue.getLineNumber())
-              .report(convertSeverity(issue.getSeverity()),
-                  issue.getMessage());
+      errorReporter
+          .atNullableLine(Path.of(uri.path()), issue.getLineNumber())
+          .report(convertSeverity(issue.getSeverity()), issue.getMessage());
     }
   }
 
diff --git a/core/src/main/java/org/lflang/generator/LanguageServerErrorReporter.java b/core/src/main/java/org/lflang/generator/LanguageServerErrorReporter.java
index 3fe1a2907e..d71f943a16 100644
--- a/core/src/main/java/org/lflang/generator/LanguageServerErrorReporter.java
+++ b/core/src/main/java/org/lflang/generator/LanguageServerErrorReporter.java
@@ -6,8 +6,6 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
-import java.util.OptionalInt;
-
 import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.lsp4j.Diagnostic;
@@ -16,7 +14,6 @@
 import org.eclipse.lsp4j.Range;
 import org.eclipse.lsp4j.services.LanguageClient;
 import org.eclipse.xtext.nodemodel.util.NodeModelUtils;
-import org.lflang.ErrorReporter;
 import org.lflang.ErrorReporterBase;
 
 /**
@@ -37,7 +34,6 @@ public class LanguageServerErrorReporter extends ErrorReporterBase {
   /** The list of all diagnostics since the last reset. */
   private final Map<Path, List<Diagnostic>> diagnostics;
 
-
   /**
    * Initialize a {@code DiagnosticAcceptor} for the document whose parse tree root node is {@code
    * parseRoot}.
@@ -56,29 +52,38 @@ protected void reportOnNode(EObject node, DiagnosticSeverity severity, String me
 
   @Override
   protected void reportWithoutPosition(DiagnosticSeverity severity, String message) {
-    report(getMainFile(), org.lflang.generator.Range.degenerateRange(Position.ORIGIN), severity, message);
+    report(
+        getMainFile(),
+        org.lflang.generator.Range.degenerateRange(Position.ORIGIN),
+        severity,
+        message);
   }
 
   @Override
   public Stage2 at(Path file, int line) {
     // Create a range for the whole line
     Optional<String> text = getLine(line - 1);
-    org.lflang.generator.Range range = new org.lflang.generator.Range(
-        Position.fromOneBased(line, 1),
-        Position.fromOneBased(line, 1 + text.map(String::length).orElse(0))
-    );
+    org.lflang.generator.Range range =
+        new org.lflang.generator.Range(
+            Position.fromOneBased(line, 1),
+            Position.fromOneBased(line, 1 + text.map(String::length).orElse(0)));
     return at(file, range);
   }
 
   @Override
-  protected void report(Path path, org.lflang.generator.Range range, DiagnosticSeverity severity, String message) {
+  protected void report(
+      Path path, org.lflang.generator.Range range, DiagnosticSeverity severity, String message) {
     if (path == null) {
       path = getMainFile();
     }
-    diagnostics.computeIfAbsent(path, p -> new ArrayList<>())
-        .add(new Diagnostic(toRange(range.getStartInclusive(), range.getEndExclusive()),
-            message, severity, "LF Language Server"));
-
+    diagnostics
+        .computeIfAbsent(path, p -> new ArrayList<>())
+        .add(
+            new Diagnostic(
+                toRange(range.getStartInclusive(), range.getEndExclusive()),
+                message,
+                severity,
+                "LF Language Server"));
   }
 
   @Override
diff --git a/core/src/main/java/org/lflang/generator/PortInstance.java b/core/src/main/java/org/lflang/generator/PortInstance.java
index 7d88cdd28d..9db13babf1 100644
--- a/core/src/main/java/org/lflang/generator/PortInstance.java
+++ b/core/src/main/java/org/lflang/generator/PortInstance.java
@@ -29,7 +29,6 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.PriorityQueue;
-
 import org.lflang.ErrorReporter;
 import org.lflang.lf.Input;
 import org.lflang.lf.Output;
@@ -397,8 +396,8 @@ private void setInitialWidth(ErrorReporter errorReporter) {
 
     if (widthSpec != null) {
       if (widthSpec.isOfVariableLength()) {
-          String message = "Variable-width multiports not supported (yet): " + definition.getName();
-          errorReporter.at(definition).error(message);
+        String message = "Variable-width multiports not supported (yet): " + definition.getName();
+        errorReporter.at(definition).error(message);
       } else {
         isMultiport = true;
 
diff --git a/core/src/main/java/org/lflang/generator/ReactorInstance.java b/core/src/main/java/org/lflang/generator/ReactorInstance.java
index 8599b43ad9..74fa05c8ba 100644
--- a/core/src/main/java/org/lflang/generator/ReactorInstance.java
+++ b/core/src/main/java/org/lflang/generator/ReactorInstance.java
@@ -35,7 +35,6 @@
 import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
-
 import org.lflang.AttributeUtils;
 import org.lflang.ErrorReporter;
 import org.lflang.TimeValue;
@@ -830,14 +829,14 @@ public ReactorInstance(
 
     this.recursive = foundSelfAsParent;
     if (recursive) {
-        reporter.at(definition).error("Recursive reactor instantiation.");
+      reporter.at(definition).error("Recursive reactor instantiation.");
     }
 
     // If the reactor definition is null, give up here. Otherwise, diagram generation
     // will fail an NPE.
     if (reactorDefinition == null) {
-        reporter.at(definition).error("Reactor instantiation has no matching reactor definition.");
-        return;
+      reporter.at(definition).error("Reactor instantiation has no matching reactor definition.");
+      return;
     }
 
     setInitialWidth();
@@ -935,12 +934,12 @@ private void establishPortConnections() {
       // Check for empty lists.
       if (!srcRanges.hasNext()) {
         if (dstRanges.hasNext()) {
-            reporter.at(connection).warning("No sources to provide inputs.");
+          reporter.at(connection).warning("No sources to provide inputs.");
         }
         return;
       } else if (!dstRanges.hasNext()) {
-          reporter.at(connection).warning("No destination. Outputs will be lost.");
-          return;
+        reporter.at(connection).warning("No destination. Outputs will be lost.");
+        return;
       }
 
       RuntimeRange<PortInstance> src = srcRanges.next();
@@ -952,7 +951,9 @@ private void establishPortConnections() {
           if (!dstRanges.hasNext()) {
             if (srcRanges.hasNext()) {
               // Should not happen (checked by the validator).
-                reporter.at(connection).warning("Source is wider than the destination. Outputs will be lost.");
+              reporter
+                  .at(connection)
+                  .warning("Source is wider than the destination. Outputs will be lost.");
             }
             break;
           }
@@ -962,7 +963,9 @@ private void establishPortConnections() {
             } else {
               if (dstRanges.hasNext()) {
                 // Should not happen (checked by the validator).
-                  reporter.at(connection).warning("Destination is wider than the source. Inputs will be missing.");
+                reporter
+                    .at(connection)
+                    .warning("Destination is wider than the source. Inputs will be missing.");
               }
               break;
             }
@@ -975,8 +978,10 @@ private void establishPortConnections() {
           src = src.tail(dst.width);
           if (!dstRanges.hasNext()) {
             // Should not happen (checked by the validator).
-              reporter.at(connection).warning("Source is wider than the destination. Outputs will be lost.");
-              break;
+            reporter
+                .at(connection)
+                .warning("Source is wider than the destination. Outputs will be lost.");
+            break;
           }
           dst = dstRanges.next();
         } else if (src.width < dst.width) {
@@ -987,8 +992,10 @@ private void establishPortConnections() {
             if (connection.isIterated()) {
               srcRanges = leftPorts.iterator();
             } else {
-                reporter.at(connection).warning("Destination is wider than the source. Inputs will be missing.");
-                break;
+              reporter
+                  .at(connection)
+                  .warning("Destination is wider than the source. Inputs will be missing.");
+              break;
             }
           }
           src = srcRanges.next();
@@ -1050,8 +1057,8 @@ private List<RuntimeRange<PortInstance>> listPortInstances(
     for (VarRef portRef : references) {
       // Simple error checking first.
       if (!(portRef.getVariable() instanceof Port)) {
-          reporter.at(portRef).error("Not a port.");
-          return result;
+        reporter.at(portRef).error("Not a port.");
+        return result;
       }
       // First, figure out which reactor we are dealing with.
       // The reactor we want is the container of the port.
diff --git a/core/src/main/java/org/lflang/generator/Validator.java b/core/src/main/java/org/lflang/generator/Validator.java
index 51d2e8412e..53efd6412e 100644
--- a/core/src/main/java/org/lflang/generator/Validator.java
+++ b/core/src/main/java/org/lflang/generator/Validator.java
@@ -141,12 +141,8 @@ private static <T> List<Future<T>> getFutures(List<Callable<T>> tasks)
    */
   public final int run(LFCommand command, CancelIndicator cancelIndicator) {
     final int returnCode = command.run(cancelIndicator);
-    getBuildReportingStrategies()
-        .first
-        .report(command.getErrors(), errorReporter, codeMaps);
-    getBuildReportingStrategies()
-        .second
-        .report(command.getOutput(), errorReporter, codeMaps);
+    getBuildReportingStrategies().first.report(command.getErrors(), errorReporter, codeMaps);
+    getBuildReportingStrategies().second.report(command.getOutput(), errorReporter, codeMaps);
     return returnCode;
   }
 
diff --git a/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java b/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java
index 061ba50d38..3ddc2a856c 100644
--- a/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java
@@ -312,10 +312,12 @@ CodeBuilder generateCMakeCode(
             break;
           }
         default:
-            errorReporter.nowhere().warning(
-                "Using the flags target property with cmake is dangerous.\n"
-                          + " Use cmake-include instead.");
-            cMakeCode.pr("add_compile_options( " + compilerFlag + " )");
+          errorReporter
+              .nowhere()
+              .warning(
+                  "Using the flags target property with cmake is dangerous.\n"
+                      + " Use cmake-include instead.");
+          cMakeCode.pr("add_compile_options( " + compilerFlag + " )");
           cMakeCode.pr("add_link_options( " + compilerFlag + ")");
       }
     }
diff --git a/core/src/main/java/org/lflang/generator/c/CCompiler.java b/core/src/main/java/org/lflang/generator/c/CCompiler.java
index 858098d9ac..c70311978c 100644
--- a/core/src/main/java/org/lflang/generator/c/CCompiler.java
+++ b/core/src/main/java/org/lflang/generator/c/CCompiler.java
@@ -134,8 +134,9 @@ public boolean runCCompiler(GeneratorBase generator, LFGeneratorContext context)
     if (cMakeReturnCode != 0
         && context.getMode() == LFGeneratorContext.Mode.STANDALONE
         && !outputContainsKnownCMakeErrors(compile.getErrors())) {
-        errorReporter.nowhere()
-            .error(targetConfig.compiler + " failed with error code " + cMakeReturnCode);
+      errorReporter
+          .nowhere()
+          .error(targetConfig.compiler + " failed with error code " + cMakeReturnCode);
     }
 
     // For warnings (vs. errors), the return code is 0.
@@ -156,8 +157,9 @@ public boolean runCCompiler(GeneratorBase generator, LFGeneratorContext context)
       if (makeReturnCode != 0
           && context.getMode() == LFGeneratorContext.Mode.STANDALONE
           && !outputContainsKnownCMakeErrors(build.getErrors())) {
-          errorReporter.nowhere()
-              .error(targetConfig.compiler + " failed with error code " + makeReturnCode);
+        errorReporter
+            .nowhere()
+            .error(targetConfig.compiler + " failed with error code " + makeReturnCode);
       }
 
       // For warnings (vs. errors), the return code is 0.
@@ -181,7 +183,7 @@ public boolean runCCompiler(GeneratorBase generator, LFGeneratorContext context)
         LFCommand flash = buildWestFlashCommand();
         int flashRet = flash.run();
         if (flashRet != 0) {
-            errorReporter.nowhere().error("West flash command failed with error code " + flashRet);
+          errorReporter.nowhere().error("West flash command failed with error code " + flashRet);
         } else {
           System.out.println("SUCCESS: Flashed application with west");
         }
@@ -201,10 +203,13 @@ public LFCommand compileCmakeCommand() {
     LFCommand command =
         commandFactory.createCommand("cmake", cmakeOptions(targetConfig, fileConfig), buildPath);
     if (command == null) {
-        errorReporter.nowhere().error("The C/CCpp target requires CMAKE >= "
+      errorReporter
+          .nowhere()
+          .error(
+              "The C/CCpp target requires CMAKE >= "
                   + CCmakeGenerator.MIN_CMAKE_VERSION
-                  + " to compile the generated code. "
-                  + "Auto-compiling can be disabled using the \"no-compile: true\" target property.");
+                  + " to compile the generated code. Auto-compiling can be disabled using the"
+                  + " \"no-compile: true\" target property.");
     }
     return command;
   }
@@ -291,9 +296,12 @@ public LFCommand buildCmakeCommand() {
                 buildTypeToCmakeConfig(targetConfig.cmakeBuildType)),
             buildPath);
     if (command == null) {
-        errorReporter.nowhere().error(
-            "The C/CCpp target requires CMAKE >= 3.5 to compile the generated code. "
-                  + "Auto-compiling can be disabled using the \"no-compile: true\" target property.");
+      errorReporter
+          .nowhere()
+          .error(
+              "The C/CCpp target requires CMAKE >= 3.5 to compile the generated code."
+                  + " Auto-compiling can be disabled using the \"no-compile: true\" target"
+                  + " property.");
     }
     return command;
   }
@@ -314,7 +322,7 @@ public LFCommand buildWestFlashCommand() {
       cmd = commandFactory.createCommand("west", List.of("flash"), buildPath);
     }
     if (cmd == null) {
-        errorReporter.nowhere().error("Could not create west flash command.");
+      errorReporter.nowhere().error("Could not create west flash command.");
     }
 
     return cmd;
@@ -340,13 +348,18 @@ private boolean outputContainsKnownCMakeErrors(String CMakeOutput) {
     if (CMakeOutput.contains("The CMAKE_C_COMPILER is set to a C++ compiler")) {
       // If so, print an appropriate error message
       if (targetConfig.compiler != null) {
-          errorReporter.nowhere().error(
-              "A C++ compiler was requested in the compiler target property."
-                      + " Use the CCpp or the Cpp target instead.");
+        errorReporter
+            .nowhere()
+            .error(
+                "A C++ compiler was requested in the compiler target property."
+                    + " Use the CCpp or the Cpp target instead.");
       } else {
-          errorReporter.nowhere().error("\"A C++ compiler was detected."
-                      + " The C target works best with a C compiler."
-                      + " Use the CCpp or the Cpp target instead.\"");
+        errorReporter
+            .nowhere()
+            .error(
+                "\"A C++ compiler was detected."
+                    + " The C target works best with a C compiler."
+                    + " Use the CCpp or the Cpp target instead.\"");
       }
       return true;
     }
@@ -414,9 +427,11 @@ public LFCommand compileCCommand(String fileToCompile, boolean noBinary) {
     LFCommand command =
         commandFactory.createCommand(targetConfig.compiler, compileArgs, fileConfig.getOutPath());
     if (command == null) {
-        errorReporter.nowhere().error(
-            "The C/CCpp target requires GCC >= 7 to compile the generated code. "
-                  + "Auto-compiling can be disabled using the \"no-compile: true\" target property.");
+      errorReporter
+          .nowhere()
+          .error(
+              "The C/CCpp target requires GCC >= 7 to compile the generated code. Auto-compiling"
+                  + " can be disabled using the \"no-compile: true\" target property.");
     }
     return command;
   }
diff --git a/core/src/main/java/org/lflang/generator/c/CGenerator.java b/core/src/main/java/org/lflang/generator/c/CGenerator.java
index 5c4993b8aa..0bc8ee0202 100644
--- a/core/src/main/java/org/lflang/generator/c/CGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CGenerator.java
@@ -45,12 +45,10 @@
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
-
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.xtext.xbase.lib.Exceptions;
 import org.eclipse.xtext.xbase.lib.IterableExtensions;
 import org.eclipse.xtext.xbase.lib.StringExtensions;
-
 import org.lflang.FileConfig;
 import org.lflang.Target;
 import org.lflang.TargetConfig;
@@ -357,12 +355,12 @@ public void accommodatePhysicalActionsIfPresent() {
           if (!targetConfig.threading
               && !targetConfig.setByUser.contains(TargetProperty.THREADING)) {
             targetConfig.threading = true;
-              String message =
-                  "Using the threaded C runtime to allow for asynchronous handling of physical action"
-                      + " "
-                      + action.getName();
-              errorReporter.at(action).warning(message);
-              return;
+            String message =
+                "Using the threaded C runtime to allow for asynchronous handling of physical action"
+                    + " "
+                    + action.getName();
+            errorReporter.at(action).warning(message);
+            return;
           }
         }
       }
@@ -376,8 +374,10 @@ public void accommodatePhysicalActionsIfPresent() {
   protected boolean isOSCompatible() {
     if (GeneratorUtils.isHostWindows()) {
       if (CCppMode) {
-        errorReporter.nowhere().error(
-            "LF programs with a CCpp target are currently not supported on Windows. "
+        errorReporter
+            .nowhere()
+            .error(
+                "LF programs with a CCpp target are currently not supported on Windows. "
                     + "Exiting code generation.");
         return false;
       }
@@ -831,8 +831,9 @@ protected void copyUserFiles(TargetConfig targetConfig, FileConfig fileConfig) {
             fileConfig.srcFile.getParent().resolve(targetConfig.fedSetupPreamble),
             destination.resolve(targetConfig.fedSetupPreamble));
       } catch (IOException e) {
-        errorReporter.nowhere().error(
-            "Failed to find _fed_setup file " + targetConfig.fedSetupPreamble);
+        errorReporter
+            .nowhere()
+            .error("Failed to find _fed_setup file " + targetConfig.fedSetupPreamble);
       }
     }
   }
@@ -1983,9 +1984,11 @@ protected void setUpGeneralParameters() {
           PlatformOption.USER_THREADS.name(),
           String.valueOf(targetConfig.platformOptions.userThreads));
     } else if (targetConfig.platformOptions.userThreads > 0) {
-        errorReporter.nowhere().warning(
-            "Specifying user threads is only for threaded Lingua Franca on the Zephyr platform. This"
-                  + " option will be ignored.");
+      errorReporter
+          .nowhere()
+          .warning(
+              "Specifying user threads is only for threaded Lingua Franca on the Zephyr platform."
+                  + " This option will be ignored.");
     }
 
     if (targetConfig.threading) { // FIXME: This logic is duplicated in CMake
@@ -2103,7 +2106,9 @@ private void createMainReactorInstance() {
             new ReactorInstance(toDefinition(mainDef.getReactorClass()), errorReporter, reactors);
         var reactionInstanceGraph = this.main.assignLevels();
         if (reactionInstanceGraph.nodeCount() > 0) {
-          errorReporter.nowhere().error("Main reactor has causality cycles. Skipping code generation.");
+          errorReporter
+              .nowhere()
+              .error("Main reactor has causality cycles. Skipping code generation.");
           return;
         }
         if (hasDeadlines) {
@@ -2112,7 +2117,7 @@ private void createMainReactorInstance() {
         // Inform the run-time of the breadth/parallelism of the reaction graph
         var breadth = reactionInstanceGraph.getBreadth();
         if (breadth == 0) {
-            errorReporter.nowhere().warning("The program has no reactions");
+          errorReporter.nowhere().warning("The program has no reactions");
         } else {
           targetConfig.compileDefinitions.put(
               "LF_REACTION_GRAPH_BREADTH", String.valueOf(reactionInstanceGraph.getBreadth()));
diff --git a/core/src/main/java/org/lflang/generator/c/CPortGenerator.java b/core/src/main/java/org/lflang/generator/c/CPortGenerator.java
index e8a195b98f..33c85d9f6d 100644
--- a/core/src/main/java/org/lflang/generator/c/CPortGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CPortGenerator.java
@@ -197,9 +197,9 @@ private static String valueDeclaration(
       CTypes types) {
     if (port.getType() == null && target.requiresTypes) {
       // This should have been caught by the validator.
-        String message = "Port is required to have a type: " + port.getName();
-        errorReporter.at(port).error(message);
-        return "";
+      String message = "Port is required to have a type: " + port.getName();
+      errorReporter.at(port).error(message);
+      return "";
     }
     // Do not convert to lf_token_t* using lfTypeToTokenType because there
     // will be a separate field pointing to the token.
diff --git a/core/src/main/java/org/lflang/generator/c/CReactionGenerator.java b/core/src/main/java/org/lflang/generator/c/CReactionGenerator.java
index 5aaa6599e8..a232f735c2 100644
--- a/core/src/main/java/org/lflang/generator/c/CReactionGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CReactionGenerator.java
@@ -9,7 +9,6 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-
 import org.lflang.ErrorReporter;
 import org.lflang.InferredType;
 import org.lflang.TargetConfig;
@@ -190,8 +189,9 @@ public static String generateInitializationForReaction(
                         : "reset_transition")
                     + ";");
           } else {
-              errorReporter.at(reaction).error(
-                  "In generateReaction(): " + name + " not a valid mode of this reactor.");
+            errorReporter
+                .at(reaction)
+                .error("In generateReaction(): " + name + " not a valid mode of this reactor.");
           }
         } else {
           if (variable instanceof Output) {
@@ -208,7 +208,9 @@ public static String generateInitializationForReaction(
           } else if (variable instanceof Watchdog) {
             reactionInitialization.pr(generateWatchdogVariablesInReaction(effect));
           } else {
-              errorReporter.at(reaction).error("In generateReaction(): effect is not an input, output, or watchdog.");
+            errorReporter
+                .at(reaction)
+                .error("In generateReaction(): effect is not an input, output, or watchdog.");
           }
         }
       }
@@ -767,8 +769,8 @@ public static String generateOutputVariablesInReaction(
     String outputName = output.getName();
     String outputWidth = generateWidthVariable(outputName);
     if (output.getType() == null && requiresTypes) {
-        errorReporter.at(output).error("Output is required to have a type: " + outputName);
-        return "";
+      errorReporter.at(output).error("Output is required to have a type: " + outputName);
+      return "";
     } else {
       // The container of the output may be a contained reactor or
       // the reactor containing the reaction.
diff --git a/core/src/main/java/org/lflang/generator/c/CUtil.java b/core/src/main/java/org/lflang/generator/c/CUtil.java
index 590797a769..25688d3284 100644
--- a/core/src/main/java/org/lflang/generator/c/CUtil.java
+++ b/core/src/main/java/org/lflang/generator/c/CUtil.java
@@ -619,14 +619,17 @@ public static void runBuildCommand(
     for (LFCommand cmd : commands) {
       int returnCode = cmd.run();
       if (returnCode != 0 && mode != LFGeneratorContext.Mode.EPOCH) {
-          // FIXME: Why is the content of stderr not provided to the user in this error
-          // message?
-          errorReporter.nowhere().error(String.format(
-                      // FIXME: Why is the content of stderr not provided to the user in this error
-                      // message?
-                      "Build command \"%s\" failed with error code %d.",
-                      targetConfig.buildCommands, returnCode));
-          return;
+        // FIXME: Why is the content of stderr not provided to the user in this error
+        // message?
+        errorReporter
+            .nowhere()
+            .error(
+                String.format(
+                    // FIXME: Why is the content of stderr not provided to the user in this error
+                    // message?
+                    "Build command \"%s\" failed with error code %d.",
+                    targetConfig.buildCommands, returnCode));
+        return;
       }
       // For warnings (vs. errors), the return code is 0.
       // But we still want to mark the IDE.
diff --git a/core/src/main/java/org/lflang/generator/c/CWatchdogGenerator.java b/core/src/main/java/org/lflang/generator/c/CWatchdogGenerator.java
index 7379bce5ee..b360693466 100644
--- a/core/src/main/java/org/lflang/generator/c/CWatchdogGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CWatchdogGenerator.java
@@ -9,7 +9,6 @@
 package org.lflang.generator.c;
 
 import java.util.List;
-
 import org.lflang.ErrorReporter;
 import org.lflang.ast.ASTUtils;
 import org.lflang.generator.CodeBuilder;
@@ -226,9 +225,12 @@ private static String generateInitializationForWatchdog(
                         : "reset_transition")
                     + ";");
           } else {
-              errorReporter.at(watchdog).error("In generateInitializationForWatchdog(): "
-                              + name
-                              + " not a valid mode of this reactor.");
+            errorReporter
+                .at(watchdog)
+                .error(
+                    "In generateInitializationForWatchdog(): "
+                        + name
+                        + " not a valid mode of this reactor.");
           }
         }
       }
diff --git a/core/src/main/java/org/lflang/generator/python/PythonGenerator.java b/core/src/main/java/org/lflang/generator/python/PythonGenerator.java
index 6da6e6a8c5..de2a41918d 100644
--- a/core/src/main/java/org/lflang/generator/python/PythonGenerator.java
+++ b/core/src/main/java/org/lflang/generator/python/PythonGenerator.java
@@ -303,14 +303,14 @@ public void processProtoFile(String filename) {
             fileConfig.srcPath);
 
     if (protoc == null) {
-        errorReporter.nowhere().error("Processing .proto files requires libprotoc >= 3.6.1");
-        return;
+      errorReporter.nowhere().error("Processing .proto files requires libprotoc >= 3.6.1");
+      return;
     }
     int returnCode = protoc.run();
     if (returnCode == 0) {
       pythonRequiredModules.add("google-api-python-client");
     } else {
-        errorReporter.nowhere().error("protoc returns error code " + returnCode);
+      errorReporter.nowhere().error("protoc returns error code " + returnCode);
     }
   }
 
diff --git a/core/src/main/java/org/lflang/generator/python/PythonReactionGenerator.java b/core/src/main/java/org/lflang/generator/python/PythonReactionGenerator.java
index 07c1b498eb..288b53d318 100644
--- a/core/src/main/java/org/lflang/generator/python/PythonReactionGenerator.java
+++ b/core/src/main/java/org/lflang/generator/python/PythonReactionGenerator.java
@@ -4,7 +4,6 @@
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Set;
-
 import org.lflang.AttributeUtils;
 import org.lflang.ErrorReporter;
 import org.lflang.Target;
@@ -270,10 +269,11 @@ private static String generateCPythonInitializers(
                 PythonPortGenerator.generateVariablesForSendingToContainedReactors(
                     pyObjects, effect.getContainer(), (Input) effect.getVariable()));
           } else {
-              String message = "In generateReaction(): "
-                  + effect.getVariable().getName()
-                  + " is neither an input nor an output.";
-              errorReporter.at(reaction).error(message);
+            String message =
+                "In generateReaction(): "
+                    + effect.getVariable().getName()
+                    + " is neither an input nor an output.";
+            errorReporter.at(reaction).error(message);
           }
         }
       }
diff --git a/core/src/main/java/org/lflang/generator/python/PythonValidator.java b/core/src/main/java/org/lflang/generator/python/PythonValidator.java
index 9b3b80de05..b216210850 100644
--- a/core/src/main/java/org/lflang/generator/python/PythonValidator.java
+++ b/core/src/main/java/org/lflang/generator/python/PythonValidator.java
@@ -263,11 +263,14 @@ private void tryReportAlternative(String[] lines, int i) {
                           .filter(p -> main.group().contains(p.getFileName().toString()))
                           .map(codeMaps::get)
                       ::iterator;
-              for (CodeMap map : relevantMaps) { // There should almost always be exactly one of these
+              for (CodeMap map :
+                  relevantMaps) { // There should almost always be exactly one of these
                 for (Path lfFile : map.lfSourcePaths()) {
-                  Position pos = map.adjusted(
-                      lfFile, Position.fromOneBased(line, map.firstNonWhitespace(line)));
-                  errorReporter.at(lfFile, pos)
+                  Position pos =
+                      map.adjusted(
+                          lfFile, Position.fromOneBased(line, map.firstNonWhitespace(line)));
+                  errorReporter
+                      .at(lfFile, pos)
                       .error(main.group().replace("*** ", "").replace("Sorry: ", ""));
                 }
               }
@@ -332,10 +335,12 @@ public Strategy getOutputReportingStrategy() {
               } catch (JsonProcessingException e) {
                 System.err.printf("Failed to parse \"%s\":%n", validationOutput);
                 e.printStackTrace();
-                errorReporter.nowhere().warning(
-                    "Failed to parse linter output. The Lingua Franca code generator is tested with"
-                                    + " Pylint version 2.12.2. Consider updating Pylint if you have an older"
-                                    + " version.");
+                errorReporter
+                    .nowhere()
+                    .warning(
+                        "Failed to parse linter output. The Lingua Franca code generator is tested"
+                            + " with Pylint version 2.12.2. Consider updating Pylint if you have an"
+                            + " older version.");
               }
             };
           }
@@ -370,8 +375,7 @@ private void bestEffortReport(
               DiagnosticSeverity severity,
               String humanMessage) {
             if (!lfEnd.equals(Position.ORIGIN) && !lfStart.equals(Position.ORIGIN)) { // Ideal case
-              errorReporter.at(file, new Range(lfStart, lfEnd))
-                  .report(severity, humanMessage);
+              errorReporter.at(file, new Range(lfStart, lfEnd)).report(severity, humanMessage);
             } else { // Fallback: Try to report on the correct line, or failing that, just line 1.
               if (lfStart.equals(Position.ORIGIN))
                 lfStart =
diff --git a/core/src/main/java/org/lflang/generator/rust/CargoDependencySpec.java b/core/src/main/java/org/lflang/generator/rust/CargoDependencySpec.java
index 4dc3593f77..ceeaec7fc9 100644
--- a/core/src/main/java/org/lflang/generator/rust/CargoDependencySpec.java
+++ b/core/src/main/java/org/lflang/generator/rust/CargoDependencySpec.java
@@ -31,9 +31,7 @@
 import java.util.Objects;
 import java.util.Set;
 import java.util.stream.Collectors;
-
 import org.eclipse.emf.ecore.EObject;
-
 import org.lflang.ErrorReporter;
 import org.lflang.TargetProperty;
 import org.lflang.TargetProperty.TargetPropertyType;
@@ -285,10 +283,10 @@ public void check(Element element, String name, LFValidator v) {
         try {
           parseValue(pair);
         } catch (InvalidLfSourceException e) {
-            ErrorReporter errorReporter = v.getErrorReporter();
-            EObject object = e.getNode();
-            String message = e.getProblem();
-            errorReporter.at(object).error(message);
+          ErrorReporter errorReporter = v.getErrorReporter();
+          EObject object = e.getNode();
+          String message = e.getProblem();
+          errorReporter.at(object).error(message);
         }
       }
     }
diff --git a/core/src/main/java/org/lflang/generator/rust/RustTargetConfig.java b/core/src/main/java/org/lflang/generator/rust/RustTargetConfig.java
index db249c442b..fdb83fab6a 100644
--- a/core/src/main/java/org/lflang/generator/rust/RustTargetConfig.java
+++ b/core/src/main/java/org/lflang/generator/rust/RustTargetConfig.java
@@ -64,15 +64,15 @@ public void setCargoDependencies(Map<String, CargoDependencySpec> cargoDependenc
   public void addAndCheckTopLevelModule(Path path, EObject errorOwner, ErrorReporter err) {
     String fileName = path.getFileName().toString();
     if (!Files.exists(path)) {
-        err.at(errorOwner).error("File not found");
+      err.at(errorOwner).error("File not found");
     } else if (Files.isRegularFile(path) && !fileName.endsWith(".rs")) {
-        err.at(errorOwner).error("Not a rust file");
+      err.at(errorOwner).error("Not a rust file");
     } else if (fileName.equals("main.rs")) {
-        err.at(errorOwner).error("Cannot use 'main.rs' as a module name (reserved)");
+      err.at(errorOwner).error("Cannot use 'main.rs' as a module name (reserved)");
     } else if (fileName.equals("reactors") || fileName.equals("reactors.rs")) {
-        err.at(errorOwner).error("Cannot use 'reactors' as a module name (reserved)");
+      err.at(errorOwner).error("Cannot use 'reactors' as a module name (reserved)");
     } else if (Files.isDirectory(path) && !Files.exists(path.resolve("mod.rs"))) {
-        err.at(errorOwner).error("Cannot find module descriptor in directory");
+      err.at(errorOwner).error("Cannot find module descriptor in directory");
     }
     this.rustTopLevelModules.add(path);
   }
diff --git a/core/src/main/java/org/lflang/util/ArduinoUtil.java b/core/src/main/java/org/lflang/util/ArduinoUtil.java
index e749a0568a..460ae2eb86 100644
--- a/core/src/main/java/org/lflang/util/ArduinoUtil.java
+++ b/core/src/main/java/org/lflang/util/ArduinoUtil.java
@@ -110,8 +110,8 @@ public void buildArduino(FileConfig fileConfig, TargetConfig targetConfig) {
       int retCode = 0;
       retCode = command.run(context.getCancelIndicator());
       if (retCode != 0 && context.getMode() == LFGeneratorContext.Mode.STANDALONE) {
-          errorReporter.nowhere().error("arduino-cli failed with error code " + retCode);
-          throw new IOException("arduino-cli failure");
+        errorReporter.nowhere().error("arduino-cli failed with error code " + retCode);
+        throw new IOException("arduino-cli failure");
       }
     } catch (IOException e) {
       Exceptions.sneakyThrow(e);
@@ -132,17 +132,18 @@ public void buildArduino(FileConfig fileConfig, TargetConfig targetConfig) {
                     targetConfig.platformOptions.port),
                 fileConfig.getSrcGenPath());
         if (flash == null) {
-            errorReporter.nowhere().error("Could not create arduino-cli flash command.");
+          errorReporter.nowhere().error("Could not create arduino-cli flash command.");
         }
         int flashRet = flash.run();
         if (flashRet != 0) {
-            errorReporter.nowhere().error(
-                "arduino-cli flash command failed with error code " + flashRet);
+          errorReporter
+              .nowhere()
+              .error("arduino-cli flash command failed with error code " + flashRet);
         } else {
           System.out.println("SUCCESS: Flashed board using arduino-cli");
         }
       } else {
-          errorReporter.nowhere().error("Need to provide a port on which to automatically flash.");
+        errorReporter.nowhere().error("Need to provide a port on which to automatically flash.");
       }
     } else {
       System.out.println("********");
diff --git a/core/src/main/java/org/lflang/util/FileUtil.java b/core/src/main/java/org/lflang/util/FileUtil.java
index 0b12105dfc..3d6600621d 100644
--- a/core/src/main/java/org/lflang/util/FileUtil.java
+++ b/core/src/main/java/org/lflang/util/FileUtil.java
@@ -327,11 +327,12 @@ public static void copyFilesOrDirectories(
           }
           System.out.println("Copied '" + fileOrDirectory + "' from the file system.");
         } catch (IOException e) {
-            String message = "Unable to copy '"
-                + fileOrDirectory
-                + "' from the file system. Reason: "
-                + e.toString();
-            errorReporter.nowhere().error(message);
+          String message =
+              "Unable to copy '"
+                  + fileOrDirectory
+                  + "' from the file system. Reason: "
+                  + e.toString();
+          errorReporter.nowhere().error(message);
         }
       } else {
         try {
@@ -342,11 +343,12 @@ public static void copyFilesOrDirectories(
             System.out.println("Copied '" + fileOrDirectory + "' from the class path.");
           }
         } catch (IOException e) {
-            String message = "Unable to copy '"
-                + fileOrDirectory
-                + "' from the class path. Reason: "
-                + e.toString();
-            errorReporter.nowhere().error(message);
+          String message =
+              "Unable to copy '"
+                  + fileOrDirectory
+                  + "' from the class path. Reason: "
+                  + e.toString();
+          errorReporter.nowhere().error(message);
         }
       }
     }
diff --git a/core/src/main/java/org/lflang/util/LFCommand.java b/core/src/main/java/org/lflang/util/LFCommand.java
index a064a057e0..518401f305 100644
--- a/core/src/main/java/org/lflang/util/LFCommand.java
+++ b/core/src/main/java/org/lflang/util/LFCommand.java
@@ -29,7 +29,6 @@
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.OutputStream;
 import java.io.PrintStream;
 import java.nio.file.Path;
 import java.nio.file.Paths;
diff --git a/core/src/main/java/org/lflang/validation/LFValidator.java b/core/src/main/java/org/lflang/validation/LFValidator.java
index 31afa8e1ac..237a3aad13 100644
--- a/core/src/main/java/org/lflang/validation/LFValidator.java
+++ b/core/src/main/java/org/lflang/validation/LFValidator.java
@@ -1076,7 +1076,7 @@ public void checkTargetDecl(TargetDecl target) throws IOException {
     }
     String lfFileName = FileUtil.nameWithoutExtension(target.eResource());
     if (Character.isDigit(lfFileName.charAt(0))) {
-        errorReporter.nowhere().error("LF file names must not start with a number");
+      errorReporter.nowhere().error("LF file names must not start with a number");
     }
   }
 
diff --git a/core/src/main/java/org/lflang/validation/ValidatorErrorReporter.java b/core/src/main/java/org/lflang/validation/ValidatorErrorReporter.java
index bc8876bc5a..e50a4f5e2a 100644
--- a/core/src/main/java/org/lflang/validation/ValidatorErrorReporter.java
+++ b/core/src/main/java/org/lflang/validation/ValidatorErrorReporter.java
@@ -27,11 +27,9 @@
 package org.lflang.validation;
 
 import java.nio.file.Path;
-
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.lsp4j.DiagnosticSeverity;
 import org.eclipse.xtext.validation.ValidationMessageAcceptor;
-
 import org.lflang.ErrorReporterBase;
 import org.lflang.generator.Range;
 
@@ -70,30 +68,31 @@ protected void reportWithoutPosition(DiagnosticSeverity severity, String message
    *
    * <p>Unfortunately, there is no way to provide a path and a line number to the
    * ValidationMessageAcceptor as messages can only be reported directly as EObjects. While it is
-   * not an ideal solution, this method composes a messages indicating the location of the error
-   * and
-   * reports this on the object currently under validation. This way, the error message is not
-   * lost,
+   * not an ideal solution, this method composes a messages indicating the location of the error and
+   * reports this on the object currently under validation. This way, the error message is not lost,
    * but it is not necessarily reported precisely at the location of the actual error.
    */
   @Override
   protected void report(Path path, Range range, DiagnosticSeverity severity, String message) {
     String fullMessage =
-        message + " (Reported from " + path + " on line "
-            + range.getStartInclusive().getOneBasedLine() + ")";
+        message
+            + " (Reported from "
+            + path
+            + " on line "
+            + range.getStartInclusive().getOneBasedLine()
+            + ")";
     reportOnNode(validatorState.getCurrentObject(), severity, fullMessage);
   }
 
   @Override
   protected void reportOnNode(EObject node, DiagnosticSeverity severity, String message) {
     switch (severity) {
-    case Error -> acceptor.acceptError(
-        message, node, null, ValidationMessageAcceptor.INSIGNIFICANT_INDEX, null);
-    case Warning -> acceptor.acceptWarning(
-        message, node, null, ValidationMessageAcceptor.INSIGNIFICANT_INDEX, null);
-    case Information, Hint -> acceptor.acceptInfo(
-        message, node, null, ValidationMessageAcceptor.INSIGNIFICANT_INDEX, null);
+      case Error -> acceptor.acceptError(
+          message, node, null, ValidationMessageAcceptor.INSIGNIFICANT_INDEX, null);
+      case Warning -> acceptor.acceptWarning(
+          message, node, null, ValidationMessageAcceptor.INSIGNIFICANT_INDEX, null);
+      case Information, Hint -> acceptor.acceptInfo(
+          message, node, null, ValidationMessageAcceptor.INSIGNIFICANT_INDEX, null);
     }
   }
-
 }

From 34543e7cf58c06599ab0ab95fd45c865fd885156 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Fournier?= <clement.fournier@tu-dresden.de>
Date: Fri, 16 Jun 2023 18:01:17 +0200
Subject: [PATCH 14/17] Replace most System.out.println with usage of error
 reporter

---
 .../lflang/federated/extensions/CExtension.java    |  2 +-
 .../federated/extensions/CExtensionUtils.java      | 14 ++++++++------
 .../org/lflang/federated/generator/FedEmitter.java |  2 +-
 .../lflang/federated/generator/FedGenerator.java   |  2 +-
 .../federated/launcher/FedLauncherGenerator.java   |  2 +-
 .../lflang/generator/DockerComposeGenerator.java   |  5 ++++-
 .../main/java/org/lflang/generator/DockerData.java | 11 ++++++-----
 .../java/org/lflang/generator/DockerGenerator.java |  2 +-
 .../java/org/lflang/generator/GeneratorBase.java   |  6 +++---
 .../java/org/lflang/generator/LFGenerator.java     |  8 +++++++-
 .../lflang/generator/ReactionInstanceGraph.java    |  2 +-
 .../java/org/lflang/generator/c/CCompiler.java     |  6 +++---
 .../java/org/lflang/generator/c/CGenerator.java    | 14 +++++++-------
 .../lflang/generator/python/PythonGenerator.java   |  4 ++--
 .../src/main/java/org/lflang/util/ArduinoUtil.java | 12 ++++++------
 core/src/main/java/org/lflang/util/FileUtil.java   | 10 ++++++----
 core/src/main/java/org/lflang/util/LFCommand.java  |  1 +
 .../kotlin/org/lflang/generator/ts/TSGenerator.kt  |  4 ++--
 18 files changed, 61 insertions(+), 46 deletions(-)

diff --git a/core/src/main/java/org/lflang/federated/extensions/CExtension.java b/core/src/main/java/org/lflang/federated/extensions/CExtension.java
index 8f75dd2f44..e8ec17fc56 100644
--- a/core/src/main/java/org/lflang/federated/extensions/CExtension.java
+++ b/core/src/main/java/org/lflang/federated/extensions/CExtension.java
@@ -83,7 +83,7 @@ public void initializeTargetConfig(
       RtiConfig rtiConfig)
       throws IOException {
 
-    CExtensionUtils.handleCompileDefinitions(federate, numOfFederates, rtiConfig);
+    CExtensionUtils.handleCompileDefinitions(federate, numOfFederates, rtiConfig, errorReporter);
 
     generateCMakeInclude(federate, fileConfig);
 
diff --git a/core/src/main/java/org/lflang/federated/extensions/CExtensionUtils.java b/core/src/main/java/org/lflang/federated/extensions/CExtensionUtils.java
index 391204fdb5..c3cf9940d1 100644
--- a/core/src/main/java/org/lflang/federated/extensions/CExtensionUtils.java
+++ b/core/src/main/java/org/lflang/federated/extensions/CExtensionUtils.java
@@ -7,6 +7,8 @@
 import java.util.LinkedList;
 import java.util.List;
 import java.util.regex.Pattern;
+
+import org.lflang.ErrorReporter;
 import org.lflang.InferredType;
 import org.lflang.TargetConfig.ClockSyncOptions;
 import org.lflang.TargetProperty;
@@ -239,7 +241,7 @@ static boolean isSharedPtrType(InferredType type, CTypes types) {
   }
 
   public static void handleCompileDefinitions(
-      FederateInstance federate, int numOfFederates, RtiConfig rtiConfig) {
+      FederateInstance federate, int numOfFederates, RtiConfig rtiConfig, ErrorReporter errorReporter) {
     federate.targetConfig.setByUser.add(TargetProperty.COMPILE_DEFINITIONS);
     federate.targetConfig.compileDefinitions.put("FEDERATED", "");
     federate.targetConfig.compileDefinitions.put(
@@ -255,7 +257,7 @@ public static void handleCompileDefinitions(
 
     handleAdvanceMessageInterval(federate);
 
-    initializeClockSynchronization(federate, rtiConfig);
+    initializeClockSynchronization(federate, rtiConfig, errorReporter);
   }
 
   /**
@@ -295,13 +297,13 @@ static boolean clockSyncIsOn(FederateInstance federate, RtiConfig rtiConfig) {
    *     href="https://github.com/icyphy/lingua-franca/wiki/Distributed-Execution#clock-synchronization">Documentation</a>
    */
   public static void initializeClockSynchronization(
-      FederateInstance federate, RtiConfig rtiConfig) {
+      FederateInstance federate, RtiConfig rtiConfig, ErrorReporter errorReporter) {
     // Check if clock synchronization should be enabled for this federate in the first place
     if (clockSyncIsOn(federate, rtiConfig)) {
-      System.out.println("Initial clock synchronization is enabled for federate " + federate.id);
+      errorReporter.nowhere().info("Initial clock synchronization is enabled for federate " + federate.id);
       if (federate.targetConfig.clockSync == ClockSyncMode.ON) {
         if (federate.targetConfig.clockSyncOptions.collectStats) {
-          System.out.println("Will collect clock sync statistics for federate " + federate.id);
+          errorReporter.nowhere().info("Will collect clock sync statistics for federate " + federate.id);
           // Add libm to the compiler flags
           // FIXME: This is a linker flag not compile flag but we don't have a way to add linker
           // flags
@@ -310,7 +312,7 @@ public static void initializeClockSynchronization(
           federate.targetConfig.compilerFlags.add("-lm");
           federate.targetConfig.setByUser.add(TargetProperty.FLAGS);
         }
-        System.out.println("Runtime clock synchronization is enabled for federate " + federate.id);
+        errorReporter.nowhere().info("Runtime clock synchronization is enabled for federate " + federate.id);
       }
 
       addClockSyncCompileDefinitions(federate);
diff --git a/core/src/main/java/org/lflang/federated/generator/FedEmitter.java b/core/src/main/java/org/lflang/federated/generator/FedEmitter.java
index bdf912d0c8..dda4dd6662 100644
--- a/core/src/main/java/org/lflang/federated/generator/FedEmitter.java
+++ b/core/src/main/java/org/lflang/federated/generator/FedEmitter.java
@@ -40,7 +40,7 @@ Map<Path, CodeMap> generateFederate(
       throws IOException {
     String fedName = federate.name;
     Files.createDirectories(fileConfig.getSrcPath());
-    System.out.println(
+    errorReporter.nowhere().info(
         "##### Generating code for federate "
             + fedName
             + " in directory "
diff --git a/core/src/main/java/org/lflang/federated/generator/FedGenerator.java b/core/src/main/java/org/lflang/federated/generator/FedGenerator.java
index f87cb8705a..37e103882f 100644
--- a/core/src/main/java/org/lflang/federated/generator/FedGenerator.java
+++ b/core/src/main/java/org/lflang/federated/generator/FedGenerator.java
@@ -264,7 +264,7 @@ private Map<Path, CodeMap> compileFederates(
         Math.min(
             6, Math.min(Math.max(federates.size(), 1), Runtime.getRuntime().availableProcessors()));
     var compileThreadPool = Executors.newFixedThreadPool(numOfCompileThreads);
-    System.out.println(
+    errorReporter.nowhere().info(
         "******** Using " + numOfCompileThreads + " threads to compile the program.");
     Map<Path, CodeMap> codeMapMap = new ConcurrentHashMap<>();
     List<SubContext> subContexts = Collections.synchronizedList(new ArrayList<>());
diff --git a/core/src/main/java/org/lflang/federated/launcher/FedLauncherGenerator.java b/core/src/main/java/org/lflang/federated/launcher/FedLauncherGenerator.java
index b93a7bee03..9480aae5ea 100644
--- a/core/src/main/java/org/lflang/federated/launcher/FedLauncherGenerator.java
+++ b/core/src/main/java/org/lflang/federated/launcher/FedLauncherGenerator.java
@@ -218,7 +218,7 @@ public void doGenerate(List<FederateInstance> federates, RtiConfig rtiConfig) {
       }
     }
 
-    System.out.println(
+    errorReporter.nowhere().info(
         "##### Generating launcher for federation " + " in directory " + fileConfig.binPath);
 
     // Write the launcher file.
diff --git a/core/src/main/java/org/lflang/generator/DockerComposeGenerator.java b/core/src/main/java/org/lflang/generator/DockerComposeGenerator.java
index a3e5028317..7e7ff22646 100644
--- a/core/src/main/java/org/lflang/generator/DockerComposeGenerator.java
+++ b/core/src/main/java/org/lflang/generator/DockerComposeGenerator.java
@@ -4,6 +4,7 @@
 import java.nio.file.Path;
 import java.util.List;
 import java.util.stream.Collectors;
+
 import org.lflang.util.FileUtil;
 
 /**
@@ -16,9 +17,11 @@ public class DockerComposeGenerator {
 
   /** Path to the docker-compose.yml file. */
   protected final Path path;
+  private final LFGeneratorContext context;
 
   public DockerComposeGenerator(LFGeneratorContext context) {
     this.path = context.getFileConfig().getSrcGenPath().resolve("docker-compose.yml");
+    this.context = context;
   }
 
   /**
@@ -112,6 +115,6 @@ public void writeDockerComposeFile(List<DockerData> services, String networkName
         String.join(
             "\n", this.generateDockerServices(services), this.generateDockerNetwork(networkName));
     FileUtil.writeToFile(contents, path);
-    System.out.println(getUsageInstructions());
+    context.getErrorReporter().nowhere().info(getUsageInstructions());
   }
 }
diff --git a/core/src/main/java/org/lflang/generator/DockerData.java b/core/src/main/java/org/lflang/generator/DockerData.java
index af29e9e1d5..850670f387 100644
--- a/core/src/main/java/org/lflang/generator/DockerData.java
+++ b/core/src/main/java/org/lflang/generator/DockerData.java
@@ -1,6 +1,7 @@
 package org.lflang.generator;
 
 import java.io.IOException;
+import java.nio.file.Files;
 import java.nio.file.Path;
 import org.lflang.util.FileUtil;
 
@@ -18,8 +19,10 @@ public class DockerData {
 
   /** The name of the service. */
   public final String serviceName;
+  private final LFGeneratorContext context;
 
-  public DockerData(String serviceName, Path dockerFilePath, String dockerFileContent) {
+  public DockerData(String serviceName, Path dockerFilePath, String dockerFileContent, LFGeneratorContext context) {
+    this.context = context;
 
     if (!dockerFilePath.toFile().isAbsolute()) {
       throw new RuntimeException("Cannot use relative docker file path in DockerData instance");
@@ -31,10 +34,8 @@ public DockerData(String serviceName, Path dockerFilePath, String dockerFileCont
 
   /** Write a docker file based on this data. */
   public void writeDockerFile() throws IOException {
-    if (dockerFilePath.toFile().exists()) {
-      dockerFilePath.toFile().delete();
-    }
+    Files.deleteIfExists(dockerFilePath);
     FileUtil.writeToFile(dockerFileContent, dockerFilePath);
-    System.out.println("Dockerfile written to " + dockerFilePath);
+    context.getErrorReporter().nowhere().info("Dockerfile written to " + dockerFilePath);
   }
 }
diff --git a/core/src/main/java/org/lflang/generator/DockerGenerator.java b/core/src/main/java/org/lflang/generator/DockerGenerator.java
index cf6044f14f..d7d842d15e 100644
--- a/core/src/main/java/org/lflang/generator/DockerGenerator.java
+++ b/core/src/main/java/org/lflang/generator/DockerGenerator.java
@@ -38,7 +38,7 @@ public DockerData generateDockerData() {
     var dockerFilePath = context.getFileConfig().getSrcGenPath().resolve("Dockerfile");
     var dockerFileContent = generateDockerFileContent();
 
-    return new DockerData(name.replace("_", ""), dockerFilePath, dockerFileContent);
+    return new DockerData(name.replace("_", ""), dockerFilePath, dockerFileContent, context);
   }
 
   public static DockerGenerator dockerGeneratorFactory(LFGeneratorContext context) {
diff --git a/core/src/main/java/org/lflang/generator/GeneratorBase.java b/core/src/main/java/org/lflang/generator/GeneratorBase.java
index 32fe62337b..e1912c9615 100644
--- a/core/src/main/java/org/lflang/generator/GeneratorBase.java
+++ b/core/src/main/java/org/lflang/generator/GeneratorBase.java
@@ -658,10 +658,10 @@ private void reportIssue(StringBuilder message, Integer lineNumber, Path path, i
    * is in, and where the generated sources are to be put.
    */
   public void printInfo(LFGeneratorContext.Mode mode) {
-    System.out.println(
+    errorReporter.nowhere().info(
         "Generating code for: " + context.getFileConfig().resource.getURI().toString());
-    System.out.println("******** mode: " + mode);
-    System.out.println("******** generated sources: " + context.getFileConfig().getSrcGenPath());
+    errorReporter.nowhere().info("******** mode: " + mode);
+    errorReporter.nowhere().info("******** generated sources: " + context.getFileConfig().getSrcGenPath());
   }
 
   /** Get the buffer type used for network messages */
diff --git a/core/src/main/java/org/lflang/generator/LFGenerator.java b/core/src/main/java/org/lflang/generator/LFGenerator.java
index 8427f165f6..8d11c55674 100644
--- a/core/src/main/java/org/lflang/generator/LFGenerator.java
+++ b/core/src/main/java/org/lflang/generator/LFGenerator.java
@@ -1,6 +1,8 @@
 package org.lflang.generator;
 
 import com.google.inject.Inject;
+import com.google.inject.Injector;
+
 import java.io.IOException;
 import java.nio.file.Path;
 import java.util.Arrays;
@@ -32,6 +34,7 @@
 public class LFGenerator extends AbstractGenerator {
 
   @Inject private LFGlobalScopeProvider scopeProvider;
+  @Inject private Injector injector;
 
   // Indicator of whether generator errors occurred.
   protected boolean generatorErrorsOccurred = false;
@@ -85,6 +88,7 @@ private GeneratorBase createGenerator(LFGeneratorContext context) {
 
   @Override
   public void doGenerate(Resource resource, IFileSystemAccess2 fsa, IGeneratorContext context) {
+    assert injector!=null;
     final LFGeneratorContext lfContext;
     if (context instanceof LFGeneratorContext) {
       lfContext = (LFGeneratorContext) context;
@@ -97,7 +101,9 @@ public void doGenerate(Resource resource, IFileSystemAccess2 fsa, IGeneratorCont
 
     if (FedASTUtils.findFederatedReactor(resource) != null) {
       try {
-        generatorErrorsOccurred = (new FedGenerator(lfContext)).doGenerate(resource, lfContext);
+        FedGenerator fedGenerator = new FedGenerator(lfContext);
+        injector.injectMembers(fedGenerator);
+        generatorErrorsOccurred = fedGenerator.doGenerate(resource, lfContext);
       } catch (IOException e) {
         throw new RuntimeIOException("Error during federated code generation", e);
       }
diff --git a/core/src/main/java/org/lflang/generator/ReactionInstanceGraph.java b/core/src/main/java/org/lflang/generator/ReactionInstanceGraph.java
index 57d171e327..36d13e2960 100644
--- a/core/src/main/java/org/lflang/generator/ReactionInstanceGraph.java
+++ b/core/src/main/java/org/lflang/generator/ReactionInstanceGraph.java
@@ -81,7 +81,7 @@ public void rebuild() {
     addNodesAndEdges(main);
 
     // FIXME: Use {@link TargetProperty#EXPORT_DEPENDENCY_GRAPH}.
-    // System.out.println(toDOT());
+    // errorReporter.nowhere().info(toDOT());
 
     // Assign a level to each reaction.
     // If there are cycles present in the graph, it will be detected here.
diff --git a/core/src/main/java/org/lflang/generator/c/CCompiler.java b/core/src/main/java/org/lflang/generator/c/CCompiler.java
index c70311978c..ef73c053a6 100644
--- a/core/src/main/java/org/lflang/generator/c/CCompiler.java
+++ b/core/src/main/java/org/lflang/generator/c/CCompiler.java
@@ -171,7 +171,7 @@ public boolean runCCompiler(GeneratorBase generator, LFGeneratorContext context)
       }
 
       if (makeReturnCode == 0 && build.getErrors().length() == 0) {
-        System.out.println(
+        errorReporter.nowhere().info(
             "SUCCESS: Compiling generated code for "
                 + fileConfig.name
                 + " finished with no errors.");
@@ -179,13 +179,13 @@ public boolean runCCompiler(GeneratorBase generator, LFGeneratorContext context)
 
       if (targetConfig.platformOptions.platform == Platform.ZEPHYR
           && targetConfig.platformOptions.flash) {
-        System.out.println("Invoking flash command for Zephyr");
+        errorReporter.nowhere().info("Invoking flash command for Zephyr");
         LFCommand flash = buildWestFlashCommand();
         int flashRet = flash.run();
         if (flashRet != 0) {
           errorReporter.nowhere().error("West flash command failed with error code " + flashRet);
         } else {
-          System.out.println("SUCCESS: Flashed application with west");
+          errorReporter.nowhere().info("SUCCESS: Flashed application with west");
         }
       }
     }
diff --git a/core/src/main/java/org/lflang/generator/c/CGenerator.java b/core/src/main/java/org/lflang/generator/c/CGenerator.java
index 0bc8ee0202..854d1afb97 100644
--- a/core/src/main/java/org/lflang/generator/c/CGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CGenerator.java
@@ -465,8 +465,8 @@ public void doGenerate(Resource resource, LFGeneratorContext context) {
         Path include = fileConfig.getSrcGenPath().resolve("include/");
         Path src = fileConfig.getSrcGenPath().resolve("src/");
         FileUtil.arduinoDeleteHelper(src, targetConfig.threading);
-        FileUtil.relativeIncludeHelper(src, include);
-        FileUtil.relativeIncludeHelper(include, include);
+        FileUtil.relativeIncludeHelper(src, include, errorReporter);
+        FileUtil.relativeIncludeHelper(include, include, errorReporter);
       } catch (IOException e) {
         //noinspection ThrowableNotThrown,ResultOfMethodCallIgnored
         Exceptions.sneakyThrow(e);
@@ -476,8 +476,8 @@ public void doGenerate(Resource resource, LFGeneratorContext context) {
         arduinoUtil.buildArduino(fileConfig, targetConfig);
         context.finish(GeneratorResult.Status.COMPILED, null);
       } else {
-        System.out.println("********");
-        System.out.println(
+        errorReporter.nowhere().info("********");
+        errorReporter.nowhere().info(
             "To compile your program, run the following command to see information about the board"
                 + " you plugged in:\n\n"
                 + "\tarduino-cli board list\n\n"
@@ -595,7 +595,7 @@ public void doGenerate(Resource resource, LFGeneratorContext context) {
         context.finish(GeneratorResult.Status.COMPILED, null);
       }
       if (!errorsOccurred()) {
-        System.out.println("Compiled binary is in " + fileConfig.binPath);
+        errorReporter.nowhere().info("Compiled binary is in " + fileConfig.binPath);
       }
     } else {
       context.finish(GeneratorResult.GENERATED_NO_EXECUTABLE.apply(context, null));
@@ -1961,7 +1961,7 @@ protected void setUpGeneralParameters() {
         && (targetConfig.platformOptions.board == null
             || !targetConfig.platformOptions.board.contains("mbed"))) {
       // non-MBED boards should not use threading
-      System.out.println(
+      errorReporter.nowhere().info(
           "Threading is incompatible on your current Arduino flavor. Setting threading to false.");
       targetConfig.threading = false;
     }
@@ -1969,7 +1969,7 @@ protected void setUpGeneralParameters() {
     if (targetConfig.platformOptions.platform == Platform.ARDUINO
         && !targetConfig.noCompile
         && targetConfig.platformOptions.board == null) {
-      System.out.println(
+      errorReporter.nowhere().info(
           "To enable compilation for the Arduino platform, you must specify the fully-qualified"
               + " board name (FQBN) in the target property. For example, platform: {name: arduino,"
               + " board: arduino:avr:leonardo}. Entering \"no-compile\" mode and generating target"
diff --git a/core/src/main/java/org/lflang/generator/python/PythonGenerator.java b/core/src/main/java/org/lflang/generator/python/PythonGenerator.java
index de2a41918d..f74c369d5b 100644
--- a/core/src/main/java/org/lflang/generator/python/PythonGenerator.java
+++ b/core/src/main/java/org/lflang/generator/python/PythonGenerator.java
@@ -397,14 +397,14 @@ public void doGenerate(Resource resource, LFGeneratorContext context) {
         copyTargetFiles();
         new PythonValidator(fileConfig, errorReporter, codeMaps, protoNames).doValidate(context);
         if (targetConfig.noCompile) {
-          System.out.println(PythonInfoGenerator.generateSetupInfo(fileConfig));
+          errorReporter.nowhere().info(PythonInfoGenerator.generateSetupInfo(fileConfig));
         }
       } catch (Exception e) {
         //noinspection ConstantConditions
         throw Exceptions.sneakyThrow(e);
       }
 
-      System.out.println(PythonInfoGenerator.generateRunInfo(fileConfig, lfModuleName));
+      errorReporter.nowhere().info(PythonInfoGenerator.generateRunInfo(fileConfig, lfModuleName));
     }
 
     if (errorReporter.getErrorsOccurred()) {
diff --git a/core/src/main/java/org/lflang/util/ArduinoUtil.java b/core/src/main/java/org/lflang/util/ArduinoUtil.java
index 460ae2eb86..4fec0b51cf 100644
--- a/core/src/main/java/org/lflang/util/ArduinoUtil.java
+++ b/core/src/main/java/org/lflang/util/ArduinoUtil.java
@@ -103,7 +103,7 @@ private LFCommand arduinoCompileCommand(FileConfig fileConfig, TargetConfig targ
    * @param targetConfig
    */
   public void buildArduino(FileConfig fileConfig, TargetConfig targetConfig) {
-    System.out.println("Retrieving Arduino Compile Script");
+    errorReporter.nowhere().info("Retrieving Arduino Compile Script");
     try {
       LFCommand command =
           arduinoCompileCommand(fileConfig, targetConfig); // Use ProcessBuilder for finer control.
@@ -116,11 +116,11 @@ public void buildArduino(FileConfig fileConfig, TargetConfig targetConfig) {
     } catch (IOException e) {
       Exceptions.sneakyThrow(e);
     }
-    System.out.println(
+    errorReporter.nowhere().info(
         "SUCCESS: Compiling generated code for " + fileConfig.name + " finished with no errors.");
     if (targetConfig.platformOptions.flash) {
       if (targetConfig.platformOptions.port != null) {
-        System.out.println("Invoking flash command for Arduino");
+        errorReporter.nowhere().info("Invoking flash command for Arduino");
         LFCommand flash =
             commandFactory.createCommand(
                 "arduino-cli",
@@ -140,14 +140,14 @@ public void buildArduino(FileConfig fileConfig, TargetConfig targetConfig) {
               .nowhere()
               .error("arduino-cli flash command failed with error code " + flashRet);
         } else {
-          System.out.println("SUCCESS: Flashed board using arduino-cli");
+          errorReporter.nowhere().info("SUCCESS: Flashed board using arduino-cli");
         }
       } else {
         errorReporter.nowhere().error("Need to provide a port on which to automatically flash.");
       }
     } else {
-      System.out.println("********");
-      System.out.println(
+      errorReporter.nowhere().info("********");
+      errorReporter.nowhere().info(
           "To flash your program, run the following command to see information about the board you"
               + " plugged in:\n\n"
               + "\tarduino-cli board list\n\n"
diff --git a/core/src/main/java/org/lflang/util/FileUtil.java b/core/src/main/java/org/lflang/util/FileUtil.java
index 3d6600621d..c84bc4da8f 100644
--- a/core/src/main/java/org/lflang/util/FileUtil.java
+++ b/core/src/main/java/org/lflang/util/FileUtil.java
@@ -325,7 +325,7 @@ public static void copyFilesOrDirectories(
           } else {
             FileUtil.copyFromFileSystem(found, dstDir, false);
           }
-          System.out.println("Copied '" + fileOrDirectory + "' from the file system.");
+          errorReporter.nowhere().info("Copied '" + fileOrDirectory + "' from the file system.");
         } catch (IOException e) {
           String message =
               "Unable to copy '"
@@ -340,7 +340,7 @@ public static void copyFilesOrDirectories(
             copyFileFromClassPath(fileOrDirectory, dstDir, false);
           } else {
             FileUtil.copyFromClassPath(fileOrDirectory, dstDir, false, false);
-            System.out.println("Copied '" + fileOrDirectory + "' from the class path.");
+            errorReporter.nowhere().info("Copied '" + fileOrDirectory + "' from the class path.");
           }
         } catch (IOException e) {
           String message =
@@ -712,10 +712,11 @@ public static boolean isCFile(Path path) {
    * Convert all includes recursively inside files within a specified folder to relative links
    *
    * @param dir The folder to search for includes to change.
+   * @param errorReporter Error reporter
    * @throws IOException If the given set of files cannot be relativized.
    */
-  public static void relativeIncludeHelper(Path dir, Path includePath) throws IOException {
-    System.out.println("Relativizing all includes in " + dir.toString());
+  public static void relativeIncludeHelper(Path dir, Path includePath, ErrorReporter errorReporter) throws IOException {
+    errorReporter.nowhere().info("Relativizing all includes in " + dir.toString());
     List<Path> includePaths =
         Files.walk(includePath)
             .filter(Files::isRegularFile)
@@ -779,6 +780,7 @@ public static void delete(Path fileOrDirectory) throws IOException {
    */
   public static void deleteDirectory(Path dir) throws IOException {
     if (Files.isDirectory(dir)) {
+      // fixme system.out
       System.out.println("Cleaning " + dir);
       List<Path> pathsToDelete = Files.walk(dir).sorted(Comparator.reverseOrder()).toList();
       for (Path path : pathsToDelete) {
diff --git a/core/src/main/java/org/lflang/util/LFCommand.java b/core/src/main/java/org/lflang/util/LFCommand.java
index 518401f305..8bed14916e 100644
--- a/core/src/main/java/org/lflang/util/LFCommand.java
+++ b/core/src/main/java/org/lflang/util/LFCommand.java
@@ -164,6 +164,7 @@ public int run(CancelIndicator cancelIndicator) {
     assert !didRun;
     didRun = true;
 
+    // FIXME remove system out
     System.out.println("--- Current working directory: " + processBuilder.directory().toString());
     System.out.println("--- Executing command: " + String.join(" ", processBuilder.command()));
 
diff --git a/core/src/main/kotlin/org/lflang/generator/ts/TSGenerator.kt b/core/src/main/kotlin/org/lflang/generator/ts/TSGenerator.kt
index 4afa183152..de43c5abef 100644
--- a/core/src/main/kotlin/org/lflang/generator/ts/TSGenerator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/ts/TSGenerator.kt
@@ -222,9 +222,9 @@ class TSGenerator(
     private fun copyConfigFiles() {
         FileUtil.copyFromClassPath(LIB_PATH, fileConfig.srcGenPath, true, true)
         for (configFile in CONFIG_FILES) {
-            var override = FileUtil.findAndCopyFile(configFile, fileConfig.srcGenPath, fileConfig);
+            val override = FileUtil.findAndCopyFile(configFile, fileConfig.srcGenPath, fileConfig);
             if (override != null) {
-                System.out.println("Using user-provided '" + override + "'");
+                errorReporter.nowhere().info("Using user-provided '" + override + "'");
             } else {
                 System.out.println("Using default '" + configFile + "'");
             }

From d9de0dcac9569a0f8f7b5b442418a826950e0c0f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Fournier?= <clement.fournier@tu-dresden.de>
Date: Fri, 16 Jun 2023 18:02:47 +0200
Subject: [PATCH 15/17] Rename ErrorReporter -> MessageReporter

---
 .../src/main/java/org/lflang/cli/CliBase.java |  4 +-
 .../org/lflang/cli/LFStandaloneModule.java    |  4 +-
 ...er.java => StandaloneMessageReporter.java} |  4 +-
 cli/lfc/src/main/java/org/lflang/cli/Lfc.java |  2 +-
 .../java/org/lflang/tests/lsp/LspTests.java   |  4 +-
 ...orter.java => DefaultMessageReporter.java} |  2 +-
 .../main/java/org/lflang/LFRuntimeModule.java |  4 +-
 ...rrorReporter.java => MessageReporter.java} |  6 +-
 ...rterBase.java => MessageReporterBase.java} |  6 +-
 core/src/main/java/org/lflang/ModelInfo.java  |  4 +-
 .../main/java/org/lflang/TargetConfig.java    |  6 +-
 .../main/java/org/lflang/TargetProperty.java  |  8 +--
 .../synthesis/LinguaFrancaSynthesis.java      |  6 +-
 ...ter.java => SynthesisMessageReporter.java} |  4 +-
 .../federated/extensions/CExtension.java      | 56 +++++++++---------
 .../federated/extensions/CExtensionUtils.java | 14 ++---
 .../extensions/FedTargetExtension.java        | 18 +++---
 .../federated/extensions/PythonExtension.java | 14 ++---
 .../federated/extensions/TSExtension.java     | 20 +++----
 .../federated/generator/FedASTUtils.java      | 34 +++++------
 .../federated/generator/FedEmitter.java       | 16 ++---
 .../federated/generator/FedGenerator.java     | 38 ++++++------
 .../federated/generator/FedMainEmitter.java   |  8 +--
 .../generator/FedPreambleEmitter.java         |  6 +-
 .../federated/generator/FedTargetConfig.java  |  8 +--
 .../federated/generator/FedTargetEmitter.java |  6 +-
 .../federated/generator/FederateInstance.java | 12 ++--
 ...java => LineAdjustingMessageReporter.java} |  8 +--
 ....java => SynchronizedMessageReporter.java} | 10 ++--
 .../federated/launcher/BuildConfig.java       | 10 ++--
 .../federated/launcher/CBuildConfig.java      |  8 +--
 .../launcher/FedLauncherGenerator.java        | 38 ++++++------
 .../federated/launcher/PyBuildConfig.java     |  6 +-
 .../federated/launcher/TsBuildConfig.java     |  6 +-
 .../FedROS2CPPSerialization.java              |  4 +-
 .../federated/validation/FedValidator.java    | 10 ++--
 .../lflang/generator/DiagnosticReporting.java |  6 +-
 .../org/lflang/generator/GeneratorBase.java   | 44 +++++++-------
 .../generator/GeneratorCommandFactory.java    | 10 ++--
 .../org/lflang/generator/GeneratorUtils.java  | 16 ++---
 .../HumanReadableReportingStrategy.java       | 18 +++---
 .../lflang/generator/IntegratedBuilder.java   | 16 ++---
 .../generator/InvalidSourceException.java     |  2 +-
 .../org/lflang/generator/LFGenerator.java     |  8 +--
 .../lflang/generator/LFGeneratorContext.java  |  4 +-
 ...ava => LanguageServerMessageReporter.java} |  8 +--
 .../org/lflang/generator/MainContext.java     | 20 +++----
 .../org/lflang/generator/PortInstance.java    | 14 ++---
 .../org/lflang/generator/ReactorInstance.java | 14 ++---
 .../java/org/lflang/generator/SubContext.java |  6 +-
 .../java/org/lflang/generator/Validator.java  | 16 ++---
 .../lflang/generator/c/CCmakeGenerator.java   |  8 +--
 .../org/lflang/generator/c/CCompiler.java     | 36 ++++++------
 .../org/lflang/generator/c/CGenerator.java    | 58 +++++++++----------
 .../lflang/generator/c/CPortGenerator.java    | 12 ++--
 .../generator/c/CReactionGenerator.java       | 18 +++---
 .../java/org/lflang/generator/c/CUtil.java    |  6 +-
 .../generator/c/CWatchdogGenerator.java       | 14 ++---
 .../generator/python/PythonGenerator.java     | 14 ++---
 .../python/PythonReactionGenerator.java       | 14 ++---
 .../generator/python/PythonValidator.java     | 26 ++++-----
 .../generator/rust/CargoDependencySpec.java   |  6 +-
 .../generator/rust/RustTargetConfig.java      |  4 +-
 .../java/org/lflang/util/ArduinoUtil.java     | 28 ++++-----
 .../main/java/org/lflang/util/FileUtil.java   | 20 +++----
 .../org/lflang/validation/LFValidator.java    |  6 +-
 ...ter.java => ValidatorMessageReporter.java} |  6 +-
 .../generator/cpp/CppActionGenerator.kt       |  8 +--
 .../org/lflang/generator/cpp/CppGenerator.kt  |  6 +-
 .../generator/cpp/CppInstanceGenerator.kt     |  6 +-
 .../generator/cpp/CppPlatformGenerator.kt     |  6 +-
 .../generator/cpp/CppReactorGenerator.kt      |  8 +--
 .../lflang/generator/cpp/CppRos2Generator.kt  |  8 +--
 .../generator/cpp/CppStandaloneGenerator.kt   | 14 ++---
 .../org/lflang/generator/cpp/CppValidator.kt  |  6 +-
 .../lflang/generator/rust/RustGenerator.kt    | 10 ++--
 .../org/lflang/generator/rust/RustModel.kt    | 10 ++--
 .../lflang/generator/rust/RustValidator.kt    |  6 +-
 .../generator/ts/TSConnectionGenerator.kt     |  6 +-
 .../generator/ts/TSConstructorGenerator.kt    |  8 +--
 .../org/lflang/generator/ts/TSGenerator.kt    | 30 +++++-----
 .../generator/ts/TSReactionGenerator.kt       |  8 +--
 .../lflang/generator/ts/TSReactorGenerator.kt |  4 +-
 .../org/lflang/generator/ts/TSValidator.kt    | 12 ++--
 .../tests/compiler/LetInferenceTests.java     |  4 +-
 .../LinguaFrancaDependencyAnalysisTest.java   |  6 +-
 .../tests/compiler/PortInstanceTests.java     |  6 +-
 .../org/lflang/tests/compiler/RangeTests.java |  6 +-
 .../java/org/lflang/tests/TestBase.java       |  4 +-
 .../diagram/lsp/LanguageDiagramServer.java    |  4 +-
 90 files changed, 539 insertions(+), 539 deletions(-)
 rename cli/base/src/main/java/org/lflang/cli/{StandaloneErrorReporter.java => StandaloneMessageReporter.java} (96%)
 rename core/src/main/java/org/lflang/{DefaultErrorReporter.java => DefaultMessageReporter.java} (90%)
 rename core/src/main/java/org/lflang/{ErrorReporter.java => MessageReporter.java} (94%)
 rename core/src/main/java/org/lflang/{ErrorReporterBase.java => MessageReporterBase.java} (90%)
 rename core/src/main/java/org/lflang/diagram/synthesis/util/{SynthesisErrorReporter.java => SynthesisMessageReporter.java} (95%)
 rename core/src/main/java/org/lflang/federated/generator/{LineAdjustingErrorReporter.java => LineAdjustingMessageReporter.java} (86%)
 rename core/src/main/java/org/lflang/federated/generator/{SynchronizedErrorReporter.java => SynchronizedMessageReporter.java} (77%)
 rename core/src/main/java/org/lflang/generator/{LanguageServerErrorReporter.java => LanguageServerMessageReporter.java} (95%)
 rename core/src/main/java/org/lflang/validation/{ValidatorErrorReporter.java => ValidatorMessageReporter.java} (96%)

diff --git a/cli/base/src/main/java/org/lflang/cli/CliBase.java b/cli/base/src/main/java/org/lflang/cli/CliBase.java
index 3daab73ab0..e1ecfd893a 100644
--- a/cli/base/src/main/java/org/lflang/cli/CliBase.java
+++ b/cli/base/src/main/java/org/lflang/cli/CliBase.java
@@ -27,7 +27,7 @@
 import org.eclipse.xtext.validation.CheckMode;
 import org.eclipse.xtext.validation.IResourceValidator;
 import org.eclipse.xtext.validation.Issue;
-import org.lflang.ErrorReporter;
+import org.lflang.MessageReporter;
 import org.lflang.LFRuntimeModule;
 import org.lflang.LFStandaloneSetup;
 import org.lflang.util.FileUtil;
@@ -88,7 +88,7 @@ static class MutuallyExclusive {
   @Inject protected ReportingBackend reporter;
 
   /** Used to report error messages at the end. */
-  @Inject protected ErrorReporter errorReporter;
+  @Inject protected MessageReporter messageReporter;
 
   /** IO context of this run. */
   @Inject protected Io io;
diff --git a/cli/base/src/main/java/org/lflang/cli/LFStandaloneModule.java b/cli/base/src/main/java/org/lflang/cli/LFStandaloneModule.java
index abf01bfcd3..8cb8395d5b 100644
--- a/cli/base/src/main/java/org/lflang/cli/LFStandaloneModule.java
+++ b/cli/base/src/main/java/org/lflang/cli/LFStandaloneModule.java
@@ -34,7 +34,7 @@
 import org.eclipse.emf.ecore.EValidator;
 import org.eclipse.emf.ecore.impl.EValidatorRegistryImpl;
 import org.eclipse.xtext.validation.ValidationMessageAcceptor;
-import org.lflang.ErrorReporter;
+import org.lflang.MessageReporter;
 import org.lflang.LFRuntimeModule;
 
 /**
@@ -56,7 +56,7 @@ public LFStandaloneModule(ReportingBackend helper, Io io) {
 
   @Override
   public void configure(Binder binder) {
-    binder.bind(ErrorReporter.class).to(StandaloneErrorReporter.class);
+    binder.bind(MessageReporter.class).to(StandaloneMessageReporter.class);
     binder.bind(ReportingBackend.class).toInstance(helper);
     binder.bind(Io.class).toInstance(io);
     binder.bind(ValidationMessageAcceptor.class).to(StandaloneIssueAcceptor.class);
diff --git a/cli/base/src/main/java/org/lflang/cli/StandaloneErrorReporter.java b/cli/base/src/main/java/org/lflang/cli/StandaloneMessageReporter.java
similarity index 96%
rename from cli/base/src/main/java/org/lflang/cli/StandaloneErrorReporter.java
rename to cli/base/src/main/java/org/lflang/cli/StandaloneMessageReporter.java
index 36ce472280..a6cbbd39cd 100644
--- a/cli/base/src/main/java/org/lflang/cli/StandaloneErrorReporter.java
+++ b/cli/base/src/main/java/org/lflang/cli/StandaloneMessageReporter.java
@@ -32,14 +32,14 @@
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.lsp4j.DiagnosticSeverity;
 import org.eclipse.xtext.diagnostics.Severity;
-import org.lflang.ErrorReporterBase;
+import org.lflang.MessageReporterBase;
 import org.lflang.generator.Range;
 
 /**
  * An error reporter that forwards all messages to an {@link IssueCollector}. They'll be sorted out
  * later.
  */
-public class StandaloneErrorReporter extends ErrorReporterBase {
+public class StandaloneMessageReporter extends MessageReporterBase {
 
   @Inject private StandaloneIssueAcceptor issueAcceptor;
 
diff --git a/cli/lfc/src/main/java/org/lflang/cli/Lfc.java b/cli/lfc/src/main/java/org/lflang/cli/Lfc.java
index 19869f9394..021fb1c9fa 100644
--- a/cli/lfc/src/main/java/org/lflang/cli/Lfc.java
+++ b/cli/lfc/src/main/java/org/lflang/cli/Lfc.java
@@ -181,7 +181,7 @@ private void invokeGenerator(List<Path> files, Path root, Properties properties)
               properties,
               resource,
               this.fileAccess,
-              fileConfig -> errorReporter);
+              fileConfig -> messageReporter);
 
       try {
         this.generator.generate(resource, this.fileAccess, context);
diff --git a/core/src/integrationTest/java/org/lflang/tests/lsp/LspTests.java b/core/src/integrationTest/java/org/lflang/tests/lsp/LspTests.java
index fe52d6016c..305f29ea21 100644
--- a/core/src/integrationTest/java/org/lflang/tests/lsp/LspTests.java
+++ b/core/src/integrationTest/java/org/lflang/tests/lsp/LspTests.java
@@ -17,7 +17,7 @@
 import org.lflang.LFStandaloneSetup;
 import org.lflang.Target;
 import org.lflang.generator.IntegratedBuilder;
-import org.lflang.generator.LanguageServerErrorReporter;
+import org.lflang.generator.LanguageServerMessageReporter;
 import org.lflang.tests.LFTest;
 import org.lflang.tests.TestBase;
 import org.lflang.tests.TestRegistry;
@@ -151,7 +151,7 @@ private void checkDiagnostics(
       Random random)
       throws IOException {
     MockLanguageClient client = new MockLanguageClient();
-    LanguageServerErrorReporter.setClient(client);
+    LanguageServerMessageReporter.setClient(client);
     for (LFTest test : selectTests(target, random)) {
       client.clearDiagnostics();
       if (alterer != null) {
diff --git a/core/src/main/java/org/lflang/DefaultErrorReporter.java b/core/src/main/java/org/lflang/DefaultMessageReporter.java
similarity index 90%
rename from core/src/main/java/org/lflang/DefaultErrorReporter.java
rename to core/src/main/java/org/lflang/DefaultMessageReporter.java
index 9be737671b..9ea3ede28a 100644
--- a/core/src/main/java/org/lflang/DefaultErrorReporter.java
+++ b/core/src/main/java/org/lflang/DefaultMessageReporter.java
@@ -6,7 +6,7 @@
 import org.lflang.generator.Range;
 
 /** Simple implementation of the ErrorReport interface that simply prints to standard out. */
-public class DefaultErrorReporter extends ErrorReporterBase implements ErrorReporter {
+public class DefaultMessageReporter extends MessageReporterBase implements MessageReporter {
 
   private void println(String s) {
     System.out.println(s);
diff --git a/core/src/main/java/org/lflang/LFRuntimeModule.java b/core/src/main/java/org/lflang/LFRuntimeModule.java
index a01986dfb3..e69b413081 100644
--- a/core/src/main/java/org/lflang/LFRuntimeModule.java
+++ b/core/src/main/java/org/lflang/LFRuntimeModule.java
@@ -46,8 +46,8 @@ public Class<? extends ISyntaxErrorMessageProvider> bindISyntaxErrorMessageProvi
   }
 
   /** The error reporter. {@code org.lflang.lfc.LFStandaloneModule} overrides this binding. */
-  public Class<? extends ErrorReporter> bindErrorReporter() {
-    return DefaultErrorReporter.class;
+  public Class<? extends MessageReporter> bindErrorReporter() {
+    return DefaultMessageReporter.class;
   }
 
   @Override
diff --git a/core/src/main/java/org/lflang/ErrorReporter.java b/core/src/main/java/org/lflang/MessageReporter.java
similarity index 94%
rename from core/src/main/java/org/lflang/ErrorReporter.java
rename to core/src/main/java/org/lflang/MessageReporter.java
index 3b39b14503..578f9c781a 100644
--- a/core/src/main/java/org/lflang/ErrorReporter.java
+++ b/core/src/main/java/org/lflang/MessageReporter.java
@@ -7,7 +7,7 @@
 import org.lflang.generator.Range;
 
 /**
- * Interface for reporting errors. This interface is a staged builder: first call one of the {@code
+ * Interface for reporting messages like errors or info. This interface is a staged builder: first call one of the {@code
  * at} methods to specify the position of the message, then use one of the report methods on the
  * returned {@link Stage2} instance.
  *
@@ -19,13 +19,13 @@
  * errorReporter.nowhere().error("Some error that has no specific position")
  * }</pre>
  *
- * @see ErrorReporterBase
+ * @see MessageReporterBase
  * @author Edward A. Lee
  * @author Marten Lohstroh
  * @author Christian Menard
  * @author Clément Fournier
  */
-public interface ErrorReporter {
+public interface MessageReporter {
 
   /** Position the message on the given range in a given file (both must be non-null). */
   Stage2 at(Path file, Range range);
diff --git a/core/src/main/java/org/lflang/ErrorReporterBase.java b/core/src/main/java/org/lflang/MessageReporterBase.java
similarity index 90%
rename from core/src/main/java/org/lflang/ErrorReporterBase.java
rename to core/src/main/java/org/lflang/MessageReporterBase.java
index c1364b6308..0ee7b0286e 100644
--- a/core/src/main/java/org/lflang/ErrorReporterBase.java
+++ b/core/src/main/java/org/lflang/MessageReporterBase.java
@@ -5,12 +5,12 @@
 import org.eclipse.lsp4j.DiagnosticSeverity;
 import org.lflang.generator.Range;
 
-/** Base implementation of the {@link ErrorReporter} interface. */
-public abstract class ErrorReporterBase implements ErrorReporter {
+/** Base implementation of the {@link MessageReporter} interface. */
+public abstract class MessageReporterBase implements MessageReporter {
 
   private boolean errorsOccurred = false;
 
-  protected ErrorReporterBase() {}
+  protected MessageReporterBase() {}
 
   @Override
   public boolean getErrorsOccurred() {
diff --git a/core/src/main/java/org/lflang/ModelInfo.java b/core/src/main/java/org/lflang/ModelInfo.java
index 5898e1691a..313f4675dd 100644
--- a/core/src/main/java/org/lflang/ModelInfo.java
+++ b/core/src/main/java/org/lflang/ModelInfo.java
@@ -98,7 +98,7 @@ public class ModelInfo {
    *
    * @param model the model to analyze.
    */
-  public void update(Model model, ErrorReporter reporter) {
+  public void update(Model model, MessageReporter reporter) {
     this.updated = true;
     this.model = model;
     this.instantiationGraph = new InstantiationGraph(model, true);
@@ -132,7 +132,7 @@ public void update(Model model, ErrorReporter reporter) {
     checkCaseInsensitiveNameCollisions(model, reporter);
   }
 
-  public void checkCaseInsensitiveNameCollisions(Model model, ErrorReporter reporter) {
+  public void checkCaseInsensitiveNameCollisions(Model model, MessageReporter reporter) {
     var reactorNames = new HashSet<>();
     var bad = new ArrayList<>();
     for (var reactor : model.getReactors()) {
diff --git a/core/src/main/java/org/lflang/TargetConfig.java b/core/src/main/java/org/lflang/TargetConfig.java
index fcb8c88a62..a61df711e9 100644
--- a/core/src/main/java/org/lflang/TargetConfig.java
+++ b/core/src/main/java/org/lflang/TargetConfig.java
@@ -71,13 +71,13 @@ public TargetConfig(TargetDecl target) { // FIXME: eliminate this constructor if
    *
    * @param cliArgs Arguments passed on the commandline.
    * @param target AST node of a target declaration.
-   * @param errorReporter An error reporter to report problems.
+   * @param messageReporter An error reporter to report problems.
    */
-  public TargetConfig(Properties cliArgs, TargetDecl target, ErrorReporter errorReporter) {
+  public TargetConfig(Properties cliArgs, TargetDecl target, MessageReporter messageReporter) {
     this(target);
     if (target.getConfig() != null) {
       List<KeyValuePair> pairs = target.getConfig().getPairs();
-      TargetProperty.set(this, pairs != null ? pairs : List.of(), errorReporter);
+      TargetProperty.set(this, pairs != null ? pairs : List.of(), messageReporter);
     }
     if (cliArgs.containsKey("no-compile")) {
       this.noCompile = true;
diff --git a/core/src/main/java/org/lflang/TargetProperty.java b/core/src/main/java/org/lflang/TargetProperty.java
index 8fd948d2d5..c2df7fea30 100644
--- a/core/src/main/java/org/lflang/TargetProperty.java
+++ b/core/src/main/java/org/lflang/TargetProperty.java
@@ -863,7 +863,7 @@ private interface PropertyParser {
      * Parse the given element into the given target config. May use the error reporter to report
      * format errors.
      */
-    void parseIntoTargetConfig(TargetConfig config, Element element, ErrorReporter err);
+    void parseIntoTargetConfig(TargetConfig config, Element element, MessageReporter err);
   }
 
   public final PropertyGetter getter;
@@ -941,7 +941,7 @@ public String getDisplayName() {
    * @param properties AST node that holds all the target properties.
    * @param err Error reporter on which property format errors will be reported
    */
-  public static void set(TargetConfig config, List<KeyValuePair> properties, ErrorReporter err) {
+  public static void set(TargetConfig config, List<KeyValuePair> properties, MessageReporter err) {
     properties.forEach(
         property -> {
           TargetProperty p = forName(property.getName());
@@ -1002,7 +1002,7 @@ public static TargetDecl extractTargetDecl(Target target, TargetConfig config) {
    *     properties originate.
    */
   public static void update(
-      TargetConfig config, List<KeyValuePair> properties, Path relativePath, ErrorReporter err) {
+      TargetConfig config, List<KeyValuePair> properties, Path relativePath, MessageReporter err) {
     properties.forEach(
         property -> {
           TargetProperty p = forName(property.getName());
@@ -1045,7 +1045,7 @@ public static void updateOne(
       TargetConfig config,
       TargetProperty property,
       List<KeyValuePair> properties,
-      ErrorReporter err) {
+      MessageReporter err) {
     properties.stream()
         .filter(p -> p.getName().equals(property.getDisplayName()))
         .findFirst()
diff --git a/core/src/main/java/org/lflang/diagram/synthesis/LinguaFrancaSynthesis.java b/core/src/main/java/org/lflang/diagram/synthesis/LinguaFrancaSynthesis.java
index b26fea12a2..a8c24abdb1 100644
--- a/core/src/main/java/org/lflang/diagram/synthesis/LinguaFrancaSynthesis.java
+++ b/core/src/main/java/org/lflang/diagram/synthesis/LinguaFrancaSynthesis.java
@@ -112,7 +112,7 @@
 import org.lflang.diagram.synthesis.util.ModeDiagrams;
 import org.lflang.diagram.synthesis.util.NamedInstanceUtil;
 import org.lflang.diagram.synthesis.util.ReactorIcons;
-import org.lflang.diagram.synthesis.util.SynthesisErrorReporter;
+import org.lflang.diagram.synthesis.util.SynthesisMessageReporter;
 import org.lflang.diagram.synthesis.util.UtilityExtensions;
 import org.lflang.generator.ActionInstance;
 import org.lflang.generator.ParameterInstance;
@@ -309,7 +309,7 @@ public KNode transform(final Model model) {
       Reactor main =
           IterableExtensions.findFirst(model.getReactors(), _utilityExtensions::isMainOrFederated);
       if (main != null) {
-        ReactorInstance reactorInstance = new ReactorInstance(main, new SynthesisErrorReporter());
+        ReactorInstance reactorInstance = new ReactorInstance(main, new SynthesisMessageReporter());
         rootNode
             .getChildren()
             .addAll(createReactorNode(reactorInstance, true, null, null, new HashMap<>()));
@@ -325,7 +325,7 @@ public KNode transform(final Model model) {
         for (Reactor reactor : model.getReactors()) {
           if (reactor == main) continue;
           ReactorInstance reactorInstance =
-              new ReactorInstance(reactor, new SynthesisErrorReporter());
+              new ReactorInstance(reactor, new SynthesisMessageReporter());
           reactorNodes.addAll(
               createReactorNode(
                   reactorInstance,
diff --git a/core/src/main/java/org/lflang/diagram/synthesis/util/SynthesisErrorReporter.java b/core/src/main/java/org/lflang/diagram/synthesis/util/SynthesisMessageReporter.java
similarity index 95%
rename from core/src/main/java/org/lflang/diagram/synthesis/util/SynthesisErrorReporter.java
rename to core/src/main/java/org/lflang/diagram/synthesis/util/SynthesisMessageReporter.java
index b6294901de..539dca74a7 100644
--- a/core/src/main/java/org/lflang/diagram/synthesis/util/SynthesisErrorReporter.java
+++ b/core/src/main/java/org/lflang/diagram/synthesis/util/SynthesisMessageReporter.java
@@ -27,13 +27,13 @@
 import java.nio.file.Path;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.lsp4j.DiagnosticSeverity;
-import org.lflang.ErrorReporterBase;
+import org.lflang.MessageReporterBase;
 import org.lflang.generator.Range;
 
 /**
  * @author Alexander Schulz-Rosengarten
  */
-public class SynthesisErrorReporter extends ErrorReporterBase {
+public class SynthesisMessageReporter extends MessageReporterBase {
 
   @Override
   protected void reportWithoutPosition(DiagnosticSeverity severity, String message) {
diff --git a/core/src/main/java/org/lflang/federated/extensions/CExtension.java b/core/src/main/java/org/lflang/federated/extensions/CExtension.java
index e8ec17fc56..3a47701475 100644
--- a/core/src/main/java/org/lflang/federated/extensions/CExtension.java
+++ b/core/src/main/java/org/lflang/federated/extensions/CExtension.java
@@ -33,7 +33,7 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.List;
-import org.lflang.ErrorReporter;
+import org.lflang.MessageReporter;
 import org.lflang.InferredType;
 import org.lflang.Target;
 import org.lflang.TargetProperty;
@@ -79,11 +79,11 @@ public void initializeTargetConfig(
       int numOfFederates,
       FederateInstance federate,
       FedFileConfig fileConfig,
-      ErrorReporter errorReporter,
+      MessageReporter messageReporter,
       RtiConfig rtiConfig)
       throws IOException {
 
-    CExtensionUtils.handleCompileDefinitions(federate, numOfFederates, rtiConfig, errorReporter);
+    CExtensionUtils.handleCompileDefinitions(federate, numOfFederates, rtiConfig, messageReporter);
 
     generateCMakeInclude(federate, fileConfig);
 
@@ -119,7 +119,7 @@ protected void generateCMakeInclude(FederateInstance federate, FedFileConfig fil
    * @param connection FIXME
    * @param type FIXME
    * @param coordinationType The coordination type
-   * @param errorReporter
+   * @param messageReporter
    */
   public String generateNetworkReceiverBody(
       Action action,
@@ -128,7 +128,7 @@ public String generateNetworkReceiverBody(
       FedConnectionInstance connection,
       InferredType type,
       CoordinationType coordinationType,
-      ErrorReporter errorReporter) {
+      MessageReporter messageReporter) {
     var receiveRef =
         CUtil.portRefInReaction(receivingPort, connection.getDstBank(), connection.getDstChannel());
     var result = new CodeBuilder();
@@ -148,7 +148,7 @@ public String generateNetworkReceiverBody(
           receiveRef + "->intended_tag = self->_lf__" + action.getName() + ".intended_tag;\n");
     }
 
-    deserialize(action, receivingPort, connection, type, receiveRef, result, errorReporter);
+    deserialize(action, receivingPort, connection, type, receiveRef, result, messageReporter);
     return result.toString();
   }
 
@@ -161,7 +161,7 @@ public String generateNetworkReceiverBody(
    * @param type Type for the port
    * @param receiveRef A target language reference to the receiving port
    * @param result Used to put generated code in
-   * @param errorReporter Used to report errors, if any
+   * @param messageReporter Used to report errors, if any
    */
   protected void deserialize(
       Action action,
@@ -170,7 +170,7 @@ protected void deserialize(
       InferredType type,
       String receiveRef,
       CodeBuilder result,
-      ErrorReporter errorReporter) {
+      MessageReporter messageReporter) {
     CTypes types = new CTypes();
     // Adjust the type of the action and the receivingPort.
     // If it is "string", then change it to "char*".
@@ -242,7 +242,7 @@ protected void deserialize(
    * @param connection
    * @param type
    * @param coordinationType
-   * @param errorReporter FIXME
+   * @param messageReporter FIXME
    */
   public String generateNetworkSenderBody(
       VarRef sendingPort,
@@ -250,7 +250,7 @@ public String generateNetworkSenderBody(
       FedConnectionInstance connection,
       InferredType type,
       CoordinationType coordinationType,
-      ErrorReporter errorReporter) {
+      MessageReporter messageReporter) {
     var sendRef =
         CUtil.portRefInReaction(sendingPort, connection.getSrcBank(), connection.getSrcChannel());
     var receiveRef =
@@ -330,7 +330,7 @@ public String generateNetworkSenderBody(
               + ", message_length";
     }
 
-    serializeAndSend(connection, type, sendRef, result, sendingFunction, commonArgs, errorReporter);
+    serializeAndSend(connection, type, sendRef, result, sendingFunction, commonArgs, messageReporter);
     return result.toString();
   }
 
@@ -343,7 +343,7 @@ public String generateNetworkSenderBody(
    * @param result
    * @param sendingFunction
    * @param commonArgs
-   * @param errorReporter
+   * @param messageReporter
    */
   protected void serializeAndSend(
       FedConnectionInstance connection,
@@ -352,7 +352,7 @@ protected void serializeAndSend(
       CodeBuilder result,
       String sendingFunction,
       String commonArgs,
-      ErrorReporter errorReporter) {
+      MessageReporter messageReporter) {
     CTypes types = new CTypes();
     var lengthExpression = "";
     var pointerExpression = "";
@@ -507,10 +507,10 @@ public String generatePreamble(
       FederateInstance federate,
       FedFileConfig fileConfig,
       RtiConfig rtiConfig,
-      ErrorReporter errorReporter)
+      MessageReporter messageReporter)
       throws IOException {
     // Put the C preamble in a {@code include/_federate.name + _preamble.h} file
-    String cPreamble = makePreamble(federate, fileConfig, rtiConfig, errorReporter);
+    String cPreamble = makePreamble(federate, fileConfig, rtiConfig, messageReporter);
     String relPath = getPreamblePath(federate);
     Path fedPreamblePath = fileConfig.getSrcPath().resolve(relPath);
     Files.createDirectories(fedPreamblePath.getParent());
@@ -539,7 +539,7 @@ protected String makePreamble(
       FederateInstance federate,
       FedFileConfig fileConfig,
       RtiConfig rtiConfig,
-      ErrorReporter errorReporter) {
+      MessageReporter messageReporter) {
 
     var code = new CodeBuilder();
 
@@ -561,9 +561,9 @@ protected String makePreamble(
         """
             .formatted(numOfNetworkActions));
 
-    code.pr(generateExecutablePreamble(federate, rtiConfig, errorReporter));
+    code.pr(generateExecutablePreamble(federate, rtiConfig, messageReporter));
 
-    code.pr(generateInitializeTriggers(federate, errorReporter));
+    code.pr(generateInitializeTriggers(federate, messageReporter));
 
     code.pr(CExtensionUtils.generateFederateNeighborStructure(federate));
 
@@ -582,18 +582,18 @@ protected String generateSerializationIncludes(
    * receiving network messages).
    *
    * @param federate The federate to initialize triggers for.
-   * @param errorReporter Used to report errors.
+   * @param messageReporter Used to report errors.
    * @return The generated code for the macro.
    */
   private String generateInitializeTriggers(
-      FederateInstance federate, ErrorReporter errorReporter) {
+      FederateInstance federate, MessageReporter messageReporter) {
     CodeBuilder code = new CodeBuilder();
     // Temporarily change the original federate reactor's name in the AST to
     // the federate's name so that trigger references are accurate.
     var federatedReactor = FedASTUtils.findFederatedReactor(federate.instantiation.eResource());
     var oldFederatedReactorName = federatedReactor.getName();
     federatedReactor.setName(federate.name);
-    var main = new ReactorInstance(federatedReactor, errorReporter, 1);
+    var main = new ReactorInstance(federatedReactor, messageReporter, 1);
     code.pr(CExtensionUtils.initializeTriggersForNetworkActions(federate, main));
     code.pr(CExtensionUtils.initializeTriggerForControlReactions(main, main, federate));
     federatedReactor.setName(oldFederatedReactorName);
@@ -610,10 +610,10 @@ private String generateInitializeTriggers(
 
   /** Generate code for an executed preamble. */
   private String generateExecutablePreamble(
-      FederateInstance federate, RtiConfig rtiConfig, ErrorReporter errorReporter) {
+      FederateInstance federate, RtiConfig rtiConfig, MessageReporter messageReporter) {
     CodeBuilder code = new CodeBuilder();
 
-    code.pr(generateCodeForPhysicalActions(federate, errorReporter));
+    code.pr(generateCodeForPhysicalActions(federate, messageReporter));
 
     code.pr(generateCodeToInitializeFederate(federate, rtiConfig));
 
@@ -758,11 +758,11 @@ private String generateCodeToInitializeFederate(FederateInstance federate, RtiCo
   /**
    * Generate code to handle physical actions in the {@code federate}.
    *
-   * @param errorReporter Used to report errors.
+   * @param messageReporter Used to report errors.
    * @return Generated code.
    */
   private String generateCodeForPhysicalActions(
-      FederateInstance federate, ErrorReporter errorReporter) {
+      FederateInstance federate, MessageReporter messageReporter) {
     CodeBuilder code = new CodeBuilder();
     if (federate.targetConfig.coordination.equals(CoordinationType.CENTRALIZED)) {
       // If this program uses centralized coordination then check
@@ -772,9 +772,9 @@ private String generateCodeForPhysicalActions(
       var main =
           new ReactorInstance(
               FedASTUtils.findFederatedReactor(federate.instantiation.eResource()),
-              errorReporter,
+              messageReporter,
               1);
-      var instance = new ReactorInstance(federateClass, main, errorReporter);
+      var instance = new ReactorInstance(federateClass, main, messageReporter);
       var outputDelayMap = federate.findOutputsConnectedToPhysicalActions(instance);
       var minDelay = TimeValue.MAX_VALUE;
       Output outputFound = null;
@@ -803,7 +803,7 @@ private String generateCodeForPhysicalActions(
                       + " target",
                   "parameter coordination-options with a value like {advance-message-interval: 10"
                       + " msec}");
-          errorReporter.at(outputFound).warning(message);
+          messageReporter.at(outputFound).warning(message);
         }
         code.pr(
             "_fed.min_delay_from_physical_action_to_federate_output = "
diff --git a/core/src/main/java/org/lflang/federated/extensions/CExtensionUtils.java b/core/src/main/java/org/lflang/federated/extensions/CExtensionUtils.java
index c3cf9940d1..6afba48178 100644
--- a/core/src/main/java/org/lflang/federated/extensions/CExtensionUtils.java
+++ b/core/src/main/java/org/lflang/federated/extensions/CExtensionUtils.java
@@ -8,7 +8,7 @@
 import java.util.List;
 import java.util.regex.Pattern;
 
-import org.lflang.ErrorReporter;
+import org.lflang.MessageReporter;
 import org.lflang.InferredType;
 import org.lflang.TargetConfig.ClockSyncOptions;
 import org.lflang.TargetProperty;
@@ -241,7 +241,7 @@ static boolean isSharedPtrType(InferredType type, CTypes types) {
   }
 
   public static void handleCompileDefinitions(
-      FederateInstance federate, int numOfFederates, RtiConfig rtiConfig, ErrorReporter errorReporter) {
+      FederateInstance federate, int numOfFederates, RtiConfig rtiConfig, MessageReporter messageReporter) {
     federate.targetConfig.setByUser.add(TargetProperty.COMPILE_DEFINITIONS);
     federate.targetConfig.compileDefinitions.put("FEDERATED", "");
     federate.targetConfig.compileDefinitions.put(
@@ -257,7 +257,7 @@ public static void handleCompileDefinitions(
 
     handleAdvanceMessageInterval(federate);
 
-    initializeClockSynchronization(federate, rtiConfig, errorReporter);
+    initializeClockSynchronization(federate, rtiConfig, messageReporter);
   }
 
   /**
@@ -297,13 +297,13 @@ static boolean clockSyncIsOn(FederateInstance federate, RtiConfig rtiConfig) {
    *     href="https://github.com/icyphy/lingua-franca/wiki/Distributed-Execution#clock-synchronization">Documentation</a>
    */
   public static void initializeClockSynchronization(
-      FederateInstance federate, RtiConfig rtiConfig, ErrorReporter errorReporter) {
+      FederateInstance federate, RtiConfig rtiConfig, MessageReporter messageReporter) {
     // Check if clock synchronization should be enabled for this federate in the first place
     if (clockSyncIsOn(federate, rtiConfig)) {
-      errorReporter.nowhere().info("Initial clock synchronization is enabled for federate " + federate.id);
+      messageReporter.nowhere().info("Initial clock synchronization is enabled for federate " + federate.id);
       if (federate.targetConfig.clockSync == ClockSyncMode.ON) {
         if (federate.targetConfig.clockSyncOptions.collectStats) {
-          errorReporter.nowhere().info("Will collect clock sync statistics for federate " + federate.id);
+          messageReporter.nowhere().info("Will collect clock sync statistics for federate " + federate.id);
           // Add libm to the compiler flags
           // FIXME: This is a linker flag not compile flag but we don't have a way to add linker
           // flags
@@ -312,7 +312,7 @@ public static void initializeClockSynchronization(
           federate.targetConfig.compilerFlags.add("-lm");
           federate.targetConfig.setByUser.add(TargetProperty.FLAGS);
         }
-        errorReporter.nowhere().info("Runtime clock synchronization is enabled for federate " + federate.id);
+        messageReporter.nowhere().info("Runtime clock synchronization is enabled for federate " + federate.id);
       }
 
       addClockSyncCompileDefinitions(federate);
diff --git a/core/src/main/java/org/lflang/federated/extensions/FedTargetExtension.java b/core/src/main/java/org/lflang/federated/extensions/FedTargetExtension.java
index 17ac198781..2b3328ab88 100644
--- a/core/src/main/java/org/lflang/federated/extensions/FedTargetExtension.java
+++ b/core/src/main/java/org/lflang/federated/extensions/FedTargetExtension.java
@@ -1,7 +1,7 @@
 package org.lflang.federated.extensions;
 
 import java.io.IOException;
-import org.lflang.ErrorReporter;
+import org.lflang.MessageReporter;
 import org.lflang.InferredType;
 import org.lflang.TargetProperty.CoordinationType;
 import org.lflang.TimeValue;
@@ -23,14 +23,14 @@ public interface FedTargetExtension {
    * @param numOfFederates
    * @param federate The federate instance.
    * @param fileConfig An instance of {@code FedFileConfig}.
-   * @param errorReporter Used to report errors.
+   * @param messageReporter Used to report errors.
    */
   void initializeTargetConfig(
       LFGeneratorContext context,
       int numOfFederates,
       FederateInstance federate,
       FedFileConfig fileConfig,
-      ErrorReporter errorReporter,
+      MessageReporter messageReporter,
       RtiConfig rtiConfig)
       throws IOException;
 
@@ -44,7 +44,7 @@ void initializeTargetConfig(
    * @param connection FIXME
    * @param type FIXME
    * @param coordinationType The coordination type
-   * @param errorReporter
+   * @param messageReporter
    */
   String generateNetworkReceiverBody(
       Action action,
@@ -53,7 +53,7 @@ String generateNetworkReceiverBody(
       FedConnectionInstance connection,
       InferredType type,
       CoordinationType coordinationType,
-      ErrorReporter errorReporter);
+      MessageReporter messageReporter);
 
   /**
    * Generate code for the body of a reaction that handles an output that is to be sent over the
@@ -64,7 +64,7 @@ String generateNetworkReceiverBody(
    * @param connection
    * @param type
    * @param coordinationType
-   * @param errorReporter FIXME
+   * @param messageReporter FIXME
    */
   String generateNetworkSenderBody(
       VarRef sendingPort,
@@ -72,7 +72,7 @@ String generateNetworkSenderBody(
       FedConnectionInstance connection,
       InferredType type,
       CoordinationType coordinationType,
-      ErrorReporter errorReporter);
+      MessageReporter messageReporter);
 
   /**
    * Generate code for the body of a reaction that decides whether the trigger for the given port is
@@ -113,13 +113,13 @@ default void annotateReaction(Reaction reaction) {}
    *
    * @param federate
    * @param rtiConfig
-   * @param errorReporter
+   * @param messageReporter
    * @return
    */
   String generatePreamble(
       FederateInstance federate,
       FedFileConfig fileConfig,
       RtiConfig rtiConfig,
-      ErrorReporter errorReporter)
+      MessageReporter messageReporter)
       throws IOException;
 }
diff --git a/core/src/main/java/org/lflang/federated/extensions/PythonExtension.java b/core/src/main/java/org/lflang/federated/extensions/PythonExtension.java
index 6fd1cb3dc9..3f290d5639 100644
--- a/core/src/main/java/org/lflang/federated/extensions/PythonExtension.java
+++ b/core/src/main/java/org/lflang/federated/extensions/PythonExtension.java
@@ -27,7 +27,7 @@
 package org.lflang.federated.extensions;
 
 import java.io.IOException;
-import org.lflang.ErrorReporter;
+import org.lflang.MessageReporter;
 import org.lflang.InferredType;
 import org.lflang.TargetProperty.CoordinationType;
 import org.lflang.ast.ASTUtils;
@@ -86,7 +86,7 @@ public String generateNetworkSenderBody(
       FedConnectionInstance connection,
       InferredType type,
       CoordinationType coordinationType,
-      ErrorReporter errorReporter) {
+      MessageReporter messageReporter) {
     var result = new CodeBuilder();
 
     // We currently have no way to mark a reaction "unordered"
@@ -95,7 +95,7 @@ public String generateNetworkSenderBody(
     result.pr(PyUtil.generateGILAcquireCode() + "\n");
     result.pr(
         super.generateNetworkSenderBody(
-            sendingPort, receivingPort, connection, type, coordinationType, errorReporter));
+            sendingPort, receivingPort, connection, type, coordinationType, messageReporter));
     result.pr(PyUtil.generateGILReleaseCode() + "\n");
     return result.getCode();
   }
@@ -108,7 +108,7 @@ public String generateNetworkReceiverBody(
       FedConnectionInstance connection,
       InferredType type,
       CoordinationType coordinationType,
-      ErrorReporter errorReporter) {
+      MessageReporter messageReporter) {
     var result = new CodeBuilder();
 
     // We currently have no way to mark a reaction "unordered"
@@ -117,7 +117,7 @@ public String generateNetworkReceiverBody(
     result.pr(PyUtil.generateGILAcquireCode() + "\n");
     result.pr(
         super.generateNetworkReceiverBody(
-            action, sendingPort, receivingPort, connection, type, coordinationType, errorReporter));
+            action, sendingPort, receivingPort, connection, type, coordinationType, messageReporter));
     result.pr(PyUtil.generateGILReleaseCode() + "\n");
     return result.getCode();
   }
@@ -130,7 +130,7 @@ protected void deserialize(
       InferredType type,
       String receiveRef,
       CodeBuilder result,
-      ErrorReporter errorReporter) {
+      MessageReporter messageReporter) {
     String value = "";
     switch (connection.getSerializer()) {
       case NATIVE:
@@ -160,7 +160,7 @@ protected void serializeAndSend(
       CodeBuilder result,
       String sendingFunction,
       String commonArgs,
-      ErrorReporter errorReporter) {
+      MessageReporter messageReporter) {
     String lengthExpression = "";
     String pointerExpression = "";
     switch (connection.getSerializer()) {
diff --git a/core/src/main/java/org/lflang/federated/extensions/TSExtension.java b/core/src/main/java/org/lflang/federated/extensions/TSExtension.java
index 665a322407..61b62de554 100644
--- a/core/src/main/java/org/lflang/federated/extensions/TSExtension.java
+++ b/core/src/main/java/org/lflang/federated/extensions/TSExtension.java
@@ -6,7 +6,7 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
-import org.lflang.ErrorReporter;
+import org.lflang.MessageReporter;
 import org.lflang.InferredType;
 import org.lflang.TargetProperty.CoordinationType;
 import org.lflang.TimeValue;
@@ -32,7 +32,7 @@ public void initializeTargetConfig(
       int numOfFederates,
       FederateInstance federate,
       FedFileConfig fileConfig,
-      ErrorReporter errorReporter,
+      MessageReporter messageReporter,
       RtiConfig rtiConfig)
       throws IOException {}
 
@@ -44,7 +44,7 @@ public String generateNetworkReceiverBody(
       FedConnectionInstance connection,
       InferredType type,
       CoordinationType coordinationType,
-      ErrorReporter errorReporter) {
+      MessageReporter messageReporter) {
     return """
         // generateNetworkReceiverBody
         if (%1$s !== undefined) {
@@ -64,7 +64,7 @@ public String generateNetworkSenderBody(
       FedConnectionInstance connection,
       InferredType type,
       CoordinationType coordinationType,
-      ErrorReporter errorReporter) {
+      MessageReporter messageReporter) {
     return """
         if (%1$s.%2$s !== undefined) {
             this.util.sendRTITimedMessage(%1$s.%2$s, %3$s, %4$s, %5$s);
@@ -110,8 +110,8 @@ public String generatePreamble(
       FederateInstance federate,
       FedFileConfig fileConfig,
       RtiConfig rtiConfig,
-      ErrorReporter errorReporter) {
-    var minOutputDelay = getMinOutputDelay(federate, fileConfig, errorReporter);
+      MessageReporter messageReporter) {
+    var minOutputDelay = getMinOutputDelay(federate, fileConfig, messageReporter);
     var upstreamConnectionDelays = getUpstreamConnectionDelays(federate);
     return """
         const defaultFederateConfig: __FederateConfig = {
@@ -149,7 +149,7 @@ public String generatePreamble(
   }
 
   private TimeValue getMinOutputDelay(
-      FederateInstance federate, FedFileConfig fileConfig, ErrorReporter errorReporter) {
+      FederateInstance federate, FedFileConfig fileConfig, MessageReporter messageReporter) {
     if (federate.targetConfig.coordination.equals(CoordinationType.CENTRALIZED)) {
       // If this program uses centralized coordination then check
       // for outputs that depend on physical actions so that null messages can be
@@ -158,9 +158,9 @@ private TimeValue getMinOutputDelay(
       var main =
           new ReactorInstance(
               FedASTUtils.findFederatedReactor(federate.instantiation.eResource()),
-              errorReporter,
+              messageReporter,
               1);
-      var instance = new ReactorInstance(federateClass, main, errorReporter);
+      var instance = new ReactorInstance(federateClass, main, messageReporter);
       var outputDelayMap = federate.findOutputsConnectedToPhysicalActions(instance);
       var minOutputDelay = TimeValue.MAX_VALUE;
       Output outputFound = null;
@@ -189,7 +189,7 @@ private TimeValue getMinOutputDelay(
                       + " target",
                   "parameter coordination-options with a value like {advance-message-interval: 10"
                       + " msec}");
-          errorReporter.at(outputFound).warning(message);
+          messageReporter.at(outputFound).warning(message);
         }
         return minOutputDelay;
       }
diff --git a/core/src/main/java/org/lflang/federated/generator/FedASTUtils.java b/core/src/main/java/org/lflang/federated/generator/FedASTUtils.java
index 338fbff242..a3f76f2bdb 100644
--- a/core/src/main/java/org/lflang/federated/generator/FedASTUtils.java
+++ b/core/src/main/java/org/lflang/federated/generator/FedASTUtils.java
@@ -42,7 +42,7 @@
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.xtext.xbase.lib.IteratorExtensions;
-import org.lflang.ErrorReporter;
+import org.lflang.MessageReporter;
 import org.lflang.InferredType;
 import org.lflang.ModelInfo;
 import org.lflang.TargetProperty.CoordinationType;
@@ -125,15 +125,15 @@ public static Reactor findFederatedReactor(Resource resource) {
    *
    * @param connection Network connection between two federates.
    * @param coordination One of CoordinationType.DECENTRALIZED or CoordinationType.CENTRALIZED.
-   * @param errorReporter Used to report errors encountered.
+   * @param messageReporter Used to report errors encountered.
    */
   public static void makeCommunication(
       FedConnectionInstance connection,
       CoordinationType coordination,
-      ErrorReporter errorReporter) {
+      MessageReporter messageReporter) {
 
     // Add the sender reaction.
-    addNetworkSenderReaction(connection, coordination, errorReporter);
+    addNetworkSenderReaction(connection, coordination, messageReporter);
 
     // Next, generate control reactions
     if (!connection.getDefinition().isPhysical()
@@ -146,7 +146,7 @@ public static void makeCommunication(
       FedASTUtils.addNetworkOutputControlReaction(connection);
 
       // Add the network input control reaction to the parent
-      FedASTUtils.addNetworkInputControlReaction(connection, coordination, errorReporter);
+      FedASTUtils.addNetworkInputControlReaction(connection, coordination, messageReporter);
     }
 
     // Create the network action (@see createNetworkAction)
@@ -159,7 +159,7 @@ public static void makeCommunication(
     ((Reactor) connection.getDefinition().eContainer()).getActions().add(networkAction);
 
     // Add the network receiver reaction in the destinationFederate
-    addNetworkReceiverReaction(networkAction, connection, coordination, errorReporter);
+    addNetworkReceiverReaction(networkAction, connection, coordination, messageReporter);
   }
 
   /**
@@ -223,7 +223,7 @@ private static void addNetworkReceiverReaction(
       Action networkAction,
       FedConnectionInstance connection,
       CoordinationType coordination,
-      ErrorReporter errorReporter) {
+      MessageReporter messageReporter) {
     LfFactory factory = LfFactory.eINSTANCE;
     VarRef sourceRef = factory.createVarRef();
     VarRef destRef = factory.createVarRef();
@@ -278,7 +278,7 @@ private static void addNetworkReceiverReaction(
                     connection,
                     ASTUtils.getInferredType(networkAction),
                     coordination,
-                    errorReporter));
+                    messageReporter));
 
     ASTUtils.addReactionAttribute(networkReceiverReaction, "_unordered");
 
@@ -297,7 +297,7 @@ private static void addNetworkReceiverReaction(
     ) {
       // Add necessary dependencies to reaction to ensure that it executes correctly
       // relative to other network input control reactions in the federate.
-      addRelativeDependency(connection, networkReceiverReaction, errorReporter);
+      addRelativeDependency(connection, networkReceiverReaction, messageReporter);
     }
   }
 
@@ -308,13 +308,13 @@ private static void addNetworkReceiverReaction(
    *
    * @param connection FIXME
    * @param coordination FIXME
-   * @param errorReporter
+   * @param messageReporter
    * @note Used in federated execution
    */
   private static void addNetworkInputControlReaction(
       FedConnectionInstance connection,
       CoordinationType coordination,
-      ErrorReporter errorReporter) {
+      MessageReporter messageReporter) {
 
     LfFactory factory = LfFactory.eINSTANCE;
     Reaction reaction = factory.createReaction();
@@ -383,7 +383,7 @@ private static void addNetworkInputControlReaction(
 
     // Add necessary dependencies to reaction to ensure that it executes correctly
     // relative to other network input control reactions in the federate.
-    addRelativeDependency(connection, reaction, errorReporter);
+    addRelativeDependency(connection, reaction, messageReporter);
   }
 
   /**
@@ -399,7 +399,7 @@ private static void addNetworkInputControlReaction(
   private static void addRelativeDependency(
       FedConnectionInstance connection,
       Reaction networkInputReaction,
-      ErrorReporter errorReporter) {
+      MessageReporter messageReporter) {
     var upstreamOutputPortsInFederate =
         findUpstreamPortsInFederate(
             connection.dstFederate,
@@ -416,7 +416,7 @@ private static void addRelativeDependency(
       networkInputReaction.getSources().add(sourceRef);
 
       // Remove the port if it introduces cycles
-      info.update((Model) networkInputReaction.eContainer().eContainer(), errorReporter);
+      info.update((Model) networkInputReaction.eContainer().eContainer(), messageReporter);
       if (!info.topologyCycles().isEmpty()) {
         networkInputReaction.getSources().remove(sourceRef);
       }
@@ -646,13 +646,13 @@ public static <E> List<E> safe(List<E> list) {
    *
    * @param connection Network connection between two federates.
    * @param coordination One of CoordinationType.DECENTRALIZED or CoordinationType.CENTRALIZED.
-   * @param errorReporter FIXME
+   * @param messageReporter FIXME
    * @note Used in federated execution
    */
   private static void addNetworkSenderReaction(
       FedConnectionInstance connection,
       CoordinationType coordination,
-      ErrorReporter errorReporter) {
+      MessageReporter messageReporter) {
     LfFactory factory = LfFactory.eINSTANCE;
     // Assume all the types are the same, so just use the first on the right.
     Type type = EcoreUtil.copy(connection.getSourcePortInstance().getDefinition().getType());
@@ -700,7 +700,7 @@ private static void addNetworkSenderReaction(
                     connection,
                     InferredType.fromAST(type),
                     coordination,
-                    errorReporter));
+                    messageReporter));
 
     ASTUtils.addReactionAttribute(networkSenderReaction, "_unordered");
 
diff --git a/core/src/main/java/org/lflang/federated/generator/FedEmitter.java b/core/src/main/java/org/lflang/federated/generator/FedEmitter.java
index dda4dd6662..dc642a5612 100644
--- a/core/src/main/java/org/lflang/federated/generator/FedEmitter.java
+++ b/core/src/main/java/org/lflang/federated/generator/FedEmitter.java
@@ -5,7 +5,7 @@
 import java.nio.file.Path;
 import java.util.HashMap;
 import java.util.Map;
-import org.lflang.ErrorReporter;
+import org.lflang.MessageReporter;
 import org.lflang.federated.launcher.RtiConfig;
 import org.lflang.generator.CodeMap;
 import org.lflang.generator.LFGeneratorContext;
@@ -16,17 +16,17 @@ public class FedEmitter {
 
   private final FedFileConfig fileConfig;
   private final Reactor originalMainReactor;
-  private final ErrorReporter errorReporter;
+  private final MessageReporter messageReporter;
   private final RtiConfig rtiConfig;
 
   public FedEmitter(
       FedFileConfig fileConfig,
       Reactor originalMainReactor,
-      ErrorReporter errorReporter,
+      MessageReporter messageReporter,
       RtiConfig rtiConfig) {
     this.fileConfig = fileConfig;
     this.originalMainReactor = originalMainReactor;
-    this.errorReporter = errorReporter;
+    this.messageReporter = messageReporter;
     this.rtiConfig = rtiConfig;
   }
 
@@ -40,7 +40,7 @@ Map<Path, CodeMap> generateFederate(
       throws IOException {
     String fedName = federate.name;
     Files.createDirectories(fileConfig.getSrcPath());
-    errorReporter.nowhere().info(
+    messageReporter.nowhere().info(
         "##### Generating code for federate "
             + fedName
             + " in directory "
@@ -51,12 +51,12 @@ Map<Path, CodeMap> generateFederate(
             "\n",
             new FedTargetEmitter()
                 .generateTarget(
-                    context, numOfFederates, federate, fileConfig, errorReporter, rtiConfig),
+                    context, numOfFederates, federate, fileConfig, messageReporter, rtiConfig),
             new FedImportEmitter().generateImports(federate, fileConfig),
             new FedPreambleEmitter()
-                .generatePreamble(federate, fileConfig, rtiConfig, errorReporter),
+                .generatePreamble(federate, fileConfig, rtiConfig, messageReporter),
             new FedReactorEmitter().generateReactorDefinitions(federate),
-            new FedMainEmitter().generateMainReactor(federate, originalMainReactor, errorReporter));
+            new FedMainEmitter().generateMainReactor(federate, originalMainReactor, messageReporter));
     Map<Path, CodeMap> codeMapMap = new HashMap<>();
     var lfFilePath = lfFilePath(fileConfig, federate);
     try (var srcWriter = Files.newBufferedWriter(lfFilePath)) {
diff --git a/core/src/main/java/org/lflang/federated/generator/FedGenerator.java b/core/src/main/java/org/lflang/federated/generator/FedGenerator.java
index 37e103882f..2b418b1ad7 100644
--- a/core/src/main/java/org/lflang/federated/generator/FedGenerator.java
+++ b/core/src/main/java/org/lflang/federated/generator/FedGenerator.java
@@ -26,7 +26,7 @@
 import org.eclipse.xtext.resource.XtextResource;
 import org.eclipse.xtext.resource.XtextResourceSet;
 import org.eclipse.xtext.util.RuntimeIOException;
-import org.lflang.ErrorReporter;
+import org.lflang.MessageReporter;
 import org.lflang.FileConfig;
 import org.lflang.LFStandaloneSetup;
 import org.lflang.Target;
@@ -60,7 +60,7 @@
 public class FedGenerator {
 
   /** */
-  private final ErrorReporter errorReporter;
+  private final MessageReporter messageReporter;
 
   /** A list of federate instances. */
   private final List<FederateInstance> federates = new ArrayList<>();
@@ -101,7 +101,7 @@ public class FedGenerator {
   public FedGenerator(LFGeneratorContext context) {
     this.fileConfig = (FedFileConfig) context.getFileConfig();
     this.targetConfig = context.getTargetConfig();
-    this.errorReporter = context.getErrorReporter();
+    this.messageReporter = context.getErrorReporter();
   }
 
   /**
@@ -140,7 +140,7 @@ public boolean doGenerate(Resource resource, LFGeneratorContext context) throws
 
     FedEmitter fedEmitter =
         new FedEmitter(
-            fileConfig, ASTUtils.toDefinition(mainDef.getReactorClass()), errorReporter, rtiConfig);
+            fileConfig, ASTUtils.toDefinition(mainDef.getReactorClass()), messageReporter, rtiConfig);
 
     // Generate LF code for each federate.
     Map<Path, CodeMap> lf2lfCodeMapMap = new HashMap<>();
@@ -178,7 +178,7 @@ public boolean doGenerate(Resource resource, LFGeneratorContext context) throws
   }
 
   private void generateLaunchScript() {
-    new FedLauncherGenerator(this.targetConfig, this.fileConfig, this.errorReporter)
+    new FedLauncherGenerator(this.targetConfig, this.fileConfig, this.messageReporter)
         .doGenerate(federates, rtiConfig);
   }
 
@@ -233,12 +233,12 @@ private boolean federatedExecutionIsSupported(Resource resource) {
     var targetOK =
         List.of(Target.C, Target.Python, Target.TS, Target.CPP, Target.CCPP).contains(target);
     if (!targetOK) {
-      errorReporter
+      messageReporter
           .at(targetDecl)
           .error("Federated execution is not supported with target " + target + ".");
     }
     if (target.equals(Target.C) && GeneratorUtils.isHostWindows()) {
-      errorReporter
+      messageReporter
           .at(targetDecl)
           .error("Federated LF programs with a C target are currently not supported on Windows.");
       targetOK = false;
@@ -264,12 +264,12 @@ private Map<Path, CodeMap> compileFederates(
         Math.min(
             6, Math.min(Math.max(federates.size(), 1), Runtime.getRuntime().availableProcessors()));
     var compileThreadPool = Executors.newFixedThreadPool(numOfCompileThreads);
-    errorReporter.nowhere().info(
+    messageReporter.nowhere().info(
         "******** Using " + numOfCompileThreads + " threads to compile the program.");
     Map<Path, CodeMap> codeMapMap = new ConcurrentHashMap<>();
     List<SubContext> subContexts = Collections.synchronizedList(new ArrayList<>());
     Averager averager = new Averager(federates.size());
-    final var threadSafeErrorReporter = new SynchronizedErrorReporter(errorReporter);
+    final var threadSafeErrorReporter = new SynchronizedMessageReporter(messageReporter);
     for (int i = 0; i < federates.size(); i++) {
       FederateInstance fed = federates.get(i);
       final int id = i;
@@ -282,8 +282,8 @@ private Map<Path, CodeMap> compileFederates(
                     true);
             FileConfig subFileConfig =
                 LFGenerator.createFileConfig(res, fileConfig.getSrcGenPath(), true);
-            ErrorReporter subContextErrorReporter =
-                new LineAdjustingErrorReporter(threadSafeErrorReporter, lf2lfCodeMapMap);
+            MessageReporter subContextMessageReporter =
+                new LineAdjustingMessageReporter(threadSafeErrorReporter, lf2lfCodeMapMap);
 
             var props = new Properties();
             if (targetConfig.dockerOptions != null && targetConfig.target.buildsUsingDocker()) {
@@ -295,12 +295,12 @@ private Map<Path, CodeMap> compileFederates(
                 new TargetConfig(
                     props,
                     GeneratorUtils.findTargetDecl(subFileConfig.resource),
-                    subContextErrorReporter);
+                    subContextMessageReporter);
             SubContext subContext =
                 new SubContext(context, IntegratedBuilder.VALIDATED_PERCENT_PROGRESS, 100) {
                   @Override
-                  public ErrorReporter getErrorReporter() {
-                    return subContextErrorReporter;
+                  public MessageReporter getErrorReporter() {
+                    return subContextMessageReporter;
                   }
 
                   @Override
@@ -420,7 +420,7 @@ private void analyzeFederates(Reactor federation, LFGeneratorContext context) {
     for (Instantiation instantiation : ASTUtils.allInstantiations(federation)) {
       int bankWidth = ASTUtils.width(instantiation.getWidthSpec(), mainReactorContext);
       if (bankWidth < 0) {
-        errorReporter.at(instantiation).error("Cannot determine bank width! Assuming width of 1.");
+        messageReporter.at(instantiation).error("Cannot determine bank width! Assuming width of 1.");
         // Continue with a bank width of 1.
         bankWidth = 1;
       }
@@ -452,7 +452,7 @@ private List<FederateInstance> getFederateInstances(
       var resource = instantiation.getReactorClass().eResource();
       var federateTargetConfig = new FedTargetConfig(context, resource);
       FederateInstance federateInstance =
-          new FederateInstance(instantiation, federateID, i, federateTargetConfig, errorReporter);
+          new FederateInstance(instantiation, federateID, i, federateTargetConfig, messageReporter);
       federates.add(federateInstance);
       federateInstances.add(federateInstance);
 
@@ -488,7 +488,7 @@ private void replaceFederateConnectionsWithProxies(Reactor federation) {
     // to duplicate the rather complicated logic in that class. We specify a depth of 1,
     // so it only creates the reactors immediately within the top level, not reactors
     // that those contain.
-    ReactorInstance mainInstance = new ReactorInstance(federation, errorReporter);
+    ReactorInstance mainInstance = new ReactorInstance(federation, messageReporter);
 
     for (ReactorInstance child : mainInstance.children) {
       for (PortInstance output : child.outputs) {
@@ -514,7 +514,7 @@ private void replaceConnectionFromOutputPort(PortInstance output) {
     for (SendRange srcRange : output.getDependentPorts()) {
       if (srcRange.connection == null) {
         // This should not happen.
-        errorReporter.at(output.getDefinition()).error("Cannot find output connection for port");
+        messageReporter.at(output.getDefinition()).error("Cannot find output connection for port");
         continue;
       }
       // Iterate through destinations
@@ -606,6 +606,6 @@ private void replaceFedConnection(FedConnectionInstance connection) {
       }
     }
 
-    FedASTUtils.makeCommunication(connection, targetConfig.coordination, errorReporter);
+    FedASTUtils.makeCommunication(connection, targetConfig.coordination, messageReporter);
   }
 }
diff --git a/core/src/main/java/org/lflang/federated/generator/FedMainEmitter.java b/core/src/main/java/org/lflang/federated/generator/FedMainEmitter.java
index dc583702e2..4d262d1bb4 100644
--- a/core/src/main/java/org/lflang/federated/generator/FedMainEmitter.java
+++ b/core/src/main/java/org/lflang/federated/generator/FedMainEmitter.java
@@ -3,7 +3,7 @@
 import java.util.function.Function;
 import java.util.stream.Collectors;
 import org.eclipse.emf.ecore.EObject;
-import org.lflang.ErrorReporter;
+import org.lflang.MessageReporter;
 import org.lflang.ast.ASTUtils;
 import org.lflang.ast.FormattingUtil;
 import org.lflang.lf.Reactor;
@@ -17,14 +17,14 @@ public class FedMainEmitter {
    *
    * @param federate
    * @param originalMainReactor The original main reactor.
-   * @param errorReporter Used to report errors.
+   * @param messageReporter Used to report errors.
    * @return The main reactor.
    */
   String generateMainReactor(
-      FederateInstance federate, Reactor originalMainReactor, ErrorReporter errorReporter) {
+      FederateInstance federate, Reactor originalMainReactor, MessageReporter messageReporter) {
     // FIXME: Handle modes at the top-level
     if (!ASTUtils.allModes(originalMainReactor).isEmpty()) {
-      errorReporter
+      messageReporter
           .at(ASTUtils.allModes(originalMainReactor).stream().findFirst().get())
           .error("Modes at the top level are not supported under federated execution.");
     }
diff --git a/core/src/main/java/org/lflang/federated/generator/FedPreambleEmitter.java b/core/src/main/java/org/lflang/federated/generator/FedPreambleEmitter.java
index 9cb35b2949..7966bc73dd 100644
--- a/core/src/main/java/org/lflang/federated/generator/FedPreambleEmitter.java
+++ b/core/src/main/java/org/lflang/federated/generator/FedPreambleEmitter.java
@@ -3,7 +3,7 @@
 import static org.lflang.ast.ASTUtils.toText;
 
 import java.io.IOException;
-import org.lflang.ErrorReporter;
+import org.lflang.MessageReporter;
 import org.lflang.ast.ASTUtils;
 import org.lflang.federated.extensions.FedTargetExtensionFactory;
 import org.lflang.federated.launcher.RtiConfig;
@@ -23,7 +23,7 @@ String generatePreamble(
       FederateInstance federate,
       FedFileConfig fileConfig,
       RtiConfig rtiConfig,
-      ErrorReporter errorReporter)
+      MessageReporter messageReporter)
       throws IOException {
     CodeBuilder preambleCode = new CodeBuilder();
 
@@ -48,7 +48,7 @@ String generatePreamble(
             =}"""
             .formatted(
                 FedTargetExtensionFactory.getExtension(federate.targetConfig.target)
-                    .generatePreamble(federate, fileConfig, rtiConfig, errorReporter)));
+                    .generatePreamble(federate, fileConfig, rtiConfig, messageReporter)));
 
     return preambleCode.getCode();
   }
diff --git a/core/src/main/java/org/lflang/federated/generator/FedTargetConfig.java b/core/src/main/java/org/lflang/federated/generator/FedTargetConfig.java
index aa0cfccc14..15694e1c0b 100644
--- a/core/src/main/java/org/lflang/federated/generator/FedTargetConfig.java
+++ b/core/src/main/java/org/lflang/federated/generator/FedTargetConfig.java
@@ -4,7 +4,7 @@
 
 import java.nio.file.Path;
 import org.eclipse.emf.ecore.resource.Resource;
-import org.lflang.ErrorReporter;
+import org.lflang.MessageReporter;
 import org.lflang.TargetConfig;
 import org.lflang.TargetProperty;
 import org.lflang.generator.GeneratorUtils;
@@ -46,10 +46,10 @@ public FedTargetConfig(LFGeneratorContext context, Resource federateResource) {
    *
    * @param federateResource The resource where the class of the federate is specified.
    * @param mainResource The resource in which the federation (i.e., main reactor) is specified.
-   * @param errorReporter An error reporter to use when problems are encountered.
+   * @param messageReporter An error reporter to use when problems are encountered.
    */
   private void mergeImportedConfig(
-      Resource federateResource, Resource mainResource, ErrorReporter errorReporter) {
+      Resource federateResource, Resource mainResource, MessageReporter messageReporter) {
     // If the federate is imported, then update the configuration based on target properties
     // in the imported file.
     if (!federateResource.equals(mainResource)) {
@@ -61,7 +61,7 @@ private void mergeImportedConfig(
             this,
             convertToEmptyListIfNull(targetProperties.getPairs()),
             getRelativePath(mainResource, federateResource),
-            errorReporter);
+            messageReporter);
       }
     }
   }
diff --git a/core/src/main/java/org/lflang/federated/generator/FedTargetEmitter.java b/core/src/main/java/org/lflang/federated/generator/FedTargetEmitter.java
index b411ff0a44..2e9b26a7ff 100644
--- a/core/src/main/java/org/lflang/federated/generator/FedTargetEmitter.java
+++ b/core/src/main/java/org/lflang/federated/generator/FedTargetEmitter.java
@@ -1,7 +1,7 @@
 package org.lflang.federated.generator;
 
 import java.io.IOException;
-import org.lflang.ErrorReporter;
+import org.lflang.MessageReporter;
 import org.lflang.TargetProperty;
 import org.lflang.ast.FormattingUtil;
 import org.lflang.federated.extensions.FedTargetExtensionFactory;
@@ -15,7 +15,7 @@ String generateTarget(
       int numOfFederates,
       FederateInstance federate,
       FedFileConfig fileConfig,
-      ErrorReporter errorReporter,
+      MessageReporter messageReporter,
       RtiConfig rtiConfig)
       throws IOException {
 
@@ -25,7 +25,7 @@ String generateTarget(
     // See https://issues.lf-lang.org/1667
     FedTargetExtensionFactory.getExtension(federate.targetConfig.target)
         .initializeTargetConfig(
-            context, numOfFederates, federate, fileConfig, errorReporter, rtiConfig);
+            context, numOfFederates, federate, fileConfig, messageReporter, rtiConfig);
 
     return FormattingUtil.renderer(federate.targetConfig.target)
         .apply(
diff --git a/core/src/main/java/org/lflang/federated/generator/FederateInstance.java b/core/src/main/java/org/lflang/federated/generator/FederateInstance.java
index 5fbcf93b78..22e70a6c73 100644
--- a/core/src/main/java/org/lflang/federated/generator/FederateInstance.java
+++ b/core/src/main/java/org/lflang/federated/generator/FederateInstance.java
@@ -36,7 +36,7 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 import org.eclipse.emf.ecore.EObject;
-import org.lflang.ErrorReporter;
+import org.lflang.MessageReporter;
 import org.lflang.TargetConfig;
 import org.lflang.TimeValue;
 import org.lflang.ast.ASTUtils;
@@ -83,18 +83,18 @@ public class FederateInstance { // why does this not extend ReactorInstance?
    *     been defined.
    * @param id The federate ID.
    * @param bankIndex If instantiation.widthSpec !== null, this gives the bank position.
-   * @param errorReporter The error reporter
+   * @param messageReporter The error reporter
    */
   public FederateInstance(
       Instantiation instantiation,
       int id,
       int bankIndex,
       TargetConfig targetConfig,
-      ErrorReporter errorReporter) {
+      MessageReporter messageReporter) {
     this.instantiation = instantiation;
     this.id = id;
     this.bankIndex = bankIndex;
-    this.errorReporter = errorReporter;
+    this.messageReporter = messageReporter;
     this.targetConfig = targetConfig;
 
     if (instantiation != null) {
@@ -510,7 +510,7 @@ private boolean containsAllVarRefs(Iterable<VarRef> varRefs) {
         referencesFederate = true;
       } else {
         if (referencesFederate) {
-          errorReporter
+          messageReporter
               .at(varRef)
               .error("Mixed triggers and effects from different federates. This is not permitted");
         }
@@ -568,7 +568,7 @@ public String toString() {
   private Set<Reaction> excludeReactions = null;
 
   /** An error reporter */
-  private final ErrorReporter errorReporter;
+  private final MessageReporter messageReporter;
 
   /**
    * Find the nearest (shortest) path to a physical action trigger from this 'reaction' in terms of
diff --git a/core/src/main/java/org/lflang/federated/generator/LineAdjustingErrorReporter.java b/core/src/main/java/org/lflang/federated/generator/LineAdjustingMessageReporter.java
similarity index 86%
rename from core/src/main/java/org/lflang/federated/generator/LineAdjustingErrorReporter.java
rename to core/src/main/java/org/lflang/federated/generator/LineAdjustingMessageReporter.java
index 0fde6e0461..9a08f007cb 100644
--- a/core/src/main/java/org/lflang/federated/generator/LineAdjustingErrorReporter.java
+++ b/core/src/main/java/org/lflang/federated/generator/LineAdjustingMessageReporter.java
@@ -3,17 +3,17 @@
 import java.nio.file.Path;
 import java.util.Map;
 import org.eclipse.emf.ecore.EObject;
-import org.lflang.ErrorReporter;
+import org.lflang.MessageReporter;
 import org.lflang.generator.CodeMap;
 import org.lflang.generator.Position;
 import org.lflang.generator.Range;
 
-public class LineAdjustingErrorReporter implements ErrorReporter {
+public class LineAdjustingMessageReporter implements MessageReporter {
 
-  private final ErrorReporter parent;
+  private final MessageReporter parent;
   private final Map<Path, CodeMap> codeMapMap;
 
-  public LineAdjustingErrorReporter(ErrorReporter parent, Map<Path, CodeMap> codeMapMap) {
+  public LineAdjustingMessageReporter(MessageReporter parent, Map<Path, CodeMap> codeMapMap) {
     this.parent = parent;
     this.codeMapMap = codeMapMap;
   }
diff --git a/core/src/main/java/org/lflang/federated/generator/SynchronizedErrorReporter.java b/core/src/main/java/org/lflang/federated/generator/SynchronizedMessageReporter.java
similarity index 77%
rename from core/src/main/java/org/lflang/federated/generator/SynchronizedErrorReporter.java
rename to core/src/main/java/org/lflang/federated/generator/SynchronizedMessageReporter.java
index 7cf7bb0610..e51a118d70 100644
--- a/core/src/main/java/org/lflang/federated/generator/SynchronizedErrorReporter.java
+++ b/core/src/main/java/org/lflang/federated/generator/SynchronizedMessageReporter.java
@@ -3,15 +3,15 @@
 import java.nio.file.Path;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.lsp4j.DiagnosticSeverity;
-import org.lflang.ErrorReporter;
-import org.lflang.ErrorReporterBase;
+import org.lflang.MessageReporter;
+import org.lflang.MessageReporterBase;
 import org.lflang.generator.Range;
 
-public class SynchronizedErrorReporter extends ErrorReporterBase {
+public class SynchronizedMessageReporter extends MessageReporterBase {
 
-  private final ErrorReporter parent;
+  private final MessageReporter parent;
 
-  public SynchronizedErrorReporter(ErrorReporter parent) {
+  public SynchronizedMessageReporter(MessageReporter parent) {
     this.parent = parent;
   }
 
diff --git a/core/src/main/java/org/lflang/federated/launcher/BuildConfig.java b/core/src/main/java/org/lflang/federated/launcher/BuildConfig.java
index 47345af147..48b297da01 100644
--- a/core/src/main/java/org/lflang/federated/launcher/BuildConfig.java
+++ b/core/src/main/java/org/lflang/federated/launcher/BuildConfig.java
@@ -1,6 +1,6 @@
 package org.lflang.federated.launcher;
 
-import org.lflang.ErrorReporter;
+import org.lflang.MessageReporter;
 import org.lflang.federated.generator.FedFileConfig;
 import org.lflang.federated.generator.FederateInstance;
 
@@ -11,7 +11,7 @@ public abstract class BuildConfig {
   protected final FederateInstance federate;
 
   /** An error reporter to report problems. */
-  protected final ErrorReporter errorReporter;
+  protected final MessageReporter messageReporter;
 
   /** The file configuration of the federation that the federate belongs to. */
   protected final FedFileConfig fileConfig;
@@ -21,11 +21,11 @@ public abstract class BuildConfig {
    *
    * @param federate The federate that this configuration applies to.
    * @param fileConfig The file configuration of the federation that the federate belongs to.
-   * @param errorReporter An error reporter to report problems.
+   * @param messageReporter An error reporter to report problems.
    */
   public BuildConfig(
-      FederateInstance federate, FedFileConfig fileConfig, ErrorReporter errorReporter) {
-    this.errorReporter = errorReporter;
+      FederateInstance federate, FedFileConfig fileConfig, MessageReporter messageReporter) {
+    this.messageReporter = messageReporter;
     this.federate = federate;
     this.fileConfig = fileConfig;
   }
diff --git a/core/src/main/java/org/lflang/federated/launcher/CBuildConfig.java b/core/src/main/java/org/lflang/federated/launcher/CBuildConfig.java
index d77ea3988c..8a3609801c 100644
--- a/core/src/main/java/org/lflang/federated/launcher/CBuildConfig.java
+++ b/core/src/main/java/org/lflang/federated/launcher/CBuildConfig.java
@@ -26,7 +26,7 @@
 package org.lflang.federated.launcher;
 
 import java.io.File;
-import org.lflang.ErrorReporter;
+import org.lflang.MessageReporter;
 import org.lflang.federated.generator.FedFileConfig;
 import org.lflang.federated.generator.FederateInstance;
 import org.lflang.generator.c.CCompiler;
@@ -41,8 +41,8 @@
 public class CBuildConfig extends BuildConfig {
 
   public CBuildConfig(
-      FederateInstance federate, FedFileConfig fileConfig, ErrorReporter errorReporter) {
-    super(federate, fileConfig, errorReporter);
+      FederateInstance federate, FedFileConfig fileConfig, MessageReporter messageReporter) {
+    super(federate, fileConfig, messageReporter);
   }
 
   @Override
@@ -56,7 +56,7 @@ public String compileCommand() {
     if (!federate.targetConfig.compileAdditionalSources.contains(linuxPlatformSupport)) {
       federate.targetConfig.compileAdditionalSources.add(linuxPlatformSupport);
     }
-    CCompiler cCompiler = new CCompiler(federate.targetConfig, fileConfig, errorReporter, false);
+    CCompiler cCompiler = new CCompiler(federate.targetConfig, fileConfig, messageReporter, false);
     commandToReturn =
         String.join(
             " ",
diff --git a/core/src/main/java/org/lflang/federated/launcher/FedLauncherGenerator.java b/core/src/main/java/org/lflang/federated/launcher/FedLauncherGenerator.java
index 9480aae5ea..f4a148ff18 100644
--- a/core/src/main/java/org/lflang/federated/launcher/FedLauncherGenerator.java
+++ b/core/src/main/java/org/lflang/federated/launcher/FedLauncherGenerator.java
@@ -33,7 +33,7 @@
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.List;
-import org.lflang.ErrorReporter;
+import org.lflang.MessageReporter;
 import org.lflang.TargetConfig;
 import org.lflang.TargetProperty.ClockSyncMode;
 import org.lflang.federated.generator.FedFileConfig;
@@ -48,19 +48,19 @@
 public class FedLauncherGenerator {
   protected TargetConfig targetConfig;
   protected FedFileConfig fileConfig;
-  protected ErrorReporter errorReporter;
+  protected MessageReporter messageReporter;
 
   /**
    * @param targetConfig The current target configuration.
    * @param fileConfig The current file configuration.
-   * @param errorReporter A error reporter for reporting any errors or warnings during the code
+   * @param messageReporter A error reporter for reporting any errors or warnings during the code
    *     generation
    */
   public FedLauncherGenerator(
-      TargetConfig targetConfig, FedFileConfig fileConfig, ErrorReporter errorReporter) {
+      TargetConfig targetConfig, FedFileConfig fileConfig, MessageReporter messageReporter) {
     this.targetConfig = targetConfig;
     this.fileConfig = fileConfig;
-    this.errorReporter = errorReporter;
+    this.messageReporter = messageReporter;
   }
 
   /**
@@ -156,7 +156,7 @@ public void doGenerate(List<FederateInstance> federates, RtiConfig rtiConfig) {
     // Index used for storing pids of federates
     int federateIndex = 0;
     for (FederateInstance federate : federates) {
-      var buildConfig = getBuildConfig(federate, fileConfig, errorReporter);
+      var buildConfig = getBuildConfig(federate, fileConfig, messageReporter);
       if (federate.isRemote) {
         Path fedRelSrcGenPath =
             fileConfig.getOutPath().relativize(fileConfig.getSrcGenPath()).resolve(federate.name);
@@ -214,11 +214,11 @@ public void doGenerate(List<FederateInstance> federates, RtiConfig rtiConfig) {
       try {
         Files.createDirectories(fileConfig.binPath);
       } catch (IOException e) {
-        errorReporter.nowhere().error("Unable to create directory: " + fileConfig.binPath);
+        messageReporter.nowhere().error("Unable to create directory: " + fileConfig.binPath);
       }
     }
 
-    errorReporter.nowhere().info(
+    messageReporter.nowhere().info(
         "##### Generating launcher for federation " + " in directory " + fileConfig.binPath);
 
     // Write the launcher file.
@@ -232,17 +232,17 @@ public void doGenerate(List<FederateInstance> federates, RtiConfig rtiConfig) {
     try {
       fOut = new FileOutputStream(file);
     } catch (FileNotFoundException e) {
-      errorReporter.nowhere().error("Unable to find file: " + file);
+      messageReporter.nowhere().error("Unable to find file: " + file);
     }
     try {
       fOut.write(shCode.toString().getBytes());
       fOut.close();
     } catch (IOException e) {
-      errorReporter.nowhere().error("Unable to write to file: " + file);
+      messageReporter.nowhere().error("Unable to write to file: " + file);
     }
 
     if (!file.setExecutable(true, false)) {
-      errorReporter.nowhere().warning("Unable to make launcher script executable.");
+      messageReporter.nowhere().warning("Unable to make launcher script executable.");
     }
 
     // Write the distributor file.
@@ -257,12 +257,12 @@ public void doGenerate(List<FederateInstance> federates, RtiConfig rtiConfig) {
         fOut.write(distCode.toString().getBytes());
         fOut.close();
         if (!file.setExecutable(true, false)) {
-          errorReporter.nowhere().warning("Unable to make file executable: " + file);
+          messageReporter.nowhere().warning("Unable to make file executable: " + file);
         }
       } catch (FileNotFoundException e) {
-        errorReporter.nowhere().error("Unable to find file: " + file);
+        messageReporter.nowhere().error("Unable to find file: " + file);
       } catch (IOException e) {
-        errorReporter.nowhere().error("Unable to write to file " + file);
+        messageReporter.nowhere().error("Unable to write to file " + file);
       }
     }
   }
@@ -498,15 +498,15 @@ private String getFedLocalLaunchCode(
    *
    * @param federate The federate to which the build configuration applies.
    * @param fileConfig The file configuration of the federation to which the federate belongs.
-   * @param errorReporter An error reporter to report problems.
+   * @param messageReporter An error reporter to report problems.
    * @return
    */
   private BuildConfig getBuildConfig(
-      FederateInstance federate, FedFileConfig fileConfig, ErrorReporter errorReporter) {
+      FederateInstance federate, FedFileConfig fileConfig, MessageReporter messageReporter) {
     return switch (federate.targetConfig.target) {
-      case C, CCPP -> new CBuildConfig(federate, fileConfig, errorReporter);
-      case Python -> new PyBuildConfig(federate, fileConfig, errorReporter);
-      case TS -> new TsBuildConfig(federate, fileConfig, errorReporter);
+      case C, CCPP -> new CBuildConfig(federate, fileConfig, messageReporter);
+      case Python -> new PyBuildConfig(federate, fileConfig, messageReporter);
+      case TS -> new TsBuildConfig(federate, fileConfig, messageReporter);
       case CPP, Rust -> throw new UnsupportedOperationException();
     };
   }
diff --git a/core/src/main/java/org/lflang/federated/launcher/PyBuildConfig.java b/core/src/main/java/org/lflang/federated/launcher/PyBuildConfig.java
index 1a8a996349..09f7fac34f 100644
--- a/core/src/main/java/org/lflang/federated/launcher/PyBuildConfig.java
+++ b/core/src/main/java/org/lflang/federated/launcher/PyBuildConfig.java
@@ -1,14 +1,14 @@
 package org.lflang.federated.launcher;
 
-import org.lflang.ErrorReporter;
+import org.lflang.MessageReporter;
 import org.lflang.federated.generator.FedFileConfig;
 import org.lflang.federated.generator.FederateInstance;
 
 public class PyBuildConfig extends BuildConfig {
 
   public PyBuildConfig(
-      FederateInstance federate, FedFileConfig fileConfig, ErrorReporter errorReporter) {
-    super(federate, fileConfig, errorReporter);
+      FederateInstance federate, FedFileConfig fileConfig, MessageReporter messageReporter) {
+    super(federate, fileConfig, messageReporter);
   }
 
   @Override
diff --git a/core/src/main/java/org/lflang/federated/launcher/TsBuildConfig.java b/core/src/main/java/org/lflang/federated/launcher/TsBuildConfig.java
index 97f40c767a..82a0e2c7ae 100644
--- a/core/src/main/java/org/lflang/federated/launcher/TsBuildConfig.java
+++ b/core/src/main/java/org/lflang/federated/launcher/TsBuildConfig.java
@@ -25,7 +25,7 @@
 
 package org.lflang.federated.launcher;
 
-import org.lflang.ErrorReporter;
+import org.lflang.MessageReporter;
 import org.lflang.federated.generator.FedFileConfig;
 import org.lflang.federated.generator.FederateInstance;
 
@@ -40,8 +40,8 @@
 public class TsBuildConfig extends BuildConfig {
 
   public TsBuildConfig(
-      FederateInstance federate, FedFileConfig fileConfig, ErrorReporter errorReporter) {
-    super(federate, fileConfig, errorReporter);
+      FederateInstance federate, FedFileConfig fileConfig, MessageReporter messageReporter) {
+    super(federate, fileConfig, messageReporter);
   }
 
   @Override
diff --git a/core/src/main/java/org/lflang/federated/serialization/FedROS2CPPSerialization.java b/core/src/main/java/org/lflang/federated/serialization/FedROS2CPPSerialization.java
index 2e29aacdb4..5f7364b3de 100644
--- a/core/src/main/java/org/lflang/federated/serialization/FedROS2CPPSerialization.java
+++ b/core/src/main/java/org/lflang/federated/serialization/FedROS2CPPSerialization.java
@@ -48,13 +48,13 @@ public class FedROS2CPPSerialization implements FedSerialization {
   public boolean isCompatible(GeneratorBase generator) {
     if (generator.getTarget() != Target.C) {
       generator
-          .errorReporter
+          .messageReporter
           .nowhere()
           .error("ROS serialization is currently only supported for the C target.");
       return false;
     } else if (!generator.getTargetConfig().compiler.equalsIgnoreCase("g++")) {
       generator
-          .errorReporter
+          .messageReporter
           .nowhere()
           .error("Please use the 'compiler: \"g++\"' target property \n" + "for ROS serialization");
       return false;
diff --git a/core/src/main/java/org/lflang/federated/validation/FedValidator.java b/core/src/main/java/org/lflang/federated/validation/FedValidator.java
index 31e96c80f3..fc82733e0d 100644
--- a/core/src/main/java/org/lflang/federated/validation/FedValidator.java
+++ b/core/src/main/java/org/lflang/federated/validation/FedValidator.java
@@ -3,7 +3,7 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Stream;
-import org.lflang.ErrorReporter;
+import org.lflang.MessageReporter;
 import org.lflang.ast.ASTUtils;
 import org.lflang.lf.Input;
 import org.lflang.lf.Instantiation;
@@ -15,7 +15,7 @@
 /** Helper class that is used to validate a federated reactor. */
 public class FedValidator {
 
-  public static void validateFederatedReactor(Reactor reactor, ErrorReporter errorReporter) {
+  public static void validateFederatedReactor(Reactor reactor, MessageReporter messageReporter) {
     if (!reactor.isFederated()) return;
 
     // Construct the set of excluded reactions for this federate.
@@ -41,7 +41,7 @@ public static void validateFederatedReactor(Reactor reactor, ErrorReporter error
       // Add all the effects that are inputs
       allVarRefsReferencingFederates.addAll(
           react.getEffects().stream().filter(it -> it.getVariable() instanceof Input).toList());
-      containsAllVarRefs(allVarRefsReferencingFederates, errorReporter);
+      containsAllVarRefs(allVarRefsReferencingFederates, messageReporter);
     }
   }
 
@@ -49,7 +49,7 @@ public static void validateFederatedReactor(Reactor reactor, ErrorReporter error
    * Check if this federate contains all the {@code varRefs}. If not, report an error using {@code
    * errorReporter}.
    */
-  private static void containsAllVarRefs(List<VarRef> varRefs, ErrorReporter errorReporter) {
+  private static void containsAllVarRefs(List<VarRef> varRefs, MessageReporter messageReporter) {
     var referencesFederate = false;
     Instantiation instantiation = null;
     for (VarRef varRef : varRefs) {
@@ -57,7 +57,7 @@ private static void containsAllVarRefs(List<VarRef> varRefs, ErrorReporter error
         instantiation = varRef.getContainer();
         referencesFederate = true;
       } else if (!varRef.getContainer().equals(instantiation)) {
-        errorReporter
+        messageReporter
             .at(varRef)
             .error(
                 "Mixed triggers and effects from" + " different federates. This is not permitted");
diff --git a/core/src/main/java/org/lflang/generator/DiagnosticReporting.java b/core/src/main/java/org/lflang/generator/DiagnosticReporting.java
index 871f417a0d..0ebbeb31ac 100644
--- a/core/src/main/java/org/lflang/generator/DiagnosticReporting.java
+++ b/core/src/main/java/org/lflang/generator/DiagnosticReporting.java
@@ -3,7 +3,7 @@
 import java.nio.file.Path;
 import java.util.Map;
 import org.eclipse.lsp4j.DiagnosticSeverity;
-import org.lflang.ErrorReporter;
+import org.lflang.MessageReporter;
 
 /**
  * {@code DiagnosticReporting} provides utilities for reporting validation output.
@@ -23,10 +23,10 @@ public interface Strategy {
      * Parse the validation output and report any errors that it contains.
      *
      * @param validationOutput any validation output
-     * @param errorReporter any error reporter
+     * @param messageReporter any error reporter
      * @param map the map from generated files to CodeMaps
      */
-    void report(String validationOutput, ErrorReporter errorReporter, Map<Path, CodeMap> map);
+    void report(String validationOutput, MessageReporter messageReporter, Map<Path, CodeMap> map);
   }
 
   /**
diff --git a/core/src/main/java/org/lflang/generator/GeneratorBase.java b/core/src/main/java/org/lflang/generator/GeneratorBase.java
index e1912c9615..5f7f7c54e9 100644
--- a/core/src/main/java/org/lflang/generator/GeneratorBase.java
+++ b/core/src/main/java/org/lflang/generator/GeneratorBase.java
@@ -42,7 +42,7 @@
 import org.eclipse.lsp4j.DiagnosticSeverity;
 import org.eclipse.xtext.xbase.lib.IterableExtensions;
 import org.eclipse.xtext.xbase.lib.IteratorExtensions;
-import org.lflang.ErrorReporter;
+import org.lflang.MessageReporter;
 import org.lflang.FileConfig;
 import org.lflang.MainConflictChecker;
 import org.lflang.Target;
@@ -77,7 +77,7 @@ public abstract class GeneratorBase extends AbstractLFValidator {
   public ReactorInstance main;
 
   /** An error reporter for reporting any errors or warnings during the code generation */
-  public ErrorReporter errorReporter;
+  public MessageReporter messageReporter;
 
   ////////////////////////////////////////////
   //// Protected fields.
@@ -164,8 +164,8 @@ public Instantiation getMainDef() {
   public GeneratorBase(LFGeneratorContext context) {
     this.context = context;
     this.targetConfig = context.getTargetConfig();
-    this.errorReporter = context.getErrorReporter();
-    this.commandFactory = new GeneratorCommandFactory(errorReporter, context.getFileConfig());
+    this.messageReporter = context.getErrorReporter();
+    this.commandFactory = new GeneratorCommandFactory(messageReporter, context.getFileConfig());
   }
 
   /**
@@ -220,7 +220,7 @@ public void doGenerate(Resource resource, LFGeneratorContext context) {
 
     // Clear any IDE markers that may have been created by a previous build.
     // Markers mark problems in the Eclipse IDE when running in integrated mode.
-    errorReporter.clearHistory();
+    messageReporter.clearHistory();
 
     ASTUtils.setMainName(context.getFileConfig().resource, context.getFileConfig().name);
 
@@ -230,7 +230,7 @@ public void doGenerate(Resource resource, LFGeneratorContext context) {
     if (Objects.equal(context.getMode(), LFGeneratorContext.Mode.STANDALONE) && mainDef != null) {
       for (String conflict : new MainConflictChecker(context.getFileConfig()).conflicts) {
         EObject object = this.mainDef.getReactorClass();
-        errorReporter.at(object).error("Conflicting main reactor in " + conflict);
+        messageReporter.at(object).error("Conflicting main reactor in " + conflict);
       }
     }
 
@@ -264,10 +264,10 @@ public void doGenerate(Resource resource, LFGeneratorContext context) {
             .map(
                 it ->
                     GeneratorUtils.getLFResource(
-                        it, context.getFileConfig().getSrcGenBasePath(), context, errorReporter))
+                        it, context.getFileConfig().getSrcGenBasePath(), context, messageReporter))
             .toList());
     GeneratorUtils.accommodatePhysicalActionsIfPresent(
-        allResources, getTarget().setsKeepAliveOptionAutomatically(), targetConfig, errorReporter);
+        allResources, getTarget().setsKeepAliveOptionAutomatically(), targetConfig, messageReporter);
     // FIXME: Should the GeneratorBase pull in {@code files} from imported
     // resources?
 
@@ -348,7 +348,7 @@ protected void setReactorsAndInstantiationGraph(LFGeneratorContext.Mode mode) {
    */
   protected void copyUserFiles(TargetConfig targetConfig, FileConfig fileConfig) {
     var dst = this.context.getFileConfig().getSrcGenPath();
-    FileUtil.copyFilesOrDirectories(targetConfig.files, dst, fileConfig, errorReporter, false);
+    FileUtil.copyFilesOrDirectories(targetConfig.files, dst, fileConfig, messageReporter, false);
   }
 
   /**
@@ -358,7 +358,7 @@ protected void copyUserFiles(TargetConfig targetConfig, FileConfig fileConfig) {
    * @return True if errors occurred.
    */
   public boolean errorsOccurred() {
-    return errorReporter.getErrorsOccurred();
+    return messageReporter.getErrorsOccurred();
   }
 
   /*
@@ -426,7 +426,7 @@ public int getReactionBankIndex(Reaction reaction) {
    */
   protected void checkModalReactorSupport(boolean isSupported) {
     if (hasModalReactors && !isSupported) {
-      errorReporter
+      messageReporter
           .nowhere()
           .error(
               "The currently selected code generation or "
@@ -442,7 +442,7 @@ protected void checkModalReactorSupport(boolean isSupported) {
    */
   protected void checkWatchdogSupport(boolean isSupported) {
     if (hasWatchdogs && !isSupported) {
-      errorReporter
+      messageReporter
           .nowhere()
           .error("Watchdogs are currently only supported for threaded programs in the C target.");
     }
@@ -464,7 +464,7 @@ private void transformConflictingConnectionsInModalReactors() {
               || connection.isIterated()
               || connection.getLeftPorts().size() > 1
               || connection.getRightPorts().size() > 1) {
-            errorReporter
+            messageReporter
                 .at(connection)
                 .error(
                     "Cannot transform connection in modal reactor. Connection uses currently not"
@@ -503,7 +503,7 @@ private void transformConflictingConnectionsInModalReactors() {
    * reactors.
    */
   protected String getConflictingConnectionsInModalReactorsBody(String source, String dest) {
-    errorReporter
+    messageReporter
         .nowhere()
         .error(
             "The currently selected code generation "
@@ -588,9 +588,9 @@ public void reportCommandErrors(String stderr) {
             // statements to find which one matches and mark all the
             // import statements down the chain. But what a pain!
             if (severity == IMarker.SEVERITY_ERROR) {
-              errorReporter.at(originalPath).error("Error in imported file: " + path);
+              messageReporter.at(originalPath).error("Error in imported file: " + path);
             } else {
-              errorReporter.at(originalPath).warning("Warning in imported file: " + path);
+              messageReporter.at(originalPath).warning("Warning in imported file: " + path);
             }
           }
         }
@@ -636,9 +636,9 @@ public void reportCommandErrors(String stderr) {
         // statements to find which one matches and mark all the
         // import statements down the chain. But what a pain!
         if (severity == IMarker.SEVERITY_ERROR) {
-          errorReporter.at(originalPath).error("Error in imported file: " + path);
+          messageReporter.at(originalPath).error("Error in imported file: " + path);
         } else {
-          errorReporter.at(originalPath).warning("Warning in imported file: " + path);
+          messageReporter.at(originalPath).warning("Warning in imported file: " + path);
         }
       }
     }
@@ -647,7 +647,7 @@ public void reportCommandErrors(String stderr) {
   private void reportIssue(StringBuilder message, Integer lineNumber, Path path, int severity) {
     DiagnosticSeverity convertedSeverity =
         severity == IMarker.SEVERITY_ERROR ? DiagnosticSeverity.Error : DiagnosticSeverity.Warning;
-    errorReporter.atNullableLine(path, lineNumber).report(convertedSeverity, message.toString());
+    messageReporter.atNullableLine(path, lineNumber).report(convertedSeverity, message.toString());
   }
 
   // //////////////////////////////////////////////////
@@ -658,10 +658,10 @@ private void reportIssue(StringBuilder message, Integer lineNumber, Path path, i
    * is in, and where the generated sources are to be put.
    */
   public void printInfo(LFGeneratorContext.Mode mode) {
-    errorReporter.nowhere().info(
+    messageReporter.nowhere().info(
         "Generating code for: " + context.getFileConfig().resource.getURI().toString());
-    errorReporter.nowhere().info("******** mode: " + mode);
-    errorReporter.nowhere().info("******** generated sources: " + context.getFileConfig().getSrcGenPath());
+    messageReporter.nowhere().info("******** mode: " + mode);
+    messageReporter.nowhere().info("******** generated sources: " + context.getFileConfig().getSrcGenPath());
   }
 
   /** Get the buffer type used for network messages */
diff --git a/core/src/main/java/org/lflang/generator/GeneratorCommandFactory.java b/core/src/main/java/org/lflang/generator/GeneratorCommandFactory.java
index 31cf87ce41..b32777b1af 100644
--- a/core/src/main/java/org/lflang/generator/GeneratorCommandFactory.java
+++ b/core/src/main/java/org/lflang/generator/GeneratorCommandFactory.java
@@ -33,7 +33,7 @@
 import java.util.List;
 import java.util.Objects;
 import org.eclipse.lsp4j.DiagnosticSeverity;
-import org.lflang.ErrorReporter;
+import org.lflang.MessageReporter;
 import org.lflang.FileConfig;
 import org.lflang.util.LFCommand;
 
@@ -47,12 +47,12 @@
  */
 public class GeneratorCommandFactory {
 
-  protected final ErrorReporter errorReporter;
+  protected final MessageReporter messageReporter;
   protected final FileConfig fileConfig;
   protected boolean quiet = false;
 
-  public GeneratorCommandFactory(ErrorReporter errorReporter, FileConfig fileConfig) {
-    this.errorReporter = Objects.requireNonNull(errorReporter);
+  public GeneratorCommandFactory(MessageReporter messageReporter, FileConfig fileConfig) {
+    this.messageReporter = Objects.requireNonNull(messageReporter);
     this.fileConfig = Objects.requireNonNull(fileConfig);
   }
 
@@ -150,7 +150,7 @@ public LFCommand createCommand(String cmd, List<String> args, Path dir, boolean
               + "You can set PATH in ~/.bash_profile on Linux or Mac.";
 
       DiagnosticSeverity severity = failOnError ? Error : Warning;
-      errorReporter.nowhere().report(severity, message);
+      messageReporter.nowhere().report(severity, message);
     }
 
     return command;
diff --git a/core/src/main/java/org/lflang/generator/GeneratorUtils.java b/core/src/main/java/org/lflang/generator/GeneratorUtils.java
index db2e36041e..8fd9b09524 100644
--- a/core/src/main/java/org/lflang/generator/GeneratorUtils.java
+++ b/core/src/main/java/org/lflang/generator/GeneratorUtils.java
@@ -10,7 +10,7 @@
 import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.xtext.xbase.lib.IteratorExtensions;
-import org.lflang.ErrorReporter;
+import org.lflang.MessageReporter;
 import org.lflang.FileConfig;
 import org.lflang.TargetConfig;
 import org.lflang.TargetProperty;
@@ -48,7 +48,7 @@ public static void accommodatePhysicalActionsIfPresent(
       List<Resource> resources,
       boolean setsKeepAliveOptionAutomatically,
       TargetConfig targetConfig,
-      ErrorReporter errorReporter) {
+      MessageReporter messageReporter) {
     if (!setsKeepAliveOptionAutomatically) {
       return;
     }
@@ -65,7 +65,7 @@ public static void accommodatePhysicalActionsIfPresent(
               String.format(
                   "Setting %s to true because of the physical action %s.",
                   TargetProperty.KEEPALIVE.getDisplayName(), action.getName());
-          errorReporter.at(action).warning(message);
+          messageReporter.at(action).warning(message);
           return;
         }
       }
@@ -110,20 +110,20 @@ public static List<Resource> getResources(Iterable<Reactor> reactors) {
    * @param srcGenBasePath The root directory for any generated sources associated with the
    *     resource.
    * @param context The generator invocation context.
-   * @param errorReporter An error message acceptor.
+   * @param messageReporter An error message acceptor.
    * @return the {@code LFResource} representation of the given resource.
    */
   public static LFResource getLFResource(
       Resource resource,
       Path srcGenBasePath,
       LFGeneratorContext context,
-      ErrorReporter errorReporter) {
+      MessageReporter messageReporter) {
     var target = ASTUtils.targetDecl(resource);
     KeyValuePairs config = target.getConfig();
     var targetConfig = new TargetConfig(target);
     if (config != null) {
       List<KeyValuePair> pairs = config.getPairs();
-      TargetProperty.set(targetConfig, pairs != null ? pairs : List.of(), errorReporter);
+      TargetProperty.set(targetConfig, pairs != null ? pairs : List.of(), messageReporter);
     }
     FileConfig fc =
         LFGenerator.createFileConfig(
@@ -166,7 +166,7 @@ public static boolean isHostWindows() {
   public static boolean canGenerate(
       Boolean errorsOccurred,
       Instantiation mainDef,
-      ErrorReporter errorReporter,
+      MessageReporter messageReporter,
       LFGeneratorContext context) {
     // stop if there are any errors found in the program by doGenerate() in GeneratorBase
     if (errorsOccurred) {
@@ -175,7 +175,7 @@ public static boolean canGenerate(
     }
     // abort if there is no main reactor
     if (mainDef == null) {
-      errorReporter
+      messageReporter
           .nowhere()
           .info(
               "The given Lingua Franca program does not define a main reactor. Therefore, no code"
diff --git a/core/src/main/java/org/lflang/generator/HumanReadableReportingStrategy.java b/core/src/main/java/org/lflang/generator/HumanReadableReportingStrategy.java
index ca2b75bded..6030ccc1fd 100644
--- a/core/src/main/java/org/lflang/generator/HumanReadableReportingStrategy.java
+++ b/core/src/main/java/org/lflang/generator/HumanReadableReportingStrategy.java
@@ -7,7 +7,7 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import org.eclipse.lsp4j.DiagnosticSeverity;
-import org.lflang.ErrorReporter;
+import org.lflang.MessageReporter;
 
 /**
  * An error reporting strategy that parses human-readable output.
@@ -66,14 +66,14 @@ public HumanReadableReportingStrategy(
   }
 
   @Override
-  public void report(String validationOutput, ErrorReporter errorReporter, Map<Path, CodeMap> map) {
+  public void report(String validationOutput, MessageReporter messageReporter, Map<Path, CodeMap> map) {
     Iterator<String> it = validationOutput.lines().iterator();
     while (it.hasNext() || bufferedLine != null) {
       if (bufferedLine != null) {
-        reportErrorLine(bufferedLine, it, errorReporter, map);
+        reportErrorLine(bufferedLine, it, messageReporter, map);
         bufferedLine = null;
       } else {
-        reportErrorLine(it.next(), it, errorReporter, map);
+        reportErrorLine(it.next(), it, messageReporter, map);
       }
     }
   }
@@ -83,11 +83,11 @@ public void report(String validationOutput, ErrorReporter errorReporter, Map<Pat
    *
    * @param line The current line.
    * @param it An iterator over the lines that follow the current line.
-   * @param errorReporter An arbitrary ErrorReporter.
+   * @param messageReporter An arbitrary ErrorReporter.
    * @param maps A mapping from generated file paths to CodeMaps.
    */
   private void reportErrorLine(
-      String line, Iterator<String> it, ErrorReporter errorReporter, Map<Path, CodeMap> maps) {
+      String line, Iterator<String> it, MessageReporter messageReporter, Map<Path, CodeMap> maps) {
     Matcher matcher = diagnosticMessagePattern.matcher(stripEscaped(line));
     if (matcher.matches()) {
       final Path path = Paths.get(matcher.group("path"));
@@ -104,16 +104,16 @@ private void reportErrorLine(
           DiagnosticReporting.messageOf(matcher.group("message"), path, generatedFilePosition);
       final CodeMap map = maps.get(relativeTo != null ? relativeTo.resolve(path) : path);
       if (map == null) {
-        errorReporter.nowhere().report(severity, message);
+        messageReporter.nowhere().report(severity, message);
         return;
       }
       for (Path srcFile : map.lfSourcePaths()) {
         Position lfFilePosition = map.adjusted(srcFile, generatedFilePosition);
         if (column != null) {
           Range range = findAppropriateRange(lfFilePosition, it);
-          errorReporter.at(srcFile, range).report(severity, message);
+          messageReporter.at(srcFile, range).report(severity, message);
         } else {
-          errorReporter.at(srcFile, lfFilePosition.getOneBasedLine()).report(severity, message);
+          messageReporter.at(srcFile, lfFilePosition.getOneBasedLine()).report(severity, message);
         }
       }
     }
diff --git a/core/src/main/java/org/lflang/generator/IntegratedBuilder.java b/core/src/main/java/org/lflang/generator/IntegratedBuilder.java
index 717f4f7c3c..9c229e17e9 100644
--- a/core/src/main/java/org/lflang/generator/IntegratedBuilder.java
+++ b/core/src/main/java/org/lflang/generator/IntegratedBuilder.java
@@ -17,7 +17,7 @@
 import org.eclipse.xtext.validation.CheckMode;
 import org.eclipse.xtext.validation.IResourceValidator;
 import org.eclipse.xtext.validation.Issue;
-import org.lflang.ErrorReporter;
+import org.lflang.MessageReporter;
 import org.lflang.FileConfig;
 import org.lflang.generator.LFGeneratorContext.Mode;
 
@@ -64,12 +64,12 @@ public GeneratorResult run(
             .toString());
     List<EObject> parseRoots = getResource(uri).getContents();
     if (parseRoots.isEmpty()) return GeneratorResult.NOTHING;
-    ErrorReporter errorReporter = new LanguageServerErrorReporter(parseRoots.get(0));
+    MessageReporter messageReporter = new LanguageServerMessageReporter(parseRoots.get(0));
     reportProgress.apply("Validating...", START_PERCENT_PROGRESS);
-    validate(uri, errorReporter);
+    validate(uri, messageReporter);
     reportProgress.apply("Code validation complete.", VALIDATED_PERCENT_PROGRESS);
     if (cancelIndicator.isCanceled()) return GeneratorResult.CANCELLED;
-    if (errorReporter.getErrorsOccurred()) return GeneratorResult.FAILED;
+    if (messageReporter.getErrorsOccurred()) return GeneratorResult.FAILED;
     reportProgress.apply("Generating code...", VALIDATED_PERCENT_PROGRESS);
     return doGenerate(uri, mustComplete, reportProgress, cancelIndicator);
   }
@@ -80,12 +80,12 @@ public GeneratorResult run(
    * Validates the Lingua Franca file {@code f}.
    *
    * @param uri The URI of a Lingua Franca file.
-   * @param errorReporter The error reporter.
+   * @param messageReporter The error reporter.
    */
-  private void validate(URI uri, ErrorReporter errorReporter) {
+  private void validate(URI uri, MessageReporter messageReporter) {
     for (Issue issue :
         validator.validate(getResource(uri), CheckMode.ALL, CancelIndicator.NullImpl)) {
-      errorReporter
+      messageReporter
           .atNullableLine(Path.of(uri.path()), issue.getLineNumber())
           .report(convertSeverity(issue.getSeverity()), issue.getMessage());
     }
@@ -113,7 +113,7 @@ private GeneratorResult doGenerate(
             new Properties(),
             resource,
             fileAccess,
-            fileConfig -> new LanguageServerErrorReporter(resource.getContents().get(0)));
+            fileConfig -> new LanguageServerMessageReporter(resource.getContents().get(0)));
     generator.generate(getResource(uri), fileAccess, context);
     return context.getResult();
   }
diff --git a/core/src/main/java/org/lflang/generator/InvalidSourceException.java b/core/src/main/java/org/lflang/generator/InvalidSourceException.java
index 88b65d0c24..f4dc12ae8a 100644
--- a/core/src/main/java/org/lflang/generator/InvalidSourceException.java
+++ b/core/src/main/java/org/lflang/generator/InvalidSourceException.java
@@ -27,7 +27,7 @@
 /**
  * This exception is thrown when a program fails a validity check performed by a code generator (and
  * not the validator). This should be thrown only when local control flow cannot recover, otherwise
- * using {@link GeneratorBase#errorReporter} should be preferred, in order to collect more errors
+ * using {@link GeneratorBase#messageReporter} should be preferred, in order to collect more errors
  * before failing.
  *
  * @author Clément Fournier
diff --git a/core/src/main/java/org/lflang/generator/LFGenerator.java b/core/src/main/java/org/lflang/generator/LFGenerator.java
index 8d11c55674..0647fbd31d 100644
--- a/core/src/main/java/org/lflang/generator/LFGenerator.java
+++ b/core/src/main/java/org/lflang/generator/LFGenerator.java
@@ -11,7 +11,7 @@
 import org.eclipse.xtext.generator.IFileSystemAccess2;
 import org.eclipse.xtext.generator.IGeneratorContext;
 import org.eclipse.xtext.util.RuntimeIOException;
-import org.lflang.ErrorReporter;
+import org.lflang.MessageReporter;
 import org.lflang.FileConfig;
 import org.lflang.Target;
 import org.lflang.ast.ASTUtils;
@@ -117,9 +117,9 @@ public void doGenerate(Resource resource, IFileSystemAccess2 fsa, IGeneratorCont
         generatorErrorsOccurred = generator.errorsOccurred();
       }
     }
-    final ErrorReporter errorReporter = lfContext.getErrorReporter();
-    if (errorReporter instanceof LanguageServerErrorReporter) {
-      ((LanguageServerErrorReporter) errorReporter).publishDiagnostics();
+    final MessageReporter messageReporter = lfContext.getErrorReporter();
+    if (messageReporter instanceof LanguageServerMessageReporter) {
+      ((LanguageServerMessageReporter) messageReporter).publishDiagnostics();
     }
   }
 
diff --git a/core/src/main/java/org/lflang/generator/LFGeneratorContext.java b/core/src/main/java/org/lflang/generator/LFGeneratorContext.java
index 727ce229b9..1ad1400b10 100644
--- a/core/src/main/java/org/lflang/generator/LFGeneratorContext.java
+++ b/core/src/main/java/org/lflang/generator/LFGeneratorContext.java
@@ -6,7 +6,7 @@
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.xtext.generator.IFileSystemAccess2;
 import org.eclipse.xtext.generator.IGeneratorContext;
-import org.lflang.ErrorReporter;
+import org.lflang.MessageReporter;
 import org.lflang.FileConfig;
 import org.lflang.TargetConfig;
 
@@ -79,7 +79,7 @@ enum Mode {
   Properties getArgs();
 
   /** Get the error reporter for this context; construct one if it hasn't been constructed yet. */
-  ErrorReporter getErrorReporter();
+  MessageReporter getErrorReporter();
 
   /**
    * Mark the code generation process performed in this context as finished with the result {@code
diff --git a/core/src/main/java/org/lflang/generator/LanguageServerErrorReporter.java b/core/src/main/java/org/lflang/generator/LanguageServerMessageReporter.java
similarity index 95%
rename from core/src/main/java/org/lflang/generator/LanguageServerErrorReporter.java
rename to core/src/main/java/org/lflang/generator/LanguageServerMessageReporter.java
index d71f943a16..2a1f9c4e5a 100644
--- a/core/src/main/java/org/lflang/generator/LanguageServerErrorReporter.java
+++ b/core/src/main/java/org/lflang/generator/LanguageServerMessageReporter.java
@@ -14,14 +14,14 @@
 import org.eclipse.lsp4j.Range;
 import org.eclipse.lsp4j.services.LanguageClient;
 import org.eclipse.xtext.nodemodel.util.NodeModelUtils;
-import org.lflang.ErrorReporterBase;
+import org.lflang.MessageReporterBase;
 
 /**
  * Report diagnostics to the language client.
  *
  * @author Peter Donovan
  */
-public class LanguageServerErrorReporter extends ErrorReporterBase {
+public class LanguageServerMessageReporter extends MessageReporterBase {
 
   /**
    * The language client to which errors should be reported, if such a client is available. FIXME:
@@ -40,7 +40,7 @@ public class LanguageServerErrorReporter extends ErrorReporterBase {
    *
    * @param parseRoot the root of the AST of the document for which this is an error reporter
    */
-  public LanguageServerErrorReporter(EObject parseRoot) {
+  public LanguageServerMessageReporter(EObject parseRoot) {
     this.parseRoot = parseRoot;
     this.diagnostics = new HashMap<>();
   }
@@ -101,7 +101,7 @@ public boolean getErrorsOccurred() {
    * @param client the language client
    */
   public static void setClient(LanguageClient client) {
-    LanguageServerErrorReporter.client = client;
+    LanguageServerMessageReporter.client = client;
   }
 
   /** Publish diagnostics by forwarding them to the language client. */
diff --git a/core/src/main/java/org/lflang/generator/MainContext.java b/core/src/main/java/org/lflang/generator/MainContext.java
index 4a60c4d6a8..c724c37dba 100644
--- a/core/src/main/java/org/lflang/generator/MainContext.java
+++ b/core/src/main/java/org/lflang/generator/MainContext.java
@@ -8,8 +8,8 @@
 import org.eclipse.xtext.generator.IFileSystemAccess2;
 import org.eclipse.xtext.util.CancelIndicator;
 import org.eclipse.xtext.util.RuntimeIOException;
-import org.lflang.DefaultErrorReporter;
-import org.lflang.ErrorReporter;
+import org.lflang.DefaultMessageReporter;
+import org.lflang.MessageReporter;
 import org.lflang.FileConfig;
 import org.lflang.TargetConfig;
 import org.lflang.generator.IntegratedBuilder.ReportProgress;
@@ -23,7 +23,7 @@
 public class MainContext implements LFGeneratorContext {
 
   /** This constructor will be set by the LF plugin, if the generator is running in Epoch. */
-  public static Function<FileConfig, ErrorReporter> EPOCH_ERROR_REPORTER_CONSTRUCTOR = null;
+  public static Function<FileConfig, MessageReporter> EPOCH_ERROR_REPORTER_CONSTRUCTOR = null;
 
   /** The indicator that shows whether this build process is canceled. */
   private final CancelIndicator cancelIndicator;
@@ -41,7 +41,7 @@ public class MainContext implements LFGeneratorContext {
   private GeneratorResult result = null;
 
   private final Properties args;
-  private final ErrorReporter errorReporter;
+  private final MessageReporter messageReporter;
 
   /**
    * Initialize the context of a build process whose cancellation is indicated by {@code
@@ -62,7 +62,7 @@ public MainContext(
         fsa,
         (mode == Mode.EPOCH && EPOCH_ERROR_REPORTER_CONSTRUCTOR != null)
             ? EPOCH_ERROR_REPORTER_CONSTRUCTOR
-            : fileConfig -> new DefaultErrorReporter());
+            : fileConfig -> new DefaultMessageReporter());
   }
 
   /**
@@ -86,7 +86,7 @@ public MainContext(
       Properties args,
       Resource resource,
       IFileSystemAccess2 fsa,
-      Function<FileConfig, ErrorReporter> constructErrorReporter) {
+      Function<FileConfig, MessageReporter> constructErrorReporter) {
     this.mode = mode;
     this.cancelIndicator = cancelIndicator == null ? () -> false : cancelIndicator;
     this.reportProgress = reportProgress;
@@ -104,7 +104,7 @@ public MainContext(
       throw new RuntimeIOException("Error during FileConfig instantiation", e);
     }
 
-    this.errorReporter = constructErrorReporter.apply(this.fileConfig);
+    this.messageReporter = constructErrorReporter.apply(this.fileConfig);
 
     loadTargetConfig();
   }
@@ -125,8 +125,8 @@ public Properties getArgs() {
   }
 
   @Override
-  public ErrorReporter getErrorReporter() {
-    return errorReporter;
+  public MessageReporter getErrorReporter() {
+    return messageReporter;
   }
 
   @Override
@@ -165,6 +165,6 @@ public void reportProgress(String message, int percentage) {
    */
   public void loadTargetConfig() {
     this.targetConfig =
-        new TargetConfig(args, GeneratorUtils.findTargetDecl(fileConfig.resource), errorReporter);
+        new TargetConfig(args, GeneratorUtils.findTargetDecl(fileConfig.resource), messageReporter);
   }
 }
diff --git a/core/src/main/java/org/lflang/generator/PortInstance.java b/core/src/main/java/org/lflang/generator/PortInstance.java
index 9db13babf1..c9e89f40b0 100644
--- a/core/src/main/java/org/lflang/generator/PortInstance.java
+++ b/core/src/main/java/org/lflang/generator/PortInstance.java
@@ -29,7 +29,7 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.PriorityQueue;
-import org.lflang.ErrorReporter;
+import org.lflang.MessageReporter;
 import org.lflang.lf.Input;
 import org.lflang.lf.Output;
 import org.lflang.lf.Parameter;
@@ -70,16 +70,16 @@ public PortInstance(Port definition, ReactorInstance parent) {
    *
    * @param definition The declaration in the AST.
    * @param parent The parent.
-   * @param errorReporter An error reporter, or null to throw exceptions.
+   * @param messageReporter An error reporter, or null to throw exceptions.
    */
-  public PortInstance(Port definition, ReactorInstance parent, ErrorReporter errorReporter) {
+  public PortInstance(Port definition, ReactorInstance parent, MessageReporter messageReporter) {
     super(definition, parent);
 
     if (parent == null) {
       throw new NullPointerException("Cannot create a PortInstance with no parent.");
     }
 
-    setInitialWidth(errorReporter);
+    setInitialWidth(messageReporter);
   }
 
   //////////////////////////////////////////////////////
@@ -388,16 +388,16 @@ private List<RuntimeRange<PortInstance>> eventualSources(RuntimeRange<PortInstan
    * Set the initial multiport width, if this is a multiport, from the widthSpec in the definition.
    * This will be set to -1 if the width cannot be determined.
    *
-   * @param errorReporter For reporting errors.
+   * @param messageReporter For reporting errors.
    */
-  private void setInitialWidth(ErrorReporter errorReporter) {
+  private void setInitialWidth(MessageReporter messageReporter) {
     // If this is a multiport, determine the width.
     WidthSpec widthSpec = definition.getWidthSpec();
 
     if (widthSpec != null) {
       if (widthSpec.isOfVariableLength()) {
         String message = "Variable-width multiports not supported (yet): " + definition.getName();
-        errorReporter.at(definition).error(message);
+        messageReporter.at(definition).error(message);
       } else {
         isMultiport = true;
 
diff --git a/core/src/main/java/org/lflang/generator/ReactorInstance.java b/core/src/main/java/org/lflang/generator/ReactorInstance.java
index 74fa05c8ba..11a055b007 100644
--- a/core/src/main/java/org/lflang/generator/ReactorInstance.java
+++ b/core/src/main/java/org/lflang/generator/ReactorInstance.java
@@ -36,7 +36,7 @@
 import java.util.Optional;
 import java.util.Set;
 import org.lflang.AttributeUtils;
-import org.lflang.ErrorReporter;
+import org.lflang.MessageReporter;
 import org.lflang.TimeValue;
 import org.lflang.ast.ASTUtils;
 import org.lflang.generator.TriggerInstance.BuiltinTriggerVariable;
@@ -89,7 +89,7 @@ public class ReactorInstance extends NamedInstance<Instantiation> {
    * @param reactor The top-level reactor.
    * @param reporter The error reporter.
    */
-  public ReactorInstance(Reactor reactor, ErrorReporter reporter, List<Reactor> reactors) {
+  public ReactorInstance(Reactor reactor, MessageReporter reporter, List<Reactor> reactors) {
     this(ASTUtils.createInstantiation(reactor), null, reporter, -1, reactors);
     assert !reactors.isEmpty();
   }
@@ -100,7 +100,7 @@ public ReactorInstance(Reactor reactor, ErrorReporter reporter, List<Reactor> re
    * @param reactor The top-level reactor.
    * @param reporter The error reporter.
    */
-  public ReactorInstance(Reactor reactor, ErrorReporter reporter) {
+  public ReactorInstance(Reactor reactor, MessageReporter reporter) {
     this(ASTUtils.createInstantiation(reactor), null, reporter, -1, List.of());
   }
 
@@ -112,7 +112,7 @@ public ReactorInstance(Reactor reactor, ErrorReporter reporter) {
    * @param reporter The error reporter.
    * @param desiredDepth The depth to which to go, or -1 to construct the full hierarchy.
    */
-  public ReactorInstance(Reactor reactor, ErrorReporter reporter, int desiredDepth) {
+  public ReactorInstance(Reactor reactor, MessageReporter reporter, int desiredDepth) {
     this(ASTUtils.createInstantiation(reactor), null, reporter, desiredDepth, List.of());
   }
 
@@ -124,7 +124,7 @@ public ReactorInstance(Reactor reactor, ErrorReporter reporter, int desiredDepth
    * @param parent The parent reactor instance.
    * @param reporter The error reporter.
    */
-  public ReactorInstance(Reactor reactor, ReactorInstance parent, ErrorReporter reporter) {
+  public ReactorInstance(Reactor reactor, ReactorInstance parent, MessageReporter reporter) {
     this(ASTUtils.createInstantiation(reactor), parent, reporter, -1, List.of());
   }
 
@@ -718,7 +718,7 @@ public TimeValue getTimeValue(Expression expr) {
   //// Protected fields.
 
   /** The generator that created this reactor instance. */
-  protected ErrorReporter reporter; // FIXME: This accumulates a lot of redundant references
+  protected MessageReporter reporter; // FIXME: This accumulates a lot of redundant references
 
   /** The map of used built-in triggers. */
   protected Map<BuiltinTrigger, TriggerInstance<BuiltinTriggerVariable>> builtinTriggers =
@@ -801,7 +801,7 @@ protected void createWatchdogInstances() {
   public ReactorInstance(
       Instantiation definition,
       ReactorInstance parent,
-      ErrorReporter reporter,
+      MessageReporter reporter,
       int desiredDepth,
       List<Reactor> reactors) {
     super(definition, parent);
diff --git a/core/src/main/java/org/lflang/generator/SubContext.java b/core/src/main/java/org/lflang/generator/SubContext.java
index cf90cb1fda..1620e10bc7 100644
--- a/core/src/main/java/org/lflang/generator/SubContext.java
+++ b/core/src/main/java/org/lflang/generator/SubContext.java
@@ -2,7 +2,7 @@
 
 import java.util.Properties;
 import org.eclipse.xtext.util.CancelIndicator;
-import org.lflang.ErrorReporter;
+import org.lflang.MessageReporter;
 import org.lflang.FileConfig;
 import org.lflang.TargetConfig;
 
@@ -20,7 +20,7 @@ public class SubContext implements LFGeneratorContext {
   private final int endPercentProgress;
   private GeneratorResult result = null;
 
-  protected ErrorReporter errorReporter;
+  protected MessageReporter messageReporter;
 
   /**
    * Initializes the context within {@code containingContext} of the process that extends from
@@ -55,7 +55,7 @@ public Properties getArgs() {
   }
 
   @Override
-  public ErrorReporter getErrorReporter() {
+  public MessageReporter getErrorReporter() {
     return containingContext.getErrorReporter();
   }
 
diff --git a/core/src/main/java/org/lflang/generator/Validator.java b/core/src/main/java/org/lflang/generator/Validator.java
index 53efd6412e..33eaec4238 100644
--- a/core/src/main/java/org/lflang/generator/Validator.java
+++ b/core/src/main/java/org/lflang/generator/Validator.java
@@ -15,7 +15,7 @@
 import java.util.concurrent.Future;
 import java.util.stream.Collectors;
 import org.eclipse.xtext.util.CancelIndicator;
-import org.lflang.ErrorReporter;
+import org.lflang.MessageReporter;
 import org.lflang.util.LFCommand;
 
 /**
@@ -43,15 +43,15 @@ public Pair(S first, T second) {
     }
   }
 
-  protected final ErrorReporter errorReporter;
+  protected final MessageReporter messageReporter;
   protected final ImmutableMap<Path, CodeMap> codeMaps;
 
   /**
    * Initialize a {@code Validator} that reports errors to {@code errorReporter} and adjusts
    * document positions using {@code codeMaps}.
    */
-  protected Validator(ErrorReporter errorReporter, Map<Path, CodeMap> codeMaps) {
-    this.errorReporter = errorReporter;
+  protected Validator(MessageReporter messageReporter, Map<Path, CodeMap> codeMaps) {
+    this.messageReporter = messageReporter;
     this.codeMaps = ImmutableMap.copyOf(codeMaps);
   }
 
@@ -77,11 +77,11 @@ public final void doValidate(LFGeneratorContext context)
       f.get()
           .first
           .getErrorReportingStrategy()
-          .report(f.get().second.getErrors(), errorReporter, codeMaps);
+          .report(f.get().second.getErrors(), messageReporter, codeMaps);
       f.get()
           .first
           .getOutputReportingStrategy()
-          .report(f.get().second.getOutput(), errorReporter, codeMaps);
+          .report(f.get().second.getOutput(), messageReporter, codeMaps);
     }
   }
 
@@ -141,8 +141,8 @@ private static <T> List<Future<T>> getFutures(List<Callable<T>> tasks)
    */
   public final int run(LFCommand command, CancelIndicator cancelIndicator) {
     final int returnCode = command.run(cancelIndicator);
-    getBuildReportingStrategies().first.report(command.getErrors(), errorReporter, codeMaps);
-    getBuildReportingStrategies().second.report(command.getOutput(), errorReporter, codeMaps);
+    getBuildReportingStrategies().first.report(command.getErrors(), messageReporter, codeMaps);
+    getBuildReportingStrategies().second.report(command.getOutput(), messageReporter, codeMaps);
     return returnCode;
   }
 
diff --git a/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java b/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java
index 3ddc2a856c..6fb049ca16 100644
--- a/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java
@@ -31,7 +31,7 @@
 import java.util.List;
 import java.util.Objects;
 import java.util.stream.Stream;
-import org.lflang.ErrorReporter;
+import org.lflang.MessageReporter;
 import org.lflang.FileConfig;
 import org.lflang.TargetConfig;
 import org.lflang.TargetProperty.Platform;
@@ -86,7 +86,7 @@ public CCmakeGenerator(
    *
    * @param sources A list of .c files to build.
    * @param executableName The name of the output executable.
-   * @param errorReporter Used to report errors.
+   * @param messageReporter Used to report errors.
    * @param CppMode Indicate if the compilation should happen in C++ mode
    * @param hasMain Indicate if the .lf file has a main reactor or not. If not, a library target
    *     will be created instead of an executable.
@@ -97,7 +97,7 @@ public CCmakeGenerator(
   CodeBuilder generateCMakeCode(
       List<String> sources,
       String executableName,
-      ErrorReporter errorReporter,
+      MessageReporter messageReporter,
       boolean CppMode,
       boolean hasMain,
       String cMakeExtras,
@@ -312,7 +312,7 @@ CodeBuilder generateCMakeCode(
             break;
           }
         default:
-          errorReporter
+          messageReporter
               .nowhere()
               .warning(
                   "Using the flags target property with cmake is dangerous.\n"
diff --git a/core/src/main/java/org/lflang/generator/c/CCompiler.java b/core/src/main/java/org/lflang/generator/c/CCompiler.java
index ef73c053a6..baee9a7f39 100644
--- a/core/src/main/java/org/lflang/generator/c/CCompiler.java
+++ b/core/src/main/java/org/lflang/generator/c/CCompiler.java
@@ -33,7 +33,7 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Stream;
-import org.lflang.ErrorReporter;
+import org.lflang.MessageReporter;
 import org.lflang.FileConfig;
 import org.lflang.TargetConfig;
 import org.lflang.TargetProperty;
@@ -60,7 +60,7 @@ public class CCompiler {
 
   FileConfig fileConfig;
   TargetConfig targetConfig;
-  ErrorReporter errorReporter;
+  MessageReporter messageReporter;
 
   /**
    * Indicate whether the compiler is in C++ mode. In C++ mode, the compiler produces .cpp files
@@ -76,18 +76,18 @@ public class CCompiler {
    *
    * @param targetConfig The current target configuration.
    * @param fileConfig The current file configuration.
-   * @param errorReporter Used to report errors.
+   * @param messageReporter Used to report errors.
    * @param cppMode Whether the generated code should be compiled as if it were C++.
    */
   public CCompiler(
       TargetConfig targetConfig,
       FileConfig fileConfig,
-      ErrorReporter errorReporter,
+      MessageReporter messageReporter,
       boolean cppMode) {
     this.fileConfig = fileConfig;
     this.targetConfig = targetConfig;
-    this.errorReporter = errorReporter;
-    this.commandFactory = new GeneratorCommandFactory(errorReporter, fileConfig);
+    this.messageReporter = messageReporter;
+    this.commandFactory = new GeneratorCommandFactory(messageReporter, fileConfig);
     this.cppMode = cppMode;
   }
 
@@ -134,7 +134,7 @@ public boolean runCCompiler(GeneratorBase generator, LFGeneratorContext context)
     if (cMakeReturnCode != 0
         && context.getMode() == LFGeneratorContext.Mode.STANDALONE
         && !outputContainsKnownCMakeErrors(compile.getErrors())) {
-      errorReporter
+      messageReporter
           .nowhere()
           .error(targetConfig.compiler + " failed with error code " + cMakeReturnCode);
     }
@@ -157,7 +157,7 @@ public boolean runCCompiler(GeneratorBase generator, LFGeneratorContext context)
       if (makeReturnCode != 0
           && context.getMode() == LFGeneratorContext.Mode.STANDALONE
           && !outputContainsKnownCMakeErrors(build.getErrors())) {
-        errorReporter
+        messageReporter
             .nowhere()
             .error(targetConfig.compiler + " failed with error code " + makeReturnCode);
       }
@@ -171,7 +171,7 @@ public boolean runCCompiler(GeneratorBase generator, LFGeneratorContext context)
       }
 
       if (makeReturnCode == 0 && build.getErrors().length() == 0) {
-        errorReporter.nowhere().info(
+        messageReporter.nowhere().info(
             "SUCCESS: Compiling generated code for "
                 + fileConfig.name
                 + " finished with no errors.");
@@ -179,13 +179,13 @@ public boolean runCCompiler(GeneratorBase generator, LFGeneratorContext context)
 
       if (targetConfig.platformOptions.platform == Platform.ZEPHYR
           && targetConfig.platformOptions.flash) {
-        errorReporter.nowhere().info("Invoking flash command for Zephyr");
+        messageReporter.nowhere().info("Invoking flash command for Zephyr");
         LFCommand flash = buildWestFlashCommand();
         int flashRet = flash.run();
         if (flashRet != 0) {
-          errorReporter.nowhere().error("West flash command failed with error code " + flashRet);
+          messageReporter.nowhere().error("West flash command failed with error code " + flashRet);
         } else {
-          errorReporter.nowhere().info("SUCCESS: Flashed application with west");
+          messageReporter.nowhere().info("SUCCESS: Flashed application with west");
         }
       }
     }
@@ -203,7 +203,7 @@ public LFCommand compileCmakeCommand() {
     LFCommand command =
         commandFactory.createCommand("cmake", cmakeOptions(targetConfig, fileConfig), buildPath);
     if (command == null) {
-      errorReporter
+      messageReporter
           .nowhere()
           .error(
               "The C/CCpp target requires CMAKE >= "
@@ -296,7 +296,7 @@ public LFCommand buildCmakeCommand() {
                 buildTypeToCmakeConfig(targetConfig.cmakeBuildType)),
             buildPath);
     if (command == null) {
-      errorReporter
+      messageReporter
           .nowhere()
           .error(
               "The C/CCpp target requires CMAKE >= 3.5 to compile the generated code."
@@ -322,7 +322,7 @@ public LFCommand buildWestFlashCommand() {
       cmd = commandFactory.createCommand("west", List.of("flash"), buildPath);
     }
     if (cmd == null) {
-      errorReporter.nowhere().error("Could not create west flash command.");
+      messageReporter.nowhere().error("Could not create west flash command.");
     }
 
     return cmd;
@@ -348,13 +348,13 @@ private boolean outputContainsKnownCMakeErrors(String CMakeOutput) {
     if (CMakeOutput.contains("The CMAKE_C_COMPILER is set to a C++ compiler")) {
       // If so, print an appropriate error message
       if (targetConfig.compiler != null) {
-        errorReporter
+        messageReporter
             .nowhere()
             .error(
                 "A C++ compiler was requested in the compiler target property."
                     + " Use the CCpp or the Cpp target instead.");
       } else {
-        errorReporter
+        messageReporter
             .nowhere()
             .error(
                 "\"A C++ compiler was detected."
@@ -427,7 +427,7 @@ public LFCommand compileCCommand(String fileToCompile, boolean noBinary) {
     LFCommand command =
         commandFactory.createCommand(targetConfig.compiler, compileArgs, fileConfig.getOutPath());
     if (command == null) {
-      errorReporter
+      messageReporter
           .nowhere()
           .error(
               "The C/CCpp target requires GCC >= 7 to compile the generated code. Auto-compiling"
diff --git a/core/src/main/java/org/lflang/generator/c/CGenerator.java b/core/src/main/java/org/lflang/generator/c/CGenerator.java
index 854d1afb97..db7a700845 100644
--- a/core/src/main/java/org/lflang/generator/c/CGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CGenerator.java
@@ -359,7 +359,7 @@ public void accommodatePhysicalActionsIfPresent() {
                 "Using the threaded C runtime to allow for asynchronous handling of physical action"
                     + " "
                     + action.getName();
-            errorReporter.at(action).warning(message);
+            messageReporter.at(action).warning(message);
             return;
           }
         }
@@ -374,7 +374,7 @@ public void accommodatePhysicalActionsIfPresent() {
   protected boolean isOSCompatible() {
     if (GeneratorUtils.isHostWindows()) {
       if (CCppMode) {
-        errorReporter
+        messageReporter
             .nowhere()
             .error(
                 "LF programs with a CCpp target are currently not supported on Windows. "
@@ -396,7 +396,7 @@ protected boolean isOSCompatible() {
   @Override
   public void doGenerate(Resource resource, LFGeneratorContext context) {
     super.doGenerate(resource, context);
-    if (!GeneratorUtils.canGenerate(errorsOccurred(), mainDef, errorReporter, context)) return;
+    if (!GeneratorUtils.canGenerate(errorsOccurred(), mainDef, messageReporter, context)) return;
     if (!isOSCompatible()) return; // Incompatible OS and configuration
 
     // Perform set up that does not generate code
@@ -418,10 +418,10 @@ public void doGenerate(Resource resource, LFGeneratorContext context) {
       code.writeToFile(targetFile);
     } catch (IOException e) {
       String message = e.getMessage();
-      errorReporter.nowhere().error(message);
+      messageReporter.nowhere().error(message);
     } catch (RuntimeException e) {
       String message = e.getMessage();
-      errorReporter.nowhere().error(message);
+      messageReporter.nowhere().error(message);
       throw e;
     }
 
@@ -449,7 +449,7 @@ public void doGenerate(Resource resource, LFGeneratorContext context) {
           cmakeGenerator.generateCMakeCode(
               sources,
               lfModuleName,
-              errorReporter,
+              messageReporter,
               CCppMode,
               mainDef != null,
               cMakeExtras,
@@ -465,19 +465,19 @@ public void doGenerate(Resource resource, LFGeneratorContext context) {
         Path include = fileConfig.getSrcGenPath().resolve("include/");
         Path src = fileConfig.getSrcGenPath().resolve("src/");
         FileUtil.arduinoDeleteHelper(src, targetConfig.threading);
-        FileUtil.relativeIncludeHelper(src, include, errorReporter);
-        FileUtil.relativeIncludeHelper(include, include, errorReporter);
+        FileUtil.relativeIncludeHelper(src, include, messageReporter);
+        FileUtil.relativeIncludeHelper(include, include, messageReporter);
       } catch (IOException e) {
         //noinspection ThrowableNotThrown,ResultOfMethodCallIgnored
         Exceptions.sneakyThrow(e);
       }
       if (!targetConfig.noCompile) {
-        ArduinoUtil arduinoUtil = new ArduinoUtil(context, commandFactory, errorReporter);
+        ArduinoUtil arduinoUtil = new ArduinoUtil(context, commandFactory, messageReporter);
         arduinoUtil.buildArduino(fileConfig, targetConfig);
         context.finish(GeneratorResult.Status.COMPILED, null);
       } else {
-        errorReporter.nowhere().info("********");
-        errorReporter.nowhere().info(
+        messageReporter.nowhere().info("********");
+        messageReporter.nowhere().info(
             "To compile your program, run the following command to see information about the board"
                 + " you plugged in:\n\n"
                 + "\tarduino-cli board list\n\n"
@@ -564,7 +564,7 @@ public void doGenerate(Resource resource, LFGeneratorContext context) {
       // ); // FIXME: Move to FedGenerator
       // Create the compiler to be used later
 
-      var cCompiler = new CCompiler(targetConfig, threadFileConfig, errorReporter, CppMode);
+      var cCompiler = new CCompiler(targetConfig, threadFileConfig, messageReporter, CppMode);
       try {
         if (!cCompiler.runCCompiler(generator, context)) {
           // If compilation failed, remove any bin files that may have been created.
@@ -589,13 +589,13 @@ public void doGenerate(Resource resource, LFGeneratorContext context) {
             fileConfig,
             targetConfig,
             commandFactory,
-            errorReporter,
+            messageReporter,
             this::reportCommandErrors,
             context.getMode());
         context.finish(GeneratorResult.Status.COMPILED, null);
       }
       if (!errorsOccurred()) {
-        errorReporter.nowhere().info("Compiled binary is in " + fileConfig.binPath);
+        messageReporter.nowhere().info("Compiled binary is in " + fileConfig.binPath);
       }
     } else {
       context.finish(GeneratorResult.GENERATED_NO_EXECUTABLE.apply(context, null));
@@ -822,7 +822,7 @@ protected void copyUserFiles(TargetConfig targetConfig, FileConfig fileConfig) {
     var destination = this.fileConfig.getSrcGenPath();
 
     FileUtil.copyFilesOrDirectories(
-        targetConfig.cmakeIncludes, destination, fileConfig, errorReporter, true);
+        targetConfig.cmakeIncludes, destination, fileConfig, messageReporter, true);
 
     // FIXME: Unclear what the following does, but it does not appear to belong here.
     if (!StringExtensions.isNullOrEmpty(targetConfig.fedSetupPreamble)) {
@@ -831,7 +831,7 @@ protected void copyUserFiles(TargetConfig targetConfig, FileConfig fileConfig) {
             fileConfig.srcFile.getParent().resolve(targetConfig.fedSetupPreamble),
             destination.resolve(targetConfig.fedSetupPreamble));
       } catch (IOException e) {
-        errorReporter
+        messageReporter
             .nowhere()
             .error("Failed to find _fed_setup file " + targetConfig.fedSetupPreamble);
       }
@@ -890,7 +890,7 @@ private void generateHeaders() throws IOException {
                                             it.tpr,
                                             p,
                                             getTarget(),
-                                            errorReporter,
+                                            messageReporter,
                                             types,
                                             new CodeBuilder(),
                                             true,
@@ -943,7 +943,7 @@ private void pickCompilePlatform() {
     if (targetConfig.platformOptions.platform != Platform.AUTO) {
       osName = targetConfig.platformOptions.platform.toString();
     } else if (Stream.of("mac", "darwin", "win", "nux").noneMatch(osName::contains)) {
-      errorReporter.nowhere().error("Platform " + osName + " is not supported");
+      messageReporter.nowhere().error("Platform " + osName + " is not supported");
     }
   }
 
@@ -1048,7 +1048,7 @@ private void generateReactorClassBody(
     generateAuxiliaryStructs(header, tpr, false);
     // The following must go before the self struct so the #include watchdog.h ends up in the
     // header.
-    CWatchdogGenerator.generateWatchdogs(src, header, tpr, errorReporter);
+    CWatchdogGenerator.generateWatchdogs(src, header, tpr, messageReporter);
     generateSelfStruct(header, tpr, constructorCode);
     generateMethods(src, tpr);
     generateReactions(src, tpr);
@@ -1120,7 +1120,7 @@ protected void generateAuxiliaryStructs(
     for (Port p : allPorts(tpr.reactor())) {
       builder.pr(
           CPortGenerator.generateAuxiliaryStruct(
-              tpr, p, getTarget(), errorReporter, types, federatedExtension, userFacing, null));
+              tpr, p, getTarget(), messageReporter, types, federatedExtension, userFacing, null));
     }
     // The very first item on this struct needs to be
     // a trigger_t* because the struct will be cast to (trigger_t*)
@@ -1389,7 +1389,7 @@ protected void generateReaction(
             tpr,
             reactionIndex,
             mainDef,
-            errorReporter,
+            messageReporter,
             types,
             targetConfig,
             getTarget().requiresTypes));
@@ -1636,7 +1636,7 @@ public void processProtoFile(String filename) {
             List.of("--c_out=" + this.fileConfig.getSrcGenPath(), filename),
             fileConfig.srcPath);
     if (protoc == null) {
-      errorReporter.nowhere().error("Processing .proto files requires protoc-c >= 1.3.3.");
+      messageReporter.nowhere().error("Processing .proto files requires protoc-c >= 1.3.3.");
       return;
     }
     var returnCode = protoc.run();
@@ -1649,7 +1649,7 @@ public void processProtoFile(String filename) {
       targetConfig.compileLibraries.add("protobuf-c");
       targetConfig.compilerFlags.add("-lprotobuf-c");
     } else {
-      errorReporter.nowhere().error("protoc-c returns error code " + returnCode);
+      messageReporter.nowhere().error("protoc-c returns error code " + returnCode);
     }
   }
 
@@ -1961,7 +1961,7 @@ protected void setUpGeneralParameters() {
         && (targetConfig.platformOptions.board == null
             || !targetConfig.platformOptions.board.contains("mbed"))) {
       // non-MBED boards should not use threading
-      errorReporter.nowhere().info(
+      messageReporter.nowhere().info(
           "Threading is incompatible on your current Arduino flavor. Setting threading to false.");
       targetConfig.threading = false;
     }
@@ -1969,7 +1969,7 @@ protected void setUpGeneralParameters() {
     if (targetConfig.platformOptions.platform == Platform.ARDUINO
         && !targetConfig.noCompile
         && targetConfig.platformOptions.board == null) {
-      errorReporter.nowhere().info(
+      messageReporter.nowhere().info(
           "To enable compilation for the Arduino platform, you must specify the fully-qualified"
               + " board name (FQBN) in the target property. For example, platform: {name: arduino,"
               + " board: arduino:avr:leonardo}. Entering \"no-compile\" mode and generating target"
@@ -1984,7 +1984,7 @@ protected void setUpGeneralParameters() {
           PlatformOption.USER_THREADS.name(),
           String.valueOf(targetConfig.platformOptions.userThreads));
     } else if (targetConfig.platformOptions.userThreads > 0) {
-      errorReporter
+      messageReporter
           .nowhere()
           .warning(
               "Specifying user threads is only for threaded Lingua Franca on the Zephyr platform."
@@ -2103,10 +2103,10 @@ private void createMainReactorInstance() {
       if (this.main == null) {
         // Recursively build instances.
         this.main =
-            new ReactorInstance(toDefinition(mainDef.getReactorClass()), errorReporter, reactors);
+            new ReactorInstance(toDefinition(mainDef.getReactorClass()), messageReporter, reactors);
         var reactionInstanceGraph = this.main.assignLevels();
         if (reactionInstanceGraph.nodeCount() > 0) {
-          errorReporter
+          messageReporter
               .nowhere()
               .error("Main reactor has causality cycles. Skipping code generation.");
           return;
@@ -2117,7 +2117,7 @@ private void createMainReactorInstance() {
         // Inform the run-time of the breadth/parallelism of the reaction graph
         var breadth = reactionInstanceGraph.getBreadth();
         if (breadth == 0) {
-          errorReporter.nowhere().warning("The program has no reactions");
+          messageReporter.nowhere().warning("The program has no reactions");
         } else {
           targetConfig.compileDefinitions.put(
               "LF_REACTION_GRAPH_BREADTH", String.valueOf(reactionInstanceGraph.getBreadth()));
diff --git a/core/src/main/java/org/lflang/generator/c/CPortGenerator.java b/core/src/main/java/org/lflang/generator/c/CPortGenerator.java
index 33c85d9f6d..85c70a82e1 100644
--- a/core/src/main/java/org/lflang/generator/c/CPortGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CPortGenerator.java
@@ -3,7 +3,7 @@
 import static org.lflang.generator.c.CGenerator.variableStructType;
 
 import org.lflang.AttributeUtils;
-import org.lflang.ErrorReporter;
+import org.lflang.MessageReporter;
 import org.lflang.Target;
 import org.lflang.ast.ASTUtils;
 import org.lflang.generator.CodeBuilder;
@@ -37,7 +37,7 @@ public static void generateDeclarations(
    * @param tpr The reactor
    * @param port The port to generate the struct
    * @param target The target of the code generation (C, CCpp or Python)
-   * @param errorReporter The error reporter
+   * @param messageReporter The error reporter
    * @param types The helper object for types related stuff
    * @param federatedExtension The code needed to support federated execution
    * @param userFacing Whether this struct is to be presented in a user-facing header
@@ -49,7 +49,7 @@ public static String generateAuxiliaryStruct(
       TypeParameterizedReactor tpr,
       Port port,
       Target target,
-      ErrorReporter errorReporter,
+      MessageReporter messageReporter,
       CTypes types,
       CodeBuilder federatedExtension,
       boolean userFacing,
@@ -70,7 +70,7 @@ public static String generateAuxiliaryStruct(
             "size_t length;", // From token_template_t
             "bool is_present;",
             "lf_port_internal_t _base;"));
-    code.pr(valueDeclaration(tpr, port, target, errorReporter, types));
+    code.pr(valueDeclaration(tpr, port, target, messageReporter, types));
     code.pr(federatedExtension.toString());
     code.unindent();
     var name =
@@ -193,12 +193,12 @@ private static String valueDeclaration(
       TypeParameterizedReactor tpr,
       Port port,
       Target target,
-      ErrorReporter errorReporter,
+      MessageReporter messageReporter,
       CTypes types) {
     if (port.getType() == null && target.requiresTypes) {
       // This should have been caught by the validator.
       String message = "Port is required to have a type: " + port.getName();
-      errorReporter.at(port).error(message);
+      messageReporter.at(port).error(message);
       return "";
     }
     // Do not convert to lf_token_t* using lfTypeToTokenType because there
diff --git a/core/src/main/java/org/lflang/generator/c/CReactionGenerator.java b/core/src/main/java/org/lflang/generator/c/CReactionGenerator.java
index a232f735c2..c8a16546ae 100644
--- a/core/src/main/java/org/lflang/generator/c/CReactionGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CReactionGenerator.java
@@ -9,7 +9,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import org.lflang.ErrorReporter;
+import org.lflang.MessageReporter;
 import org.lflang.InferredType;
 import org.lflang.TargetConfig;
 import org.lflang.ast.ASTUtils;
@@ -57,7 +57,7 @@ public static String generateInitializationForReaction(
       TypeParameterizedReactor tpr,
       int reactionIndex,
       CTypes types,
-      ErrorReporter errorReporter,
+      MessageReporter messageReporter,
       Instantiation mainDef,
       boolean requiresTypes) {
     // Construct the reactionInitialization code to go into
@@ -189,14 +189,14 @@ public static String generateInitializationForReaction(
                         : "reset_transition")
                     + ";");
           } else {
-            errorReporter
+            messageReporter
                 .at(reaction)
                 .error("In generateReaction(): " + name + " not a valid mode of this reactor.");
           }
         } else {
           if (variable instanceof Output) {
             reactionInitialization.pr(
-                generateOutputVariablesInReaction(effect, tpr, errorReporter, requiresTypes));
+                generateOutputVariablesInReaction(effect, tpr, messageReporter, requiresTypes));
           } else if (variable instanceof Input) {
             // It is the input of a contained reactor.
             generateVariablesForSendingToContainedReactors(
@@ -208,7 +208,7 @@ public static String generateInitializationForReaction(
           } else if (variable instanceof Watchdog) {
             reactionInitialization.pr(generateWatchdogVariablesInReaction(effect));
           } else {
-            errorReporter
+            messageReporter
                 .at(reaction)
                 .error("In generateReaction(): effect is not an input, output, or watchdog.");
           }
@@ -763,13 +763,13 @@ private static String generateInputVariablesInReaction(
   public static String generateOutputVariablesInReaction(
       VarRef effect,
       TypeParameterizedReactor tpr,
-      ErrorReporter errorReporter,
+      MessageReporter messageReporter,
       boolean requiresTypes) {
     Output output = (Output) effect.getVariable();
     String outputName = output.getName();
     String outputWidth = generateWidthVariable(outputName);
     if (output.getType() == null && requiresTypes) {
-      errorReporter.at(output).error("Output is required to have a type: " + outputName);
+      messageReporter.at(output).error("Output is required to have a type: " + outputName);
       return "";
     } else {
       // The container of the output may be a contained reactor or
@@ -1232,7 +1232,7 @@ public static String generateReaction(
       TypeParameterizedReactor tpr,
       int reactionIndex,
       Instantiation mainDef,
-      ErrorReporter errorReporter,
+      MessageReporter messageReporter,
       CTypes types,
       TargetConfig targetConfig,
       boolean requiresType) {
@@ -1240,7 +1240,7 @@ public static String generateReaction(
     var body = ASTUtils.toText(getCode(types, reaction, tpr));
     String init =
         generateInitializationForReaction(
-            body, reaction, tpr, reactionIndex, types, errorReporter, mainDef, requiresType);
+            body, reaction, tpr, reactionIndex, types, messageReporter, mainDef, requiresType);
 
     code.pr("#include " + StringUtil.addDoubleQuotes(CCoreFilesUtils.getCTargetSetHeader()));
 
diff --git a/core/src/main/java/org/lflang/generator/c/CUtil.java b/core/src/main/java/org/lflang/generator/c/CUtil.java
index 25688d3284..194e6887e1 100644
--- a/core/src/main/java/org/lflang/generator/c/CUtil.java
+++ b/core/src/main/java/org/lflang/generator/c/CUtil.java
@@ -33,7 +33,7 @@
 import java.util.List;
 import java.util.Objects;
 import java.util.stream.Collectors;
-import org.lflang.ErrorReporter;
+import org.lflang.MessageReporter;
 import org.lflang.FileConfig;
 import org.lflang.InferredType;
 import org.lflang.TargetConfig;
@@ -607,7 +607,7 @@ public static void runBuildCommand(
       FileConfig fileConfig,
       TargetConfig targetConfig,
       GeneratorCommandFactory commandFactory,
-      ErrorReporter errorReporter,
+      MessageReporter messageReporter,
       ReportCommandErrors reportCommandErrors,
       LFGeneratorContext.Mode mode) {
     List<LFCommand> commands =
@@ -621,7 +621,7 @@ public static void runBuildCommand(
       if (returnCode != 0 && mode != LFGeneratorContext.Mode.EPOCH) {
         // FIXME: Why is the content of stderr not provided to the user in this error
         // message?
-        errorReporter
+        messageReporter
             .nowhere()
             .error(
                 String.format(
diff --git a/core/src/main/java/org/lflang/generator/c/CWatchdogGenerator.java b/core/src/main/java/org/lflang/generator/c/CWatchdogGenerator.java
index b360693466..876d98a123 100644
--- a/core/src/main/java/org/lflang/generator/c/CWatchdogGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CWatchdogGenerator.java
@@ -9,7 +9,7 @@
 package org.lflang.generator.c;
 
 import java.util.List;
-import org.lflang.ErrorReporter;
+import org.lflang.MessageReporter;
 import org.lflang.ast.ASTUtils;
 import org.lflang.generator.CodeBuilder;
 import org.lflang.generator.ReactorInstance;
@@ -100,11 +100,11 @@ protected static void generateWatchdogs(
       CodeBuilder src,
       CodeBuilder header,
       TypeParameterizedReactor tpr,
-      ErrorReporter errorReporter) {
+      MessageReporter messageReporter) {
     if (hasWatchdogs(tpr.reactor())) {
       header.pr("#include \"core/threaded/watchdog.h\"");
       for (Watchdog watchdog : ASTUtils.allWatchdogs(tpr.reactor())) {
-        src.pr(generateWatchdogFunction(watchdog, tpr, errorReporter));
+        src.pr(generateWatchdogFunction(watchdog, tpr, messageReporter));
       }
     }
   }
@@ -180,7 +180,7 @@ protected static String generateWatchdogTable(int count) {
    * @param tpr The concrete reactor class that has the watchdog
    */
   private static String generateInitializationForWatchdog(
-      Watchdog watchdog, TypeParameterizedReactor tpr, ErrorReporter errorReporter) {
+      Watchdog watchdog, TypeParameterizedReactor tpr, MessageReporter messageReporter) {
 
     // Construct the reactionInitialization code to go into
     // the body of the function before the verbatim code.
@@ -225,7 +225,7 @@ private static String generateInitializationForWatchdog(
                         : "reset_transition")
                     + ";");
           } else {
-            errorReporter
+            messageReporter
                 .at(watchdog)
                 .error(
                     "In generateInitializationForWatchdog(): "
@@ -270,10 +270,10 @@ private static String generateFunction(String header, String init, Watchdog watc
 
   /** Generate the watchdog handler function. */
   private static String generateWatchdogFunction(
-      Watchdog watchdog, TypeParameterizedReactor tpr, ErrorReporter errorReporter) {
+      Watchdog watchdog, TypeParameterizedReactor tpr, MessageReporter messageReporter) {
     return generateFunction(
         generateWatchdogFunctionHeader(watchdog, tpr),
-        generateInitializationForWatchdog(watchdog, tpr, errorReporter),
+        generateInitializationForWatchdog(watchdog, tpr, messageReporter),
         watchdog);
   }
 
diff --git a/core/src/main/java/org/lflang/generator/python/PythonGenerator.java b/core/src/main/java/org/lflang/generator/python/PythonGenerator.java
index f74c369d5b..f925acd9c5 100644
--- a/core/src/main/java/org/lflang/generator/python/PythonGenerator.java
+++ b/core/src/main/java/org/lflang/generator/python/PythonGenerator.java
@@ -303,14 +303,14 @@ public void processProtoFile(String filename) {
             fileConfig.srcPath);
 
     if (protoc == null) {
-      errorReporter.nowhere().error("Processing .proto files requires libprotoc >= 3.6.1");
+      messageReporter.nowhere().error("Processing .proto files requires libprotoc >= 3.6.1");
       return;
     }
     int returnCode = protoc.run();
     if (returnCode == 0) {
       pythonRequiredModules.add("google-api-python-client");
     } else {
-      errorReporter.nowhere().error("protoc returns error code " + returnCode);
+      messageReporter.nowhere().error("protoc returns error code " + returnCode);
     }
   }
 
@@ -395,19 +395,19 @@ public void doGenerate(Resource resource, LFGeneratorContext context) {
                 generatePythonFileName(lfModuleName));
         codeMaps.putAll(codeMapsForFederate);
         copyTargetFiles();
-        new PythonValidator(fileConfig, errorReporter, codeMaps, protoNames).doValidate(context);
+        new PythonValidator(fileConfig, messageReporter, codeMaps, protoNames).doValidate(context);
         if (targetConfig.noCompile) {
-          errorReporter.nowhere().info(PythonInfoGenerator.generateSetupInfo(fileConfig));
+          messageReporter.nowhere().info(PythonInfoGenerator.generateSetupInfo(fileConfig));
         }
       } catch (Exception e) {
         //noinspection ConstantConditions
         throw Exceptions.sneakyThrow(e);
       }
 
-      errorReporter.nowhere().info(PythonInfoGenerator.generateRunInfo(fileConfig, lfModuleName));
+      messageReporter.nowhere().info(PythonInfoGenerator.generateRunInfo(fileConfig, lfModuleName));
     }
 
-    if (errorReporter.getErrorsOccurred()) {
+    if (messageReporter.getErrorsOccurred()) {
       context.unsuccessfulFinish();
     } else {
       context.finish(GeneratorResult.Status.COMPILED, codeMaps);
@@ -440,7 +440,7 @@ protected void generateReaction(
     }
     src.pr(
         PythonReactionGenerator.generateCReaction(
-            reaction, tpr, reactor, reactionIndex, mainDef, errorReporter, types));
+            reaction, tpr, reactor, reactionIndex, mainDef, messageReporter, types));
   }
 
   /**
diff --git a/core/src/main/java/org/lflang/generator/python/PythonReactionGenerator.java b/core/src/main/java/org/lflang/generator/python/PythonReactionGenerator.java
index 288b53d318..a39b38b619 100644
--- a/core/src/main/java/org/lflang/generator/python/PythonReactionGenerator.java
+++ b/core/src/main/java/org/lflang/generator/python/PythonReactionGenerator.java
@@ -5,7 +5,7 @@
 import java.util.List;
 import java.util.Set;
 import org.lflang.AttributeUtils;
-import org.lflang.ErrorReporter;
+import org.lflang.MessageReporter;
 import org.lflang.Target;
 import org.lflang.ast.ASTUtils;
 import org.lflang.generator.CodeBuilder;
@@ -134,7 +134,7 @@ private static String generateCPythonFunctionCaller(
    * @param r The reactor to which <code>reaction<code> belongs to.
    * @param reactionIndex The index number of the reaction in decl.
    * @param mainDef The main reactor.
-   * @param errorReporter An error reporter.
+   * @param messageReporter An error reporter.
    * @param types A helper class for type-related stuff.
    */
   public static String generateCReaction(
@@ -143,14 +143,14 @@ public static String generateCReaction(
       Reactor r,
       int reactionIndex,
       Instantiation mainDef,
-      ErrorReporter errorReporter,
+      MessageReporter messageReporter,
       CTypes types) {
     // Contains the actual comma separated list of inputs to the reaction of type
     // generic_port_instance_struct.
     // Each input must be cast to (PyObject *) (aka their descriptors for Py_BuildValue are "O")
     List<String> pyObjects = new ArrayList<>();
     CodeBuilder code = new CodeBuilder();
-    String cPyInit = generateCPythonInitializers(reaction, r, pyObjects, errorReporter);
+    String cPyInit = generateCPythonInitializers(reaction, r, pyObjects, messageReporter);
     String cInit =
         CReactionGenerator.generateInitializationForReaction(
             "",
@@ -158,7 +158,7 @@ public static String generateCReaction(
             tpr,
             reactionIndex,
             types,
-            errorReporter,
+            messageReporter,
             mainDef,
             Target.Python.requiresTypes);
     code.pr("#include " + StringUtil.addDoubleQuotes(CCoreFilesUtils.getCTargetSetHeader()));
@@ -214,7 +214,7 @@ public static String generateFunction(String header, String init, Code code, Str
    *  We will use as a format string, "(O...O)" where the number of O's is equal to the length of the list.
    */
   private static String generateCPythonInitializers(
-      Reaction reaction, ReactorDecl decl, List<String> pyObjects, ErrorReporter errorReporter) {
+      Reaction reaction, ReactorDecl decl, List<String> pyObjects, MessageReporter messageReporter) {
     Set<Action> actionsAsTriggers = new LinkedHashSet<>();
     Reactor reactor = ASTUtils.toDefinition(decl);
     CodeBuilder code = new CodeBuilder();
@@ -273,7 +273,7 @@ private static String generateCPythonInitializers(
                 "In generateReaction(): "
                     + effect.getVariable().getName()
                     + " is neither an input nor an output.";
-            errorReporter.at(reaction).error(message);
+            messageReporter.at(reaction).error(message);
           }
         }
       }
diff --git a/core/src/main/java/org/lflang/generator/python/PythonValidator.java b/core/src/main/java/org/lflang/generator/python/PythonValidator.java
index b216210850..9f9d76339e 100644
--- a/core/src/main/java/org/lflang/generator/python/PythonValidator.java
+++ b/core/src/main/java/org/lflang/generator/python/PythonValidator.java
@@ -15,7 +15,7 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import org.eclipse.lsp4j.DiagnosticSeverity;
-import org.lflang.ErrorReporter;
+import org.lflang.MessageReporter;
 import org.lflang.FileConfig;
 import org.lflang.generator.CodeMap;
 import org.lflang.generator.DiagnosticReporting;
@@ -152,7 +152,7 @@ public DiagnosticSeverity getSeverity() {
       Pattern.compile("Instance of '(?<name>\\w+)' has no .*");
 
   private final FileConfig fileConfig;
-  private final ErrorReporter errorReporter;
+  private final MessageReporter messageReporter;
   private final ImmutableMap<Path, CodeMap> codeMaps;
 
   /**
@@ -160,7 +160,7 @@ public DiagnosticSeverity getSeverity() {
    * errors to {@code errorReporter}.
    *
    * @param fileConfig The file configuration of this build.
-   * @param errorReporter The reporter to which diagnostics should be sent.
+   * @param messageReporter The reporter to which diagnostics should be sent.
    * @param codeMaps A mapping from generated file paths to code maps that map them back to LF
    *     sources.
    * @param protoNames The names of any protocol buffer message types that are used in the LF
@@ -168,12 +168,12 @@ public DiagnosticSeverity getSeverity() {
    */
   public PythonValidator(
       FileConfig fileConfig,
-      ErrorReporter errorReporter,
+      MessageReporter messageReporter,
       Map<Path, CodeMap> codeMaps,
       Set<String> protoNames) {
-    super(errorReporter, codeMaps);
+    super(messageReporter, codeMaps);
     this.fileConfig = fileConfig;
-    this.errorReporter = errorReporter;
+    this.messageReporter = messageReporter;
     this.codeMaps = ImmutableMap.copyOf(codeMaps);
     this.protoNames = ImmutableSet.copyOf(protoNames);
   }
@@ -199,7 +199,7 @@ public Strategy getErrorReportingStrategy() {
           @Override
           public Strategy getOutputReportingStrategy() {
             return (String validationOutput,
-                ErrorReporter errorReporter,
+                MessageReporter messageReporter,
                 Map<Path, CodeMap> map) -> {
               String[] lines = (validationOutput + "\n\n\n").lines().toArray(String[]::new);
               for (int i = 0; i < lines.length - 3; i++) {
@@ -233,14 +233,14 @@ private boolean tryReportTypical(String[] lines, int i) {
               Position genPosition =
                   Position.fromOneBased(line, Integer.MAX_VALUE); // Column is just a placeholder.
               if (map == null) {
-                errorReporter.nowhere().error(message); // Undesirable fallback
+                messageReporter.nowhere().error(message); // Undesirable fallback
               } else {
                 for (Path lfFile : map.lfSourcePaths()) {
                   Position lfPosition = map.adjusted(lfFile, genPosition);
                   // TODO: We could be more precise than just getting the right line, but the way
                   // the output
                   //  is formatted (with leading whitespace possibly trimmed) does not make it easy.
-                  errorReporter.at(lfFile, lfPosition).error(message);
+                  messageReporter.at(lfFile, lfPosition).error(message);
                 }
               }
               return true;
@@ -269,7 +269,7 @@ private void tryReportAlternative(String[] lines, int i) {
                   Position pos =
                       map.adjusted(
                           lfFile, Position.fromOneBased(line, map.firstNonWhitespace(line)));
-                  errorReporter
+                  messageReporter
                       .at(lfFile, pos)
                       .error(main.group().replace("*** ", "").replace("Sorry: ", ""));
                 }
@@ -367,7 +367,7 @@ private boolean shouldIgnore(PylintMessage message) {
 
           /** Make a best-effort attempt to place the diagnostic on the correct line. */
           private void bestEffortReport(
-              ErrorReporter errorReporter,
+              MessageReporter messageReporter,
               Function<Position, Position> adjust,
               Position lfStart,
               Position lfEnd,
@@ -375,7 +375,7 @@ private void bestEffortReport(
               DiagnosticSeverity severity,
               String humanMessage) {
             if (!lfEnd.equals(Position.ORIGIN) && !lfStart.equals(Position.ORIGIN)) { // Ideal case
-              errorReporter.at(file, new Range(lfStart, lfEnd)).report(severity, humanMessage);
+              messageReporter.at(file, new Range(lfStart, lfEnd)).report(severity, humanMessage);
             } else { // Fallback: Try to report on the correct line, or failing that, just line 1.
               if (lfStart.equals(Position.ORIGIN))
                 lfStart =
@@ -384,7 +384,7 @@ private void bestEffortReport(
               // FIXME: It might be better to improve style of generated code instead of quietly
               // returning here.
               if (lfStart.equals(Position.ORIGIN) && severity != DiagnosticSeverity.Error) return;
-              errorReporter.at(file, lfStart).report(severity, humanMessage);
+              messageReporter.at(file, lfStart).report(severity, humanMessage);
             }
           }
 
diff --git a/core/src/main/java/org/lflang/generator/rust/CargoDependencySpec.java b/core/src/main/java/org/lflang/generator/rust/CargoDependencySpec.java
index ceeaec7fc9..cd160f53c1 100644
--- a/core/src/main/java/org/lflang/generator/rust/CargoDependencySpec.java
+++ b/core/src/main/java/org/lflang/generator/rust/CargoDependencySpec.java
@@ -32,7 +32,7 @@
 import java.util.Set;
 import java.util.stream.Collectors;
 import org.eclipse.emf.ecore.EObject;
-import org.lflang.ErrorReporter;
+import org.lflang.MessageReporter;
 import org.lflang.TargetProperty;
 import org.lflang.TargetProperty.TargetPropertyType;
 import org.lflang.ast.ASTUtils;
@@ -283,10 +283,10 @@ public void check(Element element, String name, LFValidator v) {
         try {
           parseValue(pair);
         } catch (InvalidLfSourceException e) {
-          ErrorReporter errorReporter = v.getErrorReporter();
+          MessageReporter messageReporter = v.getErrorReporter();
           EObject object = e.getNode();
           String message = e.getProblem();
-          errorReporter.at(object).error(message);
+          messageReporter.at(object).error(message);
         }
       }
     }
diff --git a/core/src/main/java/org/lflang/generator/rust/RustTargetConfig.java b/core/src/main/java/org/lflang/generator/rust/RustTargetConfig.java
index fdb83fab6a..7c164c1957 100644
--- a/core/src/main/java/org/lflang/generator/rust/RustTargetConfig.java
+++ b/core/src/main/java/org/lflang/generator/rust/RustTargetConfig.java
@@ -31,7 +31,7 @@
 import java.util.List;
 import java.util.Map;
 import org.eclipse.emf.ecore.EObject;
-import org.lflang.ErrorReporter;
+import org.lflang.MessageReporter;
 import org.lflang.TargetProperty.BuildType;
 
 /**
@@ -61,7 +61,7 @@ public void setCargoDependencies(Map<String, CargoDependencySpec> cargoDependenc
     this.cargoDependencies = cargoDependencies;
   }
 
-  public void addAndCheckTopLevelModule(Path path, EObject errorOwner, ErrorReporter err) {
+  public void addAndCheckTopLevelModule(Path path, EObject errorOwner, MessageReporter err) {
     String fileName = path.getFileName().toString();
     if (!Files.exists(path)) {
       err.at(errorOwner).error("File not found");
diff --git a/core/src/main/java/org/lflang/util/ArduinoUtil.java b/core/src/main/java/org/lflang/util/ArduinoUtil.java
index 4fec0b51cf..9844195cb8 100644
--- a/core/src/main/java/org/lflang/util/ArduinoUtil.java
+++ b/core/src/main/java/org/lflang/util/ArduinoUtil.java
@@ -6,7 +6,7 @@
 import java.io.IOException;
 import java.util.List;
 import org.eclipse.xtext.xbase.lib.Exceptions;
-import org.lflang.ErrorReporter;
+import org.lflang.MessageReporter;
 import org.lflang.FileConfig;
 import org.lflang.TargetConfig;
 import org.lflang.generator.GeneratorCommandFactory;
@@ -26,15 +26,15 @@ public class ArduinoUtil {
 
   private LFGeneratorContext context;
   private GeneratorCommandFactory commandFactory;
-  private ErrorReporter errorReporter;
+  private MessageReporter messageReporter;
 
   public ArduinoUtil(
       LFGeneratorContext context,
       GeneratorCommandFactory commandFactory,
-      ErrorReporter errorReporter) {
+      MessageReporter messageReporter) {
     this.context = context;
     this.commandFactory = commandFactory;
-    this.errorReporter = errorReporter;
+    this.messageReporter = messageReporter;
   }
 
   /** Return true if arduino-cli exists, false otherwise. */
@@ -103,24 +103,24 @@ private LFCommand arduinoCompileCommand(FileConfig fileConfig, TargetConfig targ
    * @param targetConfig
    */
   public void buildArduino(FileConfig fileConfig, TargetConfig targetConfig) {
-    errorReporter.nowhere().info("Retrieving Arduino Compile Script");
+    messageReporter.nowhere().info("Retrieving Arduino Compile Script");
     try {
       LFCommand command =
           arduinoCompileCommand(fileConfig, targetConfig); // Use ProcessBuilder for finer control.
       int retCode = 0;
       retCode = command.run(context.getCancelIndicator());
       if (retCode != 0 && context.getMode() == LFGeneratorContext.Mode.STANDALONE) {
-        errorReporter.nowhere().error("arduino-cli failed with error code " + retCode);
+        messageReporter.nowhere().error("arduino-cli failed with error code " + retCode);
         throw new IOException("arduino-cli failure");
       }
     } catch (IOException e) {
       Exceptions.sneakyThrow(e);
     }
-    errorReporter.nowhere().info(
+    messageReporter.nowhere().info(
         "SUCCESS: Compiling generated code for " + fileConfig.name + " finished with no errors.");
     if (targetConfig.platformOptions.flash) {
       if (targetConfig.platformOptions.port != null) {
-        errorReporter.nowhere().info("Invoking flash command for Arduino");
+        messageReporter.nowhere().info("Invoking flash command for Arduino");
         LFCommand flash =
             commandFactory.createCommand(
                 "arduino-cli",
@@ -132,22 +132,22 @@ public void buildArduino(FileConfig fileConfig, TargetConfig targetConfig) {
                     targetConfig.platformOptions.port),
                 fileConfig.getSrcGenPath());
         if (flash == null) {
-          errorReporter.nowhere().error("Could not create arduino-cli flash command.");
+          messageReporter.nowhere().error("Could not create arduino-cli flash command.");
         }
         int flashRet = flash.run();
         if (flashRet != 0) {
-          errorReporter
+          messageReporter
               .nowhere()
               .error("arduino-cli flash command failed with error code " + flashRet);
         } else {
-          errorReporter.nowhere().info("SUCCESS: Flashed board using arduino-cli");
+          messageReporter.nowhere().info("SUCCESS: Flashed board using arduino-cli");
         }
       } else {
-        errorReporter.nowhere().error("Need to provide a port on which to automatically flash.");
+        messageReporter.nowhere().error("Need to provide a port on which to automatically flash.");
       }
     } else {
-      errorReporter.nowhere().info("********");
-      errorReporter.nowhere().info(
+      messageReporter.nowhere().info("********");
+      messageReporter.nowhere().info(
           "To flash your program, run the following command to see information about the board you"
               + " plugged in:\n\n"
               + "\tarduino-cli board list\n\n"
diff --git a/core/src/main/java/org/lflang/util/FileUtil.java b/core/src/main/java/org/lflang/util/FileUtil.java
index c84bc4da8f..74ed6b8653 100644
--- a/core/src/main/java/org/lflang/util/FileUtil.java
+++ b/core/src/main/java/org/lflang/util/FileUtil.java
@@ -33,7 +33,7 @@
 import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.xtext.util.RuntimeIOException;
-import org.lflang.ErrorReporter;
+import org.lflang.MessageReporter;
 import org.lflang.FileConfig;
 
 public class FileUtil {
@@ -307,13 +307,13 @@ public static Path findAndCopyFile(String file, Path dstDir, FileConfig fileConf
    * @param dstDir The location to copy the files to.
    * @param fileConfig The file configuration that specifies where the find entries the given
    *     entries.
-   * @param errorReporter An error reporter to report problems.
+   * @param messageReporter An error reporter to report problems.
    */
   public static void copyFilesOrDirectories(
       List<String> entries,
       Path dstDir,
       FileConfig fileConfig,
-      ErrorReporter errorReporter,
+      MessageReporter messageReporter,
       boolean fileEntriesOnly) {
     for (String fileOrDirectory : entries) {
       var path = Paths.get(fileOrDirectory);
@@ -325,14 +325,14 @@ public static void copyFilesOrDirectories(
           } else {
             FileUtil.copyFromFileSystem(found, dstDir, false);
           }
-          errorReporter.nowhere().info("Copied '" + fileOrDirectory + "' from the file system.");
+          messageReporter.nowhere().info("Copied '" + fileOrDirectory + "' from the file system.");
         } catch (IOException e) {
           String message =
               "Unable to copy '"
                   + fileOrDirectory
                   + "' from the file system. Reason: "
                   + e.toString();
-          errorReporter.nowhere().error(message);
+          messageReporter.nowhere().error(message);
         }
       } else {
         try {
@@ -340,7 +340,7 @@ public static void copyFilesOrDirectories(
             copyFileFromClassPath(fileOrDirectory, dstDir, false);
           } else {
             FileUtil.copyFromClassPath(fileOrDirectory, dstDir, false, false);
-            errorReporter.nowhere().info("Copied '" + fileOrDirectory + "' from the class path.");
+            messageReporter.nowhere().info("Copied '" + fileOrDirectory + "' from the class path.");
           }
         } catch (IOException e) {
           String message =
@@ -348,7 +348,7 @@ public static void copyFilesOrDirectories(
                   + fileOrDirectory
                   + "' from the class path. Reason: "
                   + e.toString();
-          errorReporter.nowhere().error(message);
+          messageReporter.nowhere().error(message);
         }
       }
     }
@@ -712,11 +712,11 @@ public static boolean isCFile(Path path) {
    * Convert all includes recursively inside files within a specified folder to relative links
    *
    * @param dir The folder to search for includes to change.
-   * @param errorReporter Error reporter
+   * @param messageReporter Error reporter
    * @throws IOException If the given set of files cannot be relativized.
    */
-  public static void relativeIncludeHelper(Path dir, Path includePath, ErrorReporter errorReporter) throws IOException {
-    errorReporter.nowhere().info("Relativizing all includes in " + dir.toString());
+  public static void relativeIncludeHelper(Path dir, Path includePath, MessageReporter messageReporter) throws IOException {
+    messageReporter.nowhere().info("Relativizing all includes in " + dir.toString());
     List<Path> includePaths =
         Files.walk(includePath)
             .filter(Files::isRegularFile)
diff --git a/core/src/main/java/org/lflang/validation/LFValidator.java b/core/src/main/java/org/lflang/validation/LFValidator.java
index 237a3aad13..4cd61b9aa6 100644
--- a/core/src/main/java/org/lflang/validation/LFValidator.java
+++ b/core/src/main/java/org/lflang/validation/LFValidator.java
@@ -1615,7 +1615,7 @@ public void checkUnspecifiedTransitionType(Reaction reaction) {
   //// Public methods.
 
   /** Return the error reporter for this validator. */
-  public ValidatorErrorReporter getErrorReporter() {
+  public ValidatorMessageReporter getErrorReporter() {
     return this.errorReporter;
   }
 
@@ -1912,8 +1912,8 @@ private boolean sameType(Type type1, Type type2) {
   //// Private fields.
 
   /** The error reporter. */
-  private ValidatorErrorReporter errorReporter =
-      new ValidatorErrorReporter(getMessageAcceptor(), new ValidatorStateAccess());
+  private ValidatorMessageReporter errorReporter =
+      new ValidatorMessageReporter(getMessageAcceptor(), new ValidatorStateAccess());
 
   /** Helper class containing information about the model. */
   private ModelInfo info = new ModelInfo();
diff --git a/core/src/main/java/org/lflang/validation/ValidatorErrorReporter.java b/core/src/main/java/org/lflang/validation/ValidatorMessageReporter.java
similarity index 96%
rename from core/src/main/java/org/lflang/validation/ValidatorErrorReporter.java
rename to core/src/main/java/org/lflang/validation/ValidatorMessageReporter.java
index e50a4f5e2a..3ef4e05798 100644
--- a/core/src/main/java/org/lflang/validation/ValidatorErrorReporter.java
+++ b/core/src/main/java/org/lflang/validation/ValidatorMessageReporter.java
@@ -30,7 +30,7 @@
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.lsp4j.DiagnosticSeverity;
 import org.eclipse.xtext.validation.ValidationMessageAcceptor;
-import org.lflang.ErrorReporterBase;
+import org.lflang.MessageReporterBase;
 import org.lflang.generator.Range;
 
 /**
@@ -47,12 +47,12 @@
  *
  * @author Christian Menard
  */
-public class ValidatorErrorReporter extends ErrorReporterBase {
+public class ValidatorMessageReporter extends MessageReporterBase {
 
   private final ValidationMessageAcceptor acceptor;
   private final BaseLFValidator.ValidatorStateAccess validatorState;
 
-  public ValidatorErrorReporter(
+  public ValidatorMessageReporter(
       ValidationMessageAcceptor acceptor, BaseLFValidator.ValidatorStateAccess stateAccess) {
     this.acceptor = acceptor;
     this.validatorState = stateAccess;
diff --git a/core/src/main/kotlin/org/lflang/generator/cpp/CppActionGenerator.kt b/core/src/main/kotlin/org/lflang/generator/cpp/CppActionGenerator.kt
index 632b3cab39..a0e31d0b47 100644
--- a/core/src/main/kotlin/org/lflang/generator/cpp/CppActionGenerator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/cpp/CppActionGenerator.kt
@@ -24,7 +24,7 @@
 
 package org.lflang.generator.cpp
 
-import org.lflang.ErrorReporter
+import org.lflang.MessageReporter
 import org.lflang.generator.PrependOperator
 import org.lflang.generator.orZero
 import org.lflang.inferredType
@@ -34,7 +34,7 @@ import org.lflang.lf.BuiltinTrigger
 import org.lflang.lf.Reactor
 
 /** A C++ code generator for actions */
-class CppActionGenerator(private val reactor: Reactor, private val errorReporter: ErrorReporter) {
+class CppActionGenerator(private val reactor: Reactor, private val messageReporter: MessageReporter) {
 
     companion object {
         val Action.cppType: String
@@ -55,7 +55,7 @@ class CppActionGenerator(private val reactor: Reactor, private val errorReporter
 
     private fun generateLogicalInitializer(action: Action): String {
         return if (action.minSpacing != null || !action.policy.isNullOrEmpty()) {
-            errorReporter.at(
+            messageReporter.at(
                 action
             ).error(
                 "minSpacing and spacing violation policies are not yet supported for logical actions in reactor-ccp!"
@@ -69,7 +69,7 @@ class CppActionGenerator(private val reactor: Reactor, private val errorReporter
 
     private fun initializePhysicalInitializer(action: Action): String {
         return if (action.minDelay != null || action.minSpacing != null || !action.policy.isNullOrEmpty()) {
-            errorReporter.at(
+            messageReporter.at(
                 action
             ).error(
                 "minDelay, minSpacing and spacing violation policies are not yet supported for physical actions in reactor-ccp!"
diff --git a/core/src/main/kotlin/org/lflang/generator/cpp/CppGenerator.kt b/core/src/main/kotlin/org/lflang/generator/cpp/CppGenerator.kt
index e739560ba8..359811e8d9 100644
--- a/core/src/main/kotlin/org/lflang/generator/cpp/CppGenerator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/cpp/CppGenerator.kt
@@ -67,7 +67,7 @@ class CppGenerator(
     override fun doGenerate(resource: Resource, context: LFGeneratorContext) {
         super.doGenerate(resource, context)
 
-        if (!canGenerate(errorsOccurred(), mainDef, errorReporter, context)) return
+        if (!canGenerate(errorsOccurred(), mainDef, messageReporter, context)) return
 
         // create a platform-specific generator
         val platformGenerator: CppPlatformGenerator =
@@ -88,7 +88,7 @@ class CppGenerator(
             )
 
             if (platformGenerator.doCompile(context)) {
-                CppValidator(fileConfig, errorReporter, codeMaps).doValidate(context)
+                CppValidator(fileConfig, messageReporter, codeMaps).doValidate(context)
                 context.finish(GeneratorResult.GENERATED_NO_EXECUTABLE.apply(context, codeMaps))
             } else {
                 context.unsuccessfulFinish()
@@ -149,7 +149,7 @@ class CppGenerator(
 
         // generate header and source files for all reactors
         for (r in reactors) {
-            val generator = CppReactorGenerator(r, fileConfig, errorReporter)
+            val generator = CppReactorGenerator(r, fileConfig, messageReporter)
             val headerFile = fileConfig.getReactorHeaderPath(r)
             val sourceFile = if (r.isGeneric) fileConfig.getReactorHeaderImplPath(r) else fileConfig.getReactorSourcePath(r)
             val reactorCodeMap = CodeMap.fromGeneratedCode(generator.generateSource())
diff --git a/core/src/main/kotlin/org/lflang/generator/cpp/CppInstanceGenerator.kt b/core/src/main/kotlin/org/lflang/generator/cpp/CppInstanceGenerator.kt
index 88a66ef558..19466c2fce 100644
--- a/core/src/main/kotlin/org/lflang/generator/cpp/CppInstanceGenerator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/cpp/CppInstanceGenerator.kt
@@ -34,7 +34,7 @@ import org.lflang.validation.AttributeSpec
 class CppInstanceGenerator(
     private val reactor: Reactor,
     private val fileConfig: CppFileConfig,
-    private val errorReporter: ErrorReporter
+    private val messageReporter: MessageReporter
 ) {
     companion object {
         val Instantiation.isEnclave: Boolean get() = AttributeUtils.isEnclave(this)
@@ -87,12 +87,12 @@ class CppInstanceGenerator(
         val assignments = parameters.mapNotNull {
             when {
                 it.rhs.isParens || it.rhs.isBraces -> {
-                    errorReporter.at(it).error("Parenthesis based initialization is not allowed here!")
+                    messageReporter.at(it).error("Parenthesis based initialization is not allowed here!")
                     null
                 }
 
                 it.rhs.exprs.size != 1             -> {
-                    errorReporter.at(it).error("Expected exactly one expression.")
+                    messageReporter.at(it).error("Expected exactly one expression.")
                     null
                 }
 
diff --git a/core/src/main/kotlin/org/lflang/generator/cpp/CppPlatformGenerator.kt b/core/src/main/kotlin/org/lflang/generator/cpp/CppPlatformGenerator.kt
index 09296cfe36..e2106456b8 100644
--- a/core/src/main/kotlin/org/lflang/generator/cpp/CppPlatformGenerator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/cpp/CppPlatformGenerator.kt
@@ -1,6 +1,6 @@
 package org.lflang.generator.cpp
 
-import org.lflang.ErrorReporter
+import org.lflang.MessageReporter
 import org.lflang.TargetConfig
 import org.lflang.generator.GeneratorCommandFactory
 import org.lflang.generator.LFGeneratorContext
@@ -11,7 +11,7 @@ import java.nio.file.Path
 abstract class CppPlatformGenerator(protected val generator: CppGenerator) {
     protected val codeMaps = generator.codeMaps
     protected val cppSources = generator.cppSources
-    protected val errorReporter: ErrorReporter = generator.errorReporter
+    protected val messageReporter: MessageReporter = generator.messageReporter
     protected val fileConfig: CppFileConfig = generator.fileConfig
     protected val targetConfig: TargetConfig = generator.targetConfig
     protected val commandFactory: GeneratorCommandFactory = generator.commandFactory
@@ -32,4 +32,4 @@ abstract class CppPlatformGenerator(protected val generator: CppGenerator) {
             "-DREACTOR_CPP_LOG_LEVEL=${targetConfig.logLevel.severity}",
             "-DLF_SRC_PKG_PATH=${fileConfig.srcPkgPath}",
         )
-}
\ No newline at end of file
+}
diff --git a/core/src/main/kotlin/org/lflang/generator/cpp/CppReactorGenerator.kt b/core/src/main/kotlin/org/lflang/generator/cpp/CppReactorGenerator.kt
index 78df4519f2..c28aa607ab 100644
--- a/core/src/main/kotlin/org/lflang/generator/cpp/CppReactorGenerator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/cpp/CppReactorGenerator.kt
@@ -23,7 +23,7 @@
  ***************/
 package org.lflang.generator.cpp
 
-import org.lflang.ErrorReporter
+import org.lflang.MessageReporter
 import org.lflang.generator.PrependOperator
 import org.lflang.isGeneric
 import org.lflang.lf.Reactor
@@ -33,7 +33,7 @@ import org.lflang.toUnixString
 /**
  * A C++ code generator that produces a C++ class representing a single reactor
  */
-class CppReactorGenerator(private val reactor: Reactor, fileConfig: CppFileConfig, errorReporter: ErrorReporter) {
+class CppReactorGenerator(private val reactor: Reactor, fileConfig: CppFileConfig, messageReporter: MessageReporter) {
 
     /** Comment to be inserted at the top of generated files */
     private val fileComment = fileComment(reactor.eResource())
@@ -50,9 +50,9 @@ class CppReactorGenerator(private val reactor: Reactor, fileConfig: CppFileConfi
     private val parameters = CppParameterGenerator(reactor)
     private val state = CppStateGenerator(reactor)
     private val methods = CppMethodGenerator(reactor)
-    private val instances = CppInstanceGenerator(reactor, fileConfig, errorReporter)
+    private val instances = CppInstanceGenerator(reactor, fileConfig, messageReporter)
     private val timers = CppTimerGenerator(reactor)
-    private val actions = CppActionGenerator(reactor, errorReporter)
+    private val actions = CppActionGenerator(reactor, messageReporter)
     private val ports = CppPortGenerator(reactor)
     private val reactions = CppReactionGenerator(reactor, ports, instances)
     private val assemble = CppAssembleMethodGenerator(reactor)
diff --git a/core/src/main/kotlin/org/lflang/generator/cpp/CppRos2Generator.kt b/core/src/main/kotlin/org/lflang/generator/cpp/CppRos2Generator.kt
index c24f6cae59..76969269c0 100644
--- a/core/src/main/kotlin/org/lflang/generator/cpp/CppRos2Generator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/cpp/CppRos2Generator.kt
@@ -39,7 +39,7 @@ class CppRos2Generator(generator: CppGenerator) : CppPlatformGenerator(generator
         val ros2Version = System.getenv("ROS_DISTRO")
 
         if (ros2Version.isNullOrBlank()) {
-            errorReporter.nowhere(
+            messageReporter.nowhere(
             ).error(
                 "Could not find a ROS2 installation! Please install ROS2 and source the setup script. " +
                         "Also see https://docs.ros.org/en/galactic/Installation.html"
@@ -59,11 +59,11 @@ class CppRos2Generator(generator: CppGenerator) : CppPlatformGenerator(generator
             fileConfig.outPath
         )
         val returnCode = colconCommand?.run(context.cancelIndicator);
-        if (returnCode != 0 && !errorReporter.errorsOccurred) {
+        if (returnCode != 0 && !messageReporter.errorsOccurred) {
             // If errors occurred but none were reported, then the following message is the best we can do.
-            errorReporter.nowhere().error("colcon failed with error code $returnCode")
+            messageReporter.nowhere().error("colcon failed with error code $returnCode")
         }
 
-        return !errorReporter.errorsOccurred
+        return !messageReporter.errorsOccurred
     }
 }
diff --git a/core/src/main/kotlin/org/lflang/generator/cpp/CppStandaloneGenerator.kt b/core/src/main/kotlin/org/lflang/generator/cpp/CppStandaloneGenerator.kt
index 7f0efe2c00..45fa65f4f5 100644
--- a/core/src/main/kotlin/org/lflang/generator/cpp/CppStandaloneGenerator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/cpp/CppStandaloneGenerator.kt
@@ -66,7 +66,7 @@ class CppStandaloneGenerator(generator: CppGenerator) :
             if (cmakeReturnCode == 0 && runMake) {
                 // If cmake succeeded, run make
                 val makeCommand = createMakeCommand(fileConfig.buildPath, version, fileConfig.name)
-                val makeReturnCode = CppValidator(fileConfig, errorReporter, codeMaps).run(makeCommand, context.cancelIndicator)
+                val makeReturnCode = CppValidator(fileConfig, messageReporter, codeMaps).run(makeCommand, context.cancelIndicator)
                 var installReturnCode = 0
                 if (makeReturnCode == 0) {
                     val installCommand = createMakeCommand(fileConfig.buildPath, version, "install")
@@ -77,16 +77,16 @@ class CppStandaloneGenerator(generator: CppGenerator) :
                         println("Compiled binary is in ${fileConfig.binPath}")
                     }
                 }
-                if ((makeReturnCode != 0 || installReturnCode != 0) && !errorReporter.errorsOccurred) {
+                if ((makeReturnCode != 0 || installReturnCode != 0) && !messageReporter.errorsOccurred) {
                     // If errors occurred but none were reported, then the following message is the best we can do.
-                    errorReporter.nowhere().error("make failed with error code $makeReturnCode")
+                    messageReporter.nowhere().error("make failed with error code $makeReturnCode")
                 }
             }
             if (cmakeReturnCode != 0) {
-                errorReporter.nowhere().error("cmake failed with error code $cmakeReturnCode")
+                messageReporter.nowhere().error("cmake failed with error code $cmakeReturnCode")
             }
         }
-        return !errorReporter.errorsOccurred
+        return !messageReporter.errorsOccurred
     }
 
     private fun checkCmakeVersion(): String? {
@@ -98,7 +98,7 @@ class CppStandaloneGenerator(generator: CppGenerator) :
             version = regex.find(cmd.output.toString())?.value
         }
         if (version == null || version.compareVersion("3.5.0") < 0) {
-            errorReporter.nowhere(
+            messageReporter.nowhere(
             ).error(
                 "The C++ target requires CMAKE >= 3.5.0 to compile the generated code. " +
                         "Auto-compiling can be disabled using the \"no-compile: true\" target property."
@@ -139,7 +139,7 @@ class CppStandaloneGenerator(generator: CppGenerator) :
     private fun createMakeCommand(buildPath: Path, version: String, target: String): LFCommand {
         val makeArgs: List<String>
         if (version.compareVersion("3.12.0") < 0) {
-            errorReporter.nowhere().warning("CMAKE is older than version 3.12. Parallel building is not supported.")
+            messageReporter.nowhere().warning("CMAKE is older than version 3.12. Parallel building is not supported.")
             makeArgs =
                 listOf("--build", ".", "--target", target, "--config", targetConfig.cmakeBuildType?.toString() ?: "Release")
         } else {
diff --git a/core/src/main/kotlin/org/lflang/generator/cpp/CppValidator.kt b/core/src/main/kotlin/org/lflang/generator/cpp/CppValidator.kt
index 8a1be2a810..fd642a94bf 100644
--- a/core/src/main/kotlin/org/lflang/generator/cpp/CppValidator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/cpp/CppValidator.kt
@@ -1,6 +1,6 @@
 package org.lflang.generator.cpp
 
-import org.lflang.ErrorReporter
+import org.lflang.MessageReporter
 import org.lflang.generator.CodeMap
 import org.lflang.generator.DiagnosticReporting
 import org.lflang.generator.HumanReadableReportingStrategy
@@ -19,9 +19,9 @@ import java.util.regex.Pattern
  */
 class CppValidator(
     private val fileConfig: CppFileConfig,
-    errorReporter: ErrorReporter,
+    messageReporter: MessageReporter,
     codeMaps: Map<Path, CodeMap>
-): Validator(errorReporter, codeMaps) {
+): Validator(messageReporter, codeMaps) {
 
     companion object {
         /** This matches a line in the CMake cache. */
diff --git a/core/src/main/kotlin/org/lflang/generator/rust/RustGenerator.kt b/core/src/main/kotlin/org/lflang/generator/rust/RustGenerator.kt
index 007d606620..41128800e3 100644
--- a/core/src/main/kotlin/org/lflang/generator/rust/RustGenerator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/rust/RustGenerator.kt
@@ -71,11 +71,11 @@ class RustGenerator(
     override fun doGenerate(resource: Resource, context: LFGeneratorContext) {
         super.doGenerate(resource, context)
 
-        if (!canGenerate(errorsOccurred(), mainDef, errorReporter, context)) return
+        if (!canGenerate(errorsOccurred(), mainDef, messageReporter, context)) return
 
         Files.createDirectories(fileConfig.srcGenPath)
 
-        val gen = RustModelBuilder.makeGenerationInfo(targetConfig, reactors, errorReporter)
+        val gen = RustModelBuilder.makeGenerationInfo(targetConfig, reactors, messageReporter)
         val codeMaps: Map<Path, CodeMap> = RustEmitter.generateRustProject(fileConfig, gen)
 
         if (targetConfig.noCompile || errorsOccurred()) {
@@ -86,7 +86,7 @@ class RustGenerator(
                 "Code generation complete. Compiling...", IntegratedBuilder.GENERATED_PERCENT_PROGRESS
             )
             Files.deleteIfExists(fileConfig.executable) // cleanup, cargo doesn't do it
-            if (context.mode == LFGeneratorContext.Mode.LSP_MEDIUM) RustValidator(fileConfig, errorReporter, codeMaps).doValidate(context)
+            if (context.mode == LFGeneratorContext.Mode.LSP_MEDIUM) RustValidator(fileConfig, messageReporter, codeMaps).doValidate(context)
             else invokeRustCompiler(context, codeMaps)
         }
     }
@@ -120,7 +120,7 @@ class RustGenerator(
         ) ?: return
         cargoCommand.setQuiet()
 
-        val validator = RustValidator(fileConfig, errorReporter, codeMaps)
+        val validator = RustValidator(fileConfig, messageReporter, codeMaps)
         val cargoReturnCode = validator.run(cargoCommand, context.cancelIndicator)
 
         if (cargoReturnCode == 0) {
@@ -143,7 +143,7 @@ class RustGenerator(
             context.finish(GeneratorResult.CANCELLED)
         } else {
             if (!errorsOccurred()) {
-                errorReporter.nowhere(
+                messageReporter.nowhere(
                 ).error(
                     "cargo failed with error code $cargoReturnCode and reported the following error(s):\n${cargoCommand.errors}"
                 )
diff --git a/core/src/main/kotlin/org/lflang/generator/rust/RustModel.kt b/core/src/main/kotlin/org/lflang/generator/rust/RustModel.kt
index e5f58e40c2..b2bacb0ce3 100644
--- a/core/src/main/kotlin/org/lflang/generator/rust/RustModel.kt
+++ b/core/src/main/kotlin/org/lflang/generator/rust/RustModel.kt
@@ -422,7 +422,7 @@ object RustModelBuilder {
     /**
      * Given the input to the generator, produce the model classes.
      */
-    fun makeGenerationInfo(targetConfig: TargetConfig, reactors: List<Reactor>, errorReporter: ErrorReporter): GenerationInfo {
+    fun makeGenerationInfo(targetConfig: TargetConfig, reactors: List<Reactor>, messageReporter: MessageReporter): GenerationInfo {
         val reactorsInfos = makeReactorInfos(reactors)
         // todo how do we pick the main reactor? it seems like super.doGenerate sets that field...
         val mainReactor = reactorsInfos.lastOrNull { it.isMain } ?: reactorsInfos.last()
@@ -430,7 +430,7 @@ object RustModelBuilder {
 
         val dependencies = targetConfig.rust.cargoDependencies.toMutableMap()
         dependencies.compute(RustEmitterBase.runtimeCrateFullName) { _, spec ->
-            computeDefaultRuntimeConfiguration(spec, targetConfig, errorReporter)
+            computeDefaultRuntimeConfiguration(spec, targetConfig, messageReporter)
         }
 
         return GenerationInfo(
@@ -458,14 +458,14 @@ object RustModelBuilder {
     private fun computeDefaultRuntimeConfiguration(
         userSpec: CargoDependencySpec?,
         targetConfig: TargetConfig,
-        errorReporter: ErrorReporter
+        messageReporter: MessageReporter
     ): CargoDependencySpec {
         fun CargoDependencySpec.useDefaultRuntimePath() {
             this.localPath = System.getenv("LOCAL_RUST_REACTOR_RT")?.also {
                 // Print info to reduce surprise. If the env var is not set,
                 // the runtime will be fetched from the internet by Cargo. If
                 // the value is incorrect, Cargo will crash.
-                errorReporter.nowhere().info("Using the Rust runtime from environment variable LOCAL_RUST_REACTOR_RT=$it")
+                messageReporter.nowhere().info("Using the Rust runtime from environment variable LOCAL_RUST_REACTOR_RT=$it")
             }
 
             if (localPath == null) {
@@ -510,7 +510,7 @@ object RustModelBuilder {
             }
 
             if (!targetConfig.threading && PARALLEL_RT_FEATURE in userSpec.features) {
-                errorReporter.nowhere().warning("Threading cannot be disabled as it was enabled manually as a runtime feature.")
+                messageReporter.nowhere().warning("Threading cannot be disabled as it was enabled manually as a runtime feature.")
             }
 
             return userSpec
diff --git a/core/src/main/kotlin/org/lflang/generator/rust/RustValidator.kt b/core/src/main/kotlin/org/lflang/generator/rust/RustValidator.kt
index 88ad8b6261..5ee732acd0 100644
--- a/core/src/main/kotlin/org/lflang/generator/rust/RustValidator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/rust/RustValidator.kt
@@ -5,7 +5,7 @@ import com.fasterxml.jackson.core.JsonProcessingException
 import com.fasterxml.jackson.databind.DeserializationFeature
 import com.fasterxml.jackson.databind.ObjectMapper
 import org.eclipse.lsp4j.DiagnosticSeverity
-import org.lflang.ErrorReporter
+import org.lflang.MessageReporter
 import org.lflang.FileConfig
 import org.lflang.generator.CodeMap
 import org.lflang.generator.DiagnosticReporting
@@ -25,9 +25,9 @@ import java.nio.file.Paths
 @Suppress("ArrayInDataClass")  // Data classes here must not be used in data structures such as hashmaps.
 class RustValidator(
     private val fileConfig: FileConfig,
-    errorReporter: ErrorReporter,
+    messageReporter: MessageReporter,
     codeMaps: Map<Path, CodeMap>
-): Validator(errorReporter, codeMaps) {
+): Validator(messageReporter, codeMaps) {
     companion object {
         private val mapper = ObjectMapper().configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false)
         private const val COMPILER_MESSAGE_REASON = "compiler-message"
diff --git a/core/src/main/kotlin/org/lflang/generator/ts/TSConnectionGenerator.kt b/core/src/main/kotlin/org/lflang/generator/ts/TSConnectionGenerator.kt
index 9083fc049e..acdd762bdc 100644
--- a/core/src/main/kotlin/org/lflang/generator/ts/TSConnectionGenerator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/ts/TSConnectionGenerator.kt
@@ -1,6 +1,6 @@
 package org.lflang.generator.ts
 
-import org.lflang.ErrorReporter
+import org.lflang.MessageReporter
 import org.lflang.hasMultipleConnections
 import org.lflang.isBank
 import org.lflang.lf.Connection
@@ -13,7 +13,7 @@ import java.util.*
  */
 class TSConnectionGenerator (
     private val connections: List<Connection>,
-    private val errorReporter: ErrorReporter
+    private val messageReporter: MessageReporter
 ) {
     // There is no generateClassProperties() for connections
 
@@ -70,4 +70,4 @@ class TSConnectionGenerator (
         }
         return connectionInstantiations.joinToString("\n")
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/kotlin/org/lflang/generator/ts/TSConstructorGenerator.kt b/core/src/main/kotlin/org/lflang/generator/ts/TSConstructorGenerator.kt
index a1ec96c9ac..c28d9277bb 100644
--- a/core/src/main/kotlin/org/lflang/generator/ts/TSConstructorGenerator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/ts/TSConstructorGenerator.kt
@@ -1,6 +1,6 @@
 package org.lflang.generator.ts
 
-import org.lflang.ErrorReporter
+import org.lflang.MessageReporter
 import org.lflang.TargetConfig
 import org.lflang.generator.PrependOperator
 import org.lflang.generator.getTargetInitializer
@@ -18,7 +18,7 @@ import java.util.*
  * registrations.
  */
 class TSConstructorGenerator(
-    private val errorReporter: ErrorReporter,
+    private val messageReporter: MessageReporter,
     private val reactor: Reactor
 ) {
 
@@ -94,8 +94,8 @@ class TSConstructorGenerator(
         isFederate: Boolean,
         networkMessageActions: List<String>
     ): String {
-        val connections = TSConnectionGenerator(reactor.connections, errorReporter)
-        val reactions = TSReactionGenerator(errorReporter, reactor)
+        val connections = TSConnectionGenerator(reactor.connections, messageReporter)
+        val reactions = TSReactionGenerator(messageReporter, reactor)
 
         return with(PrependOperator) {
             """
diff --git a/core/src/main/kotlin/org/lflang/generator/ts/TSGenerator.kt b/core/src/main/kotlin/org/lflang/generator/ts/TSGenerator.kt
index de43c5abef..a9f1e60be4 100644
--- a/core/src/main/kotlin/org/lflang/generator/ts/TSGenerator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/ts/TSGenerator.kt
@@ -112,7 +112,7 @@ class TSGenerator(
 
         instantiationGraph
 
-        if (!canGenerate(errorsOccurred(), mainDef, errorReporter, context)) return
+        if (!canGenerate(errorsOccurred(), mainDef, messageReporter, context)) return
         if (!isOsCompatible()) return
 
         // createMainReactorInstance()
@@ -148,7 +148,7 @@ class TSGenerator(
                 println("No .proto files have been imported. Skipping protocol buffer compilation.")
             }
             val parsingContext = SubContext(context, COLLECTED_DEPENDENCIES_PERCENT_PROGRESS, 100)
-            val validator = TSValidator(fileConfig, errorReporter, codeMaps)
+            val validator = TSValidator(fileConfig, messageReporter, codeMaps)
             if (!context.cancelIndicator.isCanceled) {
                 if (context.mode == LFGeneratorContext.Mode.LSP_MEDIUM) {
                     if (!passesChecks(validator, parsingContext)) {
@@ -224,7 +224,7 @@ class TSGenerator(
         for (configFile in CONFIG_FILES) {
             val override = FileUtil.findAndCopyFile(configFile, fileConfig.srcGenPath, fileConfig);
             if (override != null) {
-                errorReporter.nowhere().info("Using user-provided '" + override + "'");
+                messageReporter.nowhere().info("Using user-provided '" + override + "'");
             } else {
                 System.out.println("Using default '" + configFile + "'");
             }
@@ -253,7 +253,7 @@ class TSGenerator(
         val (mainParameters, parameterCode) = parameterGenerator.generateParameters()
         tsCode.append(parameterCode)
 
-        val reactorGenerator = TSReactorGenerator(this, errorReporter, targetConfig)
+        val reactorGenerator = TSReactorGenerator(this, messageReporter, targetConfig)
         for (reactor in reactors) {
             tsCode.append(reactorGenerator.generateReactor(reactor))
         }
@@ -303,12 +303,12 @@ class TSGenerator(
             val ret = pnpmInstall.run(context.cancelIndicator)
             if (ret != 0) {
                 val errors: String = pnpmInstall.errors
-                errorReporter.at(GeneratorUtils.findTargetDecl(resource))
+                messageReporter.at(GeneratorUtils.findTargetDecl(resource))
                     .error("pnpm install command failed" + if (errors.isBlank()) "." else ":\n$errors")
             }
             installProtoBufsIfNeeded(true, path, context.cancelIndicator)
         } else {
-            errorReporter.nowhere(
+            messageReporter.nowhere(
             ).warning(
                 "Falling back on npm. To prevent an accumulation of replicated dependencies, " +
                         "it is highly recommended to install pnpm globally (npm install -g pnpm)."
@@ -317,14 +317,14 @@ class TSGenerator(
             val npmInstall = commandFactory.createCommand("npm", if (production) listOf("install", "--production") else listOf("install"), path)
 
             if (npmInstall == null) {
-                errorReporter.nowhere().error(NO_NPM_MESSAGE)
+                messageReporter.nowhere().error(NO_NPM_MESSAGE)
                 return
             }
 
             if (npmInstall.run(context.cancelIndicator) != 0) {
-                errorReporter.at(GeneratorUtils.findTargetDecl(resource))
+                messageReporter.at(GeneratorUtils.findTargetDecl(resource))
                     .error("npm install command failed: " + npmInstall.errors)
-                errorReporter.at(GeneratorUtils.findTargetDecl(resource))
+                messageReporter.at(GeneratorUtils.findTargetDecl(resource))
                     .error(
                     "npm install command failed." +
                             "\nFor installation instructions, see: https://www.npmjs.com/get-npm"
@@ -338,7 +338,7 @@ class TSGenerator(
                 val rtPath = path.resolve("node_modules").resolve("@lf-lang").resolve("reactor-ts")
                 val buildRuntime = commandFactory.createCommand("npm", listOf("run", "build"), rtPath)
                 if (buildRuntime.run(context.cancelIndicator) != 0) {
-                    errorReporter.at(GeneratorUtils.findTargetDecl(resource))
+                    messageReporter.at(GeneratorUtils.findTargetDecl(resource))
                         .error("Unable to build runtime in dev mode: " + buildRuntime.errors.toString())
                 }
             }
@@ -379,7 +379,7 @@ class TSGenerator(
         val protoc = commandFactory.createCommand("protoc", protocArgs, fileConfig.srcPath)
 
         if (protoc == null) {
-            errorReporter.nowhere().error("Processing .proto files requires libprotoc >= 3.6.1.")
+            messageReporter.nowhere().error("Processing .proto files requires libprotoc >= 3.6.1.")
             return
         }
 
@@ -394,7 +394,7 @@ class TSGenerator(
 //                targetConfig.compileLibraries.add('-l')
 //                targetConfig.compileLibraries.add('protobuf-c')
         } else {
-            errorReporter.nowhere().error("protoc failed with error code $returnCode.")
+            messageReporter.nowhere().error("protoc failed with error code $returnCode.")
         }
         // FIXME: report errors from this command.
     }
@@ -420,14 +420,14 @@ class TSGenerator(
         val tsc = commandFactory.createCommand("npm", listOf("run", "build"), fileConfig.srcGenPkgPath)
 
         if (tsc == null) {
-            errorReporter.nowhere().error(NO_NPM_MESSAGE)
+            messageReporter.nowhere().error(NO_NPM_MESSAGE)
             return
         }
 
         if (validator.run(tsc, cancelIndicator) == 0) {
             println("SUCCESS (compiling generated TypeScript code)")
         } else {
-            errorReporter.nowhere().error("Compiler failed with the following errors:\n${tsc.errors}")
+            messageReporter.nowhere().error("Compiler failed with the following errors:\n${tsc.errors}")
         }
     }
 
@@ -436,7 +436,7 @@ class TSGenerator(
      * @param context The context of the compilation.
      */
     private fun concludeCompilation(context: LFGeneratorContext, codeMaps: Map<Path, CodeMap>) {
-        if (errorReporter.errorsOccurred) {
+        if (messageReporter.errorsOccurred) {
             context.unsuccessfulFinish()
         } else {
             context.finish(GeneratorResult.Status.COMPILED, codeMaps)
diff --git a/core/src/main/kotlin/org/lflang/generator/ts/TSReactionGenerator.kt b/core/src/main/kotlin/org/lflang/generator/ts/TSReactionGenerator.kt
index d32e0a9860..ac2e7af402 100644
--- a/core/src/main/kotlin/org/lflang/generator/ts/TSReactionGenerator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/ts/TSReactionGenerator.kt
@@ -1,6 +1,6 @@
 package org.lflang.generator.ts
 
-import org.lflang.ErrorReporter
+import org.lflang.MessageReporter
 import org.lflang.ast.ASTUtils
 import org.lflang.generator.PrependOperator
 import org.lflang.isBank
@@ -24,7 +24,7 @@ import java.util.LinkedList
  *  @author Hokeun Kim
  */
 class TSReactionGenerator(
-    private val errorReporter: ErrorReporter,
+    private val messageReporter: MessageReporter,
     private val reactor: Reactor
 ) {
 
@@ -138,7 +138,7 @@ class TSReactionGenerator(
             is Port   -> (trigOrSource.variable as Port).tsPortType
             else      -> {
                 val message = "Invalid trigger: ${trigOrSource.variable.name}"
-                errorReporter.nowhere().error(message)
+                messageReporter.nowhere().error(message)
                 message
             }
         }
@@ -302,7 +302,7 @@ class TSReactionGenerator(
             val functArg = effect.generateVarRef()
             when (val effectVar = effect.variable) {
                 is Timer  -> {
-                    errorReporter.nowhere().error("A timer cannot be an effect of a reaction")
+                    messageReporter.nowhere().error("A timer cannot be an effect of a reaction")
                 }
 
                 is Action -> {
diff --git a/core/src/main/kotlin/org/lflang/generator/ts/TSReactorGenerator.kt b/core/src/main/kotlin/org/lflang/generator/ts/TSReactorGenerator.kt
index 4a0ef62092..29e99af361 100644
--- a/core/src/main/kotlin/org/lflang/generator/ts/TSReactorGenerator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/ts/TSReactorGenerator.kt
@@ -17,7 +17,7 @@ import java.util.*
  */
 class TSReactorGenerator(
     private val tsGenerator: TSGenerator,
-    private val errorReporter: ErrorReporter,
+    private val messageReporter: MessageReporter,
     private val targetConfig: TargetConfig
 ) {
 
@@ -125,7 +125,7 @@ ${"             |"..preamble.code.toText()}
         val actionGenerator = TSActionGenerator(reactor.actions, networkMessageActions)
         val portGenerator = TSPortGenerator(reactor.inputs, reactor.outputs)
 
-        val constructorGenerator = TSConstructorGenerator(errorReporter, reactor)
+        val constructorGenerator = TSConstructorGenerator(messageReporter, reactor)
         return with(PrependOperator) {
             """
                 |// =============== START reactor class ${reactor.name}
diff --git a/core/src/main/kotlin/org/lflang/generator/ts/TSValidator.kt b/core/src/main/kotlin/org/lflang/generator/ts/TSValidator.kt
index e60c1a99df..65af1b8f11 100644
--- a/core/src/main/kotlin/org/lflang/generator/ts/TSValidator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/ts/TSValidator.kt
@@ -4,7 +4,7 @@ import com.fasterxml.jackson.annotation.JsonProperty
 import com.fasterxml.jackson.databind.DeserializationFeature
 import com.fasterxml.jackson.databind.ObjectMapper
 import org.eclipse.lsp4j.DiagnosticSeverity
-import org.lflang.ErrorReporter
+import org.lflang.MessageReporter
 import org.lflang.FileConfig
 import org.lflang.generator.*
 import org.lflang.util.LFCommand
@@ -24,15 +24,15 @@ private val TSC_LABEL: Pattern = Pattern.compile("((?<=\\s))(~+)")
 @Suppress("ArrayInDataClass")  // Data classes here must not be used in data structures such as hashmaps.
 class TSValidator(
     private val fileConfig: FileConfig,
-    errorReporter: ErrorReporter,
+    messageReporter: MessageReporter,
     codeMaps: Map<Path, CodeMap>
-): Validator(errorReporter, codeMaps) {
+): Validator(messageReporter, codeMaps) {
 
     private class TSLinter(
         private val fileConfig: FileConfig,
-        errorReporter: ErrorReporter,
+        messageReporter: MessageReporter,
         codeMaps: Map<Path, CodeMap>
-    ): Validator(errorReporter, codeMaps) {
+    ): Validator(messageReporter, codeMaps) {
         companion object {
             private val mapper = ObjectMapper().configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false)
         }
@@ -145,7 +145,7 @@ class TSValidator(
      * @param context The context of the current build.
      */
     fun doLint(context: LFGeneratorContext) {
-        TSLinter(fileConfig, errorReporter, codeMaps).doValidate(context)
+        TSLinter(fileConfig, messageReporter, codeMaps).doValidate(context)
     }
 
     // If this is not true, then the user might as well be writing JavaScript.
diff --git a/core/src/test/java/org/lflang/tests/compiler/LetInferenceTests.java b/core/src/test/java/org/lflang/tests/compiler/LetInferenceTests.java
index 38387ac8a4..8f78cd5906 100644
--- a/core/src/test/java/org/lflang/tests/compiler/LetInferenceTests.java
+++ b/core/src/test/java/org/lflang/tests/compiler/LetInferenceTests.java
@@ -36,7 +36,7 @@
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
-import org.lflang.DefaultErrorReporter;
+import org.lflang.DefaultMessageReporter;
 import org.lflang.TimeUnit;
 import org.lflang.TimeValue;
 import org.lflang.ast.ASTUtils;
@@ -125,7 +125,7 @@ public void testLet() throws Exception {
     }
 
     ReactorInstance mainInstance =
-        new ReactorInstance(toDefinition(mainDef.getReactorClass()), new DefaultErrorReporter());
+        new ReactorInstance(toDefinition(mainDef.getReactorClass()), new DefaultMessageReporter());
 
     for (ReactorInstance reactorInstance : mainInstance.children) {
       if (reactorInstance.isGeneratedDelay()) {
diff --git a/core/src/test/java/org/lflang/tests/compiler/LinguaFrancaDependencyAnalysisTest.java b/core/src/test/java/org/lflang/tests/compiler/LinguaFrancaDependencyAnalysisTest.java
index 516c712498..182a421e10 100644
--- a/core/src/test/java/org/lflang/tests/compiler/LinguaFrancaDependencyAnalysisTest.java
+++ b/core/src/test/java/org/lflang/tests/compiler/LinguaFrancaDependencyAnalysisTest.java
@@ -37,7 +37,7 @@
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
-import org.lflang.DefaultErrorReporter;
+import org.lflang.DefaultMessageReporter;
 import org.lflang.ModelInfo;
 import org.lflang.generator.ReactorInstance;
 import org.lflang.lf.Instantiation;
@@ -144,7 +144,7 @@ public void cyclicDependency() throws Exception {
     }
 
     ReactorInstance instance =
-        new ReactorInstance(toDefinition(mainDef.getReactorClass()), new DefaultErrorReporter());
+        new ReactorInstance(toDefinition(mainDef.getReactorClass()), new DefaultMessageReporter());
     Assertions.assertFalse(instance.getCycles().isEmpty());
   }
 
@@ -171,7 +171,7 @@ public void circularInstantiation() throws Exception {
     Assertions.assertNotNull(model);
 
     ModelInfo info = new ModelInfo();
-    info.update(model, new DefaultErrorReporter());
+    info.update(model, new DefaultMessageReporter());
     Assertions.assertTrue(
         info.instantiationGraph.hasCycles() == true, "Did not detect cyclic instantiation.");
   }
diff --git a/core/src/test/java/org/lflang/tests/compiler/PortInstanceTests.java b/core/src/test/java/org/lflang/tests/compiler/PortInstanceTests.java
index 8b8ef52a8f..e5c94dbec3 100644
--- a/core/src/test/java/org/lflang/tests/compiler/PortInstanceTests.java
+++ b/core/src/test/java/org/lflang/tests/compiler/PortInstanceTests.java
@@ -3,8 +3,8 @@
 import java.util.List;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.lflang.DefaultErrorReporter;
-import org.lflang.ErrorReporter;
+import org.lflang.DefaultMessageReporter;
+import org.lflang.MessageReporter;
 import org.lflang.generator.PortInstance;
 import org.lflang.generator.ReactionInstance;
 import org.lflang.generator.ReactorInstance;
@@ -17,7 +17,7 @@
 
 public class PortInstanceTests {
 
-  private ErrorReporter reporter = new DefaultErrorReporter();
+  private MessageReporter reporter = new DefaultMessageReporter();
   private static LfFactory factory = LfFactory.eINSTANCE;
 
   @Test
diff --git a/core/src/test/java/org/lflang/tests/compiler/RangeTests.java b/core/src/test/java/org/lflang/tests/compiler/RangeTests.java
index 2c17145aaa..07d7a3da34 100644
--- a/core/src/test/java/org/lflang/tests/compiler/RangeTests.java
+++ b/core/src/test/java/org/lflang/tests/compiler/RangeTests.java
@@ -4,8 +4,8 @@
 import java.util.Set;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.lflang.DefaultErrorReporter;
-import org.lflang.ErrorReporter;
+import org.lflang.DefaultMessageReporter;
+import org.lflang.MessageReporter;
 import org.lflang.generator.PortInstance;
 import org.lflang.generator.ReactorInstance;
 import org.lflang.generator.RuntimeRange;
@@ -16,7 +16,7 @@
 
 public class RangeTests {
 
-  private ErrorReporter reporter = new DefaultErrorReporter();
+  private MessageReporter reporter = new DefaultMessageReporter();
   private static LfFactory factory = LfFactory.eINSTANCE;
 
   @Test
diff --git a/core/src/testFixtures/java/org/lflang/tests/TestBase.java b/core/src/testFixtures/java/org/lflang/tests/TestBase.java
index c149c550c6..a0002f0723 100644
--- a/core/src/testFixtures/java/org/lflang/tests/TestBase.java
+++ b/core/src/testFixtures/java/org/lflang/tests/TestBase.java
@@ -38,7 +38,7 @@
 import org.eclipse.xtext.validation.CheckMode;
 import org.eclipse.xtext.validation.IResourceValidator;
 import org.junit.jupiter.api.extension.ExtendWith;
-import org.lflang.DefaultErrorReporter;
+import org.lflang.DefaultMessageReporter;
 import org.lflang.FileConfig;
 import org.lflang.LFRuntimeModule;
 import org.lflang.LFStandaloneSetup;
@@ -428,7 +428,7 @@ private void configure(LFTest test, Configurator configurator, TestLevel level)
             props,
             r,
             fileAccess,
-            fileConfig -> new DefaultErrorReporter());
+            fileConfig -> new DefaultMessageReporter());
 
     test.configure(context);
 
diff --git a/lsp/src/main/java/org/lflang/diagram/lsp/LanguageDiagramServer.java b/lsp/src/main/java/org/lflang/diagram/lsp/LanguageDiagramServer.java
index 96e887d242..0531d97721 100644
--- a/lsp/src/main/java/org/lflang/diagram/lsp/LanguageDiagramServer.java
+++ b/lsp/src/main/java/org/lflang/diagram/lsp/LanguageDiagramServer.java
@@ -19,7 +19,7 @@
 import org.eclipse.xtext.ide.server.LanguageServerImpl;
 import org.eclipse.xtext.service.AbstractGenericModule;
 import org.eclipse.xtext.util.Modules2;
-import org.lflang.generator.LanguageServerErrorReporter;
+import org.lflang.generator.LanguageServerMessageReporter;
 import org.lflang.ide.LFIdeSetup;
 
 /**
@@ -77,7 +77,7 @@ public void onConnect() {
       super.onConnect();
       constraints.setClient((KGraphLanguageClient) languageClient);
       rectPack.setClient((KGraphLanguageClient) languageClient);
-      LanguageServerErrorReporter.setClient(languageClient);
+      LanguageServerMessageReporter.setClient(languageClient);
       lfExtension.setClient(languageClient);
       // The following is needed because VS Code treats System.err like System.out and System.out
       // like a shout

From 62350e8708ba4f6c3b896da46367f3bba494925e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Fournier?= <clement.fournier@tu-dresden.de>
Date: Fri, 16 Jun 2023 18:06:20 +0200
Subject: [PATCH 16/17] Format

---
 .../src/main/java/org/lflang/cli/CliBase.java |  2 +-
 .../org/lflang/cli/LFStandaloneModule.java    |  2 +-
 .../lflang/cli/StandaloneMessageReporter.java |  3 +-
 .../main/java/org/lflang/MessageReporter.java |  6 +--
 .../main/java/org/lflang/TargetProperty.java  |  1 -
 .../federated/extensions/CExtension.java      |  5 +-
 .../federated/extensions/CExtensionUtils.java | 20 +++++---
 .../extensions/FedTargetExtension.java        |  2 +-
 .../federated/extensions/PythonExtension.java | 10 +++-
 .../federated/extensions/TSExtension.java     |  2 +-
 .../federated/generator/FedASTUtils.java      |  2 +-
 .../federated/generator/FedEmitter.java       | 15 +++---
 .../federated/generator/FedGenerator.java     | 16 ++++--
 .../launcher/FedLauncherGenerator.java        |  5 +-
 .../generator/DockerComposeGenerator.java     |  2 +-
 .../java/org/lflang/generator/DockerData.java |  7 ++-
 .../org/lflang/generator/GeneratorBase.java   | 16 ++++--
 .../generator/GeneratorCommandFactory.java    |  2 +-
 .../org/lflang/generator/GeneratorUtils.java  |  2 +-
 .../HumanReadableReportingStrategy.java       |  3 +-
 .../lflang/generator/IntegratedBuilder.java   |  2 +-
 .../org/lflang/generator/LFGenerator.java     |  5 +-
 .../lflang/generator/LFGeneratorContext.java  |  2 +-
 .../LanguageServerMessageReporter.java        |  2 -
 .../org/lflang/generator/MainContext.java     |  2 +-
 .../java/org/lflang/generator/SubContext.java |  2 +-
 .../lflang/generator/c/CCmakeGenerator.java   |  2 +-
 .../org/lflang/generator/c/CCompiler.java     | 12 +++--
 .../org/lflang/generator/c/CGenerator.java    | 50 +++++++++++--------
 .../generator/c/CReactionGenerator.java       |  2 +-
 .../java/org/lflang/generator/c/CUtil.java    |  2 +-
 .../python/PythonReactionGenerator.java       |  5 +-
 .../generator/python/PythonValidator.java     |  2 +-
 .../java/org/lflang/util/ArduinoUtil.java     | 26 ++++++----
 .../main/java/org/lflang/util/FileUtil.java   |  5 +-
 35 files changed, 148 insertions(+), 96 deletions(-)

diff --git a/cli/base/src/main/java/org/lflang/cli/CliBase.java b/cli/base/src/main/java/org/lflang/cli/CliBase.java
index d93f093eea..0b61fa767b 100644
--- a/cli/base/src/main/java/org/lflang/cli/CliBase.java
+++ b/cli/base/src/main/java/org/lflang/cli/CliBase.java
@@ -27,9 +27,9 @@
 import org.eclipse.xtext.validation.CheckMode;
 import org.eclipse.xtext.validation.IResourceValidator;
 import org.eclipse.xtext.validation.Issue;
-import org.lflang.MessageReporter;
 import org.lflang.LFRuntimeModule;
 import org.lflang.LFStandaloneSetup;
+import org.lflang.MessageReporter;
 import org.lflang.util.FileUtil;
 import picocli.CommandLine;
 import picocli.CommandLine.ArgGroup;
diff --git a/cli/base/src/main/java/org/lflang/cli/LFStandaloneModule.java b/cli/base/src/main/java/org/lflang/cli/LFStandaloneModule.java
index 8cb8395d5b..99dfd9a0b8 100644
--- a/cli/base/src/main/java/org/lflang/cli/LFStandaloneModule.java
+++ b/cli/base/src/main/java/org/lflang/cli/LFStandaloneModule.java
@@ -34,8 +34,8 @@
 import org.eclipse.emf.ecore.EValidator;
 import org.eclipse.emf.ecore.impl.EValidatorRegistryImpl;
 import org.eclipse.xtext.validation.ValidationMessageAcceptor;
-import org.lflang.MessageReporter;
 import org.lflang.LFRuntimeModule;
+import org.lflang.MessageReporter;
 
 /**
  * Module that is only available when running LFC as a standalone program.
diff --git a/cli/base/src/main/java/org/lflang/cli/StandaloneMessageReporter.java b/cli/base/src/main/java/org/lflang/cli/StandaloneMessageReporter.java
index a6cbbd39cd..1ecffbdedb 100644
--- a/cli/base/src/main/java/org/lflang/cli/StandaloneMessageReporter.java
+++ b/cli/base/src/main/java/org/lflang/cli/StandaloneMessageReporter.java
@@ -47,8 +47,7 @@ static Severity convertSeverity(DiagnosticSeverity severity) {
     return switch (severity) {
       case Error -> Severity.ERROR;
       case Warning -> Severity.WARNING;
-      case Information -> Severity.INFO;
-      case Hint -> Severity.IGNORE;
+      case Information, Hint -> Severity.INFO;
     };
   }
 
diff --git a/core/src/main/java/org/lflang/MessageReporter.java b/core/src/main/java/org/lflang/MessageReporter.java
index 578f9c781a..949c708592 100644
--- a/core/src/main/java/org/lflang/MessageReporter.java
+++ b/core/src/main/java/org/lflang/MessageReporter.java
@@ -7,9 +7,9 @@
 import org.lflang.generator.Range;
 
 /**
- * Interface for reporting messages like errors or info. This interface is a staged builder: first call one of the {@code
- * at} methods to specify the position of the message, then use one of the report methods on the
- * returned {@link Stage2} instance.
+ * Interface for reporting messages like errors or info. This interface is a staged builder: first
+ * call one of the {@code at} methods to specify the position of the message, then use one of the
+ * report methods on the returned {@link Stage2} instance.
  *
  * <p>Examples:
  *
diff --git a/core/src/main/java/org/lflang/TargetProperty.java b/core/src/main/java/org/lflang/TargetProperty.java
index cfca699994..f86f87ea2b 100644
--- a/core/src/main/java/org/lflang/TargetProperty.java
+++ b/core/src/main/java/org/lflang/TargetProperty.java
@@ -34,7 +34,6 @@
 import java.util.Optional;
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
-import org.eclipse.xtext.util.RuntimeIOException;
 import org.lflang.TargetConfig.DockerOptions;
 import org.lflang.TargetConfig.PlatformOptions;
 import org.lflang.TargetConfig.TracingOptions;
diff --git a/core/src/main/java/org/lflang/federated/extensions/CExtension.java b/core/src/main/java/org/lflang/federated/extensions/CExtension.java
index 3a47701475..4ae1c7328c 100644
--- a/core/src/main/java/org/lflang/federated/extensions/CExtension.java
+++ b/core/src/main/java/org/lflang/federated/extensions/CExtension.java
@@ -33,8 +33,8 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.List;
-import org.lflang.MessageReporter;
 import org.lflang.InferredType;
+import org.lflang.MessageReporter;
 import org.lflang.Target;
 import org.lflang.TargetProperty;
 import org.lflang.TargetProperty.CoordinationType;
@@ -330,7 +330,8 @@ public String generateNetworkSenderBody(
               + ", message_length";
     }
 
-    serializeAndSend(connection, type, sendRef, result, sendingFunction, commonArgs, messageReporter);
+    serializeAndSend(
+        connection, type, sendRef, result, sendingFunction, commonArgs, messageReporter);
     return result.toString();
   }
 
diff --git a/core/src/main/java/org/lflang/federated/extensions/CExtensionUtils.java b/core/src/main/java/org/lflang/federated/extensions/CExtensionUtils.java
index 6afba48178..bacd99d56c 100644
--- a/core/src/main/java/org/lflang/federated/extensions/CExtensionUtils.java
+++ b/core/src/main/java/org/lflang/federated/extensions/CExtensionUtils.java
@@ -7,9 +7,8 @@
 import java.util.LinkedList;
 import java.util.List;
 import java.util.regex.Pattern;
-
-import org.lflang.MessageReporter;
 import org.lflang.InferredType;
+import org.lflang.MessageReporter;
 import org.lflang.TargetConfig.ClockSyncOptions;
 import org.lflang.TargetProperty;
 import org.lflang.TargetProperty.ClockSyncMode;
@@ -241,7 +240,10 @@ static boolean isSharedPtrType(InferredType type, CTypes types) {
   }
 
   public static void handleCompileDefinitions(
-      FederateInstance federate, int numOfFederates, RtiConfig rtiConfig, MessageReporter messageReporter) {
+      FederateInstance federate,
+      int numOfFederates,
+      RtiConfig rtiConfig,
+      MessageReporter messageReporter) {
     federate.targetConfig.setByUser.add(TargetProperty.COMPILE_DEFINITIONS);
     federate.targetConfig.compileDefinitions.put("FEDERATED", "");
     federate.targetConfig.compileDefinitions.put(
@@ -300,10 +302,14 @@ public static void initializeClockSynchronization(
       FederateInstance federate, RtiConfig rtiConfig, MessageReporter messageReporter) {
     // Check if clock synchronization should be enabled for this federate in the first place
     if (clockSyncIsOn(federate, rtiConfig)) {
-      messageReporter.nowhere().info("Initial clock synchronization is enabled for federate " + federate.id);
+      messageReporter
+          .nowhere()
+          .info("Initial clock synchronization is enabled for federate " + federate.id);
       if (federate.targetConfig.clockSync == ClockSyncMode.ON) {
         if (federate.targetConfig.clockSyncOptions.collectStats) {
-          messageReporter.nowhere().info("Will collect clock sync statistics for federate " + federate.id);
+          messageReporter
+              .nowhere()
+              .info("Will collect clock sync statistics for federate " + federate.id);
           // Add libm to the compiler flags
           // FIXME: This is a linker flag not compile flag but we don't have a way to add linker
           // flags
@@ -312,7 +318,9 @@ public static void initializeClockSynchronization(
           federate.targetConfig.compilerFlags.add("-lm");
           federate.targetConfig.setByUser.add(TargetProperty.FLAGS);
         }
-        messageReporter.nowhere().info("Runtime clock synchronization is enabled for federate " + federate.id);
+        messageReporter
+            .nowhere()
+            .info("Runtime clock synchronization is enabled for federate " + federate.id);
       }
 
       addClockSyncCompileDefinitions(federate);
diff --git a/core/src/main/java/org/lflang/federated/extensions/FedTargetExtension.java b/core/src/main/java/org/lflang/federated/extensions/FedTargetExtension.java
index 2b3328ab88..616cfa8fce 100644
--- a/core/src/main/java/org/lflang/federated/extensions/FedTargetExtension.java
+++ b/core/src/main/java/org/lflang/federated/extensions/FedTargetExtension.java
@@ -1,8 +1,8 @@
 package org.lflang.federated.extensions;
 
 import java.io.IOException;
-import org.lflang.MessageReporter;
 import org.lflang.InferredType;
+import org.lflang.MessageReporter;
 import org.lflang.TargetProperty.CoordinationType;
 import org.lflang.TimeValue;
 import org.lflang.federated.generator.FedConnectionInstance;
diff --git a/core/src/main/java/org/lflang/federated/extensions/PythonExtension.java b/core/src/main/java/org/lflang/federated/extensions/PythonExtension.java
index 3f290d5639..d467e981e0 100644
--- a/core/src/main/java/org/lflang/federated/extensions/PythonExtension.java
+++ b/core/src/main/java/org/lflang/federated/extensions/PythonExtension.java
@@ -27,8 +27,8 @@
 package org.lflang.federated.extensions;
 
 import java.io.IOException;
-import org.lflang.MessageReporter;
 import org.lflang.InferredType;
+import org.lflang.MessageReporter;
 import org.lflang.TargetProperty.CoordinationType;
 import org.lflang.ast.ASTUtils;
 import org.lflang.federated.generator.FedConnectionInstance;
@@ -117,7 +117,13 @@ public String generateNetworkReceiverBody(
     result.pr(PyUtil.generateGILAcquireCode() + "\n");
     result.pr(
         super.generateNetworkReceiverBody(
-            action, sendingPort, receivingPort, connection, type, coordinationType, messageReporter));
+            action,
+            sendingPort,
+            receivingPort,
+            connection,
+            type,
+            coordinationType,
+            messageReporter));
     result.pr(PyUtil.generateGILReleaseCode() + "\n");
     return result.getCode();
   }
diff --git a/core/src/main/java/org/lflang/federated/extensions/TSExtension.java b/core/src/main/java/org/lflang/federated/extensions/TSExtension.java
index 61b62de554..884b40fbb4 100644
--- a/core/src/main/java/org/lflang/federated/extensions/TSExtension.java
+++ b/core/src/main/java/org/lflang/federated/extensions/TSExtension.java
@@ -6,8 +6,8 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
-import org.lflang.MessageReporter;
 import org.lflang.InferredType;
+import org.lflang.MessageReporter;
 import org.lflang.TargetProperty.CoordinationType;
 import org.lflang.TimeValue;
 import org.lflang.ast.ASTUtils;
diff --git a/core/src/main/java/org/lflang/federated/generator/FedASTUtils.java b/core/src/main/java/org/lflang/federated/generator/FedASTUtils.java
index a3f76f2bdb..71b809baf6 100644
--- a/core/src/main/java/org/lflang/federated/generator/FedASTUtils.java
+++ b/core/src/main/java/org/lflang/federated/generator/FedASTUtils.java
@@ -42,8 +42,8 @@
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.xtext.xbase.lib.IteratorExtensions;
-import org.lflang.MessageReporter;
 import org.lflang.InferredType;
+import org.lflang.MessageReporter;
 import org.lflang.ModelInfo;
 import org.lflang.TargetProperty.CoordinationType;
 import org.lflang.TimeValue;
diff --git a/core/src/main/java/org/lflang/federated/generator/FedEmitter.java b/core/src/main/java/org/lflang/federated/generator/FedEmitter.java
index dc642a5612..c6e515854d 100644
--- a/core/src/main/java/org/lflang/federated/generator/FedEmitter.java
+++ b/core/src/main/java/org/lflang/federated/generator/FedEmitter.java
@@ -40,11 +40,13 @@ Map<Path, CodeMap> generateFederate(
       throws IOException {
     String fedName = federate.name;
     Files.createDirectories(fileConfig.getSrcPath());
-    messageReporter.nowhere().info(
-        "##### Generating code for federate "
-            + fedName
-            + " in directory "
-            + fileConfig.getSrcPath());
+    messageReporter
+        .nowhere()
+        .info(
+            "##### Generating code for federate "
+                + fedName
+                + " in directory "
+                + fileConfig.getSrcPath());
 
     String federateCode =
         String.join(
@@ -56,7 +58,8 @@ Map<Path, CodeMap> generateFederate(
             new FedPreambleEmitter()
                 .generatePreamble(federate, fileConfig, rtiConfig, messageReporter),
             new FedReactorEmitter().generateReactorDefinitions(federate),
-            new FedMainEmitter().generateMainReactor(federate, originalMainReactor, messageReporter));
+            new FedMainEmitter()
+                .generateMainReactor(federate, originalMainReactor, messageReporter));
     Map<Path, CodeMap> codeMapMap = new HashMap<>();
     var lfFilePath = lfFilePath(fileConfig, federate);
     try (var srcWriter = Files.newBufferedWriter(lfFilePath)) {
diff --git a/core/src/main/java/org/lflang/federated/generator/FedGenerator.java b/core/src/main/java/org/lflang/federated/generator/FedGenerator.java
index 2b418b1ad7..b3cd74fe48 100644
--- a/core/src/main/java/org/lflang/federated/generator/FedGenerator.java
+++ b/core/src/main/java/org/lflang/federated/generator/FedGenerator.java
@@ -26,9 +26,9 @@
 import org.eclipse.xtext.resource.XtextResource;
 import org.eclipse.xtext.resource.XtextResourceSet;
 import org.eclipse.xtext.util.RuntimeIOException;
-import org.lflang.MessageReporter;
 import org.lflang.FileConfig;
 import org.lflang.LFStandaloneSetup;
+import org.lflang.MessageReporter;
 import org.lflang.Target;
 import org.lflang.TargetConfig;
 import org.lflang.TargetProperty.CoordinationType;
@@ -140,7 +140,10 @@ public boolean doGenerate(Resource resource, LFGeneratorContext context) throws
 
     FedEmitter fedEmitter =
         new FedEmitter(
-            fileConfig, ASTUtils.toDefinition(mainDef.getReactorClass()), messageReporter, rtiConfig);
+            fileConfig,
+            ASTUtils.toDefinition(mainDef.getReactorClass()),
+            messageReporter,
+            rtiConfig);
 
     // Generate LF code for each federate.
     Map<Path, CodeMap> lf2lfCodeMapMap = new HashMap<>();
@@ -264,8 +267,9 @@ private Map<Path, CodeMap> compileFederates(
         Math.min(
             6, Math.min(Math.max(federates.size(), 1), Runtime.getRuntime().availableProcessors()));
     var compileThreadPool = Executors.newFixedThreadPool(numOfCompileThreads);
-    messageReporter.nowhere().info(
-        "******** Using " + numOfCompileThreads + " threads to compile the program.");
+    messageReporter
+        .nowhere()
+        .info("******** Using " + numOfCompileThreads + " threads to compile the program.");
     Map<Path, CodeMap> codeMapMap = new ConcurrentHashMap<>();
     List<SubContext> subContexts = Collections.synchronizedList(new ArrayList<>());
     Averager averager = new Averager(federates.size());
@@ -420,7 +424,9 @@ private void analyzeFederates(Reactor federation, LFGeneratorContext context) {
     for (Instantiation instantiation : ASTUtils.allInstantiations(federation)) {
       int bankWidth = ASTUtils.width(instantiation.getWidthSpec(), mainReactorContext);
       if (bankWidth < 0) {
-        messageReporter.at(instantiation).error("Cannot determine bank width! Assuming width of 1.");
+        messageReporter
+            .at(instantiation)
+            .error("Cannot determine bank width! Assuming width of 1.");
         // Continue with a bank width of 1.
         bankWidth = 1;
       }
diff --git a/core/src/main/java/org/lflang/federated/launcher/FedLauncherGenerator.java b/core/src/main/java/org/lflang/federated/launcher/FedLauncherGenerator.java
index f4a148ff18..53b8ec6607 100644
--- a/core/src/main/java/org/lflang/federated/launcher/FedLauncherGenerator.java
+++ b/core/src/main/java/org/lflang/federated/launcher/FedLauncherGenerator.java
@@ -218,8 +218,9 @@ public void doGenerate(List<FederateInstance> federates, RtiConfig rtiConfig) {
       }
     }
 
-    messageReporter.nowhere().info(
-        "##### Generating launcher for federation " + " in directory " + fileConfig.binPath);
+    messageReporter
+        .nowhere()
+        .info("##### Generating launcher for federation " + " in directory " + fileConfig.binPath);
 
     // Write the launcher file.
     // Delete file previously produced, if any.
diff --git a/core/src/main/java/org/lflang/generator/DockerComposeGenerator.java b/core/src/main/java/org/lflang/generator/DockerComposeGenerator.java
index 7e7ff22646..1b2dab1c52 100644
--- a/core/src/main/java/org/lflang/generator/DockerComposeGenerator.java
+++ b/core/src/main/java/org/lflang/generator/DockerComposeGenerator.java
@@ -4,7 +4,6 @@
 import java.nio.file.Path;
 import java.util.List;
 import java.util.stream.Collectors;
-
 import org.lflang.util.FileUtil;
 
 /**
@@ -17,6 +16,7 @@ public class DockerComposeGenerator {
 
   /** Path to the docker-compose.yml file. */
   protected final Path path;
+
   private final LFGeneratorContext context;
 
   public DockerComposeGenerator(LFGeneratorContext context) {
diff --git a/core/src/main/java/org/lflang/generator/DockerData.java b/core/src/main/java/org/lflang/generator/DockerData.java
index 850670f387..181c7fd745 100644
--- a/core/src/main/java/org/lflang/generator/DockerData.java
+++ b/core/src/main/java/org/lflang/generator/DockerData.java
@@ -19,9 +19,14 @@ public class DockerData {
 
   /** The name of the service. */
   public final String serviceName;
+
   private final LFGeneratorContext context;
 
-  public DockerData(String serviceName, Path dockerFilePath, String dockerFileContent, LFGeneratorContext context) {
+  public DockerData(
+      String serviceName,
+      Path dockerFilePath,
+      String dockerFileContent,
+      LFGeneratorContext context) {
     this.context = context;
 
     if (!dockerFilePath.toFile().isAbsolute()) {
diff --git a/core/src/main/java/org/lflang/generator/GeneratorBase.java b/core/src/main/java/org/lflang/generator/GeneratorBase.java
index 5f7f7c54e9..76af5c5c25 100644
--- a/core/src/main/java/org/lflang/generator/GeneratorBase.java
+++ b/core/src/main/java/org/lflang/generator/GeneratorBase.java
@@ -42,9 +42,9 @@
 import org.eclipse.lsp4j.DiagnosticSeverity;
 import org.eclipse.xtext.xbase.lib.IterableExtensions;
 import org.eclipse.xtext.xbase.lib.IteratorExtensions;
-import org.lflang.MessageReporter;
 import org.lflang.FileConfig;
 import org.lflang.MainConflictChecker;
+import org.lflang.MessageReporter;
 import org.lflang.Target;
 import org.lflang.TargetConfig;
 import org.lflang.ast.ASTUtils;
@@ -267,7 +267,10 @@ public void doGenerate(Resource resource, LFGeneratorContext context) {
                         it, context.getFileConfig().getSrcGenBasePath(), context, messageReporter))
             .toList());
     GeneratorUtils.accommodatePhysicalActionsIfPresent(
-        allResources, getTarget().setsKeepAliveOptionAutomatically(), targetConfig, messageReporter);
+        allResources,
+        getTarget().setsKeepAliveOptionAutomatically(),
+        targetConfig,
+        messageReporter);
     // FIXME: Should the GeneratorBase pull in {@code files} from imported
     // resources?
 
@@ -658,10 +661,13 @@ private void reportIssue(StringBuilder message, Integer lineNumber, Path path, i
    * is in, and where the generated sources are to be put.
    */
   public void printInfo(LFGeneratorContext.Mode mode) {
-    messageReporter.nowhere().info(
-        "Generating code for: " + context.getFileConfig().resource.getURI().toString());
+    messageReporter
+        .nowhere()
+        .info("Generating code for: " + context.getFileConfig().resource.getURI().toString());
     messageReporter.nowhere().info("******** mode: " + mode);
-    messageReporter.nowhere().info("******** generated sources: " + context.getFileConfig().getSrcGenPath());
+    messageReporter
+        .nowhere()
+        .info("******** generated sources: " + context.getFileConfig().getSrcGenPath());
   }
 
   /** Get the buffer type used for network messages */
diff --git a/core/src/main/java/org/lflang/generator/GeneratorCommandFactory.java b/core/src/main/java/org/lflang/generator/GeneratorCommandFactory.java
index b32777b1af..7e9575b219 100644
--- a/core/src/main/java/org/lflang/generator/GeneratorCommandFactory.java
+++ b/core/src/main/java/org/lflang/generator/GeneratorCommandFactory.java
@@ -33,8 +33,8 @@
 import java.util.List;
 import java.util.Objects;
 import org.eclipse.lsp4j.DiagnosticSeverity;
-import org.lflang.MessageReporter;
 import org.lflang.FileConfig;
+import org.lflang.MessageReporter;
 import org.lflang.util.LFCommand;
 
 /**
diff --git a/core/src/main/java/org/lflang/generator/GeneratorUtils.java b/core/src/main/java/org/lflang/generator/GeneratorUtils.java
index 8fd9b09524..09cf940fb3 100644
--- a/core/src/main/java/org/lflang/generator/GeneratorUtils.java
+++ b/core/src/main/java/org/lflang/generator/GeneratorUtils.java
@@ -10,8 +10,8 @@
 import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.xtext.xbase.lib.IteratorExtensions;
-import org.lflang.MessageReporter;
 import org.lflang.FileConfig;
+import org.lflang.MessageReporter;
 import org.lflang.TargetConfig;
 import org.lflang.TargetProperty;
 import org.lflang.ast.ASTUtils;
diff --git a/core/src/main/java/org/lflang/generator/HumanReadableReportingStrategy.java b/core/src/main/java/org/lflang/generator/HumanReadableReportingStrategy.java
index 6030ccc1fd..fedfcb6d36 100644
--- a/core/src/main/java/org/lflang/generator/HumanReadableReportingStrategy.java
+++ b/core/src/main/java/org/lflang/generator/HumanReadableReportingStrategy.java
@@ -66,7 +66,8 @@ public HumanReadableReportingStrategy(
   }
 
   @Override
-  public void report(String validationOutput, MessageReporter messageReporter, Map<Path, CodeMap> map) {
+  public void report(
+      String validationOutput, MessageReporter messageReporter, Map<Path, CodeMap> map) {
     Iterator<String> it = validationOutput.lines().iterator();
     while (it.hasNext() || bufferedLine != null) {
       if (bufferedLine != null) {
diff --git a/core/src/main/java/org/lflang/generator/IntegratedBuilder.java b/core/src/main/java/org/lflang/generator/IntegratedBuilder.java
index 9c229e17e9..41ad7a4c3d 100644
--- a/core/src/main/java/org/lflang/generator/IntegratedBuilder.java
+++ b/core/src/main/java/org/lflang/generator/IntegratedBuilder.java
@@ -17,8 +17,8 @@
 import org.eclipse.xtext.validation.CheckMode;
 import org.eclipse.xtext.validation.IResourceValidator;
 import org.eclipse.xtext.validation.Issue;
-import org.lflang.MessageReporter;
 import org.lflang.FileConfig;
+import org.lflang.MessageReporter;
 import org.lflang.generator.LFGeneratorContext.Mode;
 
 /**
diff --git a/core/src/main/java/org/lflang/generator/LFGenerator.java b/core/src/main/java/org/lflang/generator/LFGenerator.java
index 0647fbd31d..261a615b91 100644
--- a/core/src/main/java/org/lflang/generator/LFGenerator.java
+++ b/core/src/main/java/org/lflang/generator/LFGenerator.java
@@ -2,7 +2,6 @@
 
 import com.google.inject.Inject;
 import com.google.inject.Injector;
-
 import java.io.IOException;
 import java.nio.file.Path;
 import java.util.Arrays;
@@ -11,8 +10,8 @@
 import org.eclipse.xtext.generator.IFileSystemAccess2;
 import org.eclipse.xtext.generator.IGeneratorContext;
 import org.eclipse.xtext.util.RuntimeIOException;
-import org.lflang.MessageReporter;
 import org.lflang.FileConfig;
+import org.lflang.MessageReporter;
 import org.lflang.Target;
 import org.lflang.ast.ASTUtils;
 import org.lflang.federated.generator.FedASTUtils;
@@ -88,7 +87,7 @@ private GeneratorBase createGenerator(LFGeneratorContext context) {
 
   @Override
   public void doGenerate(Resource resource, IFileSystemAccess2 fsa, IGeneratorContext context) {
-    assert injector!=null;
+    assert injector != null;
     final LFGeneratorContext lfContext;
     if (context instanceof LFGeneratorContext) {
       lfContext = (LFGeneratorContext) context;
diff --git a/core/src/main/java/org/lflang/generator/LFGeneratorContext.java b/core/src/main/java/org/lflang/generator/LFGeneratorContext.java
index 1ad1400b10..cc3b41c6c1 100644
--- a/core/src/main/java/org/lflang/generator/LFGeneratorContext.java
+++ b/core/src/main/java/org/lflang/generator/LFGeneratorContext.java
@@ -6,8 +6,8 @@
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.xtext.generator.IFileSystemAccess2;
 import org.eclipse.xtext.generator.IGeneratorContext;
-import org.lflang.MessageReporter;
 import org.lflang.FileConfig;
+import org.lflang.MessageReporter;
 import org.lflang.TargetConfig;
 
 /**
diff --git a/core/src/main/java/org/lflang/generator/LanguageServerMessageReporter.java b/core/src/main/java/org/lflang/generator/LanguageServerMessageReporter.java
index e5f74983b0..0fd51333b1 100644
--- a/core/src/main/java/org/lflang/generator/LanguageServerMessageReporter.java
+++ b/core/src/main/java/org/lflang/generator/LanguageServerMessageReporter.java
@@ -6,7 +6,6 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
-
 import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.lsp4j.Diagnostic;
@@ -15,7 +14,6 @@
 import org.eclipse.lsp4j.Range;
 import org.eclipse.lsp4j.services.LanguageClient;
 import org.eclipse.xtext.nodemodel.util.NodeModelUtils;
-
 import org.lflang.MessageReporterBase;
 import org.lflang.util.FileUtil;
 
diff --git a/core/src/main/java/org/lflang/generator/MainContext.java b/core/src/main/java/org/lflang/generator/MainContext.java
index c724c37dba..7357929c06 100644
--- a/core/src/main/java/org/lflang/generator/MainContext.java
+++ b/core/src/main/java/org/lflang/generator/MainContext.java
@@ -9,8 +9,8 @@
 import org.eclipse.xtext.util.CancelIndicator;
 import org.eclipse.xtext.util.RuntimeIOException;
 import org.lflang.DefaultMessageReporter;
-import org.lflang.MessageReporter;
 import org.lflang.FileConfig;
+import org.lflang.MessageReporter;
 import org.lflang.TargetConfig;
 import org.lflang.generator.IntegratedBuilder.ReportProgress;
 
diff --git a/core/src/main/java/org/lflang/generator/SubContext.java b/core/src/main/java/org/lflang/generator/SubContext.java
index 1620e10bc7..9c2bb24e5c 100644
--- a/core/src/main/java/org/lflang/generator/SubContext.java
+++ b/core/src/main/java/org/lflang/generator/SubContext.java
@@ -2,8 +2,8 @@
 
 import java.util.Properties;
 import org.eclipse.xtext.util.CancelIndicator;
-import org.lflang.MessageReporter;
 import org.lflang.FileConfig;
+import org.lflang.MessageReporter;
 import org.lflang.TargetConfig;
 
 /**
diff --git a/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java b/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java
index 6fb049ca16..7b6cb006c2 100644
--- a/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java
@@ -31,8 +31,8 @@
 import java.util.List;
 import java.util.Objects;
 import java.util.stream.Stream;
-import org.lflang.MessageReporter;
 import org.lflang.FileConfig;
+import org.lflang.MessageReporter;
 import org.lflang.TargetConfig;
 import org.lflang.TargetProperty.Platform;
 import org.lflang.generator.CodeBuilder;
diff --git a/core/src/main/java/org/lflang/generator/c/CCompiler.java b/core/src/main/java/org/lflang/generator/c/CCompiler.java
index baee9a7f39..681432b21b 100644
--- a/core/src/main/java/org/lflang/generator/c/CCompiler.java
+++ b/core/src/main/java/org/lflang/generator/c/CCompiler.java
@@ -33,8 +33,8 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Stream;
-import org.lflang.MessageReporter;
 import org.lflang.FileConfig;
+import org.lflang.MessageReporter;
 import org.lflang.TargetConfig;
 import org.lflang.TargetProperty;
 import org.lflang.TargetProperty.Platform;
@@ -171,10 +171,12 @@ public boolean runCCompiler(GeneratorBase generator, LFGeneratorContext context)
       }
 
       if (makeReturnCode == 0 && build.getErrors().length() == 0) {
-        messageReporter.nowhere().info(
-            "SUCCESS: Compiling generated code for "
-                + fileConfig.name
-                + " finished with no errors.");
+        messageReporter
+            .nowhere()
+            .info(
+                "SUCCESS: Compiling generated code for "
+                    + fileConfig.name
+                    + " finished with no errors.");
       }
 
       if (targetConfig.platformOptions.platform == Platform.ZEPHYR
diff --git a/core/src/main/java/org/lflang/generator/c/CGenerator.java b/core/src/main/java/org/lflang/generator/c/CGenerator.java
index db7a700845..d842ecb2dd 100644
--- a/core/src/main/java/org/lflang/generator/c/CGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CGenerator.java
@@ -477,20 +477,23 @@ public void doGenerate(Resource resource, LFGeneratorContext context) {
         context.finish(GeneratorResult.Status.COMPILED, null);
       } else {
         messageReporter.nowhere().info("********");
-        messageReporter.nowhere().info(
-            "To compile your program, run the following command to see information about the board"
-                + " you plugged in:\n\n"
-                + "\tarduino-cli board list\n\n"
-                + "Grab the FQBN and PORT from the command and run the following command in the"
-                + " generated sources directory:\n\n"
-                + "\tarduino-cli compile -b <FQBN> --build-property"
-                + " compiler.c.extra_flags='-DLF_UNTHREADED -DPLATFORM_ARDUINO"
-                + " -DINITIAL_EVENT_QUEUE_SIZE=10 -DINITIAL_REACT_QUEUE_SIZE=10' --build-property"
-                + " compiler.cpp.extra_flags='-DLF_UNTHREADED -DPLATFORM_ARDUINO"
-                + " -DINITIAL_EVENT_QUEUE_SIZE=10 -DINITIAL_REACT_QUEUE_SIZE=10' .\n\n"
-                + "To flash/upload your generated sketch to the board, run the following command in"
-                + " the generated sources directory:\n\n"
-                + "\tarduino-cli upload -b <FQBN> -p <PORT>\n");
+        messageReporter
+            .nowhere()
+            .info(
+                "To compile your program, run the following command to see information about the"
+                    + " board you plugged in:\n\n"
+                    + "\tarduino-cli board list\n\n"
+                    + "Grab the FQBN and PORT from the command and run the following command in the"
+                    + " generated sources directory:\n\n"
+                    + "\tarduino-cli compile -b <FQBN> --build-property"
+                    + " compiler.c.extra_flags='-DLF_UNTHREADED -DPLATFORM_ARDUINO"
+                    + " -DINITIAL_EVENT_QUEUE_SIZE=10 -DINITIAL_REACT_QUEUE_SIZE=10'"
+                    + " --build-property compiler.cpp.extra_flags='-DLF_UNTHREADED"
+                    + " -DPLATFORM_ARDUINO -DINITIAL_EVENT_QUEUE_SIZE=10"
+                    + " -DINITIAL_REACT_QUEUE_SIZE=10' .\n\n"
+                    + "To flash/upload your generated sketch to the board, run the following"
+                    + " command in the generated sources directory:\n\n"
+                    + "\tarduino-cli upload -b <FQBN> -p <PORT>\n");
         // System.out.println("For a list of all boards installed on your computer, you can use the
         // following command:\n\n\tarduino-cli board listall\n");
         context.finish(GeneratorResult.GENERATED_NO_EXECUTABLE.apply(context, null));
@@ -1961,19 +1964,24 @@ protected void setUpGeneralParameters() {
         && (targetConfig.platformOptions.board == null
             || !targetConfig.platformOptions.board.contains("mbed"))) {
       // non-MBED boards should not use threading
-      messageReporter.nowhere().info(
-          "Threading is incompatible on your current Arduino flavor. Setting threading to false.");
+      messageReporter
+          .nowhere()
+          .info(
+              "Threading is incompatible on your current Arduino flavor. Setting threading to"
+                  + " false.");
       targetConfig.threading = false;
     }
 
     if (targetConfig.platformOptions.platform == Platform.ARDUINO
         && !targetConfig.noCompile
         && targetConfig.platformOptions.board == null) {
-      messageReporter.nowhere().info(
-          "To enable compilation for the Arduino platform, you must specify the fully-qualified"
-              + " board name (FQBN) in the target property. For example, platform: {name: arduino,"
-              + " board: arduino:avr:leonardo}. Entering \"no-compile\" mode and generating target"
-              + " code only.");
+      messageReporter
+          .nowhere()
+          .info(
+              "To enable compilation for the Arduino platform, you must specify the fully-qualified"
+                  + " board name (FQBN) in the target property. For example, platform: {name:"
+                  + " arduino, board: arduino:avr:leonardo}. Entering \"no-compile\" mode and"
+                  + " generating target code only.");
       targetConfig.noCompile = true;
     }
 
diff --git a/core/src/main/java/org/lflang/generator/c/CReactionGenerator.java b/core/src/main/java/org/lflang/generator/c/CReactionGenerator.java
index c8a16546ae..9d82b8f640 100644
--- a/core/src/main/java/org/lflang/generator/c/CReactionGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CReactionGenerator.java
@@ -9,8 +9,8 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import org.lflang.MessageReporter;
 import org.lflang.InferredType;
+import org.lflang.MessageReporter;
 import org.lflang.TargetConfig;
 import org.lflang.ast.ASTUtils;
 import org.lflang.federated.extensions.CExtensionUtils;
diff --git a/core/src/main/java/org/lflang/generator/c/CUtil.java b/core/src/main/java/org/lflang/generator/c/CUtil.java
index 194e6887e1..c2c04e7a2f 100644
--- a/core/src/main/java/org/lflang/generator/c/CUtil.java
+++ b/core/src/main/java/org/lflang/generator/c/CUtil.java
@@ -33,9 +33,9 @@
 import java.util.List;
 import java.util.Objects;
 import java.util.stream.Collectors;
-import org.lflang.MessageReporter;
 import org.lflang.FileConfig;
 import org.lflang.InferredType;
+import org.lflang.MessageReporter;
 import org.lflang.TargetConfig;
 import org.lflang.ast.ASTUtils;
 import org.lflang.generator.ActionInstance;
diff --git a/core/src/main/java/org/lflang/generator/python/PythonReactionGenerator.java b/core/src/main/java/org/lflang/generator/python/PythonReactionGenerator.java
index a39b38b619..c65d4ad3de 100644
--- a/core/src/main/java/org/lflang/generator/python/PythonReactionGenerator.java
+++ b/core/src/main/java/org/lflang/generator/python/PythonReactionGenerator.java
@@ -214,7 +214,10 @@ public static String generateFunction(String header, String init, Code code, Str
    *  We will use as a format string, "(O...O)" where the number of O's is equal to the length of the list.
    */
   private static String generateCPythonInitializers(
-      Reaction reaction, ReactorDecl decl, List<String> pyObjects, MessageReporter messageReporter) {
+      Reaction reaction,
+      ReactorDecl decl,
+      List<String> pyObjects,
+      MessageReporter messageReporter) {
     Set<Action> actionsAsTriggers = new LinkedHashSet<>();
     Reactor reactor = ASTUtils.toDefinition(decl);
     CodeBuilder code = new CodeBuilder();
diff --git a/core/src/main/java/org/lflang/generator/python/PythonValidator.java b/core/src/main/java/org/lflang/generator/python/PythonValidator.java
index 9f9d76339e..8dedb2f9d6 100644
--- a/core/src/main/java/org/lflang/generator/python/PythonValidator.java
+++ b/core/src/main/java/org/lflang/generator/python/PythonValidator.java
@@ -15,8 +15,8 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import org.eclipse.lsp4j.DiagnosticSeverity;
-import org.lflang.MessageReporter;
 import org.lflang.FileConfig;
+import org.lflang.MessageReporter;
 import org.lflang.generator.CodeMap;
 import org.lflang.generator.DiagnosticReporting;
 import org.lflang.generator.DiagnosticReporting.Strategy;
diff --git a/core/src/main/java/org/lflang/util/ArduinoUtil.java b/core/src/main/java/org/lflang/util/ArduinoUtil.java
index 9844195cb8..13f854f9c7 100644
--- a/core/src/main/java/org/lflang/util/ArduinoUtil.java
+++ b/core/src/main/java/org/lflang/util/ArduinoUtil.java
@@ -6,8 +6,8 @@
 import java.io.IOException;
 import java.util.List;
 import org.eclipse.xtext.xbase.lib.Exceptions;
-import org.lflang.MessageReporter;
 import org.lflang.FileConfig;
+import org.lflang.MessageReporter;
 import org.lflang.TargetConfig;
 import org.lflang.generator.GeneratorCommandFactory;
 import org.lflang.generator.LFGeneratorContext;
@@ -116,8 +116,12 @@ public void buildArduino(FileConfig fileConfig, TargetConfig targetConfig) {
     } catch (IOException e) {
       Exceptions.sneakyThrow(e);
     }
-    messageReporter.nowhere().info(
-        "SUCCESS: Compiling generated code for " + fileConfig.name + " finished with no errors.");
+    messageReporter
+        .nowhere()
+        .info(
+            "SUCCESS: Compiling generated code for "
+                + fileConfig.name
+                + " finished with no errors.");
     if (targetConfig.platformOptions.flash) {
       if (targetConfig.platformOptions.port != null) {
         messageReporter.nowhere().info("Invoking flash command for Arduino");
@@ -147,13 +151,15 @@ public void buildArduino(FileConfig fileConfig, TargetConfig targetConfig) {
       }
     } else {
       messageReporter.nowhere().info("********");
-      messageReporter.nowhere().info(
-          "To flash your program, run the following command to see information about the board you"
-              + " plugged in:\n\n"
-              + "\tarduino-cli board list\n\n"
-              + "Grab the FQBN and PORT from the command and run the following command in the"
-              + " generated sources directory:\n\n"
-              + "\tarduino-cli upload -b <FQBN> -p <PORT>\n");
+      messageReporter
+          .nowhere()
+          .info(
+              "To flash your program, run the following command to see information about the board"
+                  + " you plugged in:\n\n"
+                  + "\tarduino-cli board list\n\n"
+                  + "Grab the FQBN and PORT from the command and run the following command in the"
+                  + " generated sources directory:\n\n"
+                  + "\tarduino-cli upload -b <FQBN> -p <PORT>\n");
     }
   }
 }
diff --git a/core/src/main/java/org/lflang/util/FileUtil.java b/core/src/main/java/org/lflang/util/FileUtil.java
index 1d72a55ad2..063e383df8 100644
--- a/core/src/main/java/org/lflang/util/FileUtil.java
+++ b/core/src/main/java/org/lflang/util/FileUtil.java
@@ -33,8 +33,8 @@
 import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.xtext.util.RuntimeIOException;
-import org.lflang.MessageReporter;
 import org.lflang.FileConfig;
+import org.lflang.MessageReporter;
 
 public class FileUtil {
 
@@ -715,7 +715,8 @@ public static boolean isCFile(Path path) {
    * @param messageReporter Error reporter
    * @throws IOException If the given set of files cannot be relativized.
    */
-  public static void relativeIncludeHelper(Path dir, Path includePath, MessageReporter messageReporter) throws IOException {
+  public static void relativeIncludeHelper(
+      Path dir, Path includePath, MessageReporter messageReporter) throws IOException {
     messageReporter.nowhere().info("Relativizing all includes in " + dir.toString());
     List<Path> includePaths =
         Files.walk(includePath)

From d5e7fdc409c199825f6e8c59d51222f5c86ae69c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Fournier?= <clement.fournier@tu-dresden.de>
Date: Wed, 21 Jun 2023 13:29:48 +0200
Subject: [PATCH 17/17] Fix rust line numbers

---
 .../main/kotlin/org/lflang/generator/rust/RustValidator.kt    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/src/main/kotlin/org/lflang/generator/rust/RustValidator.kt b/core/src/main/kotlin/org/lflang/generator/rust/RustValidator.kt
index 5ee732acd0..9b4f6de19b 100644
--- a/core/src/main/kotlin/org/lflang/generator/rust/RustValidator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/rust/RustValidator.kt
@@ -105,9 +105,9 @@ class RustValidator(
         @JsonProperty("expansion") val expansion: RustSpanExpansion?
     ) {
         val start: Position
-            get() = Position.fromZeroBased(lineStart, columnStart)
+            get() = Position.fromOneBased(lineStart, columnStart)
         val end: Position
-            get() = Position.fromZeroBased(lineEnd, columnEnd)
+            get() = Position.fromOneBased(lineEnd, columnEnd)
         val range: Range get() = Range(start, end)
     }
     private data class RustSpanExpansion(