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

Private setter for open property: is now an error, not a warning

Browse Source
This commit is contained in:
Mikhail Glukhikh
2015-12-11 15:27:30 +03:00
parent 00504a3f6d
commit fe78f944a6
4 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/diagnostics/Errors.java
+1 -1
View File
@@ -360,7 +360,7 @@ public interface Errors {
DiagnosticFactory0<PsiElement> GETTER_VISIBILITY_DIFFERS_FROM_PROPERTY_VISIBILITY = DiagnosticFactory0.create(ERROR); DiagnosticFactory0<PsiElement> GETTER_VISIBILITY_DIFFERS_FROM_PROPERTY_VISIBILITY = DiagnosticFactory0.create(ERROR);
DiagnosticFactory0<PsiElement> SETTER_VISIBILITY_DIFFERS_FROM_LATEINIT_VISIBILITY = DiagnosticFactory0.create(ERROR); DiagnosticFactory0<PsiElement> SETTER_VISIBILITY_DIFFERS_FROM_LATEINIT_VISIBILITY = DiagnosticFactory0.create(ERROR);
DiagnosticFactory0<PsiElement> PRIVATE_SETTER_FOR_ABSTRACT_PROPERTY = DiagnosticFactory0.create(ERROR); DiagnosticFactory0<PsiElement> PRIVATE_SETTER_FOR_ABSTRACT_PROPERTY = DiagnosticFactory0.create(ERROR);
DiagnosticFactory0<PsiElement> PRIVATE_SETTER_FOR_OPEN_PROPERTY = DiagnosticFactory0.create(WARNING); DiagnosticFactory0<PsiElement> PRIVATE_SETTER_FOR_OPEN_PROPERTY = DiagnosticFactory0.create(ERROR);
DiagnosticFactory2<KtTypeReference, KotlinType, KotlinType> WRONG_GETTER_RETURN_TYPE = DiagnosticFactory2.create(ERROR); DiagnosticFactory2<KtTypeReference, KotlinType, KotlinType> WRONG_GETTER_RETURN_TYPE = DiagnosticFactory2.create(ERROR);
DiagnosticFactory0<KtTypeReference> WRONG_SETTER_RETURN_TYPE = DiagnosticFactory0.create(ERROR); DiagnosticFactory0<KtTypeReference> WRONG_SETTER_RETURN_TYPE = DiagnosticFactory0.create(ERROR);
compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ClassVarModality.kt
Vendored
-1
View File
@@ -6,7 +6,6 @@ open class ClassVarModality() {
final internal var property2: Int = 1 final internal var property2: Int = 1
open var property3: Int = 1 open var property3: Int = 1
private set
final internal var property4: Int = 1 final internal var property4: Int = 1
private set private set
compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ClassVarModality.txt
Vendored
+1 -1
View File
@@ -10,7 +10,7 @@ public open class ClassVarModality {
internal final fun <set-property2>(/*0*/ <set-?>: kotlin.Int): kotlin.Unit internal final fun <set-property2>(/*0*/ <set-?>: kotlin.Int): kotlin.Unit
public open var property3: kotlin.Int public open var property3: kotlin.Int
public open fun <get-property3>(): kotlin.Int public open fun <get-property3>(): kotlin.Int
private open fun <set-property3>(/*0*/ <set-?>: kotlin.Int): kotlin.Unit public open fun <set-property3>(/*0*/ <set-?>: kotlin.Int): kotlin.Unit
internal final var property4: kotlin.Int internal final var property4: kotlin.Int
internal final fun <get-property4>(): kotlin.Int internal final fun <get-property4>(): kotlin.Int
private final fun <set-property4>(/*0*/ <set-?>: kotlin.Int): kotlin.Unit private final fun <set-property4>(/*0*/ <set-?>: kotlin.Int): kotlin.Unit
idea/testData/checker/Abstract.kt
Vendored
+1 -1
View File
@@ -71,7 +71,7 @@ interface MyTrait {
<warning>abstract</warning> val a3: Int = <error>1</error> <warning>abstract</warning> val a3: Int = <error>1</error>
var b: Int <error>private</error> set var b: Int <error>private</error> set
var b1: Int = <error>0</error>; <warning>private</warning> set var b1: Int = <error>0</error>; <error>private</error> set
<warning>abstract</warning> var b2: Int <error>private</error> set <warning>abstract</warning> var b2: Int <error>private</error> set
<warning>abstract</warning> var b3: Int = <error>0</error>; <error>private</error> set <warning>abstract</warning> var b3: Int = <error>0</error>; <error>private</error> set