fix(mps-model-adapters): inconsistent resolution of SRepository

Author: slisson

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

@@ -3,7 +3,6 @@ package org.modelix.model.mpsadapters
 import org.jetbrains.mps.openapi.model.SModel
 import org.jetbrains.mps.openapi.module.SModule
 import org.jetbrains.mps.openapi.module.SModuleReference
-import org.jetbrains.mps.openapi.module.SRepository
 import org.modelix.model.api.BuiltinLanguages
 import org.modelix.model.api.IChildLinkReference
 import org.modelix.model.api.IConcept
@@ -47,8 +46,6 @@ data class MPSDevKitDependencyAsNode(
 
     override fun getElement(): MPSDevKitDependencyAsNode = this
 
-    override fun getRepository(): SRepository? = moduleImporter?.repository ?: modelImporter?.repository
-
     override fun getPropertyAccessors(): List<Pair<IPropertyReference, IPropertyAccessor<MPSDevKitDependencyAsNode>>> {
         return propertyAccessors
     }

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

@@ -1,10 +1,8 @@
 package org.modelix.model.mpsadapters
 
-import jetbrains.mps.smodel.MPSModuleRepository
 import org.jetbrains.mps.openapi.language.SConcept
 import org.jetbrains.mps.openapi.model.SModelReference
 import org.jetbrains.mps.openapi.model.SNodeId
-import org.jetbrains.mps.openapi.module.SRepository
 import org.modelix.model.api.ConceptReference
 import org.modelix.model.api.IChildLinkReference
 import org.modelix.model.api.IMutableModel
@@ -16,12 +14,12 @@ import org.modelix.model.api.ISyncTargetNode
 import org.modelix.model.api.IWritableNode
 import org.modelix.model.api.NewNodeSpec
 import org.modelix.model.api.upcast
+import org.modelix.mps.api.ModelixMpsApi
 import org.modelix.mps.multiplatform.model.MPSNodeReference
 
 abstract class MPSGenericNodeAdapter<E> : IWritableNode, ISyncTargetNode {
 
     protected abstract fun getElement(): E
-    abstract fun getRepository(): SRepository?
     protected abstract fun getPropertyAccessors(): List<Pair<IPropertyReference, IPropertyAccessor<E>>>
     protected abstract fun getReferenceAccessors(): List<Pair<IReferenceLinkReference, IReferenceAccessor<E>>>
     protected abstract fun getChildAccessors(): List<Pair<IChildLinkReference, IChildAccessor<E>>>
@@ -35,7 +33,7 @@ abstract class MPSGenericNodeAdapter<E> : IWritableNode, ISyncTargetNode {
     protected fun getChildAccessor(role: IChildLinkReference) = requireNotNull(tryGetChildAccessor(role)) { "Unknown child link [role = $role, node = $this]" }
 
     override fun getModel(): IMutableModel {
-        return MPSArea(getRepository() ?: MPSModuleRepository.getInstance()).asModel()
+        return MPSArea(ModelixMpsApi.getRepository()).asModel()
     }
 
     override fun getAllChildren(): List<IWritableNode> {
@@ -92,7 +90,7 @@ abstract class MPSGenericNodeAdapter<E> : IWritableNode, ISyncTargetNode {
 
     private fun doSyncNewChildren(role: IChildLinkReference, index: Int, sourceNodes: List<Pair<ConceptReference, NewNodeSpec?>>): List<IWritableNode> {
         val accessor = getChildAccessor(role)
-        val repo = getRepository() ?: MPSModuleRepository.getInstance()
+        val repo = ModelixMpsApi.getRepository()
         val resolvedConcepts = sourceNodes.map { it.first }.distinct().associateWith { concept ->
             repo.resolveConcept(concept)
         }

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

@@ -4,7 +4,6 @@ import jetbrains.mps.project.facets.JavaModuleFacet
 import jetbrains.mps.smodel.Generator
 import jetbrains.mps.util.MacroHelper
 import jetbrains.mps.util.MacrosFactory
-import org.jetbrains.mps.openapi.module.SRepository
 import org.jetbrains.mps.openapi.persistence.Memento
 import org.modelix.model.api.BuiltinLanguages
 import org.modelix.model.api.IChildLinkReference
@@ -58,8 +57,6 @@ data class MPSJavaModuleFacetAsNode(val facet: JavaModuleFacet) : MPSGenericNode
 
     override fun getElement(): JavaModuleFacet = facet
 
-    override fun getRepository(): SRepository? = null
-
     override fun getPropertyAccessors() = propertyAccessors
 
     override fun getReferenceAccessors() = referenceAccessors

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

@@ -13,7 +13,6 @@ import org.jetbrains.mps.openapi.model.SModelId
 import org.jetbrains.mps.openapi.model.SModelName
 import org.jetbrains.mps.openapi.model.SModelReference
 import org.jetbrains.mps.openapi.module.SModuleId
-import org.jetbrains.mps.openapi.module.SRepository
 import org.jetbrains.mps.openapi.persistence.PersistenceFacade
 import org.modelix.model.api.BuiltinLanguages
 import org.modelix.model.api.IChildLinkReference
@@ -198,10 +197,6 @@ data class MPSModelAsNode(val model: SModel) : MPSGenericNodeAdapter<SModel>() {
         )
     }
 
-    override fun getRepository(): SRepository? {
-        return model.module?.repository
-    }
-
     override fun getElement(): SModel {
         return model
     }

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

@@ -2,7 +2,6 @@ package org.modelix.model.mpsadapters
 
 import org.jetbrains.mps.openapi.model.SModel
 import org.jetbrains.mps.openapi.model.SModelReference
-import org.jetbrains.mps.openapi.module.SRepository
 import org.modelix.model.api.BuiltinLanguages
 import org.modelix.model.api.IChildLinkReference
 import org.modelix.model.api.IConcept
@@ -43,10 +42,6 @@ data class MPSModelImportAsNode(val importedModel: SModelReference, val importin
         return this
     }
 
-    override fun getRepository(): SRepository? {
-        return importingModel.repository
-    }
-
     override fun getPropertyAccessors(): List<Pair<IPropertyReference, IPropertyAccessor<MPSModelImportAsNode>>> {
         return emptyList()
     }

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

@@ -20,7 +20,6 @@ import org.jetbrains.mps.openapi.module.FacetsFacade
 import org.jetbrains.mps.openapi.module.SModule
 import org.jetbrains.mps.openapi.module.SModuleId
 import org.jetbrains.mps.openapi.module.SModuleReference
-import org.jetbrains.mps.openapi.module.SRepository
 import org.jetbrains.mps.openapi.persistence.PersistenceFacade
 import org.modelix.model.api.BuiltinLanguages
 import org.modelix.model.api.IChildLinkReference
@@ -295,18 +294,14 @@ abstract class MPSModuleAsNode<E : SModule> : MPSGenericNodeAdapter<E>() {
         return module
     }
 
-    override fun getRepository(): SRepository? {
-        return module.repository
-    }
-
     override fun getPropertyAccessors(): List<Pair<IPropertyReference, IPropertyAccessor<E>>> = propertyAccessors
 
     override fun getReferenceAccessors(): List<Pair<IReferenceLinkReference, IReferenceAccessor<E>>> = referenceAccessors
 
     override fun getChildAccessors(): List<Pair<IChildLinkReference, IChildAccessor<E>>> = childAccessors
 
     override fun getParent(): IWritableNode? {
-        return module.repository?.asWritableNode()
+        return ModelixMpsApi.getRepository().asWritableNode()
     }
 
     override fun getNodeReference(): INodeReference {

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

@@ -6,7 +6,6 @@ import jetbrains.mps.project.structure.modules.ModuleReference
 import org.jetbrains.mps.openapi.module.SDependencyScope
 import org.jetbrains.mps.openapi.module.SModule
 import org.jetbrains.mps.openapi.module.SModuleReference
-import org.jetbrains.mps.openapi.module.SRepository
 import org.modelix.model.api.BuiltinLanguages
 import org.modelix.model.api.IChildLinkReference
 import org.modelix.model.api.IConcept
@@ -150,10 +149,6 @@ data class MPSModuleDependencyAsNode(
         return this
     }
 
-    override fun getRepository(): SRepository? {
-        return null
-    }
-
     override fun getPropertyAccessors(): List<Pair<IPropertyReference, IPropertyAccessor<MPSModuleDependencyAsNode>>> {
         return propertyAccessors
     }

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

@@ -2,7 +2,6 @@ package org.modelix.model.mpsadapters
 
 import org.jetbrains.mps.openapi.module.SModuleId
 import org.jetbrains.mps.openapi.module.SModuleReference
-import org.jetbrains.mps.openapi.module.SRepository
 import org.modelix.model.api.BuiltinLanguages
 import org.modelix.model.api.ChildLinkReferenceByUID
 import org.modelix.model.api.IChildLinkReference
@@ -25,10 +24,6 @@ data class MPSModuleReferenceAsNode(
         return this
     }
 
-    override fun getRepository(): SRepository? {
-        return parent.getRepository()
-    }
-
     override fun getPropertyAccessors(): List<Pair<IPropertyReference, IPropertyAccessor<MPSModuleReferenceAsNode>>> {
         return emptyList()
     }

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

@@ -1,7 +1,6 @@
 package org.modelix.model.mpsadapters
 
 import jetbrains.mps.project.ModuleId
-import org.jetbrains.mps.openapi.module.SRepository
 import org.jetbrains.mps.openapi.persistence.PersistenceFacade
 import org.modelix.kotlin.utils.ContextValue
 import org.modelix.model.api.BuiltinLanguages
@@ -119,10 +118,6 @@ data class MPSProjectAsNode(val project: IMPSProject) : MPSGenericNodeAdapter<IM
         return project
     }
 
-    override fun getRepository(): SRepository? {
-        return project.getRepository()
-    }
-
     override fun getPropertyAccessors(): List<Pair<IPropertyReference, IPropertyAccessor<IMPSProject>>> {
         return propertyAccessors
     }

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

@@ -1,7 +1,6 @@
 package org.modelix.model.mpsadapters
 
 import org.jetbrains.mps.openapi.module.SModule
-import org.jetbrains.mps.openapi.module.SRepository
 import org.modelix.model.api.BuiltinLanguages
 import org.modelix.model.api.IChildLinkReference
 import org.modelix.model.api.IConcept
@@ -48,10 +47,6 @@ data class MPSProjectModuleAsNode(val project: IMPSProject, val module: SModule)
         return this
     }
 
-    override fun getRepository(): SRepository? {
-        return project.getRepository()
-    }
-
     override fun getPropertyAccessors(): List<Pair<IPropertyReference, IPropertyAccessor<MPSProjectModuleAsNode>>> {
         return propertyAccessors
     }