fix(mps-sync-plugin): status stopped updating after an exception

Author: slisson

mps-sync-plugin3/src/main/kotlin/org/modelix/mps/sync3/BindingWorker.kt

@@ -79,7 +79,7 @@ class BindingWorker(
         invalidatingListener = null
     }
 
-    private fun ModelSynchronizer.executeSync() {
+    private fun ModelSynchronizer.synchronizeAndStoreInstance() {
         try {
             activeSynchronizer = this
             synchronize()
@@ -94,10 +94,17 @@ class BindingWorker(
         val current = synchronizer.getCurrentSyncStack()
         val previous = previousSyncStack
         previousSyncStack = current
+
+        // The user should just have enough details to understand where the sync is spending its time.
         val firstChange = current.zip(previous).indexOfFirst { it.first != it.second }
-        val busyPath = current.take(firstChange + 1)
-        return busyPath.joinToString(" > ") {
-            it.getName() ?: it.tryGetConcept()?.getShortName() ?: it.getNodeReference().serialize()
+        val path = current.take(firstChange + 1).drop(1)
+
+        return path.joinToString(" > ") { node ->
+            runCatching { node.getName() }.getOrNull()?.takeIf { it.isNotEmpty() }
+                ?: runCatching { node.tryGetConcept()?.getShortName() }.getOrNull()?.takeIf { it.isNotEmpty() }
+                ?: runCatching { node.getNodeReference().serialize() }.getOrNull()
+                ?: runCatching { node.toString() }.getOrNull()
+                ?: (node::class.java.simpleName + "@" + System.identityHashCode(node))
         }
     }
 
@@ -279,7 +286,7 @@ class BindingWorker(
                         if (!continueOnError()) throw it
                         getMPSListener().synchronizationErrorHappened()
                     },
-                ).executeSync()
+                ).synchronizeAndStoreInstance()
             }
         }
     }
@@ -340,7 +347,7 @@ class BindingWorker(
                             sourceMask = MPSProjectSyncMask(listOf(mpsProject), true),
                             targetMask = MPSProjectSyncMask(listOf(mpsProject), false),
                             onException = { if (!continueOnError()) throw it },
-                        ).executeSync()
+                        ).synchronizeAndStoreInstance()
                     }
                 }
             }

mps-sync-plugin3/src/main/kotlin/org/modelix/mps/sync3/ui/ModelSyncStatusWidget.kt

@@ -41,11 +41,18 @@ class ModelSyncStatusWidget(val project: Project) : CustomStatusBarWidget, Statu
     companion object {
         const val ID = "ModelixSyncStatus"
         val ICON = IconManager.getInstance().getIcon("org/modelix/mps/sync3/modelix16.svg", this::class.java)
+        private val LOG = mu.KotlinLogging.logger { }
     }
 
     private val component: JLabel = JLabel("", ICON, JLabel.LEFT)
     private val timer = EdtExecutorService.getScheduledExecutorInstance()
-        .scheduleWithFixedDelay({ updateComponent() }, 1000, 500, TimeUnit.MILLISECONDS)
+        .scheduleWithFixedDelay({
+            try {
+                updateComponent()
+            } catch (ex: Throwable) {
+                LOG.error(ex) { "Widget update failed" }
+            }
+        }, 1000, 500, TimeUnit.MILLISECONDS)
     private var disposed = false
     private var highlighted = false