From 18e5af37ffe3f40c9fa3569ca50aaa08cbc23176 Mon Sep 17 00:00:00 2001 From: Igor Yakovlev Date: Mon, 23 Nov 2020 23:32:31 +0300 Subject: [PATCH] [FIR IDE] LC Fixed incorrect JvmOverloads --- .../lightClasses/nullabilityAnnotations/JvmOverloads.kt | 2 ++ .../asJava/lightClasses/nullabilityAnnotations/Trait.kt | 4 +++- .../kotlin/idea/asJava/classes/firLightClassUtils.kt | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/JvmOverloads.kt b/compiler/testData/asJava/lightClasses/nullabilityAnnotations/JvmOverloads.kt index f74f173c583..41047055587 100644 --- a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/JvmOverloads.kt +++ b/compiler/testData/asJava/lightClasses/nullabilityAnnotations/JvmOverloads.kt @@ -6,3 +6,5 @@ class C { return "a" } } + +// FIR_COMPARISON \ No newline at end of file diff --git a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/Trait.kt b/compiler/testData/asJava/lightClasses/nullabilityAnnotations/Trait.kt index b9d1c860a91..43561766384 100644 --- a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/Trait.kt +++ b/compiler/testData/asJava/lightClasses/nullabilityAnnotations/Trait.kt @@ -17,4 +17,6 @@ interface Trait { var nullableVar: String? val notNullVal: String var notNullVar: String -} \ No newline at end of file +} + +// FIR_COMPARISON \ No newline at end of file diff --git a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/asJava/classes/firLightClassUtils.kt b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/asJava/classes/firLightClassUtils.kt index 469a4f04c2c..6d1820eaa56 100644 --- a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/asJava/classes/firLightClassUtils.kt +++ b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/asJava/classes/firLightClassUtils.kt @@ -133,7 +133,7 @@ internal fun FirLightClassBase.createMethods( containingClass = this@createMethods, isTopLevel = isTopLevel, methodIndex = methodIndex++, - argumentsSkipMask = skipMask + argumentsSkipMask = skipMask.clone() as BitSet ) ) }