Merge pull request #10091 from tamasvajk/kotlin-data-class

Kotlin: Identify data classes during extraction

java/downgrades/ecb42310286011ada450ff65b9b417509863549f/upgrade.properties

@@ -0,0 +1,3 @@
+description: Remove ktDataClasses relation
+compatibility: backwards
+ktDataClasses.rel: delete

java/kotlin-extractor/src/main/kotlin/KotlinFileExtractor.kt

@@ -435,6 +435,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)

java/ql/lib/config/semmlecode.dbscheme

@@ -1234,3 +1234,7 @@ ktFunctionOriginalNames(
   unique int id: @method ref,
   string name: string ref
 )
+
+ktDataClasses(
+  unique int id: @class ref
+)

java/ql/lib/semmle/code/java/Type.qll

@@ -726,6 +726,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.
  */

java/ql/lib/upgrades/81ccfabe82e696953268e784979262e56871ce86/upgrade.properties

@@ -0,0 +1,2 @@
+description: Add ktDataClasses relation
+compatibility: backwards

java/ql/test/kotlin/library-tests/data-classes/data_classes.expected

@@ -0,0 +1 @@
+| dc.kt:1:1:1:71 | ProtoMapValue |

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