From b145c97b37c61d7aa870a8a34373d1f607e22b42 Mon Sep 17 00:00:00 2001 From: Yan Zhulanow Date: Mon, 16 Jul 2018 21:23:41 +0300 Subject: [PATCH] Kapt: Restore line mappings correctly for nested classes and its members --- .../kotlin/kapt3/base/stubs/KaptStubLineInformation.kt | 4 ++-- plugins/kapt3/kapt3-compiler/testData/converter/kt24272.kt | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/plugins/kapt3/kapt3-base/src/org/jetbrains/kotlin/kapt3/base/stubs/KaptStubLineInformation.kt b/plugins/kapt3/kapt3-base/src/org/jetbrains/kotlin/kapt3/base/stubs/KaptStubLineInformation.kt index beb92fd3b11..24388f5548f 100644 --- a/plugins/kapt3/kapt3-base/src/org/jetbrains/kotlin/kapt3/base/stubs/KaptStubLineInformation.kt +++ b/plugins/kapt3/kapt3-base/src/org/jetbrains/kotlin/kapt3/base/stubs/KaptStubLineInformation.kt @@ -95,13 +95,13 @@ class KaptStubLineInformation { } is JCTree.JCClassDecl -> { val className = parent.simpleName.toString() - val newName = if (currentName.isEmpty()) className else currentName + "#" + className + val newName = if (currentName.isEmpty()) className else currentName + "$" + className if (declaration === parent) { return newName } for (definition in parent.defs) { - getFqName(declaration, definition, className)?.let { return it } + getFqName(declaration, definition, newName)?.let { return it } } return null diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/kt24272.kt b/plugins/kapt3/kapt3-compiler/testData/converter/kt24272.kt index 665247e23a5..4eaecb6bf89 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/kt24272.kt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/kt24272.kt @@ -1,7 +1,6 @@ // STRICT_MODE -// EXPECTED_ERROR(java:23:50) cannot find symbol -// EXPECTED_ERROR(java:28:49) cannot find symbol +// EXPECTED_ERROR(kotlin:12:9) cannot find symbol // EXPECTED_ERROR(other:-1:-1) Can't generate a stub for 'Foo$Bar$Bar'. class Foo(private val string: String) {