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

Commit trace for callable reference's LHS with reserved syntax like foo?::bar?::bar to avoid the lack of diagnostics reporting

Browse Source 
^KT-35075 Fixed
This commit is contained in:
Victor Petukhov
2020-06-25 15:41:27 +03:00
parent 1ee8e615fc
commit cbd8b58d5c
7 changed files with 103 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/types/expressions/DoubleColonExpressionResolver.kt
+22 -7
View File
@@ -325,7 +325,7 @@ class DoubleColonExpressionResolver(
}
private fun resolveReservedExpressionSyntaxOnDoubleColonLHS(doubleColonExpression: KtDoubleColonExpression, c: ExpressionTypingContext):
Pair<Boolean, DoubleColonLHS?> {
ReservedDoubleColonLHSResolutionResult {
val resultForReservedExpr = tryResolveLHS(
doubleColonExpression, c,
this::shouldTryResolveLHSAsReservedExpression,
@@ -335,7 +335,7 @@ class DoubleColonExpressionResolver(
val lhs = resultForReservedExpr.lhs
if (lhs != null) {
c.trace.report(RESERVED_SYNTAX_IN_CALLABLE_REFERENCE_LHS.on(resultForReservedExpr.expression))
return Pair(true, resultForReservedExpr.commit())
return ReservedDoubleColonLHSResolutionResult(true, resultForReservedExpr.commit(), resultForReservedExpr.traceAndCache)
}
}
@@ -349,11 +349,13 @@ class DoubleColonExpressionResolver(
if (lhs != null) {
c.trace.report(RESERVED_SYNTAX_IN_CALLABLE_REFERENCE_LHS.on(resultForReservedCallChain.expression))
// DO NOT commit trace from resultForReservedCallChain here
return Pair(true, null)
return ReservedDoubleColonLHSResolutionResult(true, null, resultForReservedExpr?.traceAndCache)
}
}
return Pair(false, null)
return ReservedDoubleColonLHSResolutionResult(
false, null, resultForReservedExpr?.traceAndCache ?: resultForReservedCallChain?.traceAndCache
)
}
internal fun resolveDoubleColonLHS(doubleColonExpression: KtDoubleColonExpression, c: ExpressionTypingContext): DoubleColonLHS? {
@@ -367,7 +369,9 @@ class DoubleColonExpressionResolver(
}
}
val (isReservedExpressionSyntax, doubleColonLHS) = resolveReservedExpressionSyntaxOnDoubleColonLHS(doubleColonExpression, c)
val (isReservedExpressionSyntax, doubleColonLHS, traceAndCacheFromReservedDoubleColonLHS) =
resolveReservedExpressionSyntaxOnDoubleColonLHS(doubleColonExpression, c)
if (isReservedExpressionSyntax) return doubleColonLHS
val resultForType = tryResolveLHS(doubleColonExpression, c, this::shouldTryResolveLHSAsType) { expression, context ->
@@ -390,14 +394,25 @@ class DoubleColonExpressionResolver(
}
}
// If the LHS could be resolved neither as an expression nor as a type, we should still type-check it to allow all diagnostics
// to be reported and references to be resolved. For that, we commit one of the applicable traces here, preferring the expression
if (resultForExpr != null) return resultForExpr.commit()
if (resultForType != null) return resultForType.commit()
/*
* If the LHS could be resolved neither as an expression nor as a type,
* but it was resolved as expression with reserved syntax like `foo?::bar?::bar`,
* then we commit the trace of that resolution result.
*/
traceAndCacheFromReservedDoubleColonLHS?.commit()
return null
}
private data class ReservedDoubleColonLHSResolutionResult(
val isReservedExpressionSyntax: Boolean,
val lhs: DoubleColonLHS?,
val traceAndCache: TemporaryTraceAndCache?
)
private class LHSResolutionResult<out T : DoubleColonLHS>(
val lhs: T?,
val expression: KtExpression,