Extract enum field declarations

tamasvajk · igfoo · commit b5c8d29e40a1 · 2022-05-10T19:51:29.000+01:00
diff --git a/java/kotlin-extractor/src/main/kotlin/KotlinFileExtractor.kt b/java/kotlin-extractor/src/main/kotlin/KotlinFileExtractor.kt
@@ -830,6 +830,15 @@ open class KotlinFileExtractor(
                     tw.writeFieldsKotlinType(id, type.kotlinResult.id)
                     val locId = tw.getLocation(ee)
                     tw.writeHasLocation(id, locId)
+
+                    if (!isExternalDeclaration(ee)) {
+                        val fieldDeclarationId = tw.getFreshIdLabel<DbFielddecl>()
+                        tw.writeFielddecls(fieldDeclarationId, parentId)
+                        tw.writeFieldDeclaredIn(id, fieldDeclarationId, 0)
+                        tw.writeHasLocation(fieldDeclarationId, locId)
+
+                        extractTypeAccess(type, locId, fieldDeclarationId, 0)
+                    }
                 }
             }
         }
diff --git a/java/ql/test/kotlin/library-tests/exprs_typeaccess/PrintAst.expected b/java/ql/test/kotlin/library-tests/exprs_typeaccess/PrintAst.expected
@@ -87,6 +87,12 @@ A.kt:
 #   23|               -3: [TypeAccess] Unit
 #   23|                 0: [TypeAccess] Enu
 #   23|           1: [BlockStmt] { ... }
+#   24|       4: [FieldDeclaration] Enu A;
+#   24|         -1: [TypeAccess] Enu
+#   24|       5: [FieldDeclaration] Enu B;
+#   24|         -1: [TypeAccess] Enu
+#   24|       6: [FieldDeclaration] Enu C;
+#   24|         -1: [TypeAccess] Enu
 B.java:
 #    0| [CompilationUnit] B
 #    1|   1: [Class] B

Original file line number	Diff line number	Diff line change
`@@ -830,6 +830,15 @@ open class KotlinFileExtractor(`
`830`	`830`	`tw.writeFieldsKotlinType(id, type.kotlinResult.id)`
`831`	`831`	`val locId = tw.getLocation(ee)`
`832`	`832`	`tw.writeHasLocation(id, locId)`
	`833`	`+`
	`834`	`+ if (!isExternalDeclaration(ee)) {`
	`835`	`+ val fieldDeclarationId = tw.getFreshIdLabel<DbFielddecl>()`
	`836`	`+ tw.writeFielddecls(fieldDeclarationId, parentId)`
	`837`	`+ tw.writeFieldDeclaredIn(id, fieldDeclarationId, 0)`
	`838`	`+ tw.writeHasLocation(fieldDeclarationId, locId)`
	`839`	`+`
	`840`	`+ extractTypeAccess(type, locId, fieldDeclarationId, 0)`
	`841`	`+ }`
`833`	`842`	`}`
`834`	`843`	`}`
`835`	`844`	`}`