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

Partial rollback: 'private' is no more deprecated in interfaces, some tests rolled back accordingly

Browse Source
This commit is contained in:
Mikhail Glukhikh
2015-09-25 11:44:17 +03:00
parent 505cb37052
commit 9ccf1a1729
10 changed files with 24 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/resolve/ModifiersChecker.kt
-1
View File
@@ -85,7 +85,6 @@ public object ModifierCheckerCore {
) )
private val deprecatedParentTargetMap = mapOf<JetModifierKeywordToken, Set<KotlinTarget>>( private val deprecatedParentTargetMap = mapOf<JetModifierKeywordToken, Set<KotlinTarget>>(
PRIVATE_KEYWORD to EnumSet.of(INTERFACE),
INTERNAL_KEYWORD to EnumSet.of(INTERFACE), INTERNAL_KEYWORD to EnumSet.of(INTERFACE),
PROTECTED_KEYWORD to EnumSet.of(INTERFACE) PROTECTED_KEYWORD to EnumSet.of(INTERFACE)
) )
compiler/testData/diagnostics/tests/AbstractInTrait.kt
Vendored
+4 -4
View File
@@ -7,10 +7,10 @@ interface MyTrait {
<!ABSTRACT_MODIFIER_IN_TRAIT!>abstract<!> val a2: Int <!ABSTRACT_MODIFIER_IN_TRAIT!>abstract<!> val a2: Int
<!ABSTRACT_MODIFIER_IN_TRAIT!>abstract<!> val a3: Int = <!ABSTRACT_PROPERTY_WITH_INITIALIZER!>1<!> <!ABSTRACT_MODIFIER_IN_TRAIT!>abstract<!> val a3: Int = <!ABSTRACT_PROPERTY_WITH_INITIALIZER!>1<!>
var b: Int var b: Int private set
var b1: Int = <!PROPERTY_INITIALIZER_IN_TRAIT!>0<!> var b1: Int = <!PROPERTY_INITIALIZER_IN_TRAIT!>0<!>; private set
<!ABSTRACT_MODIFIER_IN_TRAIT!>abstract<!> var b2: Int <!ABSTRACT_MODIFIER_IN_TRAIT!>abstract<!> var b2: Int private set
<!ABSTRACT_MODIFIER_IN_TRAIT!>abstract<!> var b3: Int = <!ABSTRACT_PROPERTY_WITH_INITIALIZER!>0<!> <!ABSTRACT_MODIFIER_IN_TRAIT!>abstract<!> var b3: Int = <!ABSTRACT_PROPERTY_WITH_INITIALIZER!>0<!>; private set
<!BACKING_FIELD_IN_TRAIT!>var c: Int<!> set(v: Int) { field = v } <!BACKING_FIELD_IN_TRAIT!>var c: Int<!> set(v: Int) { field = v }
<!BACKING_FIELD_IN_TRAIT!>var c1: Int<!> = <!PROPERTY_INITIALIZER_IN_TRAIT!>0<!>; set(v: Int) { field = v } <!BACKING_FIELD_IN_TRAIT!>var c1: Int<!> = <!PROPERTY_INITIALIZER_IN_TRAIT!>0<!>; set(v: Int) { field = v }
compiler/testData/diagnostics/tests/TraitWithConstructor.kt
Vendored
+3 -3
View File
@@ -6,7 +6,7 @@ interface T1<!CONSTRUCTOR_IN_TRAIT!>(val x: String)<!> {}
interface T2 <!CONSTRUCTOR_IN_TRAIT!>constructor()<!> {} interface T2 <!CONSTRUCTOR_IN_TRAIT!>constructor()<!> {}
interface T3 <!CONSTRUCTOR_IN_TRAIT!>constructor(<!UNUSED_PARAMETER!>a<!>: Int)<!> {} interface T3 private <!CONSTRUCTOR_IN_TRAIT!>constructor(<!UNUSED_PARAMETER!>a<!>: Int)<!> {}
interface T4 { interface T4 {
<!CONSTRUCTOR_IN_TRAIT!>constructor(<!UNUSED_PARAMETER!>a<!>: Int)<!> { <!CONSTRUCTOR_IN_TRAIT!>constructor(<!UNUSED_PARAMETER!>a<!>: Int)<!> {
@@ -14,5 +14,5 @@ interface T4 {
} }
} }
interface T5 <!DEPRECATED_MODIFIER_CONTAINING_DECLARATION!>private<!> <!CONSTRUCTOR_IN_TRAIT!>()<!> : T4 {} interface T5 private <!CONSTRUCTOR_IN_TRAIT!>()<!> : T4 {}
interface T6 <!CONSTRUCTOR_IN_TRAIT!>public<!><!SYNTAX!><!> : T5 {} interface T6 <!CONSTRUCTOR_IN_TRAIT!>private<!><!SYNTAX!><!> : T5 {}
compiler/testData/diagnostics/tests/TraitWithConstructor.txt
Vendored
+2 -2
View File
@@ -24,7 +24,7 @@ public interface T2 {
} }
public interface T3 { public interface T3 {
public constructor T3(/*0*/ a: kotlin.Int) private constructor T3(/*0*/ a: kotlin.Int)
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
@@ -45,7 +45,7 @@ public interface T5 : T4 {
} }
public interface T6 : T5 { public interface T6 : T5 {
public constructor T6() private constructor T6()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
compiler/testData/diagnostics/tests/delegation/Delegation_MultipleDelegates.kt
Vendored
+1 -1
View File
@@ -1,7 +1,7 @@
// !DIAGNOSTICS: -CONFLICTING_JVM_DECLARATIONS // !DIAGNOSTICS: -CONFLICTING_JVM_DECLARATIONS
interface One { interface One {
public open fun foo() : Int public open fun foo() : Int
<!DEPRECATED_MODIFIER_CONTAINING_DECLARATION!>private<!> fun boo() = 10 private fun boo() = 10
} }
interface Two { interface Two {
public open fun foo() : Int public open fun foo() : Int
compiler/testData/diagnostics/tests/inline/nonVirtualMembersWithInline.kt
Vendored
+1
View File
@@ -29,6 +29,7 @@ abstract class A {
interface B { interface B {
inline private fun good1() {}
inline public final fun good2() {} inline public final fun good2() {}
inline final fun good3() {} inline final fun good3() {}
inline final fun good4() {} inline final fun good4() {}
compiler/testData/diagnostics/tests/inline/nonVirtualMembersWithInline.txt
Vendored
+1
View File
@@ -23,6 +23,7 @@ public abstract class A {
public interface B { public interface B {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@kotlin.inline() private final fun good1(): kotlin.Unit
@kotlin.inline() public final fun good2(): kotlin.Unit @kotlin.inline() public final fun good2(): kotlin.Unit
@kotlin.inline() public final fun good3(): kotlin.Unit @kotlin.inline() public final fun good3(): kotlin.Unit
@kotlin.inline() public final fun good4(): kotlin.Unit @kotlin.inline() public final fun good4(): kotlin.Unit
compiler/testData/diagnostics/tests/override/AllPrivateFromSuperTypes.kt
Vendored
+1 -1
View File
@@ -1,7 +1,7 @@
package test package test
interface A { interface A {
<!DEPRECATED_MODIFIER_CONTAINING_DECLARATION!>private<!> val a: String private val a: String
get() = "AAAA!" get() = "AAAA!"
} }
compiler/testData/diagnostics/tests/variance/Visibility.kt
Vendored
+7 -7
View File
@@ -2,19 +2,19 @@ interface Test<in I, out O> {
val internal_val: <!TYPE_VARIANCE_CONFLICT!>I<!> val internal_val: <!TYPE_VARIANCE_CONFLICT!>I<!>
public val public_val: <!TYPE_VARIANCE_CONFLICT!>I<!> public val public_val: <!TYPE_VARIANCE_CONFLICT!>I<!>
<!DEPRECATED_MODIFIER_CONTAINING_DECLARATION!>protected<!> val protected_val: <!TYPE_VARIANCE_CONFLICT!>I<!> <!DEPRECATED_MODIFIER_CONTAINING_DECLARATION!>protected<!> val protected_val: <!TYPE_VARIANCE_CONFLICT!>I<!>
<!DEPRECATED_MODIFIER_CONTAINING_DECLARATION!>private<!> val private_val: I private val private_val: I
var interlan_private_set: <!TYPE_VARIANCE_CONFLICT!>O<!> var interlan_private_set: <!TYPE_VARIANCE_CONFLICT!>O<!>
<!DEPRECATED_MODIFIER_CONTAINING_DECLARATION!>private<!> set private set
public var public_private_set: <!TYPE_VARIANCE_CONFLICT!>O<!> public var public_private_set: <!TYPE_VARIANCE_CONFLICT!>O<!>
<!DEPRECATED_MODIFIER_CONTAINING_DECLARATION!>private<!> set private set
<!DEPRECATED_MODIFIER_CONTAINING_DECLARATION!>protected<!> var protected_private_set: <!TYPE_VARIANCE_CONFLICT!>O<!> <!DEPRECATED_MODIFIER_CONTAINING_DECLARATION!>protected<!> var protected_private_set: <!TYPE_VARIANCE_CONFLICT!>O<!>
<!DEPRECATED_MODIFIER_CONTAINING_DECLARATION!>private<!> set private set
<!DEPRECATED_MODIFIER_CONTAINING_DECLARATION!>private<!> var private_private_set: O private var private_private_set: O
<!DEPRECATED_MODIFIER_CONTAINING_DECLARATION!>private<!> set private set
fun internal_fun(i: <!TYPE_VARIANCE_CONFLICT!>O<!>) : <!TYPE_VARIANCE_CONFLICT!>I<!> fun internal_fun(i: <!TYPE_VARIANCE_CONFLICT!>O<!>) : <!TYPE_VARIANCE_CONFLICT!>I<!>
public fun public_fun(i: <!TYPE_VARIANCE_CONFLICT!>O<!>) : <!TYPE_VARIANCE_CONFLICT!>I<!> public fun public_fun(i: <!TYPE_VARIANCE_CONFLICT!>O<!>) : <!TYPE_VARIANCE_CONFLICT!>I<!>
<!DEPRECATED_MODIFIER_CONTAINING_DECLARATION!>protected<!> fun protected_fun(i: <!TYPE_VARIANCE_CONFLICT!>O<!>) : <!TYPE_VARIANCE_CONFLICT!>I<!> <!DEPRECATED_MODIFIER_CONTAINING_DECLARATION!>protected<!> fun protected_fun(i: <!TYPE_VARIANCE_CONFLICT!>O<!>) : <!TYPE_VARIANCE_CONFLICT!>I<!>
<!DEPRECATED_MODIFIER_CONTAINING_DECLARATION!>private<!> fun private_fun(i: O) : I private fun private_fun(i: O) : I
} }
idea/testData/checker/Abstract.kt
Vendored
+4 -4
View File
@@ -70,10 +70,10 @@ interface MyTrait {
<warning>abstract</warning> val a2: Int <warning>abstract</warning> val a2: Int
<warning>abstract</warning> val a3: Int = <error>1</error> <warning>abstract</warning> val a3: Int = <error>1</error>
var b: Int var b: Int private set
var b1: Int = <error>0</error>; var b1: Int = <error>0</error>; private set
<warning>abstract</warning> var b2: Int <warning>abstract</warning> var b2: Int private set
<warning>abstract</warning> var b3: Int = <error>0</error>; <warning>abstract</warning> var b3: Int = <error>0</error>; private set
<error>var c: Int</error> set(v: Int) { field = v } <error>var c: Int</error> set(v: Int) { field = v }
<error>var c1: Int</error> = <error>0</error>; set(v: Int) { field = v } <error>var c1: Int</error> = <error>0</error>; set(v: Int) { field = v }