diff --git a/java/kotlin-extractor/src/main/kotlin/KotlinUsesExtractor.kt b/java/kotlin-extractor/src/main/kotlin/KotlinUsesExtractor.kt index f7f553f03d9..faaf8f307bc 100644 --- a/java/kotlin-extractor/src/main/kotlin/KotlinUsesExtractor.kt +++ b/java/kotlin-extractor/src/main/kotlin/KotlinUsesExtractor.kt @@ -813,7 +813,7 @@ open class KotlinUsesExtractor( OperatorNameConventions.INVOKE.asString()) fun getSuffixIfInternal() = - if (f.visibility == DescriptorVisibilities.INTERNAL) { + if (f.visibility == DescriptorVisibilities.INTERNAL && f !is IrConstructor) { "\$" + getJvmModuleName(f) } else { "" diff --git a/java/ql/test/kotlin/library-tests/internal-constructor-called-from-java/User.java b/java/ql/test/kotlin/library-tests/internal-constructor-called-from-java/User.java new file mode 100644 index 00000000000..e94894fa409 --- /dev/null +++ b/java/ql/test/kotlin/library-tests/internal-constructor-called-from-java/User.java @@ -0,0 +1,5 @@ +public class User { + + public static void test() { new Test(1, 2); } + +} diff --git a/java/ql/test/kotlin/library-tests/internal-constructor-called-from-java/test.expected b/java/ql/test/kotlin/library-tests/internal-constructor-called-from-java/test.expected new file mode 100644 index 00000000000..44dbca7993e --- /dev/null +++ b/java/ql/test/kotlin/library-tests/internal-constructor-called-from-java/test.expected @@ -0,0 +1 @@ +| User.java:3:31:3:44 | new Test(...) | test.kt:3:3:3:51 | { ... } | diff --git a/java/ql/test/kotlin/library-tests/internal-constructor-called-from-java/test.kt b/java/ql/test/kotlin/library-tests/internal-constructor-called-from-java/test.kt new file mode 100644 index 00000000000..65c8b43c44c --- /dev/null +++ b/java/ql/test/kotlin/library-tests/internal-constructor-called-from-java/test.kt @@ -0,0 +1,5 @@ +public class Test() { + + internal constructor(x: Int, y: Int) : this() { } + +} diff --git a/java/ql/test/kotlin/library-tests/internal-constructor-called-from-java/test.ql b/java/ql/test/kotlin/library-tests/internal-constructor-called-from-java/test.ql new file mode 100644 index 00000000000..8ab8617ac77 --- /dev/null +++ b/java/ql/test/kotlin/library-tests/internal-constructor-called-from-java/test.ql @@ -0,0 +1,4 @@ +import java + +from ClassInstanceExpr ce +select ce, ce.getConstructor().getBody()