[IJ Plugin] Include subfolders when contributing GraphQL config (#5871)

BoD · web-flow · commit 5ff26356abb3 · 2024-05-02T11:01:19.000+02:00
diff --git a/intellij-plugin/src/main/kotlin/com/apollographql/ijplugin/graphql/ApolloGraphQLConfigContributor.kt b/intellij-plugin/src/main/kotlin/com/apollographql/ijplugin/graphql/ApolloGraphQLConfigContributor.kt
@@ -36,7 +36,7 @@ class ApolloGraphQLConfigContributor : GraphQLConfigContributor {
 
   private fun ApolloKotlinService.toGraphQLRawProjectConfig() = GraphQLRawProjectConfig(
       schema = schemaPaths.map { GraphQLRawSchemaPointer(it) },
-      include = operationPaths.map { "$it/*.graphql" },
+      include = operationPaths.map { "$it/**/*.graphql" },
       extensions = endpointUrl?.let {
         mapOf(
             GraphQLConfigKeys.EXTENSION_ENDPOINTS to mapOf(
diff --git a/intellij-plugin/src/test/kotlin/com/apollographql/ijplugin/navigation/GraphQLCustomUsageSearcherTest.kt b/intellij-plugin/src/test/kotlin/com/apollographql/ijplugin/navigation/GraphQLCustomUsageSearcherTest.kt
@@ -54,7 +54,7 @@ class GraphQLCustomUsageSearcherTest : ApolloTestCase() {
 
   @Test
   fun fragment() = testFindUsages(
-      fromFile = "src/main/graphql/ComputerFields.graphql",
+      fromFile = "src/main/graphql/fragments/ComputerFields.graphql",
       moveCaret = { moveCaret("computerFields") },
       expected = listOf(
           "ComputersQuery.graphql" to "...computerFields",
diff --git a/intellij-plugin/src/test/kotlin/com/apollographql/ijplugin/navigation/GraphQLGotoDeclarationHandlerTest.kt b/intellij-plugin/src/test/kotlin/com/apollographql/ijplugin/navigation/GraphQLGotoDeclarationHandlerTest.kt
@@ -67,7 +67,7 @@ class GraphQLGotoDeclarationHandlerTest : ApolloTestCase() {
 
   @Test
   fun goToFragmentClass() = testNavigation(
-      fromFile = "src/main/graphql/ComputerFields.graphql",
+      fromFile = "src/main/graphql/fragments/ComputerFields.graphql",
       fromElement = { elementAt<PsiElement>("computerFields")!! },
       toFile = "build/generated/source/apollo/main/com/example/generated/fragment/ComputerFields.kt",
       toElement = { elementAt<KtClass>("class ComputerFields")!! },
@@ -77,7 +77,7 @@ class GraphQLGotoDeclarationHandlerTest : ApolloTestCase() {
 
   @Test
   fun goToField() = testNavigation(
-      fromFile = "src/main/graphql/ComputerFields.graphql",
+      fromFile = "src/main/graphql/fragments/ComputerFields.graphql",
       fromElement = { elementAt<PsiElement>("resolution")!! },
       toFile = "build/generated/source/apollo/main/com/example/generated/fragment/ComputerFields.kt",
       toElement = { elementAt<KtParameter>("resolution")!! },
diff --git a/intellij-plugin/src/test/kotlin/com/apollographql/ijplugin/navigation/KotlinGoToDeclarationHandlerTest.kt b/intellij-plugin/src/test/kotlin/com/apollographql/ijplugin/navigation/KotlinGoToDeclarationHandlerTest.kt
@@ -62,7 +62,7 @@ class KotlinGoToDeclarationHandlerTest : ApolloTestCase() {
   fun goToFragmentDefinition() = testNavigation(
       fromFile = "src/main/kotlin/com/example/Main.kt",
       fromElement = { elementAt<PsiElement>("ComputerFields(") },
-      toFile = "src/main/graphql/ComputerFields.graphql",
+      toFile = "src/main/graphql/fragments/ComputerFields.graphql",
       toElement = { elementAt<GraphQLFragmentDefinition>("fragment computerFields") }
   )
 
diff --git a/intellij-plugin/src/test/kotlin/com/apollographql/ijplugin/navigation/KotlinTypeDeclarationProviderTest.kt b/intellij-plugin/src/test/kotlin/com/apollographql/ijplugin/navigation/KotlinTypeDeclarationProviderTest.kt
@@ -63,7 +63,7 @@ class KotlinTypeDeclarationProviderTest : ApolloTestCase() {
   fun goToFragmentDefinition() = testNavigation(
       fromFile = "src/main/kotlin/com/example/Main.kt",
       fromElement = { elementAt<KtProperty>("computerFields") },
-      toFile = "src/main/graphql/ComputerFields.graphql",
+      toFile = "src/main/graphql/fragments/ComputerFields.graphql",
       toElement = { elementAt<GraphQLFragmentDefinition>("fragment computerFields") }
   )
 
diff --git a/tests/intellij-plugin-test-project/src/main/graphql/fragments/ComputerFields.graphql b/tests/intellij-plugin-test-project/src/main/graphql/fragments/ComputerFields.graphql

Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ class KotlinGoToDeclarationHandlerTest : ApolloTestCase() {`
`62`	`62`	`fun goToFragmentDefinition() = testNavigation(`
`63`	`63`	`fromFile = "src/main/kotlin/com/example/Main.kt",`
`64`	`64`	`fromElement = { elementAt<PsiElement>("ComputerFields(") },`
`65`		`- toFile = "src/main/graphql/ComputerFields.graphql",`
	`65`	`+ toFile = "src/main/graphql/fragments/ComputerFields.graphql",`
`66`	`66`	`toElement = { elementAt<GraphQLFragmentDefinition>("fragment computerFields") }`
`67`	`67`	`)`
`68`	`68`
Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ class KotlinTypeDeclarationProviderTest : ApolloTestCase() {`
`63`	`63`	`fun goToFragmentDefinition() = testNavigation(`
`64`	`64`	`fromFile = "src/main/kotlin/com/example/Main.kt",`
`65`	`65`	`fromElement = { elementAt<KtProperty>("computerFields") },`
`66`		`- toFile = "src/main/graphql/ComputerFields.graphql",`
	`66`	`+ toFile = "src/main/graphql/fragments/ComputerFields.graphql",`
`67`	`67`	`toElement = { elementAt<GraphQLFragmentDefinition>("fragment computerFields") }`
`68`	`68`	`)`
`69`	`69`