Fix concurrency issue in PluginInfo.kt (#275)

Author: ghostflyby

modules/intellij-shared/api/intellij-shared.api

@@ -15,12 +15,9 @@ public final class dev/ghostflyby/intellij/AutoCleanKeyKt {
 	public static final fun toAutoCleanKey (Lcom/intellij/openapi/util/Key;Lkotlinx/coroutines/CoroutineScope;)Ldev/ghostflyby/intellij/AutoCleanKey;
 }
 
-public final class dev/ghostflyby/intellij/PluginInfoProvider {
-	public fun <init> (Ljava/lang/Class;)V
-	public fun <init> (Ljava/lang/ClassLoader;)V
-	public final fun getId ()Ljava/lang/String;
-	public final fun getName ()Ljava/lang/String;
-	public final fun getPluginDescriptor ()Lcom/intellij/openapi/extensions/PluginDescriptor;
-	public final fun getVersion ()Ljava/lang/String;
+public final class dev/ghostflyby/intellij/PluginInfoKt {
+	public static final fun getPluginId (Ljava/lang/Class;)Lcom/intellij/openapi/extensions/PluginId;
+	public static final fun getPluginName (Ljava/lang/Class;)Ljava/lang/String;
+	public static final fun getPluginVersion (Ljava/lang/Class;)Ljava/lang/String;
 }
 

modules/intellij-shared/src/main/kotlin/dev/ghostflyby/intellij/PluginInfo.kt

@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2026 ghostflyby
+ * SPDX-FileCopyrightText: 2026 ghostflyby
+ * SPDX-License-Identifier: LGPL-3.0-or-later
+ */
+
+package dev.ghostflyby.intellij
+
+import com.intellij.ide.plugins.cl.PluginAwareClassLoader
+import com.intellij.openapi.extensions.PluginDescriptor
+import com.intellij.openapi.extensions.PluginId
+
+public val Class<*>.pluginId: PluginId
+    get() = requirePluginAwareClassLoader().pluginId
+
+public val Class<*>.pluginName: String
+    get() = readPluginDescriptor { name }
+
+public val Class<*>.pluginVersion: String
+    get() = readPluginDescriptor { version }
+
+private inline fun <T> Class<*>.readPluginDescriptor(read: PluginDescriptor.() -> T): T {
+    return read(requirePluginAwareClassLoader().pluginDescriptor)
+}
+
+private fun Class<*>.requirePluginAwareClassLoader(): PluginAwareClassLoader {
+    val classLoader = classLoader
+    require(classLoader is PluginAwareClassLoader) {
+        "Plugin metadata for $name requires a PluginAwareClassLoader, " +
+                "but got ${classLoader?.javaClass?.name ?: "the bootstrap class loader"}."
+    }
+    return classLoader
+}

modules/intellij-shared/src/main/kotlin/dev/ghostflyby/intellij/PluginInfoProvider.kt

@@ -6,22 +6,37 @@
 
 package dev.ghostflyby.intellij
 
+import com.intellij.ide.plugins.cl.PluginAwareClassLoader
+import com.intellij.openapi.extensions.PluginDescriptor
 import org.junit.jupiter.api.Assertions.assertThrows
 import org.junit.jupiter.api.Assertions.assertTrue
 import org.junit.jupiter.api.Test
+import java.lang.reflect.Proxy
 import java.net.URLClassLoader
 
 internal class PluginInfoTest {
     @Test
     fun rejectsPlainClassLoader() {
         URLClassLoader(emptyArray(), null).use { classLoader ->
-            val info = PluginInfoProvider(classLoader)
+            val anchorClass = Proxy.newProxyInstance(
+                classLoader,
+                arrayOf(Runnable::class.java),
+            ) { _, _, _ -> null }.javaClass
 
             val error = assertThrows(IllegalArgumentException::class.java) {
-                info.id
+                anchorClass.pluginId
             }
 
             assertTrue(error.message.orEmpty().contains("PluginAwareClassLoader"))
         }
     }
+
+    @Test
+    fun doesNotStorePluginClassLoaderState() {
+        val fields = Class.forName("dev.ghostflyby.intellij.PluginInfoKt").declaredFields
+
+        assertTrue(fields.none { ClassLoader::class.java.isAssignableFrom(it.type) })
+        assertTrue(fields.none { PluginAwareClassLoader::class.java.isAssignableFrom(it.type) })
+        assertTrue(fields.none { PluginDescriptor::class.java.isAssignableFrom(it.type) })
+    }
 }

modules/intellij-shared/src/test/kotlin/dev/ghostflyby/intellij/PluginInfoTest.kt

@@ -4,6 +4,10 @@
 
 ## [Unreleased]
 
+### Fixed
+
+- NPE on server launch due to `lazy` concurrency [#275](https://github.com/ghostflyby/IntelliJ-Plugins/pull/275)
+
 ## [2.0.1] - 2026-07-02
 
 ### Fixed

plugins/WorkspaceMcpTools/CHANGELOG.md

@@ -12,7 +12,7 @@ plugins {
     alias(libs.plugins.kotlin.serialization)
 }
 
-version = "2.0.1"
+version = "2.0.2"
 
 dependencies {
     implementation(libs.ktor.resources)

plugins/WorkspaceMcpTools/build.gradle.kts

@@ -6,9 +6,7 @@
 
 package dev.ghostflyby.mcp
 
-import dev.ghostflyby.intellij.PluginInfoProvider
-
-internal val PluginInfo = PluginInfoProvider(WorkspaceMcpStartupActivity::class.java)
+import dev.ghostflyby.intellij.pluginVersion
 
 internal val pluginVersion: String
-    get() = PluginInfo.version
+    get() = WorkspaceMcpStartupActivity::class.java.pluginVersion