Merge pull request #323 from modelix/fix/mps-adapters-unresolved-mode…

…l-imports fix(mps-model-adapters): handle unresolvable model imports
modelix · Nov 15, 2023 · 2a7759f · 2a7759f
2 parents fe88153 + 9a28ac3
commit 2a7759f
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/mps-model-adapters/src/main/kotlin/org/modelix/model/mpsadapters/MPSModelAsNode.kt b/mps-model-adapters/src/main/kotlin/org/modelix/model/mpsadapters/MPSModelAsNode.kt
@@ -76,8 +76,9 @@ data class MPSModelAsNode(val model: SModel) : IDefaultNodeAdapter {
         } else if (link.conformsTo(BuiltinLanguages.MPSRepositoryConcepts.Model.rootNodes)) {
             model.rootNodes.map { MPSNode(it) }
         } else if (link.conformsTo(BuiltinLanguages.MPSRepositoryConcepts.Model.modelImports)) {
-            ModelImports(model).importedModels.mapNotNull {
-                MPSModelImportAsNode(it.resolve(model.repository), model)
+            ModelImports(model).importedModels.mapNotNull { modelRef ->
+                val target = modelRef.resolve(model.repository)
+                target?.let { MPSModelImportAsNode(it, model) }
             }
         } else if (link.conformsTo(BuiltinLanguages.MPSRepositoryConcepts.Model.usedLanguages)) {
             getImportedLanguagesAndDevKits()