diff --git a/plugins/devkit/devkit-core/resources/inspectionDescriptions/RetrievingLightService.html b/plugins/devkit/devkit-core/resources/inspectionDescriptions/RetrievingService.html
similarity index 88%
rename from plugins/devkit/devkit-core/resources/inspectionDescriptions/RetrievingLightService.html
rename to plugins/devkit/devkit-core/resources/inspectionDescriptions/RetrievingService.html
index 3a1f9d48b00c..747c5ee32c68 100644
--- a/plugins/devkit/devkit-core/resources/inspectionDescriptions/RetrievingLightService.html
+++ b/plugins/devkit/devkit-core/resources/inspectionDescriptions/RetrievingService.html
@@ -1,6 +1,6 @@
-Reports problems when retrieving a light service.
+Reports problems when retrieving services.
The following problems are reported:
- Mismatch when retrieving a service: attempting to get a project-level service as an application-level service, or vice versa.
diff --git a/plugins/devkit/devkit-core/resources/intellij.devkit.core.xml b/plugins/devkit/devkit-core/resources/intellij.devkit.core.xml
index bd4c40833f92..eac5dac246d9 100644
--- a/plugins/devkit/devkit-core/resources/intellij.devkit.core.xml
+++ b/plugins/devkit/devkit-core/resources/intellij.devkit.core.xml
@@ -239,10 +239,10 @@
enabledByDefault="false" level="WARNING"
implementationClass="org.jetbrains.idea.devkit.inspections.MismatchedLightServiceLevelAndCtorInspection"
key="inspection.mismatched.light.service.level.and.ctor.display.name"/>
-
Level.APP
+ "projectService" -> Level.PROJECT
+ else -> Level.NOT_SPECIFIED
+ }
+ }
+ }
+ return null
+ }
+
+ private fun hasServiceBeanFqn(extension: Extension): Boolean {
+ return extension.extensionPoint?.beanClass?.stringValue == ServiceDescriptor::class.java.canonicalName
+ }
+
data class MismatchReceivingChecker(val retrievingClassName: String,
val level: Level,
val mismatchRetrievingKey: @PropertyKey(resourceBundle = DevKitBundle.BUNDLE) String) {
diff --git a/plugins/devkit/devkit-java-tests/testData/inspections/retrievingLightService/AppLevelServiceAsProjectLevel.java b/plugins/devkit/devkit-java-tests/testData/inspections/retrievingService/AppLevelServiceAsProjectLevel.java
similarity index 100%
rename from plugins/devkit/devkit-java-tests/testData/inspections/retrievingLightService/AppLevelServiceAsProjectLevel.java
rename to plugins/devkit/devkit-java-tests/testData/inspections/retrievingService/AppLevelServiceAsProjectLevel.java
diff --git a/plugins/devkit/devkit-java-tests/testData/inspections/retrievingLightService/ProjectLevelServiceAsAppLevel.java b/plugins/devkit/devkit-java-tests/testData/inspections/retrievingService/ProjectLevelServiceAsAppLevel.java
similarity index 100%
rename from plugins/devkit/devkit-java-tests/testData/inspections/retrievingLightService/ProjectLevelServiceAsAppLevel.java
rename to plugins/devkit/devkit-java-tests/testData/inspections/retrievingService/ProjectLevelServiceAsAppLevel.java
diff --git a/plugins/devkit/devkit-java-tests/testData/inspections/retrievingLightService/ReplaceWithGetInstanceApplicationLevel.java b/plugins/devkit/devkit-java-tests/testData/inspections/retrievingService/ReplaceWithGetInstanceApplicationLevel.java
similarity index 100%
rename from plugins/devkit/devkit-java-tests/testData/inspections/retrievingLightService/ReplaceWithGetInstanceApplicationLevel.java
rename to plugins/devkit/devkit-java-tests/testData/inspections/retrievingService/ReplaceWithGetInstanceApplicationLevel.java
diff --git a/plugins/devkit/devkit-java-tests/testData/inspections/retrievingLightService/ReplaceWithGetInstanceApplicationLevel_after.java b/plugins/devkit/devkit-java-tests/testData/inspections/retrievingService/ReplaceWithGetInstanceApplicationLevel_after.java
similarity index 100%
rename from plugins/devkit/devkit-java-tests/testData/inspections/retrievingLightService/ReplaceWithGetInstanceApplicationLevel_after.java
rename to plugins/devkit/devkit-java-tests/testData/inspections/retrievingService/ReplaceWithGetInstanceApplicationLevel_after.java
diff --git a/plugins/devkit/devkit-java-tests/testData/inspections/retrievingLightService/ReplaceWithGetInstanceProjectLevel.java b/plugins/devkit/devkit-java-tests/testData/inspections/retrievingService/ReplaceWithGetInstanceProjectLevel.java
similarity index 100%
rename from plugins/devkit/devkit-java-tests/testData/inspections/retrievingLightService/ReplaceWithGetInstanceProjectLevel.java
rename to plugins/devkit/devkit-java-tests/testData/inspections/retrievingService/ReplaceWithGetInstanceProjectLevel.java
diff --git a/plugins/devkit/devkit-java-tests/testData/inspections/retrievingLightService/ReplaceWithGetInstanceProjectLevel_after.java b/plugins/devkit/devkit-java-tests/testData/inspections/retrievingService/ReplaceWithGetInstanceProjectLevel_after.java
similarity index 100%
rename from plugins/devkit/devkit-java-tests/testData/inspections/retrievingLightService/ReplaceWithGetInstanceProjectLevel_after.java
rename to plugins/devkit/devkit-java-tests/testData/inspections/retrievingService/ReplaceWithGetInstanceProjectLevel_after.java
diff --git a/plugins/devkit/devkit-java-tests/testSrc/org/jetbrains/idea/devkit/inspections/RetrievingLightServiceInspectionTest.kt b/plugins/devkit/devkit-java-tests/testSrc/org/jetbrains/idea/devkit/inspections/RetrievingServiceInspectionTest.kt
similarity index 74%
rename from plugins/devkit/devkit-java-tests/testSrc/org/jetbrains/idea/devkit/inspections/RetrievingLightServiceInspectionTest.kt
rename to plugins/devkit/devkit-java-tests/testSrc/org/jetbrains/idea/devkit/inspections/RetrievingServiceInspectionTest.kt
index cf27907f3e87..fee0fa30a58f 100644
--- a/plugins/devkit/devkit-java-tests/testSrc/org/jetbrains/idea/devkit/inspections/RetrievingLightServiceInspectionTest.kt
+++ b/plugins/devkit/devkit-java-tests/testSrc/org/jetbrains/idea/devkit/inspections/RetrievingServiceInspectionTest.kt
@@ -3,12 +3,12 @@ package org.jetbrains.idea.devkit.inspections
import com.intellij.testFramework.TestDataPath
import org.jetbrains.idea.devkit.DevkitJavaTestsUtil
-import org.jetbrains.idea.devkit.inspections.quickfix.RetrievingLightServiceInspectionTestBase
+import org.jetbrains.idea.devkit.inspections.quickfix.RetrievingServiceInspectionTestBase
-@TestDataPath("\$CONTENT_ROOT/testData/inspections/retrievingLightService")
-class RetrievingLightServiceInspectionTest : RetrievingLightServiceInspectionTestBase() {
+@TestDataPath("\$CONTENT_ROOT/testData/inspections/retrievingService")
+class RetrievingServiceInspectionTest : RetrievingServiceInspectionTestBase() {
- override fun getBasePath() = DevkitJavaTestsUtil.TESTDATA_PATH + "inspections/retrievingLightService/"
+ override fun getBasePath() = DevkitJavaTestsUtil.TESTDATA_PATH + "inspections/retrievingService/"
override fun getFileExtension() = "java"
diff --git a/plugins/devkit/devkit-kotlin-tests/testData/inspections/retrievingLightService/AppLevelServiceAsProjectLevel.kt b/plugins/devkit/devkit-kotlin-tests/testData/inspections/retrievingService/AppLevelServiceAsProjectLevel.kt
similarity index 100%
rename from plugins/devkit/devkit-kotlin-tests/testData/inspections/retrievingLightService/AppLevelServiceAsProjectLevel.kt
rename to plugins/devkit/devkit-kotlin-tests/testData/inspections/retrievingService/AppLevelServiceAsProjectLevel.kt
diff --git a/plugins/devkit/devkit-kotlin-tests/testData/inspections/retrievingLightService/ProjectLevelServiceAsAppLevel.kt b/plugins/devkit/devkit-kotlin-tests/testData/inspections/retrievingService/ProjectLevelServiceAsAppLevel.kt
similarity index 100%
rename from plugins/devkit/devkit-kotlin-tests/testData/inspections/retrievingLightService/ProjectLevelServiceAsAppLevel.kt
rename to plugins/devkit/devkit-kotlin-tests/testData/inspections/retrievingService/ProjectLevelServiceAsAppLevel.kt
diff --git a/plugins/devkit/devkit-kotlin-tests/testSrc/org/jetbrains/idea/devkit/kotlin/inspections/KtRetrievingLightServiceInspectionTest.kt b/plugins/devkit/devkit-kotlin-tests/testSrc/org/jetbrains/idea/devkit/kotlin/inspections/KtRetrievingServiceInspectionTest.kt
similarity index 70%
rename from plugins/devkit/devkit-kotlin-tests/testSrc/org/jetbrains/idea/devkit/kotlin/inspections/KtRetrievingLightServiceInspectionTest.kt
rename to plugins/devkit/devkit-kotlin-tests/testSrc/org/jetbrains/idea/devkit/kotlin/inspections/KtRetrievingServiceInspectionTest.kt
index 2fcece817a3e..23cff889ad0a 100644
--- a/plugins/devkit/devkit-kotlin-tests/testSrc/org/jetbrains/idea/devkit/kotlin/inspections/KtRetrievingLightServiceInspectionTest.kt
+++ b/plugins/devkit/devkit-kotlin-tests/testSrc/org/jetbrains/idea/devkit/kotlin/inspections/KtRetrievingServiceInspectionTest.kt
@@ -2,13 +2,13 @@
package org.jetbrains.idea.devkit.kotlin.inspections
import com.intellij.testFramework.TestDataPath
-import org.jetbrains.idea.devkit.inspections.quickfix.RetrievingLightServiceInspectionTestBase
+import org.jetbrains.idea.devkit.inspections.quickfix.RetrievingServiceInspectionTestBase
import org.jetbrains.idea.devkit.kotlin.DevkitKtTestsUtil
-@TestDataPath("\$CONTENT_ROOT/testData/inspections/retrievingLightService")
-class KtRetrievingLightServiceInspectionTest : RetrievingLightServiceInspectionTestBase() {
+@TestDataPath("\$CONTENT_ROOT/testData/inspections/retrievingService")
+class KtRetrievingServiceInspectionTest : RetrievingServiceInspectionTestBase() {
- override fun getBasePath() = DevkitKtTestsUtil.TESTDATA_PATH + "inspections/retrievingLightService/"
+ override fun getBasePath() = DevkitKtTestsUtil.TESTDATA_PATH + "inspections/retrievingService/"
override fun getFileExtension() = "kt"
diff --git a/plugins/devkit/devkit-tests/testSrc/org/jetbrains/idea/devkit/inspections/quickfix/RetrievingLightServiceInspectionTestBase.kt b/plugins/devkit/devkit-tests/testSrc/org/jetbrains/idea/devkit/inspections/quickfix/RetrievingServiceInspectionTestBase.kt
similarity index 85%
rename from plugins/devkit/devkit-tests/testSrc/org/jetbrains/idea/devkit/inspections/quickfix/RetrievingLightServiceInspectionTestBase.kt
rename to plugins/devkit/devkit-tests/testSrc/org/jetbrains/idea/devkit/inspections/quickfix/RetrievingServiceInspectionTestBase.kt
index 733de3c2bf58..cd5cd4ca3916 100644
--- a/plugins/devkit/devkit-tests/testSrc/org/jetbrains/idea/devkit/inspections/quickfix/RetrievingLightServiceInspectionTestBase.kt
+++ b/plugins/devkit/devkit-tests/testSrc/org/jetbrains/idea/devkit/inspections/quickfix/RetrievingServiceInspectionTestBase.kt
@@ -1,13 +1,13 @@
// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
package org.jetbrains.idea.devkit.inspections.quickfix
-import org.jetbrains.idea.devkit.inspections.RetrievingLightServiceInspection
+import org.jetbrains.idea.devkit.inspections.RetrievingServiceInspection
-abstract class RetrievingLightServiceInspectionTestBase : LightDevKitInspectionFixTestBase() {
+abstract class RetrievingServiceInspectionTestBase : DevKitInspectionFixTestBase() {
override fun setUp() {
super.setUp()
- myFixture.enableInspections(RetrievingLightServiceInspection())
+ myFixture.enableInspections(RetrievingServiceInspection())
myFixture.addClass("""
package com.intellij.openapi.components;