From fe78f944a6d50581f4d55f94f8cd11e3113fd615 Mon Sep 17 00:00:00 2001
From: Mikhail Glukhikh <Mikhail.Glukhikh@jetbrains.com>
Date: Fri, 11 Dec 2015 15:27:30 +0300
Subject: [PATCH] Private setter for open property: is now an error, not a
 warning

---
 .../frontend/src/org/jetbrains/kotlin/diagnostics/Errors.java   | 2 +-
 .../compiledKotlin/prop/defaultAccessors/ClassVarModality.kt    | 1 -
 .../compiledKotlin/prop/defaultAccessors/ClassVarModality.txt   | 2 +-
 idea/testData/checker/Abstract.kt                               | 2 +-
 4 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/Errors.java b/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/Errors.java
index 556e7584f5a..4c36ab217ba 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/Errors.java
+++ b/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/Errors.java
@@ -360,7 +360,7 @@ public interface Errors {
     DiagnosticFactory0<PsiElement> GETTER_VISIBILITY_DIFFERS_FROM_PROPERTY_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_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);
     DiagnosticFactory0<KtTypeReference> WRONG_SETTER_RETURN_TYPE = DiagnosticFactory0.create(ERROR);
 
diff --git a/compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ClassVarModality.kt b/compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ClassVarModality.kt
index 3fa5224e49b..b82d0e815df 100644
--- a/compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ClassVarModality.kt
+++ b/compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ClassVarModality.kt
@@ -6,7 +6,6 @@ open class ClassVarModality() {
     final internal var property2: Int = 1
 
     open var property3: Int = 1
-      private set
 
     final internal var property4: Int = 1
       private  set
diff --git a/compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ClassVarModality.txt b/compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ClassVarModality.txt
index db444eae583..89d42095f95 100644
--- a/compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ClassVarModality.txt
+++ b/compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ClassVarModality.txt
@@ -10,7 +10,7 @@ public open class ClassVarModality {
         internal final fun <set-property2>(/*0*/ <set-?>: kotlin.Int): kotlin.Unit
     public open var 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 fun <get-property4>(): kotlin.Int
         private final fun <set-property4>(/*0*/ <set-?>: kotlin.Int): kotlin.Unit
diff --git a/idea/testData/checker/Abstract.kt b/idea/testData/checker/Abstract.kt
index 8ce57040cb9..2a3cd88b599 100644
--- a/idea/testData/checker/Abstract.kt
+++ b/idea/testData/checker/Abstract.kt
@@ -71,7 +71,7 @@ interface MyTrait {
     <warning>abstract</warning> val a3: Int = <error>1</error>
 
     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 b3: Int = <error>0</error>; <error>private</error> set