Rider: Fix running unit tests after ComTest run

rider/src/main/kotlin/fi/jyu/intellij/comtest/rider/actions/ComTestGenerateDotNetSolutionAction.kt

@@ -2,6 +2,10 @@ package fi.jyu.intellij.comtest.rider.actions
 
 import com.intellij.openapi.actionSystem.AnAction
 import com.intellij.openapi.actionSystem.AnActionEvent
+import com.intellij.openapi.actionSystem.ex.ActionManagerEx
+import com.jetbrains.rd.platform.util.lifetime
+import com.jetbrains.rider.model.solutionAnalysisModel
+import com.jetbrains.rider.projectView.solution
 import fi.jyu.intellij.comtest.common.util.runWithRefresh
 import fi.jyu.intellij.comtest.rider.ComTestRunner
 import fi.jyu.intellij.comtest.rider.util.hasRiderSolution
@@ -18,21 +22,17 @@ class ComTestGenerateDotNetSolutionAction : AnAction() {
             ComTestRunner.generateForDotNetSln(proj)
         }
 
-//        // FIXME: Waiting for project reload and running unit tests automatically. Right now timing seems to be difficult
-//        VfsWatchRootHost.getInstance(proj).sync()
-//        SolutionLifecycleHost.getInstance(proj).waitSolutionBuilderIsReady()
-//        // https://dploeger.github.io/intellij-api-doc/com/intellij/openapi/project/DumbService.html
-//        val ds = proj.service<DumbService>()
-//        WorkspaceModelUpdater.getInstance(proj).syncIfPossible()
-//        thread {
-//            Thread.sleep(500)
-//            ds.waitForSmartMode()
-//            ds.smartInvokeLater({
-//                val act = ActionManagerEx.getInstanceEx().getAction("RiderUnitTestRunSolutionAction")!!
-//                act.update(e)
-//                act.actionPerformed(e)
-//            }, ModalityState.NON_MODAL)
-//        }
+        // csproj change will trigger assembly analysis
+        // Wait for it to finish and then trigger unit test discovery
+        val l = proj.lifetime.createNested()
+        proj.solution.solutionAnalysisModel.ready.change.advise(l) {
+            if (it) {
+                l.terminate(true)
+                val act = ActionManagerEx.getInstanceEx().getAction("RiderUnitTestRunSolutionAction")!!
+                act.update(e)
+                act.actionPerformed(e)
+            }
+        }
     }
 
     override fun update(e: AnActionEvent) {