fix(mps-model-adapters): filter descriptor models

https://issues.modelix.org/issue/MODELIX-918/Descriptor-models-are-exposed-as-models

Author: slisson

bulk-model-sync-lib/mps-test/src/test/kotlin/org/modelix/model/sync/bulk/lib/test/ModelImporterWithMPSAdaptersTest.kt

@@ -44,7 +44,7 @@ class ModelImporterWithMPSAdaptersTest : MPSTestBase() {
         val moduleAdapter = MPSModuleAsNode(module)
         // Arrange: Create export data
         val dataWithRootsInOneOrder = ModelData(root = moduleAdapter.asExported())
-        val modelWitRootsInOneOrder = dataWithRootsInOneOrder.root.children[1]
+        val modelWitRootsInOneOrder = dataWithRootsInOneOrder.root.children[0]
         val rootsInOneOrder = modelWitRootsInOneOrder.children
         // Arrange: Create alternative export data with switched roots
         val rootsInDifferentOrder = listOf(rootsInOneOrder[1], rootsInOneOrder[0])

mps-model-adapters-plugin/src/test/kotlin/org/modelix/model/mpsadapters/DescriptorModelIsFilteredTest.kt

@@ -1,9 +1,6 @@
 package org.modelix.model.mpsadapters
 
-import junit.framework.TestCase
 import org.modelix.model.api.BuiltinLanguages
-import org.modelix.model.api.IChildLink
-import org.modelix.model.api.INode
 
 /*
  * Copyright (c) 2023.
@@ -26,8 +23,12 @@ class DescriptorModelIsFilteredTest : MpsAdaptersTestBase("SimpleProject") {
     fun `test descriptor model is filtered by adapter`() {
         readAction {
             val module = checkNotNull(mpsProject.projectModules.find { it.moduleName == "Solution1" })
+
+            val descriptorModels = module.models.filter { it.name.stereotype == "descriptor" }
+            if (descriptorModels.isEmpty()) return@readAction // they don't seem to exist in MPS 2024.1 anymore
+
+            assertEquals(1, descriptorModels.size)
             assertEquals(2, module.models.count())
-            assertEquals(1, module.models.count { it.name.stereotype == "descriptor" })
 
             assertEquals(1, MPSModuleAsNode(module).getChildren(BuiltinLanguages.MPSRepositoryConcepts.Module.models).count())
         }

mps-model-adapters/src/main/kotlin/org/modelix/model/mpsadapters/MPSModuleAsNode.kt

@@ -20,6 +20,7 @@ import jetbrains.mps.project.ProjectManager
 import jetbrains.mps.project.Solution
 import jetbrains.mps.project.facets.JavaModuleFacet
 import jetbrains.mps.smodel.MPSModuleRepository
+import org.jetbrains.mps.openapi.model.SModel
 import org.jetbrains.mps.openapi.module.SDependencyScope
 import org.jetbrains.mps.openapi.module.SModule
 import org.jetbrains.mps.openapi.module.SModuleId
@@ -38,7 +39,7 @@ data class MPSModuleAsNode(val module: SModule) : IDefaultNodeAdapter {
     }
 
     private val childrenAccessors: Map<IChildLink, () -> Iterable<INode>> = mapOf(
-        BuiltinLanguages.MPSRepositoryConcepts.Module.models to { module.models.map { MPSModelAsNode(it) } },
+        BuiltinLanguages.MPSRepositoryConcepts.Module.models to { module.models.withoutDescriptorModel().map { MPSModelAsNode(it) } },
         BuiltinLanguages.MPSRepositoryConcepts.Module.facets to { module.facets.filterIsInstance<JavaModuleFacet>().map { MPSJavaModuleFacetAsNode(it) } },
         BuiltinLanguages.MPSRepositoryConcepts.Module.dependencies to { getDependencies() },
         BuiltinLanguages.MPSRepositoryConcepts.Module.languageDependencies to { getLanguageDependencies() },
@@ -202,3 +203,7 @@ data class MPSModuleAsNode(val module: SModule) : IDefaultNodeAdapter {
         return null
     }
 }
+
+private fun <T : SModel> Iterable<T>.withoutDescriptorModel(): List<T> {
+    return filter { it.name.stereotype != "descriptor" }
+}