Merge branch 'main' into expand-ruby-ssrf-sinks-faraday-connection-new

Author: thiggy1342

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

@@ -305,7 +305,7 @@ open class KotlinFileExtractor(
                 val kind = c.kind
                 if (kind == ClassKind.ENUM_CLASS) {
                     tw.writeIsEnumType(classId)
-                } else if (kind != ClassKind.CLASS && kind != ClassKind.OBJECT) {
+                } else if (kind != ClassKind.CLASS && kind != ClassKind.OBJECT && kind != ClassKind.ENUM_ENTRY) {
                     logger.errorElement("Unrecognised class kind $kind", c)
                 }
             }
@@ -452,7 +452,7 @@ open class KotlinFileExtractor(
                     val kind = c.kind
                     if (kind == ClassKind.ENUM_CLASS) {
                         tw.writeIsEnumType(classId)
-                    } else if (kind != ClassKind.CLASS && kind != ClassKind.OBJECT) {
+                    } else if (kind != ClassKind.CLASS && kind != ClassKind.OBJECT && kind != ClassKind.ENUM_ENTRY) {
                         logger.warnElement("Unrecognised class kind $kind", c)
                     }
 

java/ql/test/kotlin/library-tests/methods/diagnostics.expected

@@ -0,0 +1,4 @@
+import java
+import semmle.code.java.Diagnostics
+
+select any(Diagnostic d | not d.toString().matches("Not rewriting trap file for%"))