Skip to content

Commit 9a28ac3

Browse files
committed
fix(mps-model-adapters): handle unresolvable model imports
If an imported model could not be resolved, it caused a NullPointerException. This change handles this case gracefully.
1 parent 4cbd113 commit 9a28ac3

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,9 @@ data class MPSModelAsNode(val model: SModel) : IDefaultNodeAdapter {
7676
} else if (link.conformsTo(BuiltinLanguages.MPSRepositoryConcepts.Model.rootNodes)) {
7777
model.rootNodes.map { MPSNode(it) }
7878
} else if (link.conformsTo(BuiltinLanguages.MPSRepositoryConcepts.Model.modelImports)) {
79-
ModelImports(model).importedModels.mapNotNull {
80-
MPSModelImportAsNode(it.resolve(model.repository), model)
79+
ModelImports(model).importedModels.mapNotNull { modelRef ->
80+
val target = modelRef.resolve(model.repository)
81+
target?.let { MPSModelImportAsNode(it, model) }
8182
}
8283
} else if (link.conformsTo(BuiltinLanguages.MPSRepositoryConcepts.Model.usedLanguages)) {
8384
getImportedLanguagesAndDevKits()

0 commit comments

Comments
 (0)