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

Don't report unused variable warning for delegated variables with provide delegate

Browse Source 
^KT-38871 Fixed
This commit is contained in:
Mikhail Zarechenskiy
2023-03-27 11:20:33 +02:00
committed by Space Team
parent 18cfc9fcf1
commit 681e85eaed
9 changed files with 142 additions and 2 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/DiagnosticCompilerTestFE10TestdataTestGenerated.java
Generated
+12
View File
@@ -621,6 +621,12 @@ public class DiagnosticCompilerTestFE10TestdataTestGenerated extends AbstractDia
runTest("compiler/testData/diagnostics/tests/noSymbolProvidersDuplicationInDiamond.kt");
}
@Test
@TestMetadata("noUnusedOnDelegationWithProvider.kt")
public void testNoUnusedOnDelegationWithProvider() throws Exception {
runTest("compiler/testData/diagnostics/tests/noUnusedOnDelegationWithProvider.kt");
}
@Test
@TestMetadata("Nullability.kt")
public void testNullability() throws Exception {
@@ -1143,6 +1149,12 @@ public class DiagnosticCompilerTestFE10TestdataTestGenerated extends AbstractDia
runTest("compiler/testData/diagnostics/tests/UnusedParameters.kt");
}
@Test
@TestMetadata("unusedVariableOnRegularDelegatedProperty.kt")
public void testUnusedVariableOnRegularDelegatedProperty() throws Exception {
runTest("compiler/testData/diagnostics/tests/unusedVariableOnRegularDelegatedProperty.kt");
}
@Test
@TestMetadata("UnusedVariables.kt")
public void testUnusedVariables() throws Exception {
analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLFirPreresolvedReversedDiagnosticCompilerFE10TestDataTestGenerated.java
Generated
+12
View File
@@ -621,6 +621,12 @@ public class LLFirPreresolvedReversedDiagnosticCompilerFE10TestDataTestGenerated
runTest("compiler/testData/diagnostics/tests/noSymbolProvidersDuplicationInDiamond.kt");
}
@Test
@TestMetadata("noUnusedOnDelegationWithProvider.kt")
public void testNoUnusedOnDelegationWithProvider() throws Exception {
runTest("compiler/testData/diagnostics/tests/noUnusedOnDelegationWithProvider.kt");
}
@Test
@TestMetadata("Nullability.kt")
public void testNullability() throws Exception {
@@ -1143,6 +1149,12 @@ public class LLFirPreresolvedReversedDiagnosticCompilerFE10TestDataTestGenerated
runTest("compiler/testData/diagnostics/tests/UnusedParameters.kt");
}
@Test
@TestMetadata("unusedVariableOnRegularDelegatedProperty.kt")
public void testUnusedVariableOnRegularDelegatedProperty() throws Exception {
runTest("compiler/testData/diagnostics/tests/unusedVariableOnRegularDelegatedProperty.kt");
}
@Test
@TestMetadata("UnusedVariables.kt")
public void testUnusedVariables() throws Exception {
compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirLightTreeOldFrontendDiagnosticsTestGenerated.java
Generated
+12
View File
@@ -621,6 +621,12 @@ public class FirLightTreeOldFrontendDiagnosticsTestGenerated extends AbstractFir
runTest("compiler/testData/diagnostics/tests/noSymbolProvidersDuplicationInDiamond.kt");
}
@Test
@TestMetadata("noUnusedOnDelegationWithProvider.kt")
public void testNoUnusedOnDelegationWithProvider() throws Exception {
runTest("compiler/testData/diagnostics/tests/noUnusedOnDelegationWithProvider.kt");
}
@Test
@TestMetadata("Nullability.kt")
public void testNullability() throws Exception {
@@ -1143,6 +1149,12 @@ public class FirLightTreeOldFrontendDiagnosticsTestGenerated extends AbstractFir
runTest("compiler/testData/diagnostics/tests/UnusedParameters.kt");
}
@Test
@TestMetadata("unusedVariableOnRegularDelegatedProperty.kt")
public void testUnusedVariableOnRegularDelegatedProperty() throws Exception {
runTest("compiler/testData/diagnostics/tests/unusedVariableOnRegularDelegatedProperty.kt");
}
@Test
@TestMetadata("UnusedVariables.kt")
public void testUnusedVariables() throws Exception {
compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirPsiOldFrontendDiagnosticsTestGenerated.java
Generated
+12
View File
@@ -621,6 +621,12 @@ public class FirPsiOldFrontendDiagnosticsTestGenerated extends AbstractFirPsiDia
runTest("compiler/testData/diagnostics/tests/noSymbolProvidersDuplicationInDiamond.kt");
}
@Test
@TestMetadata("noUnusedOnDelegationWithProvider.kt")
public void testNoUnusedOnDelegationWithProvider() throws Exception {
runTest("compiler/testData/diagnostics/tests/noUnusedOnDelegationWithProvider.kt");
}
@Test
@TestMetadata("Nullability.kt")
public void testNullability() throws Exception {
@@ -1143,6 +1149,12 @@ public class FirPsiOldFrontendDiagnosticsTestGenerated extends AbstractFirPsiDia
runTest("compiler/testData/diagnostics/tests/UnusedParameters.kt");
}
@Test
@TestMetadata("unusedVariableOnRegularDelegatedProperty.kt")
public void testUnusedVariableOnRegularDelegatedProperty() throws Exception {
runTest("compiler/testData/diagnostics/tests/unusedVariableOnRegularDelegatedProperty.kt");
}
@Test
@TestMetadata("UnusedVariables.kt")
public void testUnusedVariables() throws Exception {
compiler/frontend/cfg/src/org/jetbrains/kotlin/cfg/ControlFlowInformationProviderImpl.kt
+13 -2
View File
@@ -690,6 +690,14 @@ class ControlFlowInformationProviderImpl private constructor(
private val VariableDescriptor.isLocalVariableWithDelegate: Boolean
get() = this is LocalVariableDescriptor && this.isDelegated
private val VariableDescriptor.isLocalVariableWithProvideDelegate: Boolean
get() {
if (!isLocalVariableWithDelegate) return false
if (this !is VariableDescriptorWithAccessors) return false
return trace.bindingContext[PROVIDE_DELEGATE_RESOLVED_CALL, this] != null
}
private fun processUnusedDeclaration(
element: KtNamedDeclaration,
variableDescriptor: VariableDescriptor,
@@ -704,8 +712,11 @@ class ControlFlowInformationProviderImpl private constructor(
element is KtDestructuringDeclarationEntry && element.parent.parent?.parent is KtParameterList ->
report(Errors.UNUSED_DESTRUCTURED_PARAMETER_ENTRY.on(element, variableDescriptor), ctxt)
KtPsiUtil.isRemovableVariableDeclaration(element) ->
report(Errors.UNUSED_VARIABLE.on(element, variableDescriptor), ctxt)
KtPsiUtil.isRemovableVariableDeclaration(element) -> {
if (!variableDescriptor.isLocalVariableWithProvideDelegate) {
report(Errors.UNUSED_VARIABLE.on(element, variableDescriptor), ctxt)
}
}
element is KtParameter ->
processUnusedParameter(ctxt, element, variableDescriptor)
compiler/testData/diagnostics/tests/noUnusedOnDelegationWithProvider.kt
Vendored
+27
View File
@@ -0,0 +1,27 @@
// FIR_IDENTICAL
// !DIAGNOSTICS: +UNUSED_VARIABLE
import kotlin.reflect.KProperty
class Example {
val valProp: String by Delegate()
val varProp: String by Delegate()
fun foo() {
val valVariable by Delegate()
val varVariable by Delegate()
}
}
class Delegate {
operator fun getValue(thisRef: Any?, property: KProperty<*>): String = "delegation"
operator fun setValue(thisRef: Any?, property: KProperty<*>, value: String) {
// setValue
}
operator fun provideDelegate(thisRef: Any?, property: KProperty<*>): Delegate {
// side effect
return Delegate()
}
}
compiler/testData/diagnostics/tests/unusedVariableOnRegularDelegatedProperty.fir.kt
Vendored
+21
View File
@@ -0,0 +1,21 @@
// !DIAGNOSTICS: +UNUSED_VARIABLE
import kotlin.reflect.KProperty
class Example {
val valProp: String by Delegate()
val varProp: String by Delegate()
fun foo() {
val valVariable by Delegate()
val varVariable by Delegate()
}
}
class Delegate {
operator fun getValue(thisRef: Any?, property: KProperty<*>): String = "delegation"
operator fun setValue(thisRef: Any?, property: KProperty<*>, value: String) {
// setValue
}
}
compiler/testData/diagnostics/tests/unusedVariableOnRegularDelegatedProperty.kt
Vendored
+21
View File
@@ -0,0 +1,21 @@
// !DIAGNOSTICS: +UNUSED_VARIABLE
import kotlin.reflect.KProperty
class Example {
val valProp: String by Delegate()
val varProp: String by Delegate()
fun foo() {
val <!UNUSED_VARIABLE!>valVariable<!> by Delegate()
val <!UNUSED_VARIABLE!>varVariable<!> by Delegate()
}
}
class Delegate {
operator fun getValue(thisRef: Any?, property: KProperty<*>): String = "delegation"
operator fun setValue(thisRef: Any?, property: KProperty<*>, value: String) {
// setValue
}
}
compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticTestGenerated.java
Generated
+12
View File
@@ -621,6 +621,12 @@ public class DiagnosticTestGenerated extends AbstractDiagnosticTest {
runTest("compiler/testData/diagnostics/tests/noSymbolProvidersDuplicationInDiamond.kt");
}
@Test
@TestMetadata("noUnusedOnDelegationWithProvider.kt")
public void testNoUnusedOnDelegationWithProvider() throws Exception {
runTest("compiler/testData/diagnostics/tests/noUnusedOnDelegationWithProvider.kt");
}
@Test
@TestMetadata("Nullability.kt")
public void testNullability() throws Exception {
@@ -1143,6 +1149,12 @@ public class DiagnosticTestGenerated extends AbstractDiagnosticTest {
runTest("compiler/testData/diagnostics/tests/UnusedParameters.kt");
}
@Test
@TestMetadata("unusedVariableOnRegularDelegatedProperty.kt")
public void testUnusedVariableOnRegularDelegatedProperty() throws Exception {
runTest("compiler/testData/diagnostics/tests/unusedVariableOnRegularDelegatedProperty.kt");
}
@Test
@TestMetadata("UnusedVariables.kt")
public void testUnusedVariables() throws Exception {