Restructuring of mechanism for compiling federated programs

.github/workflows/ts-tests.yml

@@ -28,7 +28,7 @@ jobs:
         if: ${{ runner.os == 'macOS' }}
       - name: Perform TypeScript tests
         run: |
-          ./gradlew test --tests org.lflang.tests.runtime.TypeScriptTest.*
+          ./gradlew test --tests org.lflang.tests.runtime.TypeScriptTest.* -Druntime="git://github.com/lf-lang/reactor-ts.git#fed-gen"
       - name: Report to CodeCov
         uses: codecov/[email protected]
         with:

.gitignore

@@ -12,6 +12,7 @@
 **/build/
 **/test-bin/
 **/src-gen/
+**/fed-gen/
 **/xtend-gen/
 # Created by https://www.toptal.com/developers/gitignore/api/intellij,gradle,eclipse,maven,visualstudiocode
 # Edit at https://www.toptal.com/developers/gitignore?templates=intellij,gradle,eclipse,maven,visualstudiocode
@@ -73,6 +74,8 @@ local.properties
 .cache-main
 .scala_dependencies
 .worksheet
+.metals/
+.bloop/
 
 # Uncomment this line if you wish to ignore the project description file.
 # Typically, this file would be tracked if it contains build/dependency configurations:

org.lflang.diagram/src/org/lflang/diagram/lsp/LFLanguageServerExtension.java

@@ -15,6 +15,7 @@
 import org.eclipse.xtext.ide.server.ILanguageServerAccess;
 import org.eclipse.xtext.util.CancelIndicator;
 
+import org.lflang.generator.GeneratorResult.Status;
 import org.lflang.generator.IntegratedBuilder;
 import org.lflang.generator.GeneratorResult;
 import org.lflang.LFStandaloneSetup;
@@ -90,11 +91,12 @@ public void partialBuild(String uri) {
     @JsonNotification("generator/buildAndRun")
     public CompletableFuture<String[]> buildAndRun(String uri) {
         return new CompletableFuture<String[]>().completeAsync(() -> {
-            LFCommand result = buildWithProgress(client, uri, true).getCommand();
-            if (result == null) return null;
+            var result = buildWithProgress(client, uri, true);
+            if (!result.equals(Status.COMPILED)) return null;
+            LFCommand cmd = result.getContext().getFileConfig().getCommand();
             ArrayList<String> ret = new ArrayList<>();
-            ret.add(result.directory().toString());
-            ret.addAll(result.command());
+            ret.add(cmd.directory().toString());
+            ret.addAll(cmd.command());
             return ret.toArray(new String[0]);
         });
     }

org.lflang.diagram/src/org/lflang/diagram/synthesis/LinguaFrancaSynthesis.java

@@ -278,7 +278,7 @@ public KNode transform(final Model model) {
                 List<KNode> reactorNodes = new ArrayList<>();
                 for (Reactor reactor : model.getReactors()) {
                     if (reactor == main) continue;
-                    ReactorInstance reactorInstance = new ReactorInstance(reactor, new SynthesisErrorReporter(), new HashSet<>());
+                    ReactorInstance reactorInstance = new ReactorInstance(reactor, new SynthesisErrorReporter());
                     reactorNodes.addAll(createReactorNode(reactorInstance, main == null, 
                             HashBasedTable.<ReactorInstance, PortInstance, KPort>create(), 
                             HashBasedTable.<ReactorInstance, PortInstance, KPort>create(), 

org.lflang.diagram/src/org/lflang/diagram/synthesis/util/NamedInstanceUtil.java

@@ -46,12 +46,12 @@ public static IPropertyHolder linkInstance(KGraphElement elem, NamedInstance<?>
     }
 
     /**
-     * Returns the linked NamedInstance for ther given KGraphElement.
+     * Returns the linked NamedInstance for the given KGraphElement.
      */
-    public static <T extends NamedInstance<?>> T getLinkedInstance(KGraphElement elem) {
-        NamedInstance<?> instance = elem.getProperty(LINKED_INSTANCE);
+    public static NamedInstance<?> getLinkedInstance(KGraphElement elem) {
+        var instance = elem.getProperty(LINKED_INSTANCE);
         if (instance != null) {
-            return (T) instance;
+            return instance;
         }
         return null;
     }

org.lflang.tests/src/org/lflang/tests/LFTest.java

@@ -32,9 +32,6 @@ public class LFTest implements Comparable<LFTest> {
     /** The result of the test. */
     private Result result = Result.UNKNOWN;
 
-    /** Object used to determine where the code generator puts files. */
-    private FileConfig fileConfig;
-
     /** Context provided to the code generators */
     private LFGeneratorContext context;
 
@@ -76,7 +73,7 @@ public OutputStream getOutputStream() {
         return compilationLog;
     }
 
-    public FileConfig getFileConfig() { return fileConfig; }
+    public FileConfig getFileConfig() { return context.getFileConfig(); }
 
     public LFGeneratorContext getContext() { return context; }
 
@@ -155,7 +152,7 @@ public void handleTestError(TestError e) {
         }
         if (e.getException() != null) {
             issues.append(System.lineSeparator());
-            issues.append(TestBase.stackTraceToString(e));
+            issues.append(TestBase.stackTraceToString(e.getException()));
         }
     }
 
@@ -165,9 +162,8 @@ public void markPassed() {
         execLog.clear();
     }
 
-    void configure(LFGeneratorContext context, FileConfig fileConfig) {
+    void configure(LFGeneratorContext context) {
         this.context = context;
-        this.fileConfig = fileConfig;
     }
 
     /**

org.lflang.tests/src/org/lflang/tests/RunSingleTestMain.java

@@ -31,7 +31,6 @@
 import java.util.regex.Pattern;
 
 import org.lflang.Target;
-import org.lflang.tests.TestBase.TestLevel;
 import org.lflang.tests.runtime.CCppTest;
 import org.lflang.tests.runtime.CTest;
 import org.lflang.tests.runtime.CppTest;