handle no jvm class file use case for declarationOrdering

google · Jan 30, 2024 · cd59900 · cd59900
1 parent 192212b
commit cd59900
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/kotlin-analysis-api/src/main/kotlin/com/google/devtools/ksp/impl/ResolverAAImpl.kt b/kotlin-analysis-api/src/main/kotlin/com/google/devtools/ksp/impl/ResolverAAImpl.kt
@@ -318,8 +318,8 @@ class ResolverAAImpl(
         val classId = (parentClass as KSClassDeclarationImpl).ktClassOrObjectSymbol.classIdIfNonLocal
             ?: return container.declarations
         val virtualFile = analyze {
-            (fileManager.findClass(classId, analysisScope) as JavaClassImpl).virtualFile
-        }!!
+            (fileManager.findClass(classId, analysisScope) as? JavaClassImpl)?.virtualFile
+        } ?: return container.declarations
         val kotlinClass = classBinaryCache.getKotlinBinaryClass(virtualFile) ?: return container.declarations
         val declarationOrdering = DeclarationOrdering(kotlinClass)
 

diff --git a/test-utils/src/main/kotlin/com/google/devtools/ksp/processor/DeclarationOrderProcessor.kt b/test-utils/src/main/kotlin/com/google/devtools/ksp/processor/DeclarationOrderProcessor.kt
@@ -37,6 +37,11 @@ class DeclarationOrderProcessor : AbstractTestProcessor() {
                     }
             )
         }
+        result.addAll(
+            resolver.getDeclarationsInSourceOrder(resolver.getClassDeclarationByName("kotlin.Any")!!).map {
+                it.toSignature(resolver)
+            }
+        )
         return emptyList()
     }
 

diff --git a/test-utils/testData/api/declarationOrder.kt b/test-utils/testData/api/declarationOrder.kt
@@ -68,6 +68,10 @@
 // overloaded:(I)V
 // overloaded:()V
 // overloaded:(Ljava/lang/String;Ljava/lang/String;)V
+// equals:(Ljava/lang/Object;)Z
+// hashCode:()I
+// toString:()Ljava/lang/String;
+// <init>:()V
 // END
 // MODULE: module1
 // FILE: lib/KotlinClass.kt