IncrementalGlobalSearchScope: include source roots

in addition to source files in them. This helps AA in computing package scopes.
google · Aug 26, 2024 · 57f54c8 · 57f54c8
1 parent 1490e06
commit 57f54c8
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 1 deletion.
diff --git a/...analysis-api/src/main/kotlin/com/google/devtools/ksp/standalone/KspSourceModuleBuilder.kt b/...analysis-api/src/main/kotlin/com/google/devtools/ksp/standalone/KspSourceModuleBuilder.kt
@@ -82,7 +82,7 @@ class KspModuleBuilder(
         return buildSet {
             for (root in sourceRoots) {
                 val files = when {
-                    root.isDirectory() -> collectSourceFilePaths(root)
+                    root.isDirectory() -> listOf(root) + collectSourceFilePaths(root)
                     root.hasSuitableExtensionToAnalyse() -> listOf(root)
                     else -> emptyList()
                 }

diff --git a/kotlin-analysis-api/testData/getPackage.kt b/kotlin-analysis-api/testData/getPackage.kt
@@ -33,6 +33,10 @@
 // main.test.L JAVA
 // main.test.C JAVA
 // symbols from package non.exist
+// symbols from package test
+// test.TestJava JAVA
+// symbols from package testlib
+// testlib.TestJavaLib JAVA_LIB
 // END
 
 // MODULE: lib1
@@ -64,6 +68,10 @@ val a = 0
 
 class Bar {}
 
+// FILE: testlib/Test.java
+package testlib;
+class TestJavaLib {}
+
 // MODULE: main(lib1, lib2)
 // FILE: a.kt
 package lib1
@@ -102,3 +110,7 @@ package main.test;
 public class L {
 
 }
+
+// FILE: test/Test.java
+package test;
+class TestJava {}
diff --git a/test-utils/src/main/kotlin/com/google/devtools/ksp/processor/GetPackageProcessor.kt b/test-utils/src/main/kotlin/com/google/devtools/ksp/processor/GetPackageProcessor.kt
@@ -17,6 +17,8 @@ class GetPackageProcessor : AbstractTestProcessor() {
         addPackage("lib2", resolver)
         addPackage("main.test", resolver)
         addPackage("non.exist", resolver)
+        addPackage("test", resolver)
+        addPackage("testlib", resolver)
         return emptyList()
     }
 

diff --git a/test-utils/testData/api/getPackage.kt b/test-utils/testData/api/getPackage.kt
@@ -32,6 +32,10 @@
 // main.test.C JAVA
 // main.test.D JAVA
 // symbols from package non.exist
+// symbols from package test
+// test.TestJava JAVA
+// symbols from package testlib
+// testlib.TestJavaLib JAVA_LIB
 // END
 
 // MODULE: lib1
@@ -63,6 +67,10 @@ val a = 0
 
 class Bar {}
 
+// FILE: testlib/Test.java
+package testlib;
+class TestJavaLib {}
+
 // MODULE: main(lib1, lib2)
 // FILE: a.kt
 package lib1
@@ -101,3 +109,7 @@ package main.test;
 public class L {
 
 }
+
+// FILE: test/Test.java
+package test;
+class TestJava {}