clean up service setup

Author: hauner

src/main/kotlin/io/openapiprocessor/intellij/MappingAnnotationLineMarker.kt

@@ -8,7 +8,7 @@ package io.openapiprocessor.intellij
 import com.intellij.codeInsight.daemon.RelatedItemLineMarkerInfo
 import com.intellij.codeInsight.daemon.RelatedItemLineMarkerProvider
 import com.intellij.codeInsight.navigation.NavigationGutterIconBuilder
-import com.intellij.openapi.module.Module
+import com.intellij.openapi.components.service
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.util.IconLoader
 import com.intellij.psi.PsiAnnotation
@@ -44,14 +44,15 @@ class MappingAnnotationLineMarker: RelatedItemLineMarkerProvider() {
             return null
         }
 
-        val apiPath = match.path(element)
-        val modules = findModules(element)
+        val moduleService = service<ModuleService>()
+        val modules = moduleService.findModules(element)
 
         var searchScope = GlobalSearchScope.EMPTY_SCOPE
         for (module in modules) {
             searchScope = searchScope.uniteWith(GlobalSearchScope.moduleScope(module))
         }
 
+        val apiPath = match.path(element)
         val targets = findPsiElementsOfPath(apiPath!!, searchScope, element.project)
         if (targets.isEmpty()) {
             log.warn("found no targets!")
@@ -69,22 +70,6 @@ class MappingAnnotationLineMarker: RelatedItemLineMarkerProvider() {
         return builder.createLineMarkerInfo(id)
     }
 
-    private fun findModules(element: PsiElement): List<Module> {
-        val finder = ModuleFinder(element.project)
-        val modules = finder.findModules(element.containingFile.virtualFile.presentableUrl)
-
-        if (modules.isNotEmpty()) {
-            modules.forEach {
-                log.debug("related modules of file '{}'", element.containingFile.name)
-                log.debug("found module '{}'", it.name)
-            }
-        } else {
-            log.debug("could not find module of file '{}'", element.containingFile.name)
-        }
-
-        return modules
-    }
-
     private fun findPsiElementsOfPath(path: String, searchScope: GlobalSearchScope, project: Project): List<PsiElement> {
         val targets = mutableListOf<PsiElement>()
 

src/main/kotlin/io/openapiprocessor/intellij/ModuleService.kt

@@ -0,0 +1,13 @@
+/*
+ * Copyright 2025 https://github.com/openapi-processor/openapi-processor-intellij
+ * PDX-License-Identifier: Apache-2.0
+ */
+
+package io.openapiprocessor.intellij
+
+import com.intellij.openapi.module.Module
+import com.intellij.psi.PsiElement
+
+interface ModuleService {
+    fun findModules(element: PsiElement): List<Module>
+}

src/main/kotlin/io/openapiprocessor/intellij/ModuleServiceImpl.kt

@@ -0,0 +1,31 @@
+/*
+ * Copyright 2025 https://github.com/openapi-processor/openapi-processor-intellij
+ * PDX-License-Identifier: Apache-2.0
+ */
+
+package io.openapiprocessor.intellij
+
+import com.intellij.openapi.module.Module
+import com.intellij.psi.PsiElement
+import org.slf4j.Logger
+import org.slf4j.LoggerFactory
+
+internal class ModuleServiceImpl: ModuleService {
+    private val log: Logger = LoggerFactory.getLogger(javaClass.name)
+
+    override fun findModules(element: PsiElement): List<Module> {
+        val finder = ModuleFinder(element.project)
+        val modules = finder.findModules(element.containingFile.virtualFile.presentableUrl)
+
+        if (modules.isNotEmpty()) {
+            modules.forEach {
+                log.debug("related modules of file '{}'", element.containingFile.name)
+                log.debug("found module '{}'", it.name)
+            }
+        } else {
+            log.debug("could not find module of file '{}'", element.containingFile.name)
+        }
+
+        return modules
+    }
+}

src/main/kotlin/io/openapiprocessor/intellij/TargetPackageFinder.kt

@@ -5,8 +5,9 @@
 
 package io.openapiprocessor.intellij
 
-import com.intellij.openapi.components.Service
+import com.intellij.openapi.module.Module
+import com.intellij.psi.PsiDirectory
 
-@Service
-class TargetPackageService(finder: TargetPackageFinder = TargetPackageFinderImpl()) :
-    TargetPackageFinder by finder
+interface TargetPackageService {
+    fun findPackageDirs(pkgName: String, mappingModule: Module): List<PsiDirectory>
+}

src/main/kotlin/io/openapiprocessor/intellij/TargetPackageService.kt

@@ -5,7 +5,6 @@
 
 package io.openapiprocessor.intellij
 
-import com.intellij.openapi.components.Service
 import com.intellij.openapi.module.Module
 import com.intellij.psi.JavaPsiFacade
 import com.intellij.psi.PsiDirectory
@@ -15,8 +14,7 @@ import org.slf4j.LoggerFactory
 /**
  * find the package directories of the `package-name` configuration in the `mapping.yaml`.
  */
-@Service
-class TargetPackageFinderImpl : TargetPackageFinder {
+class TargetPackageServiceImpl : TargetPackageService {
     private val log: Logger = LoggerFactory.getLogger(this.javaClass.name)
 
     override fun findPackageDirs(pkgName: String, mappingModule: Module): List<PsiDirectory> {

…ssor/intellij/TargetPackageFinderImpl.kt …sor/intellij/TargetPackageServiceImpl.ktsrc/main/kotlin/io/openapiprocessor/intellij/TargetPackageFinderImpl.kt renamed to src/main/kotlin/io/openapiprocessor/intellij/TargetPackageServiceImpl.kt src/main/kotlin/io/openapiprocessor/intellij/TargetPackageFinderImpl.kt renamed to src/main/kotlin/io/openapiprocessor/intellij/TargetPackageServiceImpl.kt

@@ -34,6 +34,15 @@
             implementationClass="io.openapiprocessor.intellij.MappingAnnotationLineMarker"/>
 
         <iconMapper mappingFile="IconMappings.json"/>
+
+        <applicationService
+            serviceInterface="io.openapiprocessor.intellij.TargetPackageService"
+            serviceImplementation="io.openapiprocessor.intellij.TargetPackageServiceImpl"/>
+
+        <applicationService
+            serviceInterface="io.openapiprocessor.intellij.ModuleService"
+            serviceImplementation="io.openapiprocessor.intellij.ModuleServiceImpl"/>
+
     </extensions>
 
     <extensions defaultExtensionNs="JavaScript.JsonSchema">

src/main/resources/META-INF/plugin.xml

@@ -9,13 +9,18 @@ import com.intellij.openapi.application.EDT
 import io.kotest.core.spec.style.StringSpec
 import io.kotest.matchers.shouldBe
 import io.openapiprocessor.intellij.listener.LightCodeInsightListener
+import io.openapiprocessor.intellij.support.ModuleServiceStub
 import io.openapiprocessor.intellij.support.psiTargets
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 
 class MappingAnnotationLineMarkerSpec : StringSpec({
     val fixture = register(LightCodeInsightListener("src/test/testdata/interface-to-openapi/paths"))
 
+    beforeTest {
+        fixture.replaceService(ModuleService::class.java, ModuleServiceStub())
+    }
+
     "adds navigation gutter icon to mapping annotation" {
         withContext(Dispatchers.EDT) {
             fixture.copyDirectoryToProject("", "")

src/test/kotlin/io/openapiprocessor/intellij/MappingAnnotationLineMarkerSpec.kt

@@ -12,7 +12,7 @@ import io.kotest.core.spec.style.StringSpec
 import io.kotest.matchers.shouldBe
 import io.kotest.matchers.string.shouldEndWith
 import io.openapiprocessor.intellij.listener.LightCodeInsightListener
-import io.openapiprocessor.intellij.support.TargetPackageFinderStub
+import io.openapiprocessor.intellij.support.TargetPackageServiceStub
 import io.openapiprocessor.intellij.support.getTargets
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
@@ -24,10 +24,8 @@ class TypeMappingPackageLineMarkerSpec: StringSpec({
     beforeTest {
         val pkgDir = test.createDir(expectedPkgDir)
         val psiDir = readAction { test.findPsiDir(pkgDir) }
-
-        test.replaceService(
-            TargetPackageService::class.java,
-            TargetPackageService(TargetPackageFinderStub(psiDir)))
+        val stub = TargetPackageServiceStub(psiDir)
+        test.replaceService(TargetPackageService::class.java, stub)
     }
 
     "adds navigation gutter at package-name" {

src/test/kotlin/io/openapiprocessor/intellij/TypeMappingPackageLineMarkerSpec.kt

@@ -0,0 +1,24 @@
+/*
+ * Copyright 2025 https://github.com/openapi-processor/openapi-processor-intellij
+ * PDX-License-Identifier: Apache-2.0
+ */
+
+package io.openapiprocessor.intellij.support
+
+import com.intellij.openapi.components.Service
+import com.intellij.openapi.module.Module
+import com.intellij.openapi.roots.ProjectRootManager
+import com.intellij.psi.PsiElement
+import io.openapiprocessor.intellij.ModuleService
+
+@Service
+class ModuleServiceStub: ModuleService {
+
+    override fun findModules(element: PsiElement): List<Module> {
+        val module = ProjectRootManager.getInstance(element.project)
+            .fileIndex
+            .getModuleForFile(element.containingFile.virtualFile)
+
+        return listOfNotNull(module)
+    }
+}