[IJ Plugin] Don't report "GraphQL endpoint not configured" for submodules (#6071)

Author: BoD

intellij-plugin/src/main/kotlin/com/apollographql/ijplugin/inspection/ApolloEndpointNotConfiguredInspection.kt

@@ -5,6 +5,7 @@ import com.apollographql.ijplugin.project.apolloProjectService
 import com.apollographql.ijplugin.telemetry.TelemetryEvent
 import com.apollographql.ijplugin.telemetry.telemetryService
 import com.apollographql.ijplugin.util.getMethodName
+import com.apollographql.ijplugin.util.isMethodCall
 import com.apollographql.ijplugin.util.lambdaBlockExpression
 import com.intellij.codeInsight.intention.preview.IntentionPreviewUtils
 import com.intellij.codeInspection.LocalInspectionTool
@@ -29,9 +30,12 @@ class ApolloEndpointNotConfiguredInspection : LocalInspectionTool() {
         super.visitCallExpression(expression)
         if (!expression.project.apolloProjectService.apolloVersion.isAtLeastV3) return
         if (expression.containingFile.name != buildGradleFileName) return
-        if (expression.getMethodName() == "service" && expression.findParentInFile { it is KtCallExpression && it.getMethodName() == "apollo" } != null) {
+        if (expression.getMethodName() == "service" && expression.findParentInFile { it.isMethodCall("apollo") } != null) {
           val serviceBlockExpression = expression.lambdaBlockExpression() ?: return
-          if (serviceBlockExpression.statements.none { it is KtCallExpression && it.getMethodName() == "introspection" }) {
+          // Don't suggest to add an introspection block if this is a submodule
+          val hasDependsOn = serviceBlockExpression.statements.any { it.isMethodCall("dependsOn") }
+          if (hasDependsOn) return
+          if (serviceBlockExpression.statements.none { it.isMethodCall("introspection") }) {
             holder.registerProblem(expression.calleeExpression!!, ApolloBundle.message("inspection.endpointNotConfigured.reportText"), AddIntrospectionBlockQuickFix)
           }
         }

intellij-plugin/src/main/kotlin/com/apollographql/ijplugin/refactoring/migration/v3tov4/item/EncloseInService.kt

@@ -7,6 +7,7 @@ import com.apollographql.ijplugin.refactoring.migration.item.toMigrationItemUsag
 import com.apollographql.ijplugin.util.decapitalizeFirstLetter
 import com.apollographql.ijplugin.util.findPsiFilesByName
 import com.apollographql.ijplugin.util.getMethodName
+import com.apollographql.ijplugin.util.isMethodCall
 import com.apollographql.ijplugin.util.lambdaBlockExpression
 import com.intellij.openapi.project.Project
 import com.intellij.psi.PsiMigration
@@ -32,7 +33,7 @@ object EncloseInService : MigrationItem() {
             val blockExpression = expression.lambdaBlockExpression() ?: return
             val statements = blockExpression.statements
             // If there's already a service call, we can't automatically refactor
-            if (statements.none { it is KtCallExpression && it.getMethodName() == "service" }) {
+            if (statements.none { it.isMethodCall("service") }) {
               usages.add(blockExpression.toMigrationItemUsageInfo())
             }
           }

intellij-plugin/src/main/kotlin/com/apollographql/ijplugin/refactoring/migration/v3tov4/item/UpdateMultiModuleConfiguration.kt

@@ -6,6 +6,7 @@ import com.apollographql.ijplugin.refactoring.migration.item.toMigrationItemUsag
 import com.apollographql.ijplugin.util.containingKtFile
 import com.apollographql.ijplugin.util.findPsiFilesByName
 import com.apollographql.ijplugin.util.getMethodName
+import com.apollographql.ijplugin.util.isMethodCall
 import com.apollographql.ijplugin.util.lambdaBlockExpression
 import com.intellij.openapi.project.Project
 import com.intellij.psi.PsiMigration
@@ -41,11 +42,11 @@ object UpdateMultiModuleConfiguration : MigrationItem() {
     file.accept(object : KtTreeVisitorVoid() {
       override fun visitCallExpression(expression: KtCallExpression) {
         super.visitCallExpression(expression)
-        var serviceFound= false
+        var serviceFound = false
         if (expression.getMethodName() == "apollo") {
           val apolloBlockExpression = expression.lambdaBlockExpression() ?: return
           val apolloStatements = apolloBlockExpression.statements
-          apolloStatements.filter { it is KtCallExpression && it.getMethodName() == "service" }.forEach { serviceCallExpression ->
+          apolloStatements.filter { it.isMethodCall("service") }.forEach { serviceCallExpression ->
             val serviceBlockExpression = (serviceCallExpression as KtCallExpression).lambdaBlockExpression() ?: return@forEach
             serviceBlockExpression.add(ktFactory.createNewLine())
             serviceBlockExpression.add(ktFactory.createExpression("dependsOn(${usage.attachedData<String>()})"))

intellij-plugin/src/main/kotlin/com/apollographql/ijplugin/util/Psi.kt

@@ -78,6 +78,8 @@ fun PsiElement.originalClassName(): String? = resolveKtName()?.asKtClass()?.name
 
 fun KtCallExpression.getMethodName(): String? = calleeExpression.cast<KtNameReferenceExpression>()?.getReferencedName()
 
+fun PsiElement.isMethodCall(methodName: String) = this is KtCallExpression && getMethodName() == methodName
+
 fun KtCallExpression.lambdaBlockExpression(): KtBlockExpression? =
   valueArguments.firstIsInstanceOrNull<KtLambdaArgument>()?.getLambdaExpression()?.bodyExpression
 

intellij-plugin/src/test/testData/inspection/EndpointNotConfigured.gradle.kts

@@ -32,4 +32,9 @@ apollo {
       schemaFile.set(file("src/main/graphql/schema.graphqls"))
     }
   }
+
+  service("e") { // Shouldn't highlight
+    packageName.set("com.example")
+    dependsOn(":schemaModule", bidirectional = true)
+  }
 }

intellij-plugin/src/test/testData/inspection/EndpointNotConfigured_after.gradle.kts

@@ -42,4 +42,9 @@ apollo {
       schemaFile.set(file("src/main/graphql/schema.graphqls"))
     }
   }
+
+  service("e") { // Shouldn't highlight
+    packageName.set("com.example")
+    dependsOn(":schemaModule", bidirectional = true)
+  }
 }