Merge pull request #3763 from sh41/jps-plugin-fix

Fix JPS plugin & refactor

Author: joshuataylor

.github/workflows/shared-test.yml

@@ -41,8 +41,8 @@ jobs:
       fail-fast: false
       matrix:
         # Stay with windows-2022 until https://github.com/erlef/setup-beam/commit/b94e7d372a9ef22d376b75a9374a7adeb0e2ea94 is released.
-        os: [ubuntu-22.04, windows-2022]
-        idea-version: ['2025.3.2', 'LATEST-EAP-SNAPSHOT']
+        os: [ ubuntu-22.04, windows-2022 ]
+        idea-version: [ '2025.3.2', 'LATEST-EAP-SNAPSHOT' ]
 
     steps:
       - name: Checkout
@@ -135,7 +135,11 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ide-version: ['ideaIU:253.30387.90', 'rubymine:2025.3.2']
+        include:
+          - ide-version: 'ideaIU:253.30387.90'
+            external-prefixes: ''
+          - ide-version: 'rubymine:2025.3.2'
+            external-prefixes: 'org.jetbrains.jps'
 
     steps:
       - name: Download Plugin Artifact
@@ -152,6 +156,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           ide-versions: ${{ matrix.ide-version }}
+          external-prefixes: ${{ matrix.external-prefixes }}
 
       - name: Print Verification Output
         id: print-verification-output

.gitignore

@@ -33,3 +33,4 @@ libs/
 CLAUDE.md
 /.claude
 /.ai
+/allure-results

CONTRIBUTING.md

@@ -109,7 +109,7 @@ The build system automatically detects your platform:
 **getQuoterDeps fails in PowerShell (erl not found):**
 - Run the task from Git Bash so `/usr/bin/sh` sees a full PATH.
 - Example:
-  - `cd /c/Users/steve/IdeaProjects/intellij-elixir`
+  - `cd /c/Users/user/IdeaProjects/intellij-elixir`
   - `./gradlew.bat getQuoterDeps --rerun-tasks --no-build-cache --no-configuration-cache`
 - If needed, add Erlang to Git Bash PATH, e.g. `export PATH="/c/Program Files/erl-24.3.4.6/bin:$PATH"`.
 

README.md

@@ -483,6 +483,7 @@ The plugin supports running Elixir, Mix, and IEx commands within WSL. This inclu
 
 * **New Project Wizard**: SDK selection is based on the location of the currently open project, not the new project. To select a WSL based SDK during the New Project Wizard, open any WSL project or directory in the IDE first. 
 * **SDKs and Project must all be on the same WSL Distribution**: You cannot use a WSL based SDK with a non-WSL project, and vice versa. You can use the `/mnt/c` drive to access Windows files from WSL, but the performance is terrible. 
+* **Build system (Ctrl+F9)**: The IDE build system only works when the **Project SDK** is set to a **JDK 21+** in the same WSL distribution, and all **Module SDKs** are set to the correct **Elixir SDK**.
 * **Performance**: Running the IDE in Windows with a WSL project is slower than running the IDE directly in the WSL instance. This is a limitation of the IDE, not specific to the Elixir plugin.  
 
 ### Module Settings

build.gradle.kts

@@ -144,11 +144,17 @@ allprojects {
         showStandardStreams = false
         showFailedStandardStreams = true
     }
+
+    tasks.withType<Test>().configureEach {
+        inputs.dir(rootProject.layout.projectDirectory.dir("testData"))
+            .withPropertyName("testData")
+            .withPathSensitivity(PathSensitivity.RELATIVE)
+    }
 }
 
 // --- Subprojects (JPS) ---
 subprojects {
-    apply(plugin = "org.jetbrains.intellij.platform.module")
+    apply(plugin = "org.jetbrains.intellij.platform.base")
 
     repositories {
         intellijPlatform { defaultRepositories() }
@@ -157,21 +163,14 @@ subprojects {
     dependencies {
         intellijPlatform {
             create(providers.gradleProperty("platformType"), providers.provider { actualPlatformVersion })
-            bundledPlugins("com.intellij.java")
-            testFramework(TestFrameworkType.Platform)
         }
-        // JPS Builder tests extend UsefulTestCase (JUnit 3/4 style) and need explicit JUnit 4 on classpath
-        testImplementation(libJunit)
     }
 
     sourceSets {
         main {
             java.srcDirs("src")
             resources.srcDirs("resources")
         }
-        test {
-            java.srcDir("tests")
-        }
     }
 }
 
@@ -266,6 +265,9 @@ intellijPlatform {
                 sinceBuild = providers.gradleProperty("pluginVerifierVersion").get()
             }
         }
+        // This allows us to verify small IDEs without errors about the JPS plugin.
+        // It's not ideal, but there doesn't seem to be any other way to deal with it right now.
+        externalPrefixes.add("org.jetbrains.jps")
     }
     sourceSets {
         val testUI: SourceSet by project.sourceSets
@@ -313,8 +315,8 @@ dependencies {
         testFramework(TestFrameworkType.JUnit5, configurationName = "testUIImplementation")
     }
 
-    implementation(project(":jps-builder"))
     implementation(project(":jps-shared"))
+    runtimeOnly(project(":jps-builder"))
     implementation(files("lib/OtpErlang.jar"))
     implementation(libCommonsIo)
 

gradle.properties

@@ -92,3 +92,9 @@ org.gradle.configuration-cache=true
 org.gradle.caching=true
 org.gradle.parallel=true
 #org.gradle.daemon=false
+# - Kotlin stdlib dependency conflict The Kotlin Standard Library (stdlib) is automatically added by the Gradle Kotlin
+#     plugin and may conflict with the version bundled in IntelliJ Platform. This can cause ClassNotFoundException or
+#     version mismatch issues at runtime. Exclude the Kotlin stdlib dependency by setting
+#     'kotlin.stdlib.default.dependency=false' in gradle.properties.
+#     See: https://jb.gg/intellij-platform-kotlin-stdlib
+kotlin.stdlib.default.dependency=false

jps-builder/build.gradle.kts

@@ -1,13 +1,13 @@
-tasks.jar {
-    archiveFileName.set("jps-builder.jar")
-}
+import org.jetbrains.intellij.platform.gradle.TestFrameworkType
 
-tasks.compileTestJava {
-    dependsOn(":jps-shared:composedJar")
+base {
+    archivesName.set("${rootProject.name}.${project.name}")
 }
 
-tasks.compileJava {
-    dependsOn(":jps-shared:composedJar")
+sourceSets {
+    test {
+        java.srcDir("tests")
+    }
 }
 
 java {
@@ -25,6 +25,17 @@ tasks.test {
 
     val elixirPath: String by project
     val elixirVersion: String by project
+    useJUnit()
+    jvmArgs(
+        "--add-opens=java.base/java.lang=ALL-UNNAMED",
+        "--add-opens=java.desktop/java.awt=ALL-UNNAMED",
+        "--add-opens=java.desktop/javax.swing=ALL-UNNAMED",
+        "--add-opens=java.desktop/sun.awt=ALL-UNNAMED",
+        "--add-opens=java.desktop/java.awt.event=ALL-UNNAMED",
+        "--add-exports=java.base/sun.nio.ch=ALL-UNNAMED",
+        "--add-exports=java.base/jdk.internal.ref=ALL-UNNAMED",
+        "--add-opens=java.base/java.nio=ALL-UNNAMED",
+    )
 
     environment("ELIXIR_LANG_ELIXIR_PATH", elixirPath)
     environment("ELIXIR_EBIN_DIRECTORY", "${elixirPath}/lib/elixir/ebin/")
@@ -33,6 +44,20 @@ tasks.test {
     include("**/*Test.class")
 }
 
+configurations {
+    named("testRuntimeClasspath") {
+        extendsFrom(
+            getByName("intellijPlatformTestClasspath"),
+            getByName("intellijPlatformTestRuntimeFixClasspath")
+        )
+    }
+}
+
 dependencies {
+    intellijPlatform {
+        testFramework(TestFrameworkType.Platform)
+        bundledPlugins("com.intellij.java")
+    }
     implementation(project(":jps-shared"))
+    testImplementation(libs.junit)
 }

jps-builder/resources/META-INF/services/org.jetbrains.jps.incremental.BuilderService

@@ -1 +1 @@
-org.elixir_lang.jps.builder.Service
+org.elixir_lang.jps.builder.execution.Service

jps-builder/resources/META-INF/services/org.jetbrains.jps.model.serialization.JpsModelSerializerExtension

@@ -0,0 +1 @@
+org.elixir_lang.jps.builder.model.SerializerExtension