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

[K2] Fix EXPECTED_DECLARATION_WITH_BODY not reporting on property accessors

Browse Source 
We don't want any `expect` function to have body. So we're sure no
new false-positive reports are introduced because of removal of
`isTopLevelOrInsideClass` condition.

^KT-59899 Fixed
This commit is contained in:
Roman Efremov
2023-09-15 15:19:06 +02:00
committed by Space Team
parent 4404e5f036
commit 1fdc607898
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirExpectConsistencyChecker.kt
+3 -3
View File
@@ -46,7 +46,7 @@ object FirExpectConsistencyChecker : FirBasicDeclarationChecker() {
reporter.reportOn(source, FirErrors.EXPECTED_PRIVATE_DECLARATION, context) reporter.reportOn(source, FirErrors.EXPECTED_PRIVATE_DECLARATION, context)
} }
if (isProhibitedDeclarationWithBody(declaration, isTopLevelOrInsideClass)) { if (isProhibitedDeclarationWithBody(declaration)) {
reporter.reportOn(source, FirErrors.EXPECTED_DECLARATION_WITH_BODY, context) reporter.reportOn(source, FirErrors.EXPECTED_DECLARATION_WITH_BODY, context)
} }
} }
@@ -68,7 +68,7 @@ object FirExpectConsistencyChecker : FirBasicDeclarationChecker() {
return isTopLevelOrInsideClass && declaration !is FirConstructor && Visibilities.isPrivate(declaration.visibility) return isTopLevelOrInsideClass && declaration !is FirConstructor && Visibilities.isPrivate(declaration.visibility)
} }
private fun isProhibitedDeclarationWithBody(declaration: FirMemberDeclaration, isTopLevelOrInsideClass: Boolean): Boolean { private fun isProhibitedDeclarationWithBody(declaration: FirMemberDeclaration): Boolean {
return isTopLevelOrInsideClass && declaration is FirFunction && declaration.hasBody return declaration is FirFunction && declaration.hasBody
} }
} }
compiler/testData/diagnostics/tests/modifiers/openInExpectInterface.fir.kt
Vendored
+1 -1
View File
@@ -13,7 +13,7 @@ expect interface My {
open val a: Int open val a: Int
open val b: String open val b: String
open val c: String get() = "" open val c: String <!EXPECTED_DECLARATION_WITH_BODY!>get()<!> = ""
<!REDUNDANT_MODIFIER!>open<!> abstract val e: Int <!REDUNDANT_MODIFIER!>open<!> abstract val e: Int
val f: Int val f: Int
compiler/testData/diagnostics/tests/multiplatform/headerClass/headerClassWithFunctionBody.fir.kt
Vendored
+2 -2
View File
@@ -18,8 +18,8 @@
val prop: String = <!EXPECTED_PROPERTY_INITIALIZER!>"no"<!> val prop: String = <!EXPECTED_PROPERTY_INITIALIZER!>"no"<!>
var getSet: String var getSet: String
get() = "no" <!EXPECTED_DECLARATION_WITH_BODY!>get()<!> = "no"
set(value) {} <!EXPECTED_DECLARATION_WITH_BODY!>set(value)<!> {}
<!EXPECTED_DECLARATION_WITH_BODY!>fun functionWithBody(x: Int): Int<!> { <!EXPECTED_DECLARATION_WITH_BODY!>fun functionWithBody(x: Int): Int<!> {
return x + 1 return x + 1
compiler/testData/diagnostics/tests/multiplatform/headerClass/memberPropertyKinds.fir.kt
Vendored
+3 -3
View File
@@ -17,10 +17,10 @@
var backingFieldVar: String = <!EXPECTED_PROPERTY_INITIALIZER!>"no"<!> var backingFieldVar: String = <!EXPECTED_PROPERTY_INITIALIZER!>"no"<!>
val customAccessorVal: String val customAccessorVal: String
get() = "no" <!EXPECTED_DECLARATION_WITH_BODY!>get()<!> = "no"
var customAccessorVar: String var customAccessorVar: String
get() = "no" <!EXPECTED_DECLARATION_WITH_BODY!>get()<!> = "no"
set(value) {} <!EXPECTED_DECLARATION_WITH_BODY!>set(value)<!> {}
<!EXPECTED_LATEINIT_PROPERTY!>lateinit<!> var lateinitVar: String <!EXPECTED_LATEINIT_PROPERTY!>lateinit<!> var lateinitVar: String