Merge pull request github#11025 from tamasvajk/kotlin-fix-external-location

Kotlin: Fix external location in integration test

Author: tamasvajk

java/ql/integration-tests/posix-only/kotlin/needless-java-wildcards/test.expected

@@ -1,2 +1,2 @@
-| Test.java:4:22:4:36 | needlessExtends | file:///modules/java.base/java/lang/Iterable.class:0:0:0:0 | Iterable<? extends String> |
+| Test.java:4:22:4:36 | needlessExtends | file://<external>/Iterable.class:0:0:0:0 | Iterable<? extends String> |
 | Test.java:7:22:7:34 | needlessSuper | build1/KotlinConsumer.class:0:0:0:0 | KotlinConsumer<? super Object> |

java/ql/integration-tests/posix-only/kotlin/needless-java-wildcards/test.ql

@@ -1,5 +1,15 @@
 import java
 
+class ClassOrInterfaceLocation extends ClassOrInterface {
+  override predicate hasLocationInfo(string path, int sl, int sc, int el, int ec) {
+    exists(string fullPath | super.hasLocationInfo(fullPath, sl, sc, el, ec) |
+      if exists(this.getFile().getRelativePath())
+      then path = fullPath
+      else path = fullPath.regexpReplaceAll(".*/", "<external>/")
+    )
+  }
+}
+
 from Method m
 where m.fromSource()
 select m, m.getAParamType()