azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FE] Fix: do not report ambiguous label if label map is empty

Browse Source
This commit is contained in:
Anastasia.Shadrina
2021-12-21 01:00:04 +07:00
committed by teamcity
parent 8905586cbb
commit ea33da3a8d
7 changed files with 37 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/DiagnosisCompilerTestFE10TestdataTestGenerated.java
Generated
+6
View File
@@ -10654,6 +10654,12 @@ public class DiagnosisCompilerTestFE10TestdataTestGenerated extends AbstractDiag
runTest("compiler/testData/diagnostics/tests/extensions/contextReceivers/insideDeclaration.kt");
}
@Test
@TestMetadata("labelFromFunctionName.kt")
public void testLabelFromFunctionName() throws Exception {
runTest("compiler/testData/diagnostics/tests/extensions/contextReceivers/labelFromFunctionName.kt");
}
@Test
@TestMetadata("labelsFromClassNameForbidden.kt")
public void testLabelsFromClassNameForbidden() throws Exception {
compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendDiagnosticsTestGenerated.java
Generated
+6
View File
@@ -10654,6 +10654,12 @@ public class FirOldFrontendDiagnosticsTestGenerated extends AbstractFirDiagnosti
runTest("compiler/testData/diagnostics/tests/extensions/contextReceivers/insideDeclaration.kt");
}
@Test
@TestMetadata("labelFromFunctionName.kt")
public void testLabelFromFunctionName() throws Exception {
runTest("compiler/testData/diagnostics/tests/extensions/contextReceivers/labelFromFunctionName.kt");
}
@Test
@TestMetadata("labelsFromClassNameForbidden.kt")
public void testLabelsFromClassNameForbidden() throws Exception {
compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendDiagnosticsWithLightTreeTestGenerated.java
Generated
+6
View File
@@ -10654,6 +10654,12 @@ public class FirOldFrontendDiagnosticsWithLightTreeTestGenerated extends Abstrac
runTest("compiler/testData/diagnostics/tests/extensions/contextReceivers/insideDeclaration.kt");
}
@Test
@TestMetadata("labelFromFunctionName.kt")
public void testLabelFromFunctionName() throws Exception {
runTest("compiler/testData/diagnostics/tests/extensions/contextReceivers/labelFromFunctionName.kt");
}
@Test
@TestMetadata("labelsFromClassNameForbidden.kt")
public void testLabelsFromClassNameForbidden() throws Exception {
compiler/frontend/src/org/jetbrains/kotlin/types/expressions/LabelResolver.kt
+1 -1
View File
@@ -190,7 +190,7 @@ object LabelResolver {
]
val thisReceivers = labelNameToReceiverMap?.get(labelName.identifier)
val thisReceiver = when {
thisReceivers == null -> declarationDescriptor.extensionReceiverParameter
thisReceivers.isNullOrEmpty() -> declarationDescriptor.extensionReceiverParameter
thisReceivers.size == 1 -> thisReceivers.single()
else -> {
BindingContextUtils.reportAmbiguousLabel(context.trace, targetLabel, declarationsByLabel)
compiler/testData/diagnostics/tests/extensions/contextReceivers/labelFromFunctionName.kt
Vendored
+9
View File
@@ -0,0 +1,9 @@
// FIR_IDENTICAL
// !LANGUAGE: +ContextReceivers
// WITH_STDLIB
fun testLabels(source: Collection<String>) {
val r = buildList {
source.mapTo(this@buildList) { it.length }
}
}
compiler/testData/diagnostics/tests/extensions/contextReceivers/labelFromFunctionName.txt
Vendored
+3
View File
@@ -0,0 +1,3 @@
package
public fun testLabels(/*0*/ source: kotlin.collections.Collection<kotlin.String>): kotlin.Unit
compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticTestGenerated.java
Generated
+6
View File
@@ -10660,6 +10660,12 @@ public class DiagnosticTestGenerated extends AbstractDiagnosticTest {
runTest("compiler/testData/diagnostics/tests/extensions/contextReceivers/insideDeclaration.kt");
}
@Test
@TestMetadata("labelFromFunctionName.kt")
public void testLabelFromFunctionName() throws Exception {
runTest("compiler/testData/diagnostics/tests/extensions/contextReceivers/labelFromFunctionName.kt");
}
@Test
@TestMetadata("labelsFromClassNameForbidden.kt")
public void testLabelsFromClassNameForbidden() throws Exception {