MangledNamesProcessor: order visits by name

(cherry picked from commit 1438dae)
google · Sep 3, 2024 · 46556c2 · 46556c2
1 parent 27e51ae
commit 46556c2
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 35 deletions.
diff --git a/test-utils/src/main/kotlin/com/google/devtools/ksp/processor/MangledNamesProcessor.kt b/test-utils/src/main/kotlin/com/google/devtools/ksp/processor/MangledNamesProcessor.kt
@@ -47,6 +47,13 @@ class MangledNamesProcessor : AbstractTestProcessor() {
  override fun defaultHandler(node: KSNode, data: MutableMap<String, String?>) {
  }
 
+ override fun visitDeclarationContainer(
+ declarationContainer: KSDeclarationContainer,
+ data: MutableMap<String, String?>
+ ) {
+ declarationContainer.declarations.sortedBy { it.simpleName.asString() }.forEach { it.accept(this, data) }
+ }
+
  override fun visitClassDeclaration(classDeclaration: KSClassDeclaration, data: MutableMap<String, String?>) {
  if (classDeclaration.modifiers.contains(Modifier.INLINE)) {
  // do not visit inline classes

diff --git a/test-utils/testData/api/mangledNames.kt b/test-utils/testData/api/mangledNames.kt
@@ -19,71 +19,71 @@
 // TEST PROCESSOR: MangledNamesProcessor
 // EXPECTED:
 // JavaEnum -> declarations
+// <init> -> <init>
 // JavaEnum.VAL1 -> declarations
 // JavaEnum.VAL2 -> declarations
-// values -> values
 // valueOf -> valueOf
-// <init> -> <init>
+// values -> values
 // JavaInput -> declarations
-// javaFunction -> javaFunction
-// staticJavaFunction -> staticJavaFunction
 // getX -> getX
 // getY -> getY
+// javaFunction -> javaFunction
 // setY -> setY
+// staticJavaFunction -> staticJavaFunction
+// mainPackage.AbstractKotlinClass -> declarations
+// get-abstractVal -> getAbstractVal
+// get-abstractVar -> getAbstractVar
+// set-abstractVar -> setAbstractVar
+// get-internalAbstractVal -> getInternalAbstractVal$mainModule
+// set-internalAbstractVal -> setInternalAbstractVal$mainModule
+// get-internalAbstractVar -> getInternalAbstractVar$mainModule
+// set-internalAbstractVar -> setInternalAbstractVar$mainModule
+// mainPackage.Anno -> declarations
+// get-a -> a
 // mainPackage.Foo -> declarations
-// get-normalProp -> getNormalProp
-// set-normalProp -> setNormalProp
+// hasJvmName -> explicitJvmName
 // get-inlineProp -> getInlineProp-HRn7Rpw
 // set-inlineProp -> setInlineProp-E03SJzc
-// get-internalProp -> getInternalProp$mainModule
-// set-internalProp -> setInternalProp$mainModule
+// inlineReceivingFun -> inlineReceivingFun-E03SJzc
+// inlineReturningFun -> inlineReturningFun-HRn7Rpw
 // get-internalInlineProp -> getInternalInlineProp-HRn7Rpw$mainModule
 // set-internalInlineProp -> setInternalInlineProp-E03SJzc$mainModule
+// internalInlineReceivingFun -> internalInlineReceivingFun-E03SJzc$mainModule
+// internalInlineReturningFun -> internalInlineReturningFun-HRn7Rpw$mainModule
+// get-internalProp -> getInternalProp$mainModule
+// set-internalProp -> setInternalProp$mainModule
 // get-jvmNameProp -> explicitGetterName
 // set-jvmNameProp -> explicitSetterName
 // normalFun -> normalFun
-// hasJvmName -> explicitJvmName
-// inlineReceivingFun -> inlineReceivingFun-E03SJzc
-// inlineReturningFun -> inlineReturningFun-HRn7Rpw
-// internalInlineReceivingFun -> internalInlineReceivingFun-E03SJzc$mainModule
-// internalInlineReturningFun -> internalInlineReturningFun-HRn7Rpw$mainModule
-// mainPackage.Anno -> declarations
-// get-a -> a
-// mainPackage.AbstractKotlinClass -> declarations
-// get-abstractVar -> getAbstractVar
-// set-abstractVar -> setAbstractVar
-// get-abstractVal -> getAbstractVal
-// get-internalAbstractVar -> getInternalAbstractVar$mainModule
-// set-internalAbstractVar -> setInternalAbstractVar$mainModule
-// get-internalAbstractVal -> getInternalAbstractVal$mainModule
-// set-internalAbstractVal -> setInternalAbstractVal$mainModule
-// fileLevelInternalFun -> fileLevelInternalFun
-// fileLevelInlineReceivingFun -> fileLevelInlineReceivingFun-E03SJzc
-// fileLevelInlineReturningFun -> fileLevelInlineReturningFun
-// fileLevelInternalInlineReceivingFun -> fileLevelInternalInlineReceivingFun-E03SJzc
-// fileLevelInternalInlineReturningFun -> fileLevelInternalInlineReturningFun
+// get-normalProp -> getNormalProp
+// set-normalProp -> setNormalProp
 // mainPackage.MyInterface -> declarations
 // get-x -> getX
 // get-y -> getY
 // set-y -> setY
+// fileLevelInlineReceivingFun -> fileLevelInlineReceivingFun-E03SJzc
+// fileLevelInlineReturningFun -> fileLevelInlineReturningFun
+// fileLevelInternalFun -> fileLevelInternalFun
+// fileLevelInternalInlineReceivingFun -> fileLevelInternalInlineReceivingFun-E03SJzc
+// fileLevelInternalInlineReturningFun -> fileLevelInternalInlineReturningFun
 // libPackage.Foo -> declarations
+// <init> -> <init>
+// hasJvmName -> explicitJvmName
 // get-inlineProp -> getInlineProp-b_MPbnQ
 // set-inlineProp -> setInlineProp-mQ73O9w
+// inlineReceivingFun -> inlineReceivingFun-mQ73O9w
+// inlineReturningFun -> inlineReturningFun-b_MPbnQ
 // get-internalInlineProp -> getInternalInlineProp-b_MPbnQ$lib
 // set-internalInlineProp -> setInternalInlineProp-mQ73O9w$lib
+// internalInlineReceivingFun -> internalInlineReceivingFun-mQ73O9w$lib
+// internalInlineReturningFun -> internalInlineReturningFun-b_MPbnQ$lib
 // get-internalProp -> getInternalProp$lib
 // set-internalProp -> setInternalProp$lib
 // get-jvmNameProp -> explicitGetterName
 // set-jvmNameProp -> explicitSetterName
+// normalFun -> normalFun
 // get-normalProp -> getNormalProp
 // set-normalProp -> setNormalProp
-// hasJvmName -> explicitJvmName
-// inlineReceivingFun -> inlineReceivingFun-mQ73O9w
-// inlineReturningFun -> inlineReturningFun-b_MPbnQ
-// internalInlineReceivingFun -> internalInlineReceivingFun-mQ73O9w$lib
-// internalInlineReturningFun -> internalInlineReturningFun-b_MPbnQ$lib
-// normalFun -> normalFun
-// <init> -> <init>
 // libPackage.AbstractKotlinClass -> declarations
 // get-abstractVal -> getAbstractVal
 // get-abstractVar -> getAbstractVar