Don't extract static init when the class already contains an anonymous init

atorralba · igfoo · commit 1926bef0508e · 2022-05-10T19:51:25.000+01:00
diff --git a/java/kotlin-extractor/src/main/kotlin/KotlinFileExtractor.kt b/java/kotlin-extractor/src/main/kotlin/KotlinFileExtractor.kt
@@ -99,7 +99,8 @@ open class KotlinFileExtractor(
                     if (isExternalDeclaration(declaration)) {
                         extractExternalClassLater(declaration)
                     } else {
-                        extractClassSource(declaration, true, true)
+                        val extractStaticInit = declaration.declarations.none { it is IrAnonymousInitializer }
+                        extractClassSource(declaration, true, extractStaticInit)
                     }
                 }
                 is IrFunction -> {
diff --git a/java/ql/test/kotlin/library-tests/classes/PrintAst.expected b/java/ql/test/kotlin/library-tests/classes/PrintAst.expected
@@ -78,7 +78,7 @@ classes.kt:
 #   29|       5: [BlockStmt] { ... }
 #   29|         0: [ThisConstructorInvocationStmt] this(...)
 #   34|   10: [Class] ClassSeven
-#   35|     2: [Constructor] ClassSeven
+#   35|     1: [Constructor] ClassSeven
 #-----|       4: (Parameters)
 #   35|         0: [Parameter] i
 #   35|       5: [BlockStmt] { ... }
@@ -96,12 +96,12 @@ classes.kt:
 #   36|         2: [ExprStmt] <Expr>;
 #   36|           0: [MethodAccess] f(...)
 #   36|             0: [VarAccess] i
-#   42|     3: [Method] getX
+#   42|     2: [Method] getX
 #   42|       5: [BlockStmt] { ... }
 #   42|         0: [ReturnStmt] return ...
 #   42|           0: [VarAccess] this.x
 #   42|             -1: [ThisAccess] this
-#   42|     3: [FieldDeclaration] int x;
+#   42|     2: [FieldDeclaration] int x;
 #   42|       -1: [TypeAccess] int
 #   42|       0: [IntegerLiteral] 3
 #   49|   11: [Class] Direction

Original file line number	Diff line number	Diff line change
`@@ -99,7 +99,8 @@ open class KotlinFileExtractor(`
`99`	`99`	`if (isExternalDeclaration(declaration)) {`
`100`	`100`	`extractExternalClassLater(declaration)`
`101`	`101`	`} else {`
`102`		`- extractClassSource(declaration, true, true)`
	`102`	`+ val extractStaticInit = declaration.declarations.none { it is IrAnonymousInitializer }`
	`103`	`+ extractClassSource(declaration, true, extractStaticInit)`
`103`	`104`	`}`
`104`	`105`	`}`
`105`	`106`	`is IrFunction -> {`