Merge pull request #11303 from tamasvajk/kotlin-one-stmt-line

Kotlin: Exclude .kt files from one stmt in line query

Author: tamasvajk

java/ql/src/Advisory/Statements/OneStatementPerLine.ql

@@ -37,6 +37,7 @@ predicate oneLineStatement(Stmt s, File f, int line, int col) {
 from Stmt s, Stmt s2
 where
   exists(File f, int line, int col, int col2 |
+    f.isJavaSourceFile() and
     oneLineStatement(s, f, line, col) and
     oneLineStatement(s2, f, line, col2) and
     col < col2 and

java/ql/test/kotlin/query-tests/OneStatementPerLine/OneStatementPerLine.expected

@@ -0,0 +1 @@
+Advisory/Statements/OneStatementPerLine.ql

java/ql/test/kotlin/query-tests/OneStatementPerLine/OneStatementPerLine.qlref

@@ -0,0 +1,7 @@
+class Foo {
+    fun foo(): Foo { return this }
+
+    fun bar(x: Foo?): Foo? {
+        return x?.foo()
+    }
+}