feat(mps-model-adapters): new MPS module org.modelix.model.repositoryconcepts

Author: slisson

.gitignore

@@ -11,3 +11,9 @@ kotlin_gen
 **/.ideaconfig
 **/.mpsconfig
 .kotlin
+
+**/classes_gen/
+**/source_gen/
+**/source_gen.caches/
+**/.mps-caches/
+/.intellijPlatform/

mps-model-adapters-plugin/build.gradle.kts

@@ -1,7 +1,18 @@
+import org.jetbrains.intellij.tasks.PrepareSandboxTask
+import org.modelix.buildtools.KnownModuleIds
+import org.modelix.buildtools.buildStubsSolutionJar
 import org.modelix.copyMps
 import org.modelix.excludeMPSLibraries
 import org.modelix.mpsHomeDir
 import org.modelix.mpsMajorVersion
+import kotlin.io.resolve
+import kotlin.jvm.java
+
+buildscript {
+    dependencies {
+        classpath(libs.modelix.build.tools.lib)
+    }
+}
 
 plugins {
     `modelix-kotlin-jvm`
@@ -10,7 +21,7 @@ plugins {
 }
 
 dependencies {
-    testImplementation(project(":mps-model-adapters"), excludeMPSLibraries)
+    implementation(project(":mps-model-adapters"), excludeMPSLibraries)
     testImplementation(kotlin("test"))
 }
 
@@ -61,6 +72,36 @@ tasks {
             into(mpsPluginDir.resolve("mps-model-adapters-plugin"))
         }
     }
+
+    withType(PrepareSandboxTask::class.java) {
+        dependsOn(":mps-repository-concepts:assembleMpsModules")
+        intoChild(pluginName.map { "$it/languages" })
+            .from(project(":mps-repository-concepts").layout.buildDirectory.map { it.dir("mpsbuild/packaged-modules") })
+
+        intoChild(pluginName.map { "$it/META-INF" })
+            .from(project.layout.projectDirectory.file("src/main/resources/META-INF"))
+            .exclude("plugin.xml")
+        intoChild(pluginName.map { "$it/META-INF" })
+            .from(patchPluginXml.flatMap { it.outputFiles })
+
+        doLast {
+            val ownJar: File = pluginJar.get().asFile
+            val classpathJars = configurations.runtimeClasspath.get().resolve()
+            val stubModelJars = configurations.compileClasspath.get().resolve().intersect(classpathJars)
+            buildStubsSolutionJar {
+                solutionName("org.modelix.mps.model.adapters.stubs")
+                solutionId("83727c3c-e8b0-4bdd-a1fc-cb4fea831777")
+                outputFolder(defaultDestinationDir.get().resolve(project.name).resolve("languages"))
+                classpathJars.forEach { classpathJar(it.name) }
+                stubModelJars.forEach { javaStubsJar(it.name) }
+                moduleDependency(KnownModuleIds.Annotations)
+                moduleDependency(KnownModuleIds.JDK)
+                moduleDependency(KnownModuleIds.MPS_OpenAPI)
+                moduleDependency(KnownModuleIds.MPS_Core)
+                moduleDependency(KnownModuleIds.MPS_IDEA)
+            }
+        }
+    }
 }
 
 group = "org.modelix.mps"

mps-model-adapters-plugin/src/main/resources/META-INF/plugin.xml

@@ -24,6 +24,6 @@
     <!-- Extension points defined by the plugin.
          Read more: https://plugins.jetbrains.com/docs/intellij/plugin-extension-points.html -->
     <extensions defaultExtensionNs="com.intellij">
-
+        <mps.LanguageLibrary dir="/languages" />
     </extensions>
 </idea-plugin>

mps-model-adapters-plugin/src/test/kotlin/org/modelix/model/mpsadapters/ConceptResolutionTest.kt

@@ -16,12 +16,4 @@ class ConceptResolutionTest : MpsAdaptersTestBase("SimpleProject") {
         assertEquals("Module", moduleConcept.getShortName())
         assertContainsElements(moduleConcept.getOwnChildLinks().map { it.getSimpleName() }, "models")
     }
-
-    fun `test MPSLanguageRepository cannot resolve the Module concept`() {
-        val conceptUID = BuiltinLanguages.MPSRepositoryConcepts.Module.getReference().getUID()
-        val moduleConcept = MPSLanguageRepository(mpsProject.repository).resolveConcept(conceptUID)
-
-        // After making the repository language part of this plugin, this assertion will fail and this test can just be removed.
-        assertNull(moduleConcept)
-    }
 }

mps-repository-concepts/.mps/modules.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="MPSProject">
+    <projectModules>
+      <modulePath path="$PROJECT_DIR$/org.modelix.model.repositoryconcepts/org.modelix.model.repositoryconcepts.mpl" folder="" />
+    </projectModules>
+  </component>
+</project>

mps-repository-concepts/build.gradle.kts

@@ -0,0 +1,21 @@
+import org.gradle.internal.jvm.Jvm
+import org.modelix.mpsHomeDir
+
+plugins {
+    base
+    `maven-publish`
+    alias(libs.plugins.modelix.mps.buildtools)
+}
+
+group = "org.modelix.mps.modules"
+
+mpsBuild {
+    mpsHome = mpsHomeDir.get().asFile.absolutePath
+    javaHome = Jvm.current().javaHome
+    disableParentPublication()
+
+    search("modules")
+    publication("repositoryconcepts") {
+        module("org.modelix.model.repositoryconcepts")
+    }
+}