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

FIR: regard implicit type for value parameter after body resolve as an error type

Browse Source
This commit is contained in:
Jinseong Jeon
2021-02-09 00:27:04 -08:00
committed by Mikhail Glukhikh
parent fbb19e3b50
commit 9aaa952b39
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/expression/FirCatchParameterChecker.kt
+2 -6
View File
@@ -13,7 +13,7 @@ import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors
import org.jetbrains.kotlin.fir.analysis.diagnostics.reportOn import org.jetbrains.kotlin.fir.analysis.diagnostics.reportOn
import org.jetbrains.kotlin.fir.expressions.FirTryExpression import org.jetbrains.kotlin.fir.expressions.FirTryExpression
import org.jetbrains.kotlin.fir.types.ConeTypeParameterType import org.jetbrains.kotlin.fir.types.ConeTypeParameterType
import org.jetbrains.kotlin.fir.types.FirResolvedTypeRef import org.jetbrains.kotlin.fir.types.coneType
object FirCatchParameterChecker : FirTryExpressionChecker() { object FirCatchParameterChecker : FirTryExpressionChecker() {
override fun check(expression: FirTryExpression, context: CheckerContext, reporter: DiagnosticReporter) { override fun check(expression: FirTryExpression, context: CheckerContext, reporter: DiagnosticReporter) {
@@ -24,11 +24,7 @@ object FirCatchParameterChecker : FirTryExpressionChecker() {
reporter.reportOn(catchParameter.source, FirErrors.CATCH_PARAMETER_WITH_DEFAULT_VALUE, context) reporter.reportOn(catchParameter.source, FirErrors.CATCH_PARAMETER_WITH_DEFAULT_VALUE, context)
} }
val typeRef = catchParameter.returnTypeRef val coneType = catchParameter.returnTypeRef.coneType
// TODO: remaining implicit types should be resolved as an error type, along with proper error kind, most likely syntax error.
if (typeRef !is FirResolvedTypeRef) return
val coneType = typeRef.type
if (coneType is ConeTypeParameterType) { if (coneType is ConeTypeParameterType) {
val isReified = coneType.lookupTag.typeParameterSymbol.fir.isReified val isReified = coneType.lookupTag.typeParameterSymbol.fir.isReified
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/body/resolve/FirBodyResolveTransformer.kt
+1 -1
View File
@@ -74,7 +74,7 @@ open class FirBodyResolveTransformer(
return (element.transformChildren(this, data) as E).compose() return (element.transformChildren(this, data) as E).compose()
} }
override fun transformTypeRef(typeRef: FirTypeRef, data: ResolutionMode): CompositeTransformResult<FirTypeRef> { override fun transformTypeRef(typeRef: FirTypeRef, data: ResolutionMode): CompositeTransformResult<FirResolvedTypeRef> {
if (typeRef is FirResolvedTypeRef) { if (typeRef is FirResolvedTypeRef) {
return typeRef.compose() return typeRef.compose()
} }
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/body/resolve/FirDeclarationsResolveTransformer.kt
+3
View File
@@ -704,6 +704,9 @@ open class FirDeclarationsResolveTransformer(transformer: FirBodyResolveTransfor
context.storeVariable(valueParameter) context.storeVariable(valueParameter)
if (valueParameter.returnTypeRef is FirImplicitTypeRef) { if (valueParameter.returnTypeRef is FirImplicitTypeRef) {
transformer.replaceDeclarationResolvePhaseIfNeeded(valueParameter, transformerPhase) transformer.replaceDeclarationResolvePhaseIfNeeded(valueParameter, transformerPhase)
valueParameter.replaceReturnTypeRef(
valueParameter.returnTypeRef.errorTypeFromPrototype(ConeSimpleDiagnostic("Unresolved value parameter type"))
)
return valueParameter.compose() return valueParameter.compose()
} }
idea/idea-completion/testData/basic/common/annotations/ParameterAnnotationArgs.kt
Vendored
+1
View File
@@ -12,3 +12,4 @@ fun foo(@inlineOptions(<caret>) { }
// EXIST: InlineOption // EXIST: InlineOption
// EXIST: String // EXIST: String
// EXIST: v // EXIST: v
// FIR_COMPARISON