Skip to content

Commit fe8ec11

Browse files
benedekhslisson
authored andcommitted
fix(mps-model-adapters): revert "don't reject illegal concept descriptors"
This reverts commit c997cc0. The name `resolveConcept` suggest that the concept was found and metamodel information is available. If `MPSLanguageRepository` never returns null then this conflicts with the metamodel information from `BuiltinLanguages`.
1 parent 8e04371 commit fe8ec11

File tree

1 file changed

+3
-0
lines changed

1 file changed

+3
-0
lines changed

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ import jetbrains.mps.smodel.adapter.ids.SConceptId
2020
import jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory
2121
import jetbrains.mps.smodel.language.ConceptRegistry
2222
import jetbrains.mps.smodel.language.LanguageRegistry
23+
import jetbrains.mps.smodel.runtime.illegal.IllegalConceptDescriptor
2324
import org.jetbrains.mps.openapi.language.SAbstractConcept
2425
import org.jetbrains.mps.openapi.module.SRepository
2526
import org.modelix.model.api.IConcept
@@ -38,6 +39,8 @@ data class MPSLanguageRepository(private val repository: SRepository) : ILanguag
3839

3940
val conceptDescriptor = ConceptRegistry.getInstance().getConceptDescriptor(conceptId)
4041

42+
if (conceptDescriptor is IllegalConceptDescriptor) return null
43+
4144
return MPSConcept(MetaAdapterFactory.getAbstractConcept(conceptDescriptor))
4245
}
4346

0 commit comments

Comments
 (0)