klighd-lsp: updateLayout is now always called during diagram generation.

kieler · NiklasRentzCAU · Sep 18, 2020 · Jun 12, 2019 · Jun 12, 2019 · Jun 12, 2019
commit 048984978529f1208df1cca05ff527b3241a5ca9
diff --git a/...ns/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/KGraphDiagramUpdater.xtend b/...ns/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/KGraphDiagramUpdater.xtend
@@ -91,10 +91,11 @@ class KGraphDiagramUpdater extends DiagramUpdater {
                 viewContext = diagramState.getKGraphContext(id)
             }
 
-            return diagramServer -> doCreateModel(viewContext, id, context.cancelChecker)
+            return diagramServer -> createModel(viewContext, id, context.cancelChecker)
         ].thenAccept [
             key.requestTextSizesAndUpdateModel(value)
         ].exceptionally [ throwable |
+            println("ERROR: " + throwable)
             return null
         ]
     }
@@ -113,23 +114,24 @@ class KGraphDiagramUpdater extends DiagramUpdater {
                         } else {
                             snapshotModel
                         }
-            val cancelChecker = context.cancelChecker
 
-            return (diagramServers as List<KGraphDiagramServer>).map [ server |
-                server -> {
-                    createModel(server, model, path, cancelChecker)
-                }
+            (diagramServers as List<KGraphDiagramServer>).forEach [ server |
+                prepareModel(server, model, path)
+                updateLayout(server)
             ]
-        ].thenAccept [ resultList |
-            // Call the text size estimation on the diagram server for which a new diagram got created.
-            resultList.filter[value !== null].forEach[key.requestTextSizesAndUpdateModel(value)]
-        ].exceptionally [ throwable |
-            println("ERROR: " + throwable)
             return null
         ]
     }
 
-    synchronized def createModel(KGraphDiagramServer server, Object model, String id, CancelIndicator cancelChecker) {
+    /**
+     * Prepares the DiagramState and the diagram server to generate an SGraph for the given model the next time the 
+     * createModel is called.
+     * 
+     * @param server The diagramServer for that the diagram state should be updated.
+     * @param model The new model that should be shown for the server.
+     * @param key The key to access the diagram state maps.
+     */
+    synchronized def void prepareModel(KGraphDiagramServer server, Object model, String key) {
 
         val properties = new KlighdSynthesisProperties()
         var SprottyViewer viewer = null
@@ -140,7 +142,7 @@ class KGraphDiagramUpdater extends DiagramUpdater {
                 viewer = iViewer
             }
 
-            synthesisId = diagramState.getSynthesisId(id)
+            synthesisId = diagramState.getSynthesisId(key)
         }
 
         // Set properties.
@@ -195,15 +197,12 @@ class KGraphDiagramUpdater extends DiagramUpdater {
         }
 
         synchronized (diagramState) {
-            diagramState.putURIString(server.clientId, id)
-            diagramState.putKGraphContext(id, viewContext)
+            diagramState.putURIString(server.clientId, key)
+            diagramState.putKGraphContext(key, viewContext)
             if (viewer !== null) {
                 diagramState.putViewer(viewer)
             }
         }
-
-        // Finally, match the diagram server with the generated SGraph by returning the SGraph.
-        return doCreateModel(viewContext, id, cancelChecker)
     }
 
     /**
@@ -216,7 +215,7 @@ class KGraphDiagramUpdater extends DiagramUpdater {
      * relevant data in the {@link KGraphDiagramState}.
      * @param cancelChecker The {@link CancelIndicator} used to tell the diagram translation to stop.
      */
-    protected def SGraph doCreateModel(ViewContext viewContext, String id, CancelIndicator cancelChecker) {
+    synchronized def SGraph createModel(ViewContext viewContext, String id, CancelIndicator cancelChecker) {
         // Generate the SGraph model from the KGraph model and store every later relevant part in the
         // diagram state.
         val diagramGenerator = diagramGeneratorProvider.get

diff --git a/....cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/KGraphLanguageServerExtension.xtend b/....cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/KGraphLanguageServerExtension.xtend
@@ -408,16 +408,13 @@ class KGraphLanguageServerExtension extends SyncDiagramLanguageServer
             // With that new diagram server, do a similar procedure to generate a diagram as for usual diagrams (except,
             // use the 'model' as its model.
             if (diagramUpdater instanceof KGraphDiagramUpdater) {
-                val sGraph = (diagramUpdater as KGraphDiagramUpdater).createModel(diagramServer, model, uri, cancelIndicator)
-                if (sGraph !== null) {
-                    diagramServer.requestTextSizesAndUpdateModel(sGraph)
-
-                    // Also, update the syntheses available for the given diagram.
-                    if (!update) {
-                        val availableSynthesesData = getAvailableSynthesesData(model.class)
-
-                        diagramServer.dispatch(new SetSynthesesAction(availableSynthesesData))
-                    }
+                (diagramUpdater as KGraphDiagramUpdater).prepareModel(diagramServer, model, uri)
+                (diagramUpdater as KGraphDiagramUpdater).updateLayout(diagramServer)
+                // Also, update the syntheses available for the given diagram.
+                if (!update) {
+                    val availableSynthesesData = getAvailableSynthesesData(model.class)
+
+                    diagramServer.dispatch(new SetSynthesesAction(availableSynthesesData))
                 }
                 return "OK"
             }