From 12b03042eaeca7970ba62845157c0e396214ea0c Mon Sep 17 00:00:00 2001 From: Sergey Ignatov Date: Mon, 7 Nov 2011 19:35:49 +0400 Subject: [PATCH] open modifier for functions added --- src/org/jetbrains/jet/j2k/ast/Function.java | 3 +++ .../jet/j2k/JavaToKotlinConverterTest.java | 2 +- testData/ast/arrayType/method/methodArrayArgs.kt | 2 +- .../callChainExpression/file/libraryFieldCall.kt | 2 +- .../callChainExpression/file/libraryMethodCall.kt | 6 +++--- .../file/libraryMethodCallFromInstance.kt | 6 +++--- .../file/libraryStringFieldCall.kt | 2 +- testData/ast/class/class/abstractClass.kt | 4 ++-- testData/ast/class/class/abstractClassShape.kt | 6 +++--- testData/ast/class/class/classWithEmptyMethods.kt | 6 +++--- .../ast/class/class/oneStaticFieldOneNonStatic.kt | 2 +- testData/ast/class/class/oneStaticMethod.kt | 2 +- .../ast/class/class/oneStaticMethodOneNonStatic.kt | 4 ++-- testData/ast/class/class/twoStaticMethod.kt | 4 ++-- .../class/fieldsWithPrimaryPrivateConstructor.kt | 4 ++-- testData/ast/function/file/override.kt | 2 +- testData/ast/function/file/overrideAndOpen.jav | 11 +++++++++++ testData/ast/function/file/overrideAndOpen.kt | 14 ++++++++++++++ testData/ast/function/method/abstractMethod.kt | 2 +- testData/ast/function/method/classGenericParam.kt | 2 +- testData/ast/function/method/emptyVoidMethod.kt | 2 +- testData/ast/function/method/final.jav | 1 + testData/ast/function/method/final.kt | 3 +++ testData/ast/function/method/internal.kt | 2 +- testData/ast/function/method/methodClassType.kt | 2 +- .../ast/function/method/methodPrimitiveType.kt | 2 +- .../ast/function/method/methodPrimitiveType2.kt | 2 +- .../function/method/methodWithReturnStatement.kt | 2 +- testData/ast/function/method/open.jav | 1 + testData/ast/function/method/open.kt | 3 +++ testData/ast/function/method/ownGenericParam.kt | 2 +- .../ast/function/method/ownSeveralGenericParams.kt | 2 +- testData/ast/function/method/private.kt | 2 +- testData/ast/function/method/protected.kt | 2 +- testData/ast/function/method/public.kt | 2 +- .../ast/inProjectionType/method/methodParams.kt | 2 +- .../newClassExpression/file/newClassByFullName.kt | 2 +- .../ast/outProjectionType/method/methodParams.kt | 2 +- .../ast/starProjectionType/method/methodParams.kt | 2 +- .../ast/superExpression/class/classAextendsB.kt | 2 +- .../ast/superExpression/file/classAdotSuperFoo.kt | 4 ++-- .../ast/thisExpression/file/classAdotThisFoo.kt | 4 ++-- .../trait/class/interfaceWithMethodDeclaration.kt | 4 ++-- .../methodDoubleParametrizationWithTwoBounds.kt | 2 +- testData/ast/typeParameters/method/where.kt | 2 +- .../ast/varArg/method/ellipsisTypeSeveralParams.kt | 2 +- .../ast/varArg/method/ellipsisTypeSingleParams.kt | 2 +- 47 files changed, 91 insertions(+), 55 deletions(-) create mode 100644 testData/ast/function/file/overrideAndOpen.jav create mode 100644 testData/ast/function/file/overrideAndOpen.kt create mode 100644 testData/ast/function/method/final.jav create mode 100644 testData/ast/function/method/final.kt create mode 100644 testData/ast/function/method/open.jav create mode 100644 testData/ast/function/method/open.kt diff --git a/src/org/jetbrains/jet/j2k/ast/Function.java b/src/org/jetbrains/jet/j2k/ast/Function.java index bfdfca1c769..46b44d8ab82 100644 --- a/src/org/jetbrains/jet/j2k/ast/Function.java +++ b/src/org/jetbrains/jet/j2k/ast/Function.java @@ -57,6 +57,9 @@ public class Function extends Member { if (myModifiers.contains(Modifier.OVERRIDE)) modifierList.add(Modifier.OVERRIDE); + if (!myModifiers.contains(Modifier.OVERRIDE) && !myModifiers.contains(Modifier.FINAL)) + modifierList.add(Modifier.OPEN); + modifierList.add(accessModifier()); if (modifierList.size() > 0) diff --git a/test/org/jetbrains/jet/j2k/JavaToKotlinConverterTest.java b/test/org/jetbrains/jet/j2k/JavaToKotlinConverterTest.java index 52cdde52219..339675b623f 100644 --- a/test/org/jetbrains/jet/j2k/JavaToKotlinConverterTest.java +++ b/test/org/jetbrains/jet/j2k/JavaToKotlinConverterTest.java @@ -123,7 +123,7 @@ public class JavaToKotlinConverterTest extends LightDaemonAnalyzerTestCase { protected String statementToKotlin(String text) throws Exception { String result = methodToKotlin("void main() {" + text + "}"); int pos = result.lastIndexOf("}"); - result = result.substring(0, pos).replaceFirst("fun main\\(\\) : Unit \\{", ""); + result = result.substring(0, pos).replaceFirst("open fun main\\(\\) : Unit \\{", ""); return prettify(result); } diff --git a/testData/ast/arrayType/method/methodArrayArgs.kt b/testData/ast/arrayType/method/methodArrayArgs.kt index b095e2dd099..0eadd674755 100644 --- a/testData/ast/arrayType/method/methodArrayArgs.kt +++ b/testData/ast/arrayType/method/methodArrayArgs.kt @@ -1,2 +1,2 @@ -fun fromArrayToCollection(a : Array?) : Unit { +open fun fromArrayToCollection(a : Array?) : Unit { } \ No newline at end of file diff --git a/testData/ast/callChainExpression/file/libraryFieldCall.kt b/testData/ast/callChainExpression/file/libraryFieldCall.kt index c77bf3464a2..23aed853064 100644 --- a/testData/ast/callChainExpression/file/libraryFieldCall.kt +++ b/testData/ast/callChainExpression/file/libraryFieldCall.kt @@ -5,7 +5,7 @@ val ourOut : PrintStream? } } open class User { -fun main() : Unit { +open fun main() : Unit { Library.ourOut?.print() } } diff --git a/testData/ast/callChainExpression/file/libraryMethodCall.kt b/testData/ast/callChainExpression/file/libraryMethodCall.kt index f5e0204d979..18c230c50f7 100644 --- a/testData/ast/callChainExpression/file/libraryMethodCall.kt +++ b/testData/ast/callChainExpression/file/libraryMethodCall.kt @@ -1,15 +1,15 @@ namespace { open class Library { class object { -fun call() : Unit { +open fun call() : Unit { } -fun getString() : String? { +open fun getString() : String? { return "" } } } open class User { -fun main() : Unit { +open fun main() : Unit { Library.call() Library.getString()?.isEmpty() } diff --git a/testData/ast/callChainExpression/file/libraryMethodCallFromInstance.kt b/testData/ast/callChainExpression/file/libraryMethodCallFromInstance.kt index 0160fa34117..25c9bffb924 100644 --- a/testData/ast/callChainExpression/file/libraryMethodCallFromInstance.kt +++ b/testData/ast/callChainExpression/file/libraryMethodCallFromInstance.kt @@ -1,13 +1,13 @@ namespace { open class Library { -fun call() : Unit { +open fun call() : Unit { } -fun getString() : String? { +open fun getString() : String? { return "" } } open class User { -fun main() : Unit { +open fun main() : Unit { var lib : Library? = Library() lib?.call() lib?.getString()?.isEmpty() diff --git a/testData/ast/callChainExpression/file/libraryStringFieldCall.kt b/testData/ast/callChainExpression/file/libraryStringFieldCall.kt index 382a87f7797..82210f26905 100644 --- a/testData/ast/callChainExpression/file/libraryStringFieldCall.kt +++ b/testData/ast/callChainExpression/file/libraryStringFieldCall.kt @@ -3,7 +3,7 @@ open class Library { public val myString : String? } open class User { -fun main() : Unit { +open fun main() : Unit { Library.myString?.isEmpty() } } diff --git a/testData/ast/class/class/abstractClass.kt b/testData/ast/class/class/abstractClass.kt index a8010e20dc2..6bbb45f4c22 100644 --- a/testData/ast/class/class/abstractClass.kt +++ b/testData/ast/class/class/abstractClass.kt @@ -1,6 +1,6 @@ abstract open class A { -abstract fun callme() : Unit -fun callmetoo() : Unit { +abstract open fun callme() : Unit +open fun callmetoo() : Unit { print("This is a concrete method.") } } \ No newline at end of file diff --git a/testData/ast/class/class/abstractClassShape.kt b/testData/ast/class/class/abstractClassShape.kt index f564ee18325..747d1875178 100644 --- a/testData/ast/class/class/abstractClassShape.kt +++ b/testData/ast/class/class/abstractClassShape.kt @@ -1,10 +1,10 @@ abstract open class Shape { public var color : String? -public fun setColor(c : String?) : Unit { +open public fun setColor(c : String?) : Unit { color = c } -public fun getColor() : String? { +open public fun getColor() : String? { return color } -abstract public fun area() : Double +abstract open public fun area() : Double } \ No newline at end of file diff --git a/testData/ast/class/class/classWithEmptyMethods.kt b/testData/ast/class/class/classWithEmptyMethods.kt index 093b68e9c67..6d0b778a365 100644 --- a/testData/ast/class/class/classWithEmptyMethods.kt +++ b/testData/ast/class/class/classWithEmptyMethods.kt @@ -1,8 +1,8 @@ class T { -fun main() : Unit { +open fun main() : Unit { } -fun i() : Int { +open fun i() : Int { } -fun s() : String? { +open fun s() : String? { } } \ No newline at end of file diff --git a/testData/ast/class/class/oneStaticFieldOneNonStatic.kt b/testData/ast/class/class/oneStaticFieldOneNonStatic.kt index d2b11e44c60..c3fb86321a3 100644 --- a/testData/ast/class/class/oneStaticFieldOneNonStatic.kt +++ b/testData/ast/class/class/oneStaticFieldOneNonStatic.kt @@ -2,7 +2,7 @@ class S { class object { var myI : Int = 10 } -fun sB() : Boolean { +open fun sB() : Boolean { return true } } \ No newline at end of file diff --git a/testData/ast/class/class/oneStaticMethod.kt b/testData/ast/class/class/oneStaticMethod.kt index 1e39f93f167..90a9a2ece81 100644 --- a/testData/ast/class/class/oneStaticMethod.kt +++ b/testData/ast/class/class/oneStaticMethod.kt @@ -1,6 +1,6 @@ class S { class object { -fun staticF() : Boolean { +open fun staticF() : Boolean { return true } } diff --git a/testData/ast/class/class/oneStaticMethodOneNonStatic.kt b/testData/ast/class/class/oneStaticMethodOneNonStatic.kt index dc7a84e71e4..baad5b8c59f 100644 --- a/testData/ast/class/class/oneStaticMethodOneNonStatic.kt +++ b/testData/ast/class/class/oneStaticMethodOneNonStatic.kt @@ -1,10 +1,10 @@ class S { class object { -fun sI() : Int { +open fun sI() : Int { return 1 } } -fun sB() : Boolean { +open fun sB() : Boolean { return true } } \ No newline at end of file diff --git a/testData/ast/class/class/twoStaticMethod.kt b/testData/ast/class/class/twoStaticMethod.kt index 4b8bfbbab24..64df630cc7e 100644 --- a/testData/ast/class/class/twoStaticMethod.kt +++ b/testData/ast/class/class/twoStaticMethod.kt @@ -1,9 +1,9 @@ class S { class object { -fun sB() : Boolean { +open fun sB() : Boolean { return true } -fun sI() : Int { +open fun sI() : Int { return 1 } } diff --git a/testData/ast/enum/class/fieldsWithPrimaryPrivateConstructor.kt b/testData/ast/enum/class/fieldsWithPrimaryPrivateConstructor.kt index a6c5d2501b5..52e96f54c6d 100644 --- a/testData/ast/enum/class/fieldsWithPrimaryPrivateConstructor.kt +++ b/testData/ast/enum/class/fieldsWithPrimaryPrivateConstructor.kt @@ -5,10 +5,10 @@ RED(23) YELLOW(24) BLUE(25) private var code : Int -private (c : Int) { +open private (c : Int) { code = c } -public fun getCode() : Int { +open public fun getCode() : Int { return code } } \ No newline at end of file diff --git a/testData/ast/function/file/override.kt b/testData/ast/function/file/override.kt index 706b160fda9..c080ae67068 100644 --- a/testData/ast/function/file/override.kt +++ b/testData/ast/function/file/override.kt @@ -1,6 +1,6 @@ namespace { open class A { -fun a() : Unit { +open fun a() : Unit { } } class B : A { diff --git a/testData/ast/function/file/overrideAndOpen.jav b/testData/ast/function/file/overrideAndOpen.jav new file mode 100644 index 00000000000..bda1a410cff --- /dev/null +++ b/testData/ast/function/file/overrideAndOpen.jav @@ -0,0 +1,11 @@ +class A { + void foo() {} +} + +class B extends A { + void foo() {} +} + +class C extends B { + void foo() {} +} \ No newline at end of file diff --git a/testData/ast/function/file/overrideAndOpen.kt b/testData/ast/function/file/overrideAndOpen.kt new file mode 100644 index 00000000000..10b231c8b89 --- /dev/null +++ b/testData/ast/function/file/overrideAndOpen.kt @@ -0,0 +1,14 @@ +namespace { +open class A { +open fun foo() : Unit { +} +} +open class B : A { +override fun foo() : Unit { +} +} +open class C : B { +override fun foo() : Unit { +} +} +} \ No newline at end of file diff --git a/testData/ast/function/method/abstractMethod.kt b/testData/ast/function/method/abstractMethod.kt index 8163dfad9bb..f5e9004be67 100644 --- a/testData/ast/function/method/abstractMethod.kt +++ b/testData/ast/function/method/abstractMethod.kt @@ -1 +1 @@ -abstract fun getNoofGears() : Int \ No newline at end of file +abstract open fun getNoofGears() : Int \ No newline at end of file diff --git a/testData/ast/function/method/classGenericParam.kt b/testData/ast/function/method/classGenericParam.kt index b9ea1d49799..a232b7e30fe 100644 --- a/testData/ast/function/method/classGenericParam.kt +++ b/testData/ast/function/method/classGenericParam.kt @@ -1,2 +1,2 @@ -fun getT() : T? { +open fun getT() : T? { } \ No newline at end of file diff --git a/testData/ast/function/method/emptyVoidMethod.kt b/testData/ast/function/method/emptyVoidMethod.kt index ae299eb173a..25bd4ab1d8e 100644 --- a/testData/ast/function/method/emptyVoidMethod.kt +++ b/testData/ast/function/method/emptyVoidMethod.kt @@ -1,2 +1,2 @@ -fun main() : Unit { +open fun main() : Unit { } \ No newline at end of file diff --git a/testData/ast/function/method/final.jav b/testData/ast/function/method/final.jav new file mode 100644 index 00000000000..8a49597af12 --- /dev/null +++ b/testData/ast/function/method/final.jav @@ -0,0 +1 @@ +final String getString() { return ""; } \ No newline at end of file diff --git a/testData/ast/function/method/final.kt b/testData/ast/function/method/final.kt new file mode 100644 index 00000000000..e6cf12b2b3f --- /dev/null +++ b/testData/ast/function/method/final.kt @@ -0,0 +1,3 @@ +fun getString() : String? { +return "" +} \ No newline at end of file diff --git a/testData/ast/function/method/internal.kt b/testData/ast/function/method/internal.kt index 5b3e9634f3f..86f2b8d992f 100644 --- a/testData/ast/function/method/internal.kt +++ b/testData/ast/function/method/internal.kt @@ -1,2 +1,2 @@ -fun test() : Unit { +open fun test() : Unit { } \ No newline at end of file diff --git a/testData/ast/function/method/methodClassType.kt b/testData/ast/function/method/methodClassType.kt index 196c45b6bf8..ef426384d58 100644 --- a/testData/ast/function/method/methodClassType.kt +++ b/testData/ast/function/method/methodClassType.kt @@ -1,2 +1,2 @@ -fun main() : String? { +open fun main() : String? { } \ No newline at end of file diff --git a/testData/ast/function/method/methodPrimitiveType.kt b/testData/ast/function/method/methodPrimitiveType.kt index c6ef43f8a14..6f5f11b4c16 100644 --- a/testData/ast/function/method/methodPrimitiveType.kt +++ b/testData/ast/function/method/methodPrimitiveType.kt @@ -1,2 +1,2 @@ -fun main() : Int { +open fun main() : Int { } \ No newline at end of file diff --git a/testData/ast/function/method/methodPrimitiveType2.kt b/testData/ast/function/method/methodPrimitiveType2.kt index c978e93e7aa..d40b67fb1a4 100644 --- a/testData/ast/function/method/methodPrimitiveType2.kt +++ b/testData/ast/function/method/methodPrimitiveType2.kt @@ -1,2 +1,2 @@ -fun main() : Boolean { +open fun main() : Boolean { } \ No newline at end of file diff --git a/testData/ast/function/method/methodWithReturnStatement.kt b/testData/ast/function/method/methodWithReturnStatement.kt index acfbd1010d8..c11bfd3dc43 100644 --- a/testData/ast/function/method/methodWithReturnStatement.kt +++ b/testData/ast/function/method/methodWithReturnStatement.kt @@ -1,3 +1,3 @@ -fun isTrue() : Boolean { +open fun isTrue() : Boolean { return true } \ No newline at end of file diff --git a/testData/ast/function/method/open.jav b/testData/ast/function/method/open.jav new file mode 100644 index 00000000000..6db748fef42 --- /dev/null +++ b/testData/ast/function/method/open.jav @@ -0,0 +1 @@ +String getString() { return ""; } \ No newline at end of file diff --git a/testData/ast/function/method/open.kt b/testData/ast/function/method/open.kt new file mode 100644 index 00000000000..db906a336d7 --- /dev/null +++ b/testData/ast/function/method/open.kt @@ -0,0 +1,3 @@ +open fun getString() : String? { +return "" +} \ No newline at end of file diff --git a/testData/ast/function/method/ownGenericParam.kt b/testData/ast/function/method/ownGenericParam.kt index e5533fdcb5f..d2ab8c63c57 100644 --- a/testData/ast/function/method/ownGenericParam.kt +++ b/testData/ast/function/method/ownGenericParam.kt @@ -1,2 +1,2 @@ -fun putU(u : U?) : Unit { +open fun putU(u : U?) : Unit { } \ No newline at end of file diff --git a/testData/ast/function/method/ownSeveralGenericParams.kt b/testData/ast/function/method/ownSeveralGenericParams.kt index 19fb6188681..58e046f0576 100644 --- a/testData/ast/function/method/ownSeveralGenericParams.kt +++ b/testData/ast/function/method/ownSeveralGenericParams.kt @@ -1,2 +1,2 @@ -fun putUVW(u : U?, v : V?, w : W?) : Unit { +open fun putUVW(u : U?, v : V?, w : W?) : Unit { } \ No newline at end of file diff --git a/testData/ast/function/method/private.kt b/testData/ast/function/method/private.kt index 45e5e8bab00..f40bc043813 100644 --- a/testData/ast/function/method/private.kt +++ b/testData/ast/function/method/private.kt @@ -1,2 +1,2 @@ -private fun test() : Unit { +open private fun test() : Unit { } \ No newline at end of file diff --git a/testData/ast/function/method/protected.kt b/testData/ast/function/method/protected.kt index dbbc30b447b..597abfa9954 100644 --- a/testData/ast/function/method/protected.kt +++ b/testData/ast/function/method/protected.kt @@ -1,2 +1,2 @@ -protected fun test() : Unit { +open protected fun test() : Unit { } \ No newline at end of file diff --git a/testData/ast/function/method/public.kt b/testData/ast/function/method/public.kt index d835330ec86..8f596ec1552 100644 --- a/testData/ast/function/method/public.kt +++ b/testData/ast/function/method/public.kt @@ -1,2 +1,2 @@ -public fun test() : Unit { +open public fun test() : Unit { } \ No newline at end of file diff --git a/testData/ast/inProjectionType/method/methodParams.kt b/testData/ast/inProjectionType/method/methodParams.kt index 6888dcd5c36..51fa30eb158 100644 --- a/testData/ast/inProjectionType/method/methodParams.kt +++ b/testData/ast/inProjectionType/method/methodParams.kt @@ -1,2 +1,2 @@ -fun popAll(dst : Collection?) : Unit { +open fun popAll(dst : Collection?) : Unit { } \ No newline at end of file diff --git a/testData/ast/newClassExpression/file/newClassByFullName.kt b/testData/ast/newClassExpression/file/newClassByFullName.kt index 9ce9a5525b4..127e33a9fea 100644 --- a/testData/ast/newClassExpression/file/newClassByFullName.kt +++ b/testData/ast/newClassExpression/file/newClassByFullName.kt @@ -2,7 +2,7 @@ namespace org.test { open class Library { } open class User { -fun main() : Unit { +open fun main() : Unit { var lib : Library? = org.test.Library() } } diff --git a/testData/ast/outProjectionType/method/methodParams.kt b/testData/ast/outProjectionType/method/methodParams.kt index 373c01e629f..895538b7d7f 100644 --- a/testData/ast/outProjectionType/method/methodParams.kt +++ b/testData/ast/outProjectionType/method/methodParams.kt @@ -1,2 +1,2 @@ -fun pushAll(src : Collection?) : Unit { +open fun pushAll(src : Collection?) : Unit { } \ No newline at end of file diff --git a/testData/ast/starProjectionType/method/methodParams.kt b/testData/ast/starProjectionType/method/methodParams.kt index 01ea4c15302..4e2b7104724 100644 --- a/testData/ast/starProjectionType/method/methodParams.kt +++ b/testData/ast/starProjectionType/method/methodParams.kt @@ -1,2 +1,2 @@ -fun wtf(w : Collection<*>?) : Unit { +open fun wtf(w : Collection<*>?) : Unit { } \ No newline at end of file diff --git a/testData/ast/superExpression/class/classAextendsB.kt b/testData/ast/superExpression/class/classAextendsB.kt index b917dff44e3..51a5d46232a 100644 --- a/testData/ast/superExpression/class/classAextendsB.kt +++ b/testData/ast/superExpression/class/classAextendsB.kt @@ -1,5 +1,5 @@ open class B { -fun call() : Unit { +open fun call() : Unit { } } open class A : B { diff --git a/testData/ast/superExpression/file/classAdotSuperFoo.kt b/testData/ast/superExpression/file/classAdotSuperFoo.kt index e2c1d9213db..a6669abc1e1 100644 --- a/testData/ast/superExpression/file/classAdotSuperFoo.kt +++ b/testData/ast/superExpression/file/classAdotSuperFoo.kt @@ -1,10 +1,10 @@ namespace { open class Base { -fun foo() : Unit +open fun foo() : Unit } open class A : Base { open class C { -fun test() : Unit { +open fun test() : Unit { super@A.foo() } } diff --git a/testData/ast/thisExpression/file/classAdotThisFoo.kt b/testData/ast/thisExpression/file/classAdotThisFoo.kt index 939b443357a..066258741cf 100644 --- a/testData/ast/thisExpression/file/classAdotThisFoo.kt +++ b/testData/ast/thisExpression/file/classAdotThisFoo.kt @@ -1,11 +1,11 @@ namespace { open class Base { -fun foo() : Unit { +open fun foo() : Unit { } } open class A : Base { open class C { -fun test() : Unit { +open fun test() : Unit { this@A.foo() } } diff --git a/testData/ast/trait/class/interfaceWithMethodDeclaration.kt b/testData/ast/trait/class/interfaceWithMethodDeclaration.kt index 6ce36f8d783..aff8b40c610 100644 --- a/testData/ast/trait/class/interfaceWithMethodDeclaration.kt +++ b/testData/ast/trait/class/interfaceWithMethodDeclaration.kt @@ -1,4 +1,4 @@ trait INode { -fun getTag() : Tag? -fun toKotlin() : String? +open fun getTag() : Tag? +open fun toKotlin() : String? } \ No newline at end of file diff --git a/testData/ast/typeParameters/method/methodDoubleParametrizationWithTwoBounds.kt b/testData/ast/typeParameters/method/methodDoubleParametrizationWithTwoBounds.kt index 21f892b7d8d..d29c4d690fb 100644 --- a/testData/ast/typeParameters/method/methodDoubleParametrizationWithTwoBounds.kt +++ b/testData/ast/typeParameters/method/methodDoubleParametrizationWithTwoBounds.kt @@ -1,2 +1,2 @@ -fun max(coll : Collection?) : T? where T : Comparable?, K : Collection? { +open fun max(coll : Collection?) : T? where T : Comparable?, K : Collection? { } \ No newline at end of file diff --git a/testData/ast/typeParameters/method/where.kt b/testData/ast/typeParameters/method/where.kt index 6a1ccaeeec6..732410c49ba 100644 --- a/testData/ast/typeParameters/method/where.kt +++ b/testData/ast/typeParameters/method/where.kt @@ -1,2 +1,2 @@ -fun max(coll : Collection?) : T? where T : Comparable? { +open fun max(coll : Collection?) : T? where T : Comparable? { } \ No newline at end of file diff --git a/testData/ast/varArg/method/ellipsisTypeSeveralParams.kt b/testData/ast/varArg/method/ellipsisTypeSeveralParams.kt index 78207eee74b..b69052b794a 100644 --- a/testData/ast/varArg/method/ellipsisTypeSeveralParams.kt +++ b/testData/ast/varArg/method/ellipsisTypeSeveralParams.kt @@ -1 +1 @@ -fun format(pattern : String?, vararg arguments : Any?) : String? \ No newline at end of file +open fun format(pattern : String?, vararg arguments : Any?) : String? \ No newline at end of file diff --git a/testData/ast/varArg/method/ellipsisTypeSingleParams.kt b/testData/ast/varArg/method/ellipsisTypeSingleParams.kt index 5219629e1e3..3dc3d147740 100644 --- a/testData/ast/varArg/method/ellipsisTypeSingleParams.kt +++ b/testData/ast/varArg/method/ellipsisTypeSingleParams.kt @@ -1,2 +1,2 @@ -fun pushAll(vararg objs : Any?) : Unit { +open fun pushAll(vararg objs : Any?) : Unit { } \ No newline at end of file