From 631ba8adcf155cef95674d4b86e9d6b46ffb815e Mon Sep 17 00:00:00 2001 From: Tamas Vajk Date: Fri, 13 May 2022 11:20:28 +0200 Subject: [PATCH] Kotlin: exclude Kotlin source from 'inner class could be static' check --- java/ql/src/Performance/InnerClassCouldBeStatic.ql | 4 +++- .../InnerClassCouldBeStatic/InnerClassCouldBeStatic.expected | 1 - 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/java/ql/src/Performance/InnerClassCouldBeStatic.ql b/java/ql/src/Performance/InnerClassCouldBeStatic.ql index 1a83db097f3..02ca5544da2 100644 --- a/java/ql/src/Performance/InnerClassCouldBeStatic.ql +++ b/java/ql/src/Performance/InnerClassCouldBeStatic.ql @@ -130,7 +130,9 @@ predicate potentiallyStatic(InnerClass c) { ) ) and // JUnit Nested test classes are required to be non-static. - not c.hasAnnotation("org.junit.jupiter.api", "Nested") + not c.hasAnnotation("org.junit.jupiter.api", "Nested") and + // There's no `static` in kotlin: + not c.getLocation().getFile().isKotlinSourceFile() } /** diff --git a/java/ql/test/kotlin/query-tests/InnerClassCouldBeStatic/InnerClassCouldBeStatic.expected b/java/ql/test/kotlin/query-tests/InnerClassCouldBeStatic/InnerClassCouldBeStatic.expected index 1fb8417d622..e69de29bb2d 100644 --- a/java/ql/test/kotlin/query-tests/InnerClassCouldBeStatic/InnerClassCouldBeStatic.expected +++ b/java/ql/test/kotlin/query-tests/InnerClassCouldBeStatic/InnerClassCouldBeStatic.expected @@ -1 +0,0 @@ -| Test.kt:3:5:5:5 | Companion | Companion should be made static, since the enclosing instance is not used. |