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

K1: don't report UNRESOLVED_WITH_TARGET on hidden setters

Browse Source
This commit is contained in:
Mikhail Glukhikh
2022-07-22 14:06:37 +02:00
committed by teamcity
parent 00d1e46c5a
commit e20efc1398
6 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/checkers/utils/DebugInfoUtil.kt
+8 -1
View File
@@ -16,12 +16,14 @@ import org.jetbrains.kotlin.diagnostics.DiagnosticFactory
import org.jetbrains.kotlin.diagnostics.Errors import org.jetbrains.kotlin.diagnostics.Errors
import org.jetbrains.kotlin.lexer.KtTokens import org.jetbrains.kotlin.lexer.KtTokens
import org.jetbrains.kotlin.psi.* import org.jetbrains.kotlin.psi.*
import org.jetbrains.kotlin.psi.psiUtil.getStrictParentOfType
import org.jetbrains.kotlin.resolve.calls.util.getResolvedCall import org.jetbrains.kotlin.resolve.calls.util.getResolvedCall
import org.jetbrains.kotlin.resolve.BindingContext import org.jetbrains.kotlin.resolve.BindingContext
import org.jetbrains.kotlin.resolve.BindingContextUtils import org.jetbrains.kotlin.resolve.BindingContextUtils
import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall
import org.jetbrains.kotlin.resolve.calls.tasks.isDynamic import org.jetbrains.kotlin.resolve.calls.tasks.isDynamic
import org.jetbrains.kotlin.types.error.ErrorUtils import org.jetbrains.kotlin.types.error.ErrorUtils
import org.jetbrains.kotlin.types.expressions.BasicExpressionTypingVisitor
import org.jetbrains.kotlin.util.slicedMap.WritableSlice import org.jetbrains.kotlin.util.slicedMap.WritableSlice
import java.util.HashMap import java.util.HashMap
@@ -172,7 +174,12 @@ object DebugInfoUtil {
} }
if (resolved && markedWithError) { if (resolved && markedWithError) {
if (Errors.UNRESOLVED_REFERENCE_DIAGNOSTICS.contains(factory)) { if (Errors.UNRESOLVED_REFERENCE_DIAGNOSTICS.contains(factory)) {
debugInfoReporter.reportUnresolvedWithTarget(expression, target!!) // This check is to avoid reporting UnresolvedWithTarget on hidden setters
if (expression !is KtSimpleNameExpression ||
!BasicExpressionTypingVisitor.isLValue(expression, expression.getStrictParentOfType<KtBinaryExpression>())
) {
debugInfoReporter.reportUnresolvedWithTarget(expression, target!!)
}
} }
} else if (!resolved && !markedWithError) { } else if (!resolved && !markedWithError) {
debugInfoReporter.reportMissingUnresolved(expression) debugInfoReporter.reportMissingUnresolved(expression)
compiler/testData/diagnostics/tests/deprecated/candidateBehindHiddenPropertyAccessors.kt
Vendored
+2 -2
View File
@@ -44,9 +44,9 @@ fun test(c: C) {
<!DEPRECATION_ERROR!>v3<!> // DEPRECATION_ERROR in FE 1.0, see KT-48799 <!DEPRECATION_ERROR!>v3<!> // DEPRECATION_ERROR in FE 1.0, see KT-48799
v3 = "" v3 = ""
v4 v4
<!DEBUG_INFO_UNRESOLVED_WITH_TARGET, UNRESOLVED_REFERENCE!>v4<!> = "" // DEPRECATION_ERROR in FE 1.0, see KT-48799 <!UNRESOLVED_REFERENCE!>v4<!> = "" // DEPRECATION_ERROR in FE 1.0, see KT-48799
<!DEPRECATION_ERROR!>v5<!> // DEPRECATION_ERROR in FE 1.0, see KT-48799 <!DEPRECATION_ERROR!>v5<!> // DEPRECATION_ERROR in FE 1.0, see KT-48799
<!DEBUG_INFO_UNRESOLVED_WITH_TARGET, UNRESOLVED_REFERENCE!>v5<!> = "" // DEPRECATION_ERROR in FE 1.0, see KT-48799 <!UNRESOLVED_REFERENCE!>v5<!> = "" // DEPRECATION_ERROR in FE 1.0, see KT-48799
v6 v6
v6 = "" v6 = ""
} }
compiler/testData/diagnostics/tests/deprecated/deprecatedPropertyInheritance_after.kt
Vendored
+1 -1
View File
@@ -132,5 +132,5 @@ fun use(
ned.p = 1 ned.p = 1
diff.<!DEPRECATION!>p<!> diff.<!DEPRECATION!>p<!>
diff.<!DEBUG_INFO_UNRESOLVED_WITH_TARGET, DEPRECATION, UNRESOLVED_REFERENCE!>p<!> = 1 diff.<!DEPRECATION, UNRESOLVED_REFERENCE!>p<!> = 1
} }
compiler/testData/diagnostics/tests/deprecated/deprecatedPropertyInheritance_before.kt
Vendored
+1 -1
View File
@@ -132,5 +132,5 @@ fun use(
ned.p = 1 ned.p = 1
diff.<!DEPRECATION!>p<!> diff.<!DEPRECATION!>p<!>
diff.<!DEBUG_INFO_UNRESOLVED_WITH_TARGET, DEPRECATION, UNRESOLVED_REFERENCE!>p<!> = 1 diff.<!DEPRECATION, UNRESOLVED_REFERENCE!>p<!> = 1
} }
compiler/testData/diagnostics/tests/deprecated/hiddenPropertyAccessors.kt
Vendored
+2 -2
View File
@@ -32,9 +32,9 @@ fun test() {
<!DEPRECATION_ERROR!>v3<!> <!DEPRECATION_ERROR!>v3<!>
v3 = "" v3 = ""
v4 v4
<!DEBUG_INFO_UNRESOLVED_WITH_TARGET, UNRESOLVED_REFERENCE!>v4<!> = "" <!UNRESOLVED_REFERENCE!>v4<!> = ""
<!DEPRECATION_ERROR!>v5<!> <!DEPRECATION_ERROR!>v5<!>
<!DEBUG_INFO_UNRESOLVED_WITH_TARGET, UNRESOLVED_REFERENCE!>v5<!> = "" <!UNRESOLVED_REFERENCE!>v5<!> = ""
<!UNRESOLVED_REFERENCE!>v6<!> <!UNRESOLVED_REFERENCE!>v6<!>
<!UNRESOLVED_REFERENCE!>v6<!> = "" <!UNRESOLVED_REFERENCE!>v6<!> = ""
} }
compiler/testData/diagnostics/tests/sourceCompatibility/apiVersion/propertyAccessors.kt
Vendored
+2 -2
View File
@@ -39,9 +39,9 @@ fun test() {
<!API_NOT_AVAILABLE!>v3<!> <!API_NOT_AVAILABLE!>v3<!>
v3 = "" v3 = ""
v4 v4
<!DEBUG_INFO_UNRESOLVED_WITH_TARGET, UNRESOLVED_REFERENCE!>v4<!> = "" <!UNRESOLVED_REFERENCE!>v4<!> = ""
<!API_NOT_AVAILABLE!>v5<!> <!API_NOT_AVAILABLE!>v5<!>
<!DEBUG_INFO_UNRESOLVED_WITH_TARGET, UNRESOLVED_REFERENCE!>v5<!> = "" <!UNRESOLVED_REFERENCE!>v5<!> = ""
<!UNRESOLVED_REFERENCE!>v6<!> <!UNRESOLVED_REFERENCE!>v6<!>
<!UNRESOLVED_REFERENCE!>v6<!> = "" <!UNRESOLVED_REFERENCE!>v6<!> = ""
<!API_NOT_AVAILABLE!>v7<!> <!API_NOT_AVAILABLE!>v7<!>