Identify data classes during extraction

tamasvajk · smowton · commit 25fce5f6bb34 · 2022-05-12T22:36:28.000+01:00
diff --git a/java/kotlin-extractor/src/main/kotlin/KotlinFileExtractor.kt b/java/kotlin-extractor/src/main/kotlin/KotlinFileExtractor.kt
@@ -386,6 +386,10 @@ open class KotlinFileExtractor(
                     } else if (kind != ClassKind.CLASS && kind != ClassKind.OBJECT) {
                         logger.warnElement("Unrecognised class kind $kind", c)
                     }
+
+                    if (c.isData) {
+                        tw.writeKtDataClasses(classId)
+                    }
                 }
 
                 val locId = tw.getLocation(c)
diff --git a/java/ql/lib/config/semmlecode.dbscheme b/java/ql/lib/config/semmlecode.dbscheme
@@ -1232,3 +1232,7 @@ ktFunctionOriginalNames(
   unique int id: @method ref,
   string name: string ref
 )
+
+ktDataClasses(
+  unique int id: @class ref
+)
diff --git a/java/ql/lib/semmle/code/java/Type.qll b/java/ql/lib/semmle/code/java/Type.qll
@@ -714,6 +714,13 @@ class CompanionObject extends Class {
   Field getInstance() { type_companion_object(_, result, this) }
 }
 
+/**
+ * A Kotlin data class declaration.
+ */
+class DataClass extends Class {
+  DataClass() { ktDataClasses(this) }
+}
+
 /**
  * A record declaration.
  */
diff --git a/java/ql/test/kotlin/library-tests/data-classes/data_classes.expected b/java/ql/test/kotlin/library-tests/data-classes/data_classes.expected
@@ -0,0 +1 @@
+| dc.kt:1:1:1:71 | ProtoMapValue |
diff --git a/java/ql/test/kotlin/library-tests/data-classes/data_classes.ql b/java/ql/test/kotlin/library-tests/data-classes/data_classes.ql
@@ -0,0 +1,5 @@
+import java
+
+from DataClass c
+where c.fromSource()
+select c

Original file line number	Diff line number	Diff line change
`@@ -386,6 +386,10 @@ open class KotlinFileExtractor(`
`386`	`386`	`} else if (kind != ClassKind.CLASS && kind != ClassKind.OBJECT) {`
`387`	`387`	`logger.warnElement("Unrecognised class kind $kind", c)`
`388`	`388`	`}`
	`389`	`+`
	`390`	`+ if (c.isData) {`
	`391`	`+ tw.writeKtDataClasses(classId)`
	`392`	`+ }`
`389`	`393`	`}`
`390`	`394`
`391`	`395`	`val locId = tw.getLocation(c)`
Original file line number	Diff line number	Diff line change
`@@ -1232,3 +1232,7 @@ ktFunctionOriginalNames(`
`1232`	`1232`	`unique int id: @method ref,`
`1233`	`1233`	`string name: string ref`
`1234`	`1234`	`)`
	`1235`	`+`
	`1236`	`+ktDataClasses(`
	`1237`	`+ unique int id: @class ref`
	`1238`	`+)`