Kotlin: Add support for string templates

igfoo · igfoo · commit 976cc31c7a68 · 2022-05-10T19:50:59.000+01:00
diff --git a/java/kotlin-extractor/src/main/kotlin/KotlinExtractorExtension.kt b/java/kotlin-extractor/src/main/kotlin/KotlinExtractorExtension.kt
@@ -1419,6 +1419,17 @@ class X {
                 val exprParent = parent.expr(e, callable)
                 extractCall(e, callable, exprParent.parent, exprParent.idx)
             }
+            is IrStringConcatenation -> {
+                val exprParent = parent.expr(e, callable)
+                val id = tw.getFreshIdLabel<DbStringtemplateexpr>()
+                val type = useType(e.type)
+                val locId = tw.getLocation(e)
+                tw.writeExprs_stringtemplateexpr(id, type.javaResult.id, type.kotlinResult.id, exprParent.parent, exprParent.idx)
+                tw.writeHasLocation(id, locId)
+                e.arguments.forEachIndexed { i, a ->
+                    extractExpressionExpr(a, callable, id, i)
+                }
+            }
             is IrConst<*> -> {
                 val exprParent = parent.expr(e, callable)
                 val v = e.value
diff --git a/java/ql/lib/config/semmlecode.dbscheme b/java/ql/lib/config/semmlecode.dbscheme
@@ -670,6 +670,7 @@ case @expr.kind of
 | 77  = @safecastexpr
 | 78  = @notinstanceofexpr
 | 79  = @stmtexpr
+| 80  = @stringtemplateexpr
 ;
 
 /** Holds if this `when` expression was written as an `if` expression. */
diff --git a/java/ql/lib/semmle/code/java/Expr.qll b/java/ql/lib/semmle/code/java/Expr.qll
@@ -2246,3 +2246,24 @@ class StmtExpr extends Expr, @stmtexpr {
 
   override string getAPrimaryQlClass() { result = "StmtExpr" }
 }
+
+/**
+ * A Kotlin string template expression. For example, `"foo${bar}baz"`.
+ */
+class StringTemplateExpr extends Expr, @stringtemplateexpr {
+  /**
+   * Gets the `i`th component of this string template.
+   *
+   * For example, in the string template `"foo${bar}baz"`, the 0th
+   * component is the string literal `"foo"`, the 1st component is
+   * the variable access `bar`, and the 2nd component is the string
+   * literal `"bar"`.
+   */
+  Expr getComponent(int i) { result.isNthChildOf(this, i) }
+
+  override string toString() { result = "\"...\"" }
+
+  override string getHalsteadID() { result = "StringTemplateExpr" }
+
+  override string getAPrimaryQlClass() { result = "StringTemplateExpr" }
+}

Original file line number	Diff line number	Diff line change
`@@ -670,6 +670,7 @@ case @expr.kind of`
`670`	`670`	`\| 77 = @safecastexpr`
`671`	`671`	`\| 78 = @notinstanceofexpr`
`672`	`672`	`\| 79 = @stmtexpr`
	`673`	`+\| 80 = @stringtemplateexpr`
`673`	`674`	`;`
`674`	`675`
`675`	`676`	/** Holds if this `when` expression was written as an `if` expression. */