fix(model-api): register and initialize the language concepts eagerly

Author: benedekh

model-api/src/commonMain/kotlin/org/modelix/model/api/BuiltinLanguages.kt

@@ -18,14 +18,31 @@ package org.modelix.model.api
 
 import kotlin.reflect.KProperty
 
+/**
+ * TODO if you add a new Concept to a language, do not forget to add it to the language's included concepts field.
+ * Otherwise the concept will not be eagerly added to the Language, when registering the language in the ILanguageRegistry.
+ */
 object BuiltinLanguages {
     @Suppress("ClassName")
-    object jetbrains_mps_lang_core : SimpleLanguage(name = "jetbrains.mps.lang.core", uid = "mps:ceab5195-25ea-4f22-9b92-103b95ca8c0c") {
-        object BaseConcept : SimpleConcept(conceptName = "BaseConcept", is_abstract = true, uid = "mps:ceab5195-25ea-4f22-9b92-103b95ca8c0c/1133920641626") {
-            init { addConcept(this) }
+    object jetbrains_mps_lang_core :
+        SimpleLanguage(name = "jetbrains.mps.lang.core", uid = "mps:ceab5195-25ea-4f22-9b92-103b95ca8c0c") {
+
+        override var includedConcepts = arrayOf(BaseConcept, Attribute, NodeAttribute, INamedConcept)
+
+        object BaseConcept : SimpleConcept(
+            conceptName = "BaseConcept",
+            is_abstract = true,
+            uid = "mps:ceab5195-25ea-4f22-9b92-103b95ca8c0c/1133920641626",
+        ) {
+            init {
+                addConcept(this)
+            }
+
             val virtualPackage by property("ceab5195-25ea-4f22-9b92-103b95ca8c0c/1133920641626/1193676396447")
-            val smodelAttribute by childLink("ceab5195-25ea-4f22-9b92-103b95ca8c0c/1133920641626/5169995583184591170").multiple().optional().type { Attribute }
+            val smodelAttribute by childLink("ceab5195-25ea-4f22-9b92-103b95ca8c0c/1133920641626/5169995583184591170").multiple()
+                .optional().type { Attribute }
         }
+
         object Attribute : SimpleConcept(
             conceptName = "Attribute",
             is_abstract = true,
@@ -34,6 +51,7 @@ object BuiltinLanguages {
         ) {
             init { addConcept(this) }
         }
+
         object NodeAttribute : SimpleConcept(
             conceptName = "NodeAttribute",
             is_abstract = true,
@@ -42,6 +60,7 @@ object BuiltinLanguages {
         ) {
             init { addConcept(this) }
         }
+
         object INamedConcept : SimpleConcept(conceptName = "INamedConcept") {
             init { addConcept(this) }
             val name by property("ceab5195-25ea-4f22-9b92-103b95ca8c0c/1169194658468/1169194664001")
@@ -53,7 +72,14 @@ object BuiltinLanguages {
      * https://github.com/JetBrains/MPS-extensions/blob/5d96c3e69192f8902cf9aa7d846d05ccfb65253d/code/model-api/org.modelix.model.repositoryconcepts/models/org.modelix.model.repositoryconcepts.structure.mps ,
      * but to get rid of that dependency, they are redefined here, with their original IDs to stay compatible.
      */
-    object MPSRepositoryConcepts : SimpleLanguage("org.modelix.model.repositoryconcepts", uid = "mps:0a7577d1-d4e5-431d-98b1-fae38f9aee80") {
+    object MPSRepositoryConcepts :
+        SimpleLanguage("org.modelix.model.repositoryconcepts", uid = "mps:0a7577d1-d4e5-431d-98b1-fae38f9aee80") {
+
+        override var includedConcepts = arrayOf(
+            Model, Module, Solution, Language, DevKit, Repository, Project, ProjectModule, ModuleReference,
+            ModelReference, LanguageDependency, SingleLanguageDependency, DevkitDependency, ModuleFacet,
+            JavaModuleFacet, ModuleDependency,
+        )
 
         object Model : SimpleConcept(
             conceptName = "Model",
@@ -314,7 +340,11 @@ object BuiltinLanguages {
         }
     }
 
-    object ModelixRuntimelang : SimpleLanguage("org.modelix.model.runtimelang", uid = "mps:b6980ebd-f01d-459d-a952-38740f6313b4") {
+    object ModelixRuntimelang :
+        SimpleLanguage("org.modelix.model.runtimelang", uid = "mps:b6980ebd-f01d-459d-a952-38740f6313b4") {
+
+        override var includedConcepts = arrayOf(ModelServerInfo, RepositoryInfo, BranchInfo)
+
         object ModelServerInfo : SimpleConcept(
             conceptName = "ModelServerInfo",
             uid = "mps:b6980ebd-f01d-459d-a952-38740f6313b4/7113393488488348863",
@@ -371,6 +401,7 @@ private fun SimpleConcept.property(uid: String) = object {
     private val instance: IProperty by lazy {
         SimpleProperty(name, uid = uid).also { owner.addProperty(it) }
     }
+
     operator fun getValue(ownerConcept: SimpleConcept, kotlinProperty: KProperty<*>): IProperty {
         this.owner = ownerConcept
         this.name = kotlinProperty.name
@@ -385,8 +416,15 @@ private fun SimpleConcept.childLink(uid: String) = object {
     private var optional: Boolean = true
     private lateinit var targetConcept: () -> IConcept
     private val instance: IChildLink by lazy {
-        SimpleChildLink(simpleName = name, uid = uid, isMultiple = multiple, isOptional = optional, targetConcept = targetConcept()).also { owner.addChildLink(it) }
+        SimpleChildLink(
+            simpleName = name,
+            uid = uid,
+            isMultiple = multiple,
+            isOptional = optional,
+            targetConcept = targetConcept(),
+        ).also { owner.addChildLink(it) }
     }
+
     operator fun getValue(ownerConcept: SimpleConcept, kotlinProperty: KProperty<*>): IChildLink {
         this.owner = ownerConcept
         this.name = kotlinProperty.name

model-api/src/commonMain/kotlin/org/modelix/model/api/SimpleLanguage.kt

@@ -44,4 +44,7 @@ open class SimpleLanguage(private val name: String, private val uid: String? = n
     }
 
     override fun getName() = name
+
+    // just a dummy field to make sure that the (lazy) concepts are registered automatically
+    protected open var includedConcepts: Array<SimpleConcept> = arrayOf()
 }