1.16.0: modelcheck: use IdeaPlatformTaskScheduler

Author: sergej-koscejev

CHANGELOG.md

@@ -5,6 +5,14 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres
 to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## 1.16.0
+
+### Fixed
+
+- `modelcheck`: use `IdeaPlatformTaskScheduler` for parallel model checking when available, so that IDEA read action is
+  started during model checks. This makes it possible to use 'find usages' without having an error about 'Read access is
+  allowed from inside read-action (or EDT) only' logged.
+
 ## 1.15.1
 
 ### Changed

execute/build.gradle.kts

@@ -14,6 +14,7 @@ mpsZips {
     include("lib/mps-logging.jar")
     include("lib/platform-api.jar")
     include("lib/util.jar")
+    include("lib/app.jar")
 
     include("lib/mpsant/mps-tool.jar")
 }

gradle.properties

@@ -1,2 +1,2 @@
-version.backend=1.15.1
+version.backend=1.16.0
 version.project-loader=2.3.0

modelcheck/src/main/kotlin/de/itemis/mps/gradle/modelcheck/ModelCheck.kt

@@ -12,25 +12,26 @@ import jetbrains.mps.errors.CheckerRegistry
 import jetbrains.mps.errors.MessageStatus
 import jetbrains.mps.errors.item.IssueKindReportItem
 import jetbrains.mps.ide.httpsupport.runtime.base.HttpSupportUtil
+import jetbrains.mps.ide.modelchecker.platform.actions.IdeaPlatformReadExecutor
 import jetbrains.mps.ide.modelchecker.platform.actions.UnresolvedReferencesChecker
 import jetbrains.mps.progress.EmptyProgressMonitor
 import jetbrains.mps.project.Project
 import jetbrains.mps.smodel.ModelAccessBase
 import jetbrains.mps.smodel.SModelStereotype
 import jetbrains.mps.tool.environment.Environment
 import jetbrains.mps.util.CollectConsumer
+import jetbrains.mps.workbench.progress.IdeaPlatformTaskScheduler
 import jetbrains.mps.workbench.progress.SystemBackgroundTaskScheduler
 import org.jetbrains.mps.openapi.model.SModel
 import org.jetbrains.mps.openapi.model.SNode
 import org.jetbrains.mps.openapi.module.SModule
 import java.io.File
-import java.lang.IllegalArgumentException
-import java.lang.UnsupportedOperationException
 import java.text.SimpleDateFormat
-import java.util.Date
+import java.util.*
 import kotlin.math.min
 import kotlin.test.fail
 
+
 val logging = detectLogging()
 val logger = logging.getLogger("de.itemis.mps.gradle.modelcheck")
 
@@ -284,17 +285,34 @@ private fun oneTestCasePerModule(modules: Iterable<SModule>, errorsPerModule: Ma
 
 private fun ModelCheckerBuilder.setParallelTaskScheduler(project: Project) {
     try {
+        setParallelTaskSchedulerV3(project)
+    } catch (e: LinkageError) {
         try {
-            val executor = (project.repository.modelAccess as ModelAccessBase).shareRead()
-            withTaskScheduler(SystemBackgroundTaskScheduler(project, executor))
-        } catch (e: NoSuchMethodError) {
-            withTaskScheduler(SystemBackgroundTaskScheduler(project))
+            setParallelTaskSchedulerV2(project)
+        } catch (e: LinkageError) {
+            try {
+                setParallelTaskSchedulerV1(project)
+            } catch (e: LinkageError) {
+                logger.warn("Parallel model checking is not supported in this version of MPS", e)
+            }
         }
-    } catch (e: NoClassDefFoundError) {
-        logger.warn("Parallel model checking is not supported in this version of MPS", e)
     }
 }
 
+private fun ModelCheckerBuilder.setParallelTaskSchedulerV3(project: Project) {
+    val executor = IdeaPlatformReadExecutor(project.repository.modelAccess)
+    withTaskScheduler(IdeaPlatformTaskScheduler(project, executor))
+}
+
+private fun ModelCheckerBuilder.setParallelTaskSchedulerV2(project: Project) {
+    val executor = (project.repository.modelAccess as ModelAccessBase).shareRead()
+    withTaskScheduler(SystemBackgroundTaskScheduler(project, executor))
+}
+
+private fun ModelCheckerBuilder.setParallelTaskSchedulerV1(project: Project) {
+    withTaskScheduler(SystemBackgroundTaskScheduler(project))
+}
+
 fun modelCheckProject(args: ModelCheckArgs, environment: Environment, project: Project): Boolean {
     val checkers = environment.platform.findComponent(CheckerRegistry::class.java)!!.checkers
     if (checkers.all { it !is UnresolvedReferencesChecker }) {