From e76debb12b91e1b456de2f6b500de9ea8ffb5a6d Mon Sep 17 00:00:00 2001 From: Mikhail Glukhikh Date: Fri, 27 Apr 2018 16:09:29 +0300 Subject: [PATCH] Report UNUSED_PARAMETER in setter #KT-21129 Fixed --- .../cfg/ControlFlowInformationProvider.kt | 3 +++ .../wrongInlineTarget/library/a.kt | 12 +++++------ .../testData/diagnostics/tests/Abstract.kt | 2 +- .../tests/AbstractInAbstractClass.kt | 2 +- .../diagnostics/tests/AbstractInClass.kt | 2 +- .../diagnostics/tests/AbstractInTrait.kt | 2 +- .../diagnostics/tests/Constructors.kt | 2 +- .../diagnostics/tests/DiamondProperty.kt | 2 +- .../tests/OverridenSetterVisibility.kt | 8 ++++---- .../tests/PrivateSetterForOverridden.kt | 4 ++-- .../testData/diagnostics/tests/Properties.kt | 2 +- .../tests/annotations/kt1860-negative.kt | 2 +- .../tests/annotations/kt1860-positive.kt | 2 +- .../tests/annotations/options/setterParam.kt | 2 +- .../withUseSiteTarget/PropertyAnnotations.kt | 2 +- .../withUseSiteTarget/SetterAnnotations.kt | 2 +- .../withUseSiteTarget/SparamAnnotations.kt | 2 +- .../withUseSiteTarget/repeatable.kt | 2 +- .../tests/backingField/FieldAsParam.kt | 2 +- .../property/extensionFromTopLevel.kt | 2 +- ...propertyInPackageHasNoInheritVisibility.kt | 2 +- ...delegationToSubTypeWithOverrideProperty.kt | 4 ++-- .../deprecatedPropertyInheritance.kt | 16 +++++++-------- .../deprecated/hiddenPropertyAccessors.kt | 8 ++++---- .../diagnostics/tests/deprecated/typeUsage.kt | 2 +- .../diagnostics/tests/enum/AbstractInEnum.kt | 2 +- .../imports/ImportFromCompanionObject.kt | 2 +- .../tests/imports/ImportFromObject.kt | 2 +- .../infos/PropertiesWithBackingFields.kt | 8 ++++---- .../property/propertyWithBackingField.kt | 2 +- .../tests/inline/property/virtualProperty.kt | 8 ++++---- .../tests/inline/protectedDepecation.kt | 4 ++-- .../diagnostics/tests/inline/publishedApi.kt | 6 +++--- .../tests/modifiers/IllegalModifiers.kt | 2 +- .../headerClassWithFunctionBody.kt | 2 +- .../headerClass/memberPropertyKinds.kt | 2 +- .../differentKindsOfProperties.kt | 2 +- .../tests/privateInFile/visibility.kt | 2 +- .../unsupportedInferenceFromGetters.kt | 2 +- .../tests/resolve/priority/kt10219.kt | 2 +- .../diagnostics/tests/scopes/kt323.kt | 4 ++-- .../script/topLevelPropertiesWithGetSet.kts | 8 ++++---- .../apiVersion/propertyAccessors.kt | 8 ++++---- .../diagnostics/tests/variance/VarProperty.kt | 20 +++++++++---------- .../dynamicTypes/dynamicExtension.kt | 2 +- .../dynamicTypes/extensionVars.kt | 10 +++++----- .../dynamicTypes/extensionsToDynamic.kt | 4 ++-- .../name/jsNameMissingOnAccessors.kt | 10 +++++----- .../name/jsNameOnAccessors.kt | 2 +- .../name/jsNameOnPropertyAndAccessor.kt | 4 ++-- .../nonConstValAsArgument.kt | 2 +- .../jvmDefault/noJvmDefaultFlag.kt | 2 +- .../jvmDefault/propertyAccessor.kt | 2 +- .../annotations/jvmDefault/target6.kt | 2 +- .../annotations/jvmDefault/target8.kt | 2 +- .../annotations/jvmStatic/property.kt | 6 +++--- idea/testData/checker/Constructors.kt | 2 +- .../infos/PropertiesWithBackingFields.kt | 4 ++-- 58 files changed, 118 insertions(+), 115 deletions(-) diff --git a/compiler/frontend/src/org/jetbrains/kotlin/cfg/ControlFlowInformationProvider.kt b/compiler/frontend/src/org/jetbrains/kotlin/cfg/ControlFlowInformationProvider.kt index 14370e7b3c0..2061042728c 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/cfg/ControlFlowInformationProvider.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/cfg/ControlFlowInformationProvider.kt @@ -685,6 +685,9 @@ class ControlFlowInformationProvider private constructor( report(UNUSED_PARAMETER.on(element, variableDescriptor), ctxt) } } + is KtPropertyAccessor -> { + report(UNUSED_PARAMETER.on(element, variableDescriptor), ctxt) + } } } diff --git a/compiler/testData/compileKotlinAgainstCustomBinaries/wrongInlineTarget/library/a.kt b/compiler/testData/compileKotlinAgainstCustomBinaries/wrongInlineTarget/library/a.kt index 3e3e1614d32..797d8b50320 100644 --- a/compiler/testData/compileKotlinAgainstCustomBinaries/wrongInlineTarget/library/a.kt +++ b/compiler/testData/compileKotlinAgainstCustomBinaries/wrongInlineTarget/library/a.kt @@ -7,15 +7,15 @@ inline fun inlineFun(p: () -> Unit) { var inlineGetter: Int inline get() = 1 - set(varue) {} + set(varue) { varue.hashCode() } var inlineSetter: Int get() = 1 - inline set(varue) {} + inline set(varue) { varue.hashCode() } var allInline: Int inline get() = 1 - inline set(varue) {} + inline set(varue) { varue.hashCode() } @@ -26,14 +26,14 @@ class A { var inlineGetter: Int inline get() = 1 - set(varue) {} + set(varue) { varue.hashCode() } var inlineSetter: Int get() = 1 - inline set(varue) {} + inline set(varue) { varue.hashCode() } var allInline: Int inline get() = 1 - inline set(varue) {} + inline set(varue) { varue.hashCode() } } \ No newline at end of file diff --git a/compiler/testData/diagnostics/tests/Abstract.kt b/compiler/testData/diagnostics/tests/Abstract.kt index 0f4f167250b..0ee38a01e5d 100644 --- a/compiler/testData/diagnostics/tests/Abstract.kt +++ b/compiler/testData/diagnostics/tests/Abstract.kt @@ -40,7 +40,7 @@ package MyPackage var l: Int abstract get abstract set var l1: Int = 0; abstract get abstract set - var n: Int abstract get abstract set(v: Int) {} + var n: Int abstract get abstract set(v: Int) {} // FILE: c.kt //creating an instance diff --git a/compiler/testData/diagnostics/tests/AbstractInAbstractClass.kt b/compiler/testData/diagnostics/tests/AbstractInAbstractClass.kt index d8992cf2feb..5d5136f582e 100644 --- a/compiler/testData/diagnostics/tests/AbstractInAbstractClass.kt +++ b/compiler/testData/diagnostics/tests/AbstractInAbstractClass.kt @@ -41,5 +41,5 @@ abstract class MyAbstractClass() { var l: Int abstract get abstract set var l1: Int = 0; abstract get abstract set - var n: Int abstract get abstract set(v: Int) {} + var n: Int abstract get abstract set(v: Int) {} } \ No newline at end of file diff --git a/compiler/testData/diagnostics/tests/AbstractInClass.kt b/compiler/testData/diagnostics/tests/AbstractInClass.kt index 0399873e4c1..5d68fab5364 100644 --- a/compiler/testData/diagnostics/tests/AbstractInClass.kt +++ b/compiler/testData/diagnostics/tests/AbstractInClass.kt @@ -41,5 +41,5 @@ class MyClass() { var l: Int abstract get abstract set var l1: Int = 0; abstract get abstract set - var n: Int abstract get abstract set(v: Int) {} + var n: Int abstract get abstract set(v: Int) {} } \ No newline at end of file diff --git a/compiler/testData/diagnostics/tests/AbstractInTrait.kt b/compiler/testData/diagnostics/tests/AbstractInTrait.kt index c09611c7056..e905dedc7f0 100644 --- a/compiler/testData/diagnostics/tests/AbstractInTrait.kt +++ b/compiler/testData/diagnostics/tests/AbstractInTrait.kt @@ -41,5 +41,5 @@ interface MyTrait { var l: Int abstract get abstract set var l1: Int = 0; abstract get abstract set - var n: Int abstract get abstract set(v: Int) {} + var n: Int abstract get abstract set(v: Int) {} } \ No newline at end of file diff --git a/compiler/testData/diagnostics/tests/Constructors.kt b/compiler/testData/diagnostics/tests/Constructors.kt index 9b0fd514a00..5a346cb0615 100644 --- a/compiler/testData/diagnostics/tests/Constructors.kt +++ b/compiler/testData/diagnostics/tests/Constructors.kt @@ -31,5 +31,5 @@ class NoCPI { val a = 1 var ab = 1 get() = 1 - set(v) {} + set(v) {} } \ No newline at end of file diff --git a/compiler/testData/diagnostics/tests/DiamondProperty.kt b/compiler/testData/diagnostics/tests/DiamondProperty.kt index 5a93ad88daa..c7051ff00bf 100644 --- a/compiler/testData/diagnostics/tests/DiamondProperty.kt +++ b/compiler/testData/diagnostics/tests/DiamondProperty.kt @@ -1,7 +1,7 @@ interface Base { var v : Int get() = 1 - set(v) {} + set(v) {} } open class Left() : Base diff --git a/compiler/testData/diagnostics/tests/OverridenSetterVisibility.kt b/compiler/testData/diagnostics/tests/OverridenSetterVisibility.kt index a62c2e3f161..0390e0166f8 100644 --- a/compiler/testData/diagnostics/tests/OverridenSetterVisibility.kt +++ b/compiler/testData/diagnostics/tests/OverridenSetterVisibility.kt @@ -1,23 +1,23 @@ public interface ITest { public var prop : Int get() = 12 - set(value) {} + set(value) {} } abstract class ATest { protected open var prop2 : Int get() = 13 - set(value) {} + set(value) {} } class Test: ATest(), ITest { override var prop : Int get() = 12 - private set(value) {} + private set(value) {} override var prop2 : Int get() = 14 - internal set(value) {} + internal set(value) {} } fun main(args: Array) { diff --git a/compiler/testData/diagnostics/tests/PrivateSetterForOverridden.kt b/compiler/testData/diagnostics/tests/PrivateSetterForOverridden.kt index da0a7928210..9ab2d228bb4 100644 --- a/compiler/testData/diagnostics/tests/PrivateSetterForOverridden.kt +++ b/compiler/testData/diagnostics/tests/PrivateSetterForOverridden.kt @@ -62,9 +62,9 @@ interface E : A { override var a: Int get() = 0 // Errors here and below - private set(arg) {} + private set(arg) {} override var b: Int get() = 0 - private set(arg) {} + private set(arg) {} } \ No newline at end of file diff --git a/compiler/testData/diagnostics/tests/Properties.kt b/compiler/testData/diagnostics/tests/Properties.kt index 0da9f1cc61b..6cc7c124be0 100644 --- a/compiler/testData/diagnostics/tests/Properties.kt +++ b/compiler/testData/diagnostics/tests/Properties.kt @@ -7,7 +7,7 @@ var x : Int = 1 + x val xx : Int = 1 + x get() : Int = 1 - set(value : Long) {} + set(value : Long) {} val p : Int = 1 get() = 1 diff --git a/compiler/testData/diagnostics/tests/annotations/kt1860-negative.kt b/compiler/testData/diagnostics/tests/annotations/kt1860-negative.kt index 9dcdb9e9121..abe7c374fb6 100644 --- a/compiler/testData/diagnostics/tests/annotations/kt1860-negative.kt +++ b/compiler/testData/diagnostics/tests/annotations/kt1860-negative.kt @@ -2,7 +2,7 @@ fun foo(@varargs f : Int) {} var bar : Int = 1 - set(@varargs v) {} + set(@varargs v) {} val x : (Int) -> Int = {@varargs x : Int -> x} diff --git a/compiler/testData/diagnostics/tests/annotations/kt1860-positive.kt b/compiler/testData/diagnostics/tests/annotations/kt1860-positive.kt index 3f6e31bbe81..deb61c77d7d 100644 --- a/compiler/testData/diagnostics/tests/annotations/kt1860-positive.kt +++ b/compiler/testData/diagnostics/tests/annotations/kt1860-positive.kt @@ -5,7 +5,7 @@ annotation class test fun foo(@test f : Int) {} var bar : Int = 1 - set(@test v) {} + set(@test v) {} val x : (Int) -> Int = {@test x : Int -> x} // todo fix parser annotation on lambda parameter diff --git a/compiler/testData/diagnostics/tests/annotations/options/setterParam.kt b/compiler/testData/diagnostics/tests/annotations/options/setterParam.kt index 9e917086f3b..a3086d0027c 100644 --- a/compiler/testData/diagnostics/tests/annotations/options/setterParam.kt +++ b/compiler/testData/diagnostics/tests/annotations/options/setterParam.kt @@ -5,4 +5,4 @@ annotation class Ann var x: Int get() = 1 - set(@Ann private x) { } \ No newline at end of file + set(@Ann private x) { } \ No newline at end of file diff --git a/compiler/testData/diagnostics/tests/annotations/withUseSiteTarget/PropertyAnnotations.kt b/compiler/testData/diagnostics/tests/annotations/withUseSiteTarget/PropertyAnnotations.kt index 3599af8db54..74ef525409e 100644 --- a/compiler/testData/diagnostics/tests/annotations/withUseSiteTarget/PropertyAnnotations.kt +++ b/compiler/testData/diagnostics/tests/annotations/withUseSiteTarget/PropertyAnnotations.kt @@ -28,7 +28,7 @@ class SomeClass { @property:Ann var propertyWithCustomSetter: Int get() = 5 - set(v) {} + set(v) {} @property:Ann fun anotherFun() { diff --git a/compiler/testData/diagnostics/tests/annotations/withUseSiteTarget/SetterAnnotations.kt b/compiler/testData/diagnostics/tests/annotations/withUseSiteTarget/SetterAnnotations.kt index b790975c89c..5931ea566a0 100644 --- a/compiler/testData/diagnostics/tests/annotations/withUseSiteTarget/SetterAnnotations.kt +++ b/compiler/testData/diagnostics/tests/annotations/withUseSiteTarget/SetterAnnotations.kt @@ -25,7 +25,7 @@ class SomeClass { @set:Ann var propertyWithCustomSetter: Int get() = 5 - set(v) {} + set(v) {} @set:Ann fun annotationOnFunction(a: Int) = a + 5 diff --git a/compiler/testData/diagnostics/tests/annotations/withUseSiteTarget/SparamAnnotations.kt b/compiler/testData/diagnostics/tests/annotations/withUseSiteTarget/SparamAnnotations.kt index 85940c22b81..faa96fb2439 100644 --- a/compiler/testData/diagnostics/tests/annotations/withUseSiteTarget/SparamAnnotations.kt +++ b/compiler/testData/diagnostics/tests/annotations/withUseSiteTarget/SparamAnnotations.kt @@ -28,7 +28,7 @@ class SomeClass { @setparam:Ann var propertyWithCustomSetter: Int get() = 5 - set(v) {} + set(v) {} @setparam:Ann fun anotherFun() { diff --git a/compiler/testData/diagnostics/tests/annotations/withUseSiteTarget/repeatable.kt b/compiler/testData/diagnostics/tests/annotations/withUseSiteTarget/repeatable.kt index ec5d48ca946..4f58911af9c 100644 --- a/compiler/testData/diagnostics/tests/annotations/withUseSiteTarget/repeatable.kt +++ b/compiler/testData/diagnostics/tests/annotations/withUseSiteTarget/repeatable.kt @@ -55,5 +55,5 @@ public class B(@param:fieldOrPro var w: Int @getSetAndParamAnn @get:getSetAndParamAnn get() = 0 // See KT-15470: fake INAPPLICABLE_TARGET_ON_PROPERTY - @getSetAndParamAnn @set:getSetAndParamAnn set(arg) {} + @getSetAndParamAnn @set:getSetAndParamAnn set(arg) {} } \ No newline at end of file diff --git a/compiler/testData/diagnostics/tests/backingField/FieldAsParam.kt b/compiler/testData/diagnostics/tests/backingField/FieldAsParam.kt index 5eb02ce2f1a..96dcdd452c2 100644 --- a/compiler/testData/diagnostics/tests/backingField/FieldAsParam.kt +++ b/compiler/testData/diagnostics/tests/backingField/FieldAsParam.kt @@ -3,6 +3,6 @@ var y: Int = 1 // No backing field! var x: Int get() = y - set(field) { + set(field) { y = field } \ No newline at end of file diff --git a/compiler/testData/diagnostics/tests/callableReference/property/extensionFromTopLevel.kt b/compiler/testData/diagnostics/tests/callableReference/property/extensionFromTopLevel.kt index d6a4b3406e5..b05fd05eba3 100644 --- a/compiler/testData/diagnostics/tests/callableReference/property/extensionFromTopLevel.kt +++ b/compiler/testData/diagnostics/tests/callableReference/property/extensionFromTopLevel.kt @@ -7,7 +7,7 @@ val String.countCharacters: Int var Int.meaning: Long get() = 42L - set(value) {} + set(value) {} fun test() { val f = String::countCharacters diff --git a/compiler/testData/diagnostics/tests/declarationChecks/propertyInPackageHasNoInheritVisibility.kt b/compiler/testData/diagnostics/tests/declarationChecks/propertyInPackageHasNoInheritVisibility.kt index 33f9c2e8398..9f37883789e 100644 --- a/compiler/testData/diagnostics/tests/declarationChecks/propertyInPackageHasNoInheritVisibility.kt +++ b/compiler/testData/diagnostics/tests/declarationChecks/propertyInPackageHasNoInheritVisibility.kt @@ -7,4 +7,4 @@ fun test() { } var g: Int = 1 - protected set(i: Int) {} \ No newline at end of file + protected set(i: Int) {} \ No newline at end of file diff --git a/compiler/testData/diagnostics/tests/delegation/memberHidesSupertypeOverride/delegationToSubTypeWithOverrideProperty.kt b/compiler/testData/diagnostics/tests/delegation/memberHidesSupertypeOverride/delegationToSubTypeWithOverrideProperty.kt index a9a8bea5f54..e246e0a18a6 100644 --- a/compiler/testData/diagnostics/tests/delegation/memberHidesSupertypeOverride/delegationToSubTypeWithOverrideProperty.kt +++ b/compiler/testData/diagnostics/tests/delegation/memberHidesSupertypeOverride/delegationToSubTypeWithOverrideProperty.kt @@ -1,14 +1,14 @@ public interface Base { var test: String get() = "OK" - set(s: String) { + set(s: String) { } } public interface Base2 : Base { override var test: String get() = "OK2" - set(value) {} + set(value) {} } class Delegate : Base2 { diff --git a/compiler/testData/diagnostics/tests/deprecated/deprecatedPropertyInheritance.kt b/compiler/testData/diagnostics/tests/deprecated/deprecatedPropertyInheritance.kt index 7d82e134685..b65caffbbe5 100644 --- a/compiler/testData/diagnostics/tests/deprecated/deprecatedPropertyInheritance.kt +++ b/compiler/testData/diagnostics/tests/deprecated/deprecatedPropertyInheritance.kt @@ -33,48 +33,48 @@ open class SetterDeprecated { class WD: WarningDeprecated() { override var p: Int get() = 3 - set(value) {} + set(value) {} } class ED: ErrorDeprecated() { override var p: Int get() = 3 - set(value) { + set(value) { } } class GD: GetterDeprecated() { override var p: Int get() = 3 - set(value) { + set(value) { } } class SD: SetterDeprecated() { override var p: Int get() = 3 - set(value) { + set(value) { } } class SDH: SetterDeprecated(), HiddenDeprecated { override var p: Int get() = 3 - set(value) { + set(value) { } } class EDH: ErrorDeprecated(), HiddenDeprecated { override var p: Int get() = 3 - set(value) { + set(value) { } } class NED: ErrorDeprecated(), NoDeprecation { override var p: Int get() = 3 - set(value) { + set(value) { } } @@ -82,7 +82,7 @@ class Diff { @Deprecated("", level = DeprecationLevel.WARNING) var p: Int @Deprecated("", level = DeprecationLevel.ERROR) get() = 3 - @Deprecated("", level = DeprecationLevel.HIDDEN) set(value) { + @Deprecated("", level = DeprecationLevel.HIDDEN) set(value) { } } diff --git a/compiler/testData/diagnostics/tests/deprecated/hiddenPropertyAccessors.kt b/compiler/testData/diagnostics/tests/deprecated/hiddenPropertyAccessors.kt index a47332edf1c..903e5d330ae 100644 --- a/compiler/testData/diagnostics/tests/deprecated/hiddenPropertyAccessors.kt +++ b/compiler/testData/diagnostics/tests/deprecated/hiddenPropertyAccessors.kt @@ -8,23 +8,23 @@ val v2 = "" var v3: String @Deprecated("", level = DeprecationLevel.HIDDEN) get() = "" - set(value) {} + set(value) {} var v4: String get() = "" @Deprecated("", level = DeprecationLevel.HIDDEN) - set(value) {} + set(value) {} var v5: String @Deprecated("", level = DeprecationLevel.HIDDEN) get() = "" @Deprecated("", level = DeprecationLevel.HIDDEN) - set(value) {} + set(value) {} @Deprecated("", level = DeprecationLevel.HIDDEN) var v6: String get() = "" - set(value) {} + set(value) {} fun test() { v1 diff --git a/compiler/testData/diagnostics/tests/deprecated/typeUsage.kt b/compiler/testData/diagnostics/tests/deprecated/typeUsage.kt index d8bd041ade2..23f313932f4 100644 --- a/compiler/testData/diagnostics/tests/deprecated/typeUsage.kt +++ b/compiler/testData/diagnostics/tests/deprecated/typeUsage.kt @@ -24,7 +24,7 @@ class Properties { var n : Obsolete get() = Obsolete() - set(value) {} + set(value) {} } fun param(param: Obsolete) { param.use() } diff --git a/compiler/testData/diagnostics/tests/enum/AbstractInEnum.kt b/compiler/testData/diagnostics/tests/enum/AbstractInEnum.kt index 3d6fdd31986..8f485c5e278 100644 --- a/compiler/testData/diagnostics/tests/enum/AbstractInEnum.kt +++ b/compiler/testData/diagnostics/tests/enum/AbstractInEnum.kt @@ -43,5 +43,5 @@ enum class MyEnum() { var l: Int abstract get abstract set var l1: Int = 0; abstract get abstract set - var n: Int abstract get abstract set(v: Int) {} + var n: Int abstract get abstract set(v: Int) {} } \ No newline at end of file diff --git a/compiler/testData/diagnostics/tests/imports/ImportFromCompanionObject.kt b/compiler/testData/diagnostics/tests/imports/ImportFromCompanionObject.kt index b696068686b..931aeab36e4 100644 --- a/compiler/testData/diagnostics/tests/imports/ImportFromCompanionObject.kt +++ b/compiler/testData/diagnostics/tests/imports/ImportFromCompanionObject.kt @@ -22,7 +22,7 @@ class C2 { fun Int.ext() = Unit var String.ext: Int get() = 3 - set(i) { + set(i) { } fun A(c: Int) = A() diff --git a/compiler/testData/diagnostics/tests/imports/ImportFromObject.kt b/compiler/testData/diagnostics/tests/imports/ImportFromObject.kt index 1ebd85704bd..6ef2930ce1f 100644 --- a/compiler/testData/diagnostics/tests/imports/ImportFromObject.kt +++ b/compiler/testData/diagnostics/tests/imports/ImportFromObject.kt @@ -19,7 +19,7 @@ object S { fun Int.ext() = Unit var String.ext: Int get() = 3 - set(i) { + set(i) { } fun A(c: Int) = A() diff --git a/compiler/testData/diagnostics/tests/infos/PropertiesWithBackingFields.kt b/compiler/testData/diagnostics/tests/infos/PropertiesWithBackingFields.kt index c7d0fc5c0aa..72bab8b732c 100644 --- a/compiler/testData/diagnostics/tests/infos/PropertiesWithBackingFields.kt +++ b/compiler/testData/diagnostics/tests/infos/PropertiesWithBackingFields.kt @@ -23,17 +23,17 @@ abstract class Test() { abstract var y2 : Int set abstract var y3 : Int set get abstract var y4 : Int set get() = 1 - abstract var y5 : Int set(x) {} get() = 1 - abstract var y6 : Int set(x) {} + abstract var y5 : Int set(x) {} get() = 1 + abstract var y6 : Int set(x) {} var v : Int var v1 : Int get var v2 : Int get set var v3 : Int get() = 1; set - var v4 : Int get() = 1; set(x){} + var v4 : Int get() = 1; set(x){} var v5 : Int get() = 1; set(x){field = x} - var v6 : Int get() = field + 1; set(x){} + var v6 : Int get() = field + 1; set(x){} abstract val v7 : Int get abstract var v8 : Int get set diff --git a/compiler/testData/diagnostics/tests/inline/property/propertyWithBackingField.kt b/compiler/testData/diagnostics/tests/inline/property/propertyWithBackingField.kt index 1b0cdd68f62..65af2083da2 100644 --- a/compiler/testData/diagnostics/tests/inline/property/propertyWithBackingField.kt +++ b/compiler/testData/diagnostics/tests/inline/property/propertyWithBackingField.kt @@ -15,7 +15,7 @@ open class A { inline var z2 = 1 var z2_1 = 1 - inline set(p: Int) {} + inline set(p: Int) {} inline val z by Delegate() } diff --git a/compiler/testData/diagnostics/tests/inline/property/virtualProperty.kt b/compiler/testData/diagnostics/tests/inline/property/virtualProperty.kt index 4789da733c2..df38cbf5ea8 100644 --- a/compiler/testData/diagnostics/tests/inline/property/virtualProperty.kt +++ b/compiler/testData/diagnostics/tests/inline/property/virtualProperty.kt @@ -7,11 +7,11 @@ final class FinalProperty { inline var varProp: Int get() = 1 - set(p: Int) {} + set(p: Int) {} var varProp_2: Int get() = 1 - inline set(p: Int) {} + inline set(p: Int) {} } @@ -24,11 +24,11 @@ open class OpenProperty { inline open var varProp: Int get() = 1 - set(p: Int) {} + set(p: Int) {} open var varProp_2: Int get() = 1 - inline set(p: Int) {} + inline set(p: Int) {} } diff --git a/compiler/testData/diagnostics/tests/inline/protectedDepecation.kt b/compiler/testData/diagnostics/tests/inline/protectedDepecation.kt index 36e6ffd21d9..16971c16679 100644 --- a/compiler/testData/diagnostics/tests/inline/protectedDepecation.kt +++ b/compiler/testData/diagnostics/tests/inline/protectedDepecation.kt @@ -14,7 +14,7 @@ open class A { protected val z: String = "1" public var zVar: String = "1" - protected set(value) {} + protected set(value) {} inline fun call() { test() @@ -77,7 +77,7 @@ internal class AInternal { protected val z: String = "1" public var zVar: String = "1" - protected set(value) {} + protected set(value) {} inline fun call() { diff --git a/compiler/testData/diagnostics/tests/inline/publishedApi.kt b/compiler/testData/diagnostics/tests/inline/publishedApi.kt index ff9db30a34e..99840bbfe1c 100644 --- a/compiler/testData/diagnostics/tests/inline/publishedApi.kt +++ b/compiler/testData/diagnostics/tests/inline/publishedApi.kt @@ -23,7 +23,7 @@ inline var inlineVar: Int publishedVarTopLevel = 1 return 1 } - set(value) { + set(value) { val a = A() a.test() publishedTopLevel() @@ -88,7 +88,7 @@ internal class A { return 1 } - set(value) { + set(value) { publicFun() internalFun() privateFun() @@ -147,7 +147,7 @@ inline internal var publishedVarTopLevel: Int return 1 } - set(value) { + set(value) { publicFun() internalFun() privateFun() diff --git a/compiler/testData/diagnostics/tests/modifiers/IllegalModifiers.kt b/compiler/testData/diagnostics/tests/modifiers/IllegalModifiers.kt index e4f52d51354..bffac287aa9 100644 --- a/compiler/testData/diagnostics/tests/modifiers/IllegalModifiers.kt +++ b/compiler/testData/diagnostics/tests/modifiers/IllegalModifiers.kt @@ -18,7 +18,7 @@ class FinalClass() { val i: Int = 1 open get(): Int = field var j: Int = 1 - open set(v: Int) {} + open set(v: Int) {} } private public class C diff --git a/compiler/testData/diagnostics/tests/multiplatform/headerClass/headerClassWithFunctionBody.kt b/compiler/testData/diagnostics/tests/multiplatform/headerClass/headerClassWithFunctionBody.kt index 01c34793518..e76995f34bd 100644 --- a/compiler/testData/diagnostics/tests/multiplatform/headerClass/headerClassWithFunctionBody.kt +++ b/compiler/testData/diagnostics/tests/multiplatform/headerClass/headerClassWithFunctionBody.kt @@ -19,7 +19,7 @@ expect class Foo( var getSet: String get() = "no" - set(value) {} + set(value) {} fun functionWithBody(x: Int): Int { return x + 1 diff --git a/compiler/testData/diagnostics/tests/multiplatform/headerClass/memberPropertyKinds.kt b/compiler/testData/diagnostics/tests/multiplatform/headerClass/memberPropertyKinds.kt index 74f469447a6..872e1f42958 100644 --- a/compiler/testData/diagnostics/tests/multiplatform/headerClass/memberPropertyKinds.kt +++ b/compiler/testData/diagnostics/tests/multiplatform/headerClass/memberPropertyKinds.kt @@ -21,7 +21,7 @@ expect class Foo { get() = "no" var customAccessorVar: String get() = "no" - set(value) {} + set(value) {} lateinit var lateinitVar: String diff --git a/compiler/testData/diagnostics/tests/multiplatform/topLevelProperty/differentKindsOfProperties.kt b/compiler/testData/diagnostics/tests/multiplatform/topLevelProperty/differentKindsOfProperties.kt index e73e201c4b4..4690a3f3abe 100644 --- a/compiler/testData/diagnostics/tests/multiplatform/topLevelProperty/differentKindsOfProperties.kt +++ b/compiler/testData/diagnostics/tests/multiplatform/topLevelProperty/differentKindsOfProperties.kt @@ -24,7 +24,7 @@ expect val customAccessorVal: String get() = "no" expect var customAccessorVar: String get() = "no" - set(value) {} + set(value) {} expect const val constVal: Int diff --git a/compiler/testData/diagnostics/tests/privateInFile/visibility.kt b/compiler/testData/diagnostics/tests/privateInFile/visibility.kt index 408af8ed52b..3659d6217b7 100644 --- a/compiler/testData/diagnostics/tests/privateInFile/visibility.kt +++ b/compiler/testData/diagnostics/tests/privateInFile/visibility.kt @@ -10,7 +10,7 @@ private open class A { private var x: Int = 10 var xx: Int = 20 - private set(value: Int) {} + private set(value: Int) {} private fun foo() {} diff --git a/compiler/testData/diagnostics/tests/properties/inferenceFromGetters/unsupportedInferenceFromGetters.kt b/compiler/testData/diagnostics/tests/properties/inferenceFromGetters/unsupportedInferenceFromGetters.kt index 2839cfffea9..428faf30d1a 100644 --- a/compiler/testData/diagnostics/tests/properties/inferenceFromGetters/unsupportedInferenceFromGetters.kt +++ b/compiler/testData/diagnostics/tests/properties/inferenceFromGetters/unsupportedInferenceFromGetters.kt @@ -39,7 +39,7 @@ fun l(x: E): List = null!! // vars var x3 get() = 1 - set(q) { + set(q) { } // recursive diff --git a/compiler/testData/diagnostics/tests/resolve/priority/kt10219.kt b/compiler/testData/diagnostics/tests/resolve/priority/kt10219.kt index 6d6979b3035..dcdaa8002c6 100644 --- a/compiler/testData/diagnostics/tests/resolve/priority/kt10219.kt +++ b/compiler/testData/diagnostics/tests/resolve/priority/kt10219.kt @@ -9,7 +9,7 @@ class A var A.timeInMillis: String get() = "" - set(v) {} + set(v) {} fun a(c: Calendar) { A().apply { diff --git a/compiler/testData/diagnostics/tests/scopes/kt323.kt b/compiler/testData/diagnostics/tests/scopes/kt323.kt index be9f3e977a4..f66b25aa25f 100644 --- a/compiler/testData/diagnostics/tests/scopes/kt323.kt +++ b/compiler/testData/diagnostics/tests/scopes/kt323.kt @@ -10,9 +10,9 @@ class B : A() { var b : Int public get() = 23 - set(i: Int) {} + set(i: Int) {} protected var c : Int get() = 23 - private set(i: Int) {} + private set(i: Int) {} } \ No newline at end of file diff --git a/compiler/testData/diagnostics/tests/script/topLevelPropertiesWithGetSet.kts b/compiler/testData/diagnostics/tests/script/topLevelPropertiesWithGetSet.kts index 40d2fcc8b97..c82d462b7e3 100644 --- a/compiler/testData/diagnostics/tests/script/topLevelPropertiesWithGetSet.kts +++ b/compiler/testData/diagnostics/tests/script/topLevelPropertiesWithGetSet.kts @@ -6,9 +6,9 @@ val String.testExtVal: Int get() = 42 val String.testExtValNoType get() = 42 -var testVar: Int get() = 42; set(value) {} +var testVar: Int get() = 42; set(value) {} -var String.testExtVar: Int get() = 42; set(value) {} +var String.testExtVar: Int get() = 42; set(value) {} val testValLineBreak: Int get() = 42 @@ -24,11 +24,11 @@ get() = 42 var testVarLineBreak: Int get() = 42 -set(value) {} +set(value) {} var String.testExtVarLineBreak: Int get() = 42 -set(value) {} +set(value) {} var testVarLineBreakSemi: Int; get() = 42 diff --git a/compiler/testData/diagnostics/tests/sourceCompatibility/apiVersion/propertyAccessors.kt b/compiler/testData/diagnostics/tests/sourceCompatibility/apiVersion/propertyAccessors.kt index 28bfadf4c27..a65a8e62731 100644 --- a/compiler/testData/diagnostics/tests/sourceCompatibility/apiVersion/propertyAccessors.kt +++ b/compiler/testData/diagnostics/tests/sourceCompatibility/apiVersion/propertyAccessors.kt @@ -10,23 +10,23 @@ val v2 = "" var v3: String @SinceKotlin("1.1") get() = "" - set(value) {} + set(value) {} var v4: String get() = "" @SinceKotlin("1.1") - set(value) {} + set(value) {} var v5: String @SinceKotlin("1.1") get() = "" @SinceKotlin("1.1") - set(value) {} + set(value) {} @SinceKotlin("1.1") var v6: String get() = "" - set(value) {} + set(value) {} @SinceKotlin("1.0") val v7: String diff --git a/compiler/testData/diagnostics/tests/variance/VarProperty.kt b/compiler/testData/diagnostics/tests/variance/VarProperty.kt index dd4e714d1e1..ea9599d42fa 100644 --- a/compiler/testData/diagnostics/tests/variance/VarProperty.kt +++ b/compiler/testData/diagnostics/tests/variance/VarProperty.kt @@ -36,15 +36,15 @@ abstract class Test { abstract var In<)!>I>.receiver4: Int abstract var In.receiver5: Int - var X.typeParameter1: Int get() = 0; set(i) {} - var O> X.typeParameter2: Int get() = 0; set(i) {} - var X.typeParameter3: Int get() = 0; set(i) {} - var )!>I>> X.typeParameter4: Int get() = 0; set(i) {} - var > X.typeParameter5: Int get() = 0; set(i) {} + var X.typeParameter1: Int get() = 0; set(i) {} + var O> X.typeParameter2: Int get() = 0; set(i) {} + var X.typeParameter3: Int get() = 0; set(i) {} + var )!>I>> X.typeParameter4: Int get() = 0; set(i) {} + var > X.typeParameter5: Int get() = 0; set(i) {} - var X.typeParameter6: Int where X : I get() = 0; set(i) {} - var X.typeParameter7: Int where X : O get() = 0; set(i) {} - var X.typeParameter8: Int where X : P get() = 0; set(i) {} - var X.typeParameter9: Int where X : In<)!>I> get() = 0; set(i) {} - var X.typeParameter0: Int where X : In get() = 0; set(i) {} + var X.typeParameter6: Int where X : I get() = 0; set(i) {} + var X.typeParameter7: Int where X : O get() = 0; set(i) {} + var X.typeParameter8: Int where X : P get() = 0; set(i) {} + var X.typeParameter9: Int where X : In<)!>I> get() = 0; set(i) {} + var X.typeParameter0: Int where X : In get() = 0; set(i) {} } diff --git a/compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/dynamicExtension.kt b/compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/dynamicExtension.kt index f32484d4769..d9e1095151f 100644 --- a/compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/dynamicExtension.kt +++ b/compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/dynamicExtension.kt @@ -8,7 +8,7 @@ fun dynamic.onDynamicFun() = 1 @kotlin.internal.DynamicExtension var dynamic.onDynamicProperty get() = "" - set(value) {} + set(value) {} fun test(d: dynamic, a: Any?) { diff --git a/compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/extensionVars.kt b/compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/extensionVars.kt index a82a04fe099..2627b1b10df 100644 --- a/compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/extensionVars.kt +++ b/compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/extensionVars.kt @@ -37,19 +37,19 @@ fun test(d: dynamic) { var Any.onAnyVar: Int get() = 1 - set(v) {} + set(v) {} var Any?.onNullableAnyVar: Int get() = 1 - set(v) {} + set(v) {} var String.onStringVar: Int get() = 1 - set(v) {} + set(v) {} var dynamic.onDynamicVar: Int get() = 1 - set(v) {} + set(v) {} class C { fun test(d: dynamic) { @@ -63,5 +63,5 @@ class C { var memberVar = 1 var Any.memberExtensionVar: Int get() = 1 - set(v) {} + set(v) {} } \ No newline at end of file diff --git a/compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/extensionsToDynamic.kt b/compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/extensionsToDynamic.kt index 4f1638cd84d..47b4712f649 100644 --- a/compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/extensionsToDynamic.kt +++ b/compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/extensionsToDynamic.kt @@ -39,7 +39,7 @@ val dynamic.valOnDynamic: Int get() = 1 var dynamic.varOnDynamic: Int get() = 1 - set(v) {} + set(v) {} class ForMemberExtensions { @@ -54,5 +54,5 @@ class ForMemberExtensions { val dynamic.memberExtensionVal: Int get() = 1 var dynamic.memberExtensionVar: Int get() = 1 - set(v) {} + set(v) {} } \ No newline at end of file diff --git a/compiler/testData/diagnostics/testsWithJsStdLib/name/jsNameMissingOnAccessors.kt b/compiler/testData/diagnostics/testsWithJsStdLib/name/jsNameMissingOnAccessors.kt index 509ed98ebe9..ba78b7d7490 100644 --- a/compiler/testData/diagnostics/testsWithJsStdLib/name/jsNameMissingOnAccessors.kt +++ b/compiler/testData/diagnostics/testsWithJsStdLib/name/jsNameMissingOnAccessors.kt @@ -3,21 +3,21 @@ package foo class A { var x: Int @JsName("get_x") get() = 23 - set(value) {} + set(value) {} var y: Int get() = 23 - @JsName("set_y") set(value) {} + @JsName("set_y") set(value) {} var z: Int @JsName("get_z") get() = 23 - @JsName("set_z") set(value) {} + @JsName("set_z") set(value) {} } var xx: Int @JsName("get_xx") get() = 23 - set(value) {} + set(value) {} var A.ext: Int @JsName("get_ext") get() = 23 - set(value) {} \ No newline at end of file + set(value) {} \ No newline at end of file diff --git a/compiler/testData/diagnostics/testsWithJsStdLib/name/jsNameOnAccessors.kt b/compiler/testData/diagnostics/testsWithJsStdLib/name/jsNameOnAccessors.kt index 40b690c9a8f..5fb713cdb92 100644 --- a/compiler/testData/diagnostics/testsWithJsStdLib/name/jsNameOnAccessors.kt +++ b/compiler/testData/diagnostics/testsWithJsStdLib/name/jsNameOnAccessors.kt @@ -3,5 +3,5 @@ package foo class A { var x: Int @JsName("xx") get() = 0 - @JsName("xx") set(value) {} + @JsName("xx") set(value) {} } \ No newline at end of file diff --git a/compiler/testData/diagnostics/testsWithJsStdLib/name/jsNameOnPropertyAndAccessor.kt b/compiler/testData/diagnostics/testsWithJsStdLib/name/jsNameOnPropertyAndAccessor.kt index 5b8802261e1..4430de23a75 100644 --- a/compiler/testData/diagnostics/testsWithJsStdLib/name/jsNameOnPropertyAndAccessor.kt +++ b/compiler/testData/diagnostics/testsWithJsStdLib/name/jsNameOnPropertyAndAccessor.kt @@ -8,7 +8,7 @@ class A { @JsName("m_") var m: Int @JsName("get_m") get() = 23 - @JsName("set_m") set(value) {} + @JsName("set_m") set(value) {} } @JsName("xx_") val xx: Int @@ -18,4 +18,4 @@ class A { @JsName("mm_") var mm: Int @JsName("get_mm") get() = 23 - @JsName("set_mm") set(value) {} + @JsName("set_mm") set(value) {} diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameters/nonConstValAsArgument.kt b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameters/nonConstValAsArgument.kt index 10847725111..0ba3f988a2b 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameters/nonConstValAsArgument.kt +++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameters/nonConstValAsArgument.kt @@ -27,7 +27,7 @@ var mutable = "" var mutableWithGetter get() = "" - set(x) = TODO() + set(x) = TODO() object WithLateinit { lateinit var kClass: KClass<*> diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/noJvmDefaultFlag.kt b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/noJvmDefaultFlag.kt index d2f97c7eaad..369c86e6ba2 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/noJvmDefaultFlag.kt +++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/noJvmDefaultFlag.kt @@ -25,5 +25,5 @@ interface B { @JvmDefault var prop4: String get() = "" - set(value) {} + set(value) {} } \ No newline at end of file diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/propertyAccessor.kt b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/propertyAccessor.kt index 7a42d96f656..5a308fba92b 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/propertyAccessor.kt +++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/propertyAccessor.kt @@ -10,5 +10,5 @@ interface B { var prop2: String @JvmDefault get() = "" - @JvmDefault set(value) {} + @JvmDefault set(value) {} } \ No newline at end of file diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/target6.kt b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/target6.kt index 145b2cc186a..c950ff528e3 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/target6.kt +++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/target6.kt @@ -25,5 +25,5 @@ interface B { @JvmDefault var prop4: String get() = "" - set(value) {} + set(value) {} } \ No newline at end of file diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/target8.kt b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/target8.kt index d410765a2f5..d4f0532299d 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/target8.kt +++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/target8.kt @@ -26,5 +26,5 @@ interface B { @JvmDefault var prop4: String get() = "" - set(value) {} + set(value) {} } \ No newline at end of file diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmStatic/property.kt b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmStatic/property.kt index 01ab88b5e0c..f97c1072cce 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmStatic/property.kt +++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmStatic/property.kt @@ -7,7 +7,7 @@ open class B { class A { companion object : B() { var p1:Int = 1 - @JvmStatic set(p: Int) { + @JvmStatic set(p: Int) { p1 = 1 } @@ -21,7 +21,7 @@ class A { object A : B() { var p:Int = 1 - @JvmStatic set(p1: Int) { + @JvmStatic set(p1: Int) { p = 1 } @@ -36,7 +36,7 @@ class A { } var p:Int = 1 - @JvmStatic set(p1: Int) { + @JvmStatic set(p1: Int) { p = 1 } diff --git a/idea/testData/checker/Constructors.kt b/idea/testData/checker/Constructors.kt index c9360f22d94..13ab72a61bc 100644 --- a/idea/testData/checker/Constructors.kt +++ b/idea/testData/checker/Constructors.kt @@ -35,5 +35,5 @@ class NoCPI { val a = 1 var ab = 1 get() = 1 - set(v) {} + set(v) {} } \ No newline at end of file diff --git a/idea/testData/checker/infos/PropertiesWithBackingFields.kt b/idea/testData/checker/infos/PropertiesWithBackingFields.kt index eab7123a37f..6e5f10c55ed 100644 --- a/idea/testData/checker/infos/PropertiesWithBackingFields.kt +++ b/idea/testData/checker/infos/PropertiesWithBackingFields.kt @@ -30,10 +30,10 @@ var v1 : Int get var v2 : Int get set var v3 : Int get() = 1; set - var v4 : Int get() = 1; set(x){} + var v4 : Int get() = 1; set(x){} var v5 : Int get() = 1; set(x){field = x} - var v6 : Int get() = field + 1; set(x){} + var v6 : Int get() = field + 1; set(x){} var v9 : Int set var v10 : Int get