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

[JS FIR] Support PROPERTY_DELEGATION_BY_DYNAMIC diagnostic

Browse Source 
^KT-59406 Fixed
This commit is contained in:
Alexander Korepanov
2023-07-11 14:44:30 +02:00
committed by Space Team
parent f6b7a07efe
commit 39fba56de9
10 changed files with 48 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/diagnostics/KtFirDataClassConverters.kt
+6
View File
@@ -5185,6 +5185,12 @@ internal val KT_DIAGNOSTIC_CONVERTER = KtDiagnosticConverterBuilder.buildConvert
token,
)
}
add(FirJsErrors.PROPERTY_DELEGATION_BY_DYNAMIC) { firDiagnostic ->
PropertyDelegationByDynamicImpl(
firDiagnostic as KtPsiDiagnostic,
token,
)
}
add(FirJsErrors.SPREAD_OPERATOR_IN_DYNAMIC_CALL) { firDiagnostic ->
SpreadOperatorInDynamicCallImpl(
firDiagnostic as KtPsiDiagnostic,
analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/diagnostics/KtFirDiagnostics.kt
+4
View File
@@ -3609,6 +3609,10 @@ sealed interface KtFirDiagnostic<PSI : PsiElement> : KtDiagnosticWithPsi<PSI> {
override val diagnosticClass get() = DelegationByDynamic::class
}
interface PropertyDelegationByDynamic : KtFirDiagnostic<KtElement> {
override val diagnosticClass get() = PropertyDelegationByDynamic::class
}
interface SpreadOperatorInDynamicCall : KtFirDiagnostic<KtElement> {
override val diagnosticClass get() = SpreadOperatorInDynamicCall::class
}
analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/diagnostics/KtFirDiagnosticsImpl.kt
+5
View File
@@ -4364,6 +4364,11 @@ internal class DelegationByDynamicImpl(
token: KtLifetimeToken,
) : KtAbstractFirDiagnostic<KtElement>(firDiagnostic, token), KtFirDiagnostic.DelegationByDynamic
internal class PropertyDelegationByDynamicImpl(
firDiagnostic: KtPsiDiagnostic,
token: KtLifetimeToken,
) : KtAbstractFirDiagnostic<KtElement>(firDiagnostic, token), KtFirDiagnostic.PropertyDelegationByDynamic
internal class SpreadOperatorInDynamicCallImpl(
firDiagnostic: KtPsiDiagnostic,
token: KtLifetimeToken,
compiler/fir/checkers/checkers-component-generator/src/org/jetbrains/kotlin/fir/checkers/generator/diagnostics/FirJsDiagnosticsList.kt
+1
View File
@@ -123,6 +123,7 @@ object JS_DIAGNOSTICS_LIST : DiagnosticList("FirJsErrors") {
val DYNAMICS by object : DiagnosticGroup("Dynamics") {
val DELEGATION_BY_DYNAMIC by error<KtElement>()
val PROPERTY_DELEGATION_BY_DYNAMIC by error<KtElement>()
val SPREAD_OPERATOR_IN_DYNAMIC_CALL by error<KtElement>(PositioningStrategy.SPREAD_OPERATOR)
val WRONG_OPERATION_WITH_DYNAMIC by error<KtElement> {
parameter<String>("operation")
compiler/fir/checkers/checkers.js/gen/org/jetbrains/kotlin/fir/analysis/diagnostics/js/FirJsErrors.kt
+1
View File
@@ -91,6 +91,7 @@ object FirJsErrors {
// Dynamics
val DELEGATION_BY_DYNAMIC by error0<KtElement>()
val PROPERTY_DELEGATION_BY_DYNAMIC by error0<KtElement>()
val SPREAD_OPERATOR_IN_DYNAMIC_CALL by error0<KtElement>(SourceElementPositioningStrategies.SPREAD_OPERATOR)
val WRONG_OPERATION_WITH_DYNAMIC by error1<KtElement, String>()
compiler/fir/checkers/checkers.js/src/org/jetbrains/kotlin/fir/analysis/diagnostics/js/FirJsErrorsDefaultMessages.kt
+2
View File
@@ -20,6 +20,7 @@ import org.jetbrains.kotlin.fir.analysis.diagnostics.js.FirJsErrors.EXTERNAL_DEL
import org.jetbrains.kotlin.fir.analysis.diagnostics.js.FirJsErrors.EXTERNAL_ENUM_ENTRY_WITH_BODY
import org.jetbrains.kotlin.fir.analysis.diagnostics.js.FirJsErrors.EXTERNAL_TYPE_EXTENDS_NON_EXTERNAL_TYPE
import org.jetbrains.kotlin.fir.analysis.diagnostics.js.FirJsErrors.DELEGATION_BY_DYNAMIC
import org.jetbrains.kotlin.fir.analysis.diagnostics.js.FirJsErrors.PROPERTY_DELEGATION_BY_DYNAMIC
import org.jetbrains.kotlin.fir.analysis.diagnostics.js.FirJsErrors.EXTERNAL_INTERFACE_AS_CLASS_LITERAL
import org.jetbrains.kotlin.fir.analysis.diagnostics.js.FirJsErrors.IMPLEMENTING_FUNCTION_INTERFACE
import org.jetbrains.kotlin.fir.analysis.diagnostics.js.FirJsErrors.INLINE_CLASS_IN_EXTERNAL_DECLARATION
@@ -82,6 +83,7 @@ object FirJsErrorsDefaultMessages : BaseDiagnosticRendererFactory() {
FirDiagnosticRenderers.SYMBOL
)
map.put(DELEGATION_BY_DYNAMIC, "Can't delegate to dynamic value")
map.put(PROPERTY_DELEGATION_BY_DYNAMIC, "Can't apply property delegation by dynamic handler")
map.put(SPREAD_OPERATOR_IN_DYNAMIC_CALL, "Can't apply spread operator in dynamic call")
map.put(WRONG_OPERATION_WITH_DYNAMIC, "Wrong operation with dynamic value: {0}", CommonRenderers.STRING)
map.put(IMPLEMENTING_FUNCTION_INTERFACE, "Implementing function interface is prohibited in JavaScript")
compiler/fir/checkers/checkers.js/src/org/jetbrains/kotlin/fir/analysis/js/checkers/JsDeclarationCheckers.kt
+5
View File
@@ -39,4 +39,9 @@ object JsDeclarationCheckers : DeclarationCheckers() {
FirJsNativeGetterChecker,
FirJsNativeSetterChecker,
)
override val propertyCheckers: Set<FirPropertyChecker>
get() = setOf(
FirJsPropertyDelegationByDynamicChecker
)
}
compiler/fir/checkers/checkers.js/src/org/jetbrains/kotlin/fir/analysis/js/checkers/declaration/FirJsPropertyDelegationByDynamicChecker.kt
+23
View File
@@ -0,0 +1,23 @@
/*
* Copyright 2010-2023 JetBrains s.r.o. and Kotlin Programming Language contributors.
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
*/
package org.jetbrains.kotlin.fir.analysis.js.checkers.declaration
import org.jetbrains.kotlin.diagnostics.DiagnosticReporter
import org.jetbrains.kotlin.diagnostics.reportOn
import org.jetbrains.kotlin.fir.analysis.checkers.context.CheckerContext
import org.jetbrains.kotlin.fir.analysis.checkers.declaration.FirPropertyChecker
import org.jetbrains.kotlin.fir.analysis.diagnostics.js.FirJsErrors
import org.jetbrains.kotlin.fir.declarations.FirProperty
import org.jetbrains.kotlin.fir.types.ConeDynamicType
import org.jetbrains.kotlin.fir.types.coneTypeOrNull
object FirJsPropertyDelegationByDynamicChecker : FirPropertyChecker() {
override fun check(declaration: FirProperty, context: CheckerContext, reporter: DiagnosticReporter) {
if (declaration.delegate?.typeRef?.coneTypeOrNull is ConeDynamicType) {
reporter.reportOn(declaration.delegate?.source, FirJsErrors.PROPERTY_DELEGATION_BY_DYNAMIC, context)
}
}
}
compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/propertyDelegateBy.fir.kt
Vendored
-27
View File
@@ -1,27 +0,0 @@
// !DIAGNOSTICS: -UNUSED_VARIABLE
external val x: dynamic
var y: Any? by x
fun foo() {
val a: Any by x
}
class C {
val a: dynamic by x
}
class A {
operator fun provideDelegate(host: Any?, p: Any): dynamic = TODO("")
}
val z: Any? by A()
class DynamicHandler {
operator fun getValue(thisRef: Any?, property: kotlin.reflect.KProperty<*>): dynamic = 23
}
class B {
val x: dynamic by DynamicHandler()
}
compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/propertyDelegateBy.kt
Vendored
+1
View File
@@ -1,3 +1,4 @@
// FIR_IDENTICAL
// !DIAGNOSTICS: -UNUSED_VARIABLE
external val x: dynamic