Fix receiver inconsistency when builder inference restriction disabled

In 154e53c update of extensionReceiverArgument in resolvedCall was accidentally moved into language feature dependant block
JetBrains · Sep 5, 2022 · a17fc51 · a17fc51
1 parent f0fd2cf
commit a17fc51
Show file tree

Hide file tree

Showing 6 changed files with 52 additions and 13 deletions.
diff --git a/...vel/api/fir/diagnostic/compiler/based/DiagnosisCompilerTestFE10TestdataTestGenerated.java b/...vel/api/fir/diagnostic/compiler/based/DiagnosisCompilerTestFE10TestdataTestGenerated.java
diff --git a/...s/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendDiagnosticsTestGenerated.java b/...s/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendDiagnosticsTestGenerated.java
diff --git a/...rg/jetbrains/kotlin/test/runners/FirOldFrontendDiagnosticsWithLightTreeTestGenerated.java b/...rg/jetbrains/kotlin/test/runners/FirOldFrontendDiagnosticsWithLightTreeTestGenerated.java
diff --git a/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/components/ResolutionParts.kt b/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/components/ResolutionParts.kt
@@ -664,23 +664,23 @@ internal object CheckReceivers : ResolutionPart() {
             )
 
             1 -> {
+                var extensionReceiverArgument = resolvedCall.extensionReceiverArgument
+                if (extensionReceiverArgument == null) {
+                    extensionReceiverArgument = chooseExtensionReceiverCandidate() ?: return
+                    resolvedCall.extensionReceiverArgument = extensionReceiverArgument
+                }
                 val checkBuilderInferenceRestriction =
                     !callComponents.languageVersionSettings
                         .supportsFeature(LanguageFeature.NoBuilderInferenceWithoutAnnotationRestriction)
-                if (checkBuilderInferenceRestriction) {
-                    var extensionReceiverArgument = resolvedCall.extensionReceiverArgument
-                    if (extensionReceiverArgument == null) {
-                        extensionReceiverArgument = chooseExtensionReceiverCandidate() ?: return
-                        resolvedCall.extensionReceiverArgument = extensionReceiverArgument
-                    }
-                    if (extensionReceiverArgument.receiver.receiverValue.type is StubTypeForBuilderInference) {
-                        addDiagnostic(
-                            StubBuilderInferenceReceiver(
-                                extensionReceiverArgument,
-                                candidateDescriptor.extensionReceiverParameter!!
-                            )
+                if (checkBuilderInferenceRestriction &&
+                    extensionReceiverArgument.receiver.receiverValue.type is StubTypeForBuilderInference
+                ) {
+                    addDiagnostic(
+                        StubBuilderInferenceReceiver(
+                            extensionReceiverArgument,
+                            candidateDescriptor.extensionReceiverParameter!!
                         )
-                    }
+                    )
                 }
                 checkReceiver(
                     resolvedCall.extensionReceiverArgument,

diff --git a/...cs/tests/inference/builderInference/noBuilderInferenceRestrictionReceiverInconsistency.kt b/...cs/tests/inference/builderInference/noBuilderInferenceRestrictionReceiverInconsistency.kt
@@ -0,0 +1,15 @@
+// FIR_IDENTICAL
+// SKIP_TXT
+// WITH_STDLIB
+// LANGUAGE: +NoBuilderInferenceWithoutAnnotationRestriction
+
+class A
+class B
+
+var B.foo: Boolean
+    get() = true
+    set(value) {}
+
+private fun A.bar(b: B) {
+    b.foo = true
+}
diff --git a/...tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticTestGenerated.java b/...tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticTestGenerated.java