From 30208d55328c474e39dc5334ac5b2f3bfa5e806a Mon Sep 17 00:00:00 2001 From: Zalim Bashorov Date: Thu, 11 Sep 2014 21:22:42 +0400 Subject: [PATCH] Minor: drop semicolon in package declaration everywhere. --- compiler/testData/cli/jvm/wrongKotlinSignature.kt | 2 +- compiler/testData/codegen/PSVM.kt | 4 ++-- compiler/testData/codegen/outerClassInfo/inlineLambda.kt | 4 ++-- compiler/testData/codegen/outerClassInfo/inlineObject.kt | 4 ++-- compiler/testData/codegen/outerClassInfo/outerClassInfo.kt | 4 ++-- compiler/testData/codegen/regressions/kt1213.kt | 4 ++-- compiler/testData/codegen/sourceInfo/foo1.kt | 4 ++-- compiler/testData/codegen/sourceInfo/foo2.kt | 4 ++-- .../accidentalOverrides/phantomClashWithSamAdapter.kt | 6 +++--- .../testData/diagnostics/tests/generics/PseudoRawTypes.kt | 4 ++-- compiler/testData/diagnostics/tests/j+k/Simple.kt | 2 +- compiler/testData/diagnostics/tests/j+k/UnboxingNulls.kt | 2 +- .../diagnostics/tests/j+k/innerNestedClassFromJava.kt | 2 +- .../tests/j+k/invisiblePackagePrivateInheritedMember.kt | 6 +++--- compiler/testData/diagnostics/tests/j+k/kt1402.kt | 2 +- compiler/testData/diagnostics/tests/j+k/kt1431.kt | 4 ++-- compiler/testData/diagnostics/tests/j+k/kt2890.kt | 4 ++-- compiler/testData/diagnostics/tests/j+k/mutableIterator.kt | 4 ++-- .../tests/j+k/packagePrivateClassStaticMember.kt | 2 +- .../testData/diagnostics/tests/j+k/packageVisibility.kt | 2 +- .../diagnostics/tests/j+k/privateNestedClassStaticMember.kt | 2 +- .../diagnostics/tests/j+k/protectedStaticSamePackage.kt | 2 +- .../diagnostics/tests/j+k/samInConstructorWithGenerics.kt | 6 +++--- .../namedArguments/disallowForSamAdapterConstructor.kt | 2 +- .../tests/namedArguments/disallowForSamAdapterFunction.kt | 2 +- .../diagnostics/tests/nullabilityAndAutoCasts/kt362.kt | 4 ++-- .../testData/diagnostics/tests/recovery/namelessInJava.kt | 4 ++-- compiler/testData/diagnostics/tests/scopes/kt1942.kt | 2 +- compiler/testData/diagnostics/tests/thisAndSuper/Super.kt | 4 ++-- .../compiledKotlin/fromLoadJava/notNull/NotNullField.kt | 2 +- idea/testData/completion/basic/common/VariableClassName.kt | 2 +- .../kotlin/findClassUsages/kotlinPrivateClassUsages.0.kt | 2 +- .../kotlin/findFunctionUsages/javaMethodUsages.0.kt | 2 +- .../kotlin/findFunctionUsages/kotlinMethodUsages.0.kt | 2 +- .../findFunctionUsages/kotlinPrivateMethodUsages.0.kt | 2 +- .../findFunctionUsages/kotlinTopLevelMethodUsages.0.kt | 2 +- .../kotlinTopLevelMethodUsagesNoImport.0.kt | 2 +- .../kotlin/findObjectUsages/javaObjectUsages.0.kt | 2 +- .../kotlin/findObjectUsages/kotlinObjectUsages.0.kt | 2 +- .../kotlin/findObjectUsages/kotlinPrivateObjectUsages.0.kt | 2 +- .../findPropertyUsages/javaClassObjectPropertyUsages.0.kt | 4 ++-- .../kotlin/findPropertyUsages/javaPropertyReadUsages.0.kt | 4 ++-- .../kotlin/findPropertyUsages/javaPropertyReadUsages2.0.kt | 4 ++-- .../kotlin/findPropertyUsages/javaPropertyUsages.0.kt | 4 ++-- .../kotlin/findPropertyUsages/javaPropertyUsages2.0.kt | 4 ++-- .../kotlin/findPropertyUsages/javaPropertyWriteUsages.0.kt | 4 ++-- .../kotlin/findPropertyUsages/javaPropertyWriteUsages2.0.kt | 4 ++-- .../findPropertyUsages/kotlinPrivatePropertyUsages.0.kt | 2 +- .../findPropertyUsages/kotlinPrivatePropertyUsages2.0.kt | 2 +- .../kotlin/findPropertyUsages/kotlinPropertyReadUsages.0.kt | 2 +- .../findPropertyUsages/kotlinPropertyReadUsages2.0.kt | 2 +- .../kotlin/findPropertyUsages/kotlinPropertyUsages.0.kt | 2 +- .../kotlin/findPropertyUsages/kotlinPropertyUsages2.0.kt | 2 +- .../findPropertyUsages/kotlinPropertyWriteUsages.0.kt | 2 +- .../findPropertyUsages/kotlinPropertyWriteUsages2.0.kt | 2 +- .../findPropertyUsages/kotlinTopLevelPropertyUsages.0.kt | 2 +- .../findWithStructuralGrouping/kotlinMethodUsages.0.kt | 2 +- .../findWithStructuralGrouping/kotlinPropertyUsages.0.kt | 2 +- .../testData/extensionProperty/cases/absExtension.kt | 2 +- libraries/stdlib/test/MathTest.kt | 2 +- 60 files changed, 87 insertions(+), 87 deletions(-) diff --git a/compiler/testData/cli/jvm/wrongKotlinSignature.kt b/compiler/testData/cli/jvm/wrongKotlinSignature.kt index 5f2ed3cd6bc..54f576741de 100644 --- a/compiler/testData/cli/jvm/wrongKotlinSignature.kt +++ b/compiler/testData/cli/jvm/wrongKotlinSignature.kt @@ -1,4 +1,4 @@ -package test; +package test import library.ClassWithWrongKotlinSignatures diff --git a/compiler/testData/codegen/PSVM.kt b/compiler/testData/codegen/PSVM.kt index a53f9b5a26f..4a52adcbbf5 100644 --- a/compiler/testData/codegen/PSVM.kt +++ b/compiler/testData/codegen/PSVM.kt @@ -1,5 +1,5 @@ -package foo; +package foo fun main(args : Array) { -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/outerClassInfo/inlineLambda.kt b/compiler/testData/codegen/outerClassInfo/inlineLambda.kt index 15c982629b8..9af4c232ed0 100644 --- a/compiler/testData/codegen/outerClassInfo/inlineLambda.kt +++ b/compiler/testData/codegen/outerClassInfo/inlineLambda.kt @@ -1,4 +1,4 @@ -package foo; +package foo import kotlin.InlineOption.* @@ -39,4 +39,4 @@ class Bar { } } -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/outerClassInfo/inlineObject.kt b/compiler/testData/codegen/outerClassInfo/inlineObject.kt index baa6dacfcff..2541a7079af 100644 --- a/compiler/testData/codegen/outerClassInfo/inlineObject.kt +++ b/compiler/testData/codegen/outerClassInfo/inlineObject.kt @@ -1,4 +1,4 @@ -package foo; +package foo import kotlin.InlineOption.* @@ -47,4 +47,4 @@ class Bar { } } -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/outerClassInfo/outerClassInfo.kt b/compiler/testData/codegen/outerClassInfo/outerClassInfo.kt index be9cc696b74..fe701258f50 100644 --- a/compiler/testData/codegen/outerClassInfo/outerClassInfo.kt +++ b/compiler/testData/codegen/outerClassInfo/outerClassInfo.kt @@ -1,4 +1,4 @@ -package foo; +package foo class Foo { @@ -39,4 +39,4 @@ val packageObjectLiteral = object { fun packageMethod(f : Foo) { class PackageLocalClass {} class PackageLocalObject {} -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/regressions/kt1213.kt b/compiler/testData/codegen/regressions/kt1213.kt index da860c37840..6f95ec93515 100644 --- a/compiler/testData/codegen/regressions/kt1213.kt +++ b/compiler/testData/codegen/regressions/kt1213.kt @@ -1,4 +1,4 @@ -package interactive; +package interactive class Shape(var height : Double = 1.0, var fillColor : String = "#AAAAAA") { @@ -8,4 +8,4 @@ fun box() : String { var a : Shape? = Shape() a?.height = 1.0 return "OK" -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/sourceInfo/foo1.kt b/compiler/testData/codegen/sourceInfo/foo1.kt index e659d58e0d3..a31aac726ca 100644 --- a/compiler/testData/codegen/sourceInfo/foo1.kt +++ b/compiler/testData/codegen/sourceInfo/foo1.kt @@ -1,5 +1,5 @@ -package foo; +package foo fun box1() = { 1 -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/sourceInfo/foo2.kt b/compiler/testData/codegen/sourceInfo/foo2.kt index 42d7dc54796..0b562a529d5 100644 --- a/compiler/testData/codegen/sourceInfo/foo2.kt +++ b/compiler/testData/codegen/sourceInfo/foo2.kt @@ -1,5 +1,5 @@ -package foo; +package foo fun box2() = { 1 -} \ No newline at end of file +} diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/phantomClashWithSamAdapter.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/phantomClashWithSamAdapter.kt index 14707fbc29f..66c67af328e 100644 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/phantomClashWithSamAdapter.kt +++ b/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/phantomClashWithSamAdapter.kt @@ -1,7 +1,7 @@ // !DIAGNOSTICS: -UNUSED_PARAMETER // FILE: p/Sam.java -package p; +package p public interface Sam { void sam(); @@ -9,7 +9,7 @@ public interface Sam { // FILE: p/Foo.java -package p; +package p public class Foo { public void foo(Sam sam); @@ -24,4 +24,4 @@ open class K0 : Foo() class K : K0() { fun foo(f: () -> Unit) {} -} \ No newline at end of file +} diff --git a/compiler/testData/diagnostics/tests/generics/PseudoRawTypes.kt b/compiler/testData/diagnostics/tests/generics/PseudoRawTypes.kt index 4716ee25328..c08572c84b9 100644 --- a/compiler/testData/diagnostics/tests/generics/PseudoRawTypes.kt +++ b/compiler/testData/diagnostics/tests/generics/PseudoRawTypes.kt @@ -1,12 +1,12 @@ // FILE: java/util/Collection.java -package java.util; +package java.util public class Collection { public void foo() {} } // FILE: test/Usage.java -package test; +package test import java.util.*; diff --git a/compiler/testData/diagnostics/tests/j+k/Simple.kt b/compiler/testData/diagnostics/tests/j+k/Simple.kt index c82f272c811..b2b4c576b0f 100644 --- a/compiler/testData/diagnostics/tests/j+k/Simple.kt +++ b/compiler/testData/diagnostics/tests/j+k/Simple.kt @@ -1,5 +1,5 @@ // FILE: aa/A.java -package aa; +package aa public class A { public void f() { } diff --git a/compiler/testData/diagnostics/tests/j+k/UnboxingNulls.kt b/compiler/testData/diagnostics/tests/j+k/UnboxingNulls.kt index d5fbdaf7186..ef5d0db1fae 100644 --- a/compiler/testData/diagnostics/tests/j+k/UnboxingNulls.kt +++ b/compiler/testData/diagnostics/tests/j+k/UnboxingNulls.kt @@ -1,5 +1,5 @@ // FILE: a/Test.java -package a; +package a public class Test { T t() {return null;} diff --git a/compiler/testData/diagnostics/tests/j+k/innerNestedClassFromJava.kt b/compiler/testData/diagnostics/tests/j+k/innerNestedClassFromJava.kt index d7554c04d75..b947abf915d 100644 --- a/compiler/testData/diagnostics/tests/j+k/innerNestedClassFromJava.kt +++ b/compiler/testData/diagnostics/tests/j+k/innerNestedClassFromJava.kt @@ -1,5 +1,5 @@ // FILE: a/M.java -package a; +package a public class M { public class Inner { diff --git a/compiler/testData/diagnostics/tests/j+k/invisiblePackagePrivateInheritedMember.kt b/compiler/testData/diagnostics/tests/j+k/invisiblePackagePrivateInheritedMember.kt index c319b79043d..c38d85bc119 100644 --- a/compiler/testData/diagnostics/tests/j+k/invisiblePackagePrivateInheritedMember.kt +++ b/compiler/testData/diagnostics/tests/j+k/invisiblePackagePrivateInheritedMember.kt @@ -1,12 +1,12 @@ // FILE: a/M.java -package a; +package a public class M { int m; } // FILE: b/F.java -package b; +package b import a.M; @@ -20,4 +20,4 @@ import b.F fun f() { F().m -} \ No newline at end of file +} diff --git a/compiler/testData/diagnostics/tests/j+k/kt1402.kt b/compiler/testData/diagnostics/tests/j+k/kt1402.kt index 40e71ec651e..4ebf694794a 100644 --- a/compiler/testData/diagnostics/tests/j+k/kt1402.kt +++ b/compiler/testData/diagnostics/tests/j+k/kt1402.kt @@ -1,5 +1,5 @@ // FILE: a/M.java -package a; +package a public class M { public static class Inner { diff --git a/compiler/testData/diagnostics/tests/j+k/kt1431.kt b/compiler/testData/diagnostics/tests/j+k/kt1431.kt index 81a9d85a805..27c5d9161be 100644 --- a/compiler/testData/diagnostics/tests/j+k/kt1431.kt +++ b/compiler/testData/diagnostics/tests/j+k/kt1431.kt @@ -1,6 +1,6 @@ //FILE: a/C.java // KT-1431 StackOverflowException in IDE when using JavaFX builders -package a; +package a public class C> { public static C create() { return null; } @@ -14,4 +14,4 @@ import a.C fun test() { C.create().foo() -} \ No newline at end of file +} diff --git a/compiler/testData/diagnostics/tests/j+k/kt2890.kt b/compiler/testData/diagnostics/tests/j+k/kt2890.kt index d4667aaef3a..1c33950ab31 100644 --- a/compiler/testData/diagnostics/tests/j+k/kt2890.kt +++ b/compiler/testData/diagnostics/tests/j+k/kt2890.kt @@ -1,5 +1,5 @@ //FILE:_03_collections/CollectionTest.java -package _03_collections; +package _03_collections import java.util.List; @@ -17,4 +17,4 @@ import java.util.ArrayList fun test() { val c = CollectionTest() CollectionTest.add(ArrayList()) -} \ No newline at end of file +} diff --git a/compiler/testData/diagnostics/tests/j+k/mutableIterator.kt b/compiler/testData/diagnostics/tests/j+k/mutableIterator.kt index 6cba8d1b63a..eeb873fdcd0 100644 --- a/compiler/testData/diagnostics/tests/j+k/mutableIterator.kt +++ b/compiler/testData/diagnostics/tests/j+k/mutableIterator.kt @@ -1,5 +1,5 @@ //FILE:a/JC.java -package a; +package a import java.util.Iterator; @@ -26,4 +26,4 @@ fun foo(c: JC, iterator: Iterator, iterable: Iterable) { val mutableIterable: MutableIterable? = c.getIterable() c.setIterable(mutableIterable) c.setIterable(iterable) -} \ No newline at end of file +} diff --git a/compiler/testData/diagnostics/tests/j+k/packagePrivateClassStaticMember.kt b/compiler/testData/diagnostics/tests/j+k/packagePrivateClassStaticMember.kt index b93b076994c..07315f94d9e 100644 --- a/compiler/testData/diagnostics/tests/j+k/packagePrivateClassStaticMember.kt +++ b/compiler/testData/diagnostics/tests/j+k/packagePrivateClassStaticMember.kt @@ -2,7 +2,7 @@ // FILE: foo/Bar.java -package foo; +package foo class Bar { static void baz() {} diff --git a/compiler/testData/diagnostics/tests/j+k/packageVisibility.kt b/compiler/testData/diagnostics/tests/j+k/packageVisibility.kt index 6fe2702aa13..66aaa752109 100644 --- a/compiler/testData/diagnostics/tests/j+k/packageVisibility.kt +++ b/compiler/testData/diagnostics/tests/j+k/packageVisibility.kt @@ -1,5 +1,5 @@ //FILE: a/MyJavaClass.java -package a; +package a class MyJavaClass { static int staticMethod() { diff --git a/compiler/testData/diagnostics/tests/j+k/privateNestedClassStaticMember.kt b/compiler/testData/diagnostics/tests/j+k/privateNestedClassStaticMember.kt index 1abe80f449d..f3a4f456628 100644 --- a/compiler/testData/diagnostics/tests/j+k/privateNestedClassStaticMember.kt +++ b/compiler/testData/diagnostics/tests/j+k/privateNestedClassStaticMember.kt @@ -2,7 +2,7 @@ // FILE: javaPackage/Foo.java -package javaPackage; +package javaPackage public class Foo { private static class Bar { diff --git a/compiler/testData/diagnostics/tests/j+k/protectedStaticSamePackage.kt b/compiler/testData/diagnostics/tests/j+k/protectedStaticSamePackage.kt index e51d7bc5689..2fce215fd6c 100644 --- a/compiler/testData/diagnostics/tests/j+k/protectedStaticSamePackage.kt +++ b/compiler/testData/diagnostics/tests/j+k/protectedStaticSamePackage.kt @@ -1,6 +1,6 @@ // FILE: test/JavaClass.java -package test; +package test public class JavaClass { protected static int field; diff --git a/compiler/testData/diagnostics/tests/j+k/samInConstructorWithGenerics.kt b/compiler/testData/diagnostics/tests/j+k/samInConstructorWithGenerics.kt index 705eb1bc5d1..63be502b865 100644 --- a/compiler/testData/diagnostics/tests/j+k/samInConstructorWithGenerics.kt +++ b/compiler/testData/diagnostics/tests/j+k/samInConstructorWithGenerics.kt @@ -1,12 +1,12 @@ // FILE: j/OnSubscribe.java -package j; +package j public interface OnSubscribe { void f(); } // FILE: j/Observable.java -package j; +package j public class Observable { @@ -18,4 +18,4 @@ public class Observable { import j.* -class K : Observable({}) \ No newline at end of file +class K : Observable({}) diff --git a/compiler/testData/diagnostics/tests/namedArguments/disallowForSamAdapterConstructor.kt b/compiler/testData/diagnostics/tests/namedArguments/disallowForSamAdapterConstructor.kt index 8e681d78d2f..60fa65281c8 100644 --- a/compiler/testData/diagnostics/tests/namedArguments/disallowForSamAdapterConstructor.kt +++ b/compiler/testData/diagnostics/tests/namedArguments/disallowForSamAdapterConstructor.kt @@ -1,6 +1,6 @@ // FILE: test/J.java -package test; +package test public class J { public J(String s, Runnable r, Boolean z) { diff --git a/compiler/testData/diagnostics/tests/namedArguments/disallowForSamAdapterFunction.kt b/compiler/testData/diagnostics/tests/namedArguments/disallowForSamAdapterFunction.kt index f1c57739a06..7a62fe7d22f 100644 --- a/compiler/testData/diagnostics/tests/namedArguments/disallowForSamAdapterFunction.kt +++ b/compiler/testData/diagnostics/tests/namedArguments/disallowForSamAdapterFunction.kt @@ -1,6 +1,6 @@ // FILE: test/J.java -package test; +package test public class J { public static void foo(String s, Runnable r, Boolean z) { diff --git a/compiler/testData/diagnostics/tests/nullabilityAndAutoCasts/kt362.kt b/compiler/testData/diagnostics/tests/nullabilityAndAutoCasts/kt362.kt index d8a3b62411d..814dd1b5298 100644 --- a/compiler/testData/diagnostics/tests/nullabilityAndAutoCasts/kt362.kt +++ b/compiler/testData/diagnostics/tests/nullabilityAndAutoCasts/kt362.kt @@ -1,7 +1,7 @@ // FILE: this.kt // KT-362 Don't allow autocasts on vals that are not internal -package example; +package example fun test() { val p = test.Public() @@ -26,4 +26,4 @@ internal class Internal() { public val public : Int? = 1; protected val protected : Int? = 1; val internal : Int? = 1 -} \ No newline at end of file +} diff --git a/compiler/testData/diagnostics/tests/recovery/namelessInJava.kt b/compiler/testData/diagnostics/tests/recovery/namelessInJava.kt index d49ace38013..613f3d1cd2e 100644 --- a/compiler/testData/diagnostics/tests/recovery/namelessInJava.kt +++ b/compiler/testData/diagnostics/tests/recovery/namelessInJava.kt @@ -1,6 +1,6 @@ // FILE: p/Nameless.java -package p; +package p public class Nameless { void () {} @@ -14,4 +14,4 @@ import p.* class K : Nameless() { fun () {} val : Int = 1 -} \ No newline at end of file +} diff --git a/compiler/testData/diagnostics/tests/scopes/kt1942.kt b/compiler/testData/diagnostics/tests/scopes/kt1942.kt index 3dd654104cd..d7184d3860b 100644 --- a/compiler/testData/diagnostics/tests/scopes/kt1942.kt +++ b/compiler/testData/diagnostics/tests/scopes/kt1942.kt @@ -1,6 +1,6 @@ //FILE:a/C.java //KT-1942 Package local members from Java are visible in subclasses -package a; +package a public class C { int myValue; diff --git a/compiler/testData/diagnostics/tests/thisAndSuper/Super.kt b/compiler/testData/diagnostics/tests/thisAndSuper/Super.kt index 7ff05bd175c..b35d6be9238 100644 --- a/compiler/testData/diagnostics/tests/thisAndSuper/Super.kt +++ b/compiler/testData/diagnostics/tests/thisAndSuper/Super.kt @@ -1,4 +1,4 @@ -package example; +package example trait T { fun foo() {} @@ -61,4 +61,4 @@ class ERROR() : UR { fun test() { super.foo() } -} \ No newline at end of file +} diff --git a/compiler/testData/loadJava/compiledKotlin/fromLoadJava/notNull/NotNullField.kt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/notNull/NotNullField.kt index 024af0bfa0e..fad244741d2 100644 --- a/compiler/testData/loadJava/compiledKotlin/fromLoadJava/notNull/NotNullField.kt +++ b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/notNull/NotNullField.kt @@ -1,4 +1,4 @@ -package test; +package test public open class NotNullField() { public var hi: String = ""; diff --git a/idea/testData/completion/basic/common/VariableClassName.kt b/idea/testData/completion/basic/common/VariableClassName.kt index c382c630cdd..744f18edced 100644 --- a/idea/testData/completion/basic/common/VariableClassName.kt +++ b/idea/testData/completion/basic/common/VariableClassName.kt @@ -1,4 +1,4 @@ -package some; +package some open class MyClass() { } diff --git a/idea/testData/findUsages/kotlin/findClassUsages/kotlinPrivateClassUsages.0.kt b/idea/testData/findUsages/kotlin/findClassUsages/kotlinPrivateClassUsages.0.kt index b4ef7cdf64d..c3c97215567 100644 --- a/idea/testData/findUsages/kotlin/findClassUsages/kotlinPrivateClassUsages.0.kt +++ b/idea/testData/findUsages/kotlin/findClassUsages/kotlinPrivateClassUsages.0.kt @@ -1,6 +1,6 @@ // PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetClass // OPTIONS: usages, constructorUsages -package server; +package server public open class Server() { private class Foo { diff --git a/idea/testData/findUsages/kotlin/findFunctionUsages/javaMethodUsages.0.kt b/idea/testData/findUsages/kotlin/findFunctionUsages/javaMethodUsages.0.kt index 1d4e6e42af4..11730be3a06 100644 --- a/idea/testData/findUsages/kotlin/findFunctionUsages/javaMethodUsages.0.kt +++ b/idea/testData/findUsages/kotlin/findFunctionUsages/javaMethodUsages.0.kt @@ -1,6 +1,6 @@ // PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetNamedFunction // OPTIONS: usages -package testing; +package testing public open class Server() { public open fun processRequest() = "foo" diff --git a/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinMethodUsages.0.kt b/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinMethodUsages.0.kt index 948ea0c621e..c8f5866ccfe 100644 --- a/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinMethodUsages.0.kt +++ b/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinMethodUsages.0.kt @@ -1,6 +1,6 @@ // PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetNamedFunction // OPTIONS: usages -package server; +package server public open class Server() { open fun processRequest() = "foo" diff --git a/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinPrivateMethodUsages.0.kt b/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinPrivateMethodUsages.0.kt index aa56a604366..0c08e9c911e 100644 --- a/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinPrivateMethodUsages.0.kt +++ b/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinPrivateMethodUsages.0.kt @@ -1,6 +1,6 @@ // PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetNamedFunction // OPTIONS: usages -package server; +package server public open class Server() { private fun doProcessRequest() = "foo" diff --git a/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinTopLevelMethodUsages.0.kt b/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinTopLevelMethodUsages.0.kt index 3d1e7e6f0f6..2077d614516 100644 --- a/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinTopLevelMethodUsages.0.kt +++ b/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinTopLevelMethodUsages.0.kt @@ -1,6 +1,6 @@ // PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetNamedFunction // OPTIONS: usages -package server; +package server fun processRequest() = "foo" diff --git a/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinTopLevelMethodUsagesNoImport.0.kt b/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinTopLevelMethodUsagesNoImport.0.kt index 1f38ca91dbe..372c66dbd57 100644 --- a/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinTopLevelMethodUsagesNoImport.0.kt +++ b/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinTopLevelMethodUsagesNoImport.0.kt @@ -1,6 +1,6 @@ // PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetNamedFunction // OPTIONS: usages, skipImports -package server; +package server fun processRequest() = "foo" diff --git a/idea/testData/findUsages/kotlin/findObjectUsages/javaObjectUsages.0.kt b/idea/testData/findUsages/kotlin/findObjectUsages/javaObjectUsages.0.kt index 22c113bad6c..61f18b34d1b 100644 --- a/idea/testData/findUsages/kotlin/findObjectUsages/javaObjectUsages.0.kt +++ b/idea/testData/findUsages/kotlin/findObjectUsages/javaObjectUsages.0.kt @@ -1,5 +1,5 @@ // PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetObjectDeclaration -package server; +package server object O { var foo: String = "foo" diff --git a/idea/testData/findUsages/kotlin/findObjectUsages/kotlinObjectUsages.0.kt b/idea/testData/findUsages/kotlin/findObjectUsages/kotlinObjectUsages.0.kt index 22c113bad6c..61f18b34d1b 100644 --- a/idea/testData/findUsages/kotlin/findObjectUsages/kotlinObjectUsages.0.kt +++ b/idea/testData/findUsages/kotlin/findObjectUsages/kotlinObjectUsages.0.kt @@ -1,5 +1,5 @@ // PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetObjectDeclaration -package server; +package server object O { var foo: String = "foo" diff --git a/idea/testData/findUsages/kotlin/findObjectUsages/kotlinPrivateObjectUsages.0.kt b/idea/testData/findUsages/kotlin/findObjectUsages/kotlinPrivateObjectUsages.0.kt index c7ed4f0a0c7..982cf6fad73 100644 --- a/idea/testData/findUsages/kotlin/findObjectUsages/kotlinPrivateObjectUsages.0.kt +++ b/idea/testData/findUsages/kotlin/findObjectUsages/kotlinPrivateObjectUsages.0.kt @@ -1,6 +1,6 @@ // PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetObjectDeclaration // OPTIONS: usages -package server; +package server public open class Server() { private object Foo { diff --git a/idea/testData/findUsages/kotlin/findPropertyUsages/javaClassObjectPropertyUsages.0.kt b/idea/testData/findUsages/kotlin/findPropertyUsages/javaClassObjectPropertyUsages.0.kt index 08da5552512..e515cd9fc59 100644 --- a/idea/testData/findUsages/kotlin/findPropertyUsages/javaClassObjectPropertyUsages.0.kt +++ b/idea/testData/findUsages/kotlin/findPropertyUsages/javaClassObjectPropertyUsages.0.kt @@ -1,9 +1,9 @@ // PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetProperty // OPTIONS: usages -package server; +package server class A { class object { var foo: String = "foo" } -} \ No newline at end of file +} diff --git a/idea/testData/findUsages/kotlin/findPropertyUsages/javaPropertyReadUsages.0.kt b/idea/testData/findUsages/kotlin/findPropertyUsages/javaPropertyReadUsages.0.kt index 959a8fe6e7d..b37cdfc686a 100644 --- a/idea/testData/findUsages/kotlin/findPropertyUsages/javaPropertyReadUsages.0.kt +++ b/idea/testData/findUsages/kotlin/findPropertyUsages/javaPropertyReadUsages.0.kt @@ -1,6 +1,6 @@ // PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetProperty // OPTIONS: usages, skipWrite -package server; +package server open class A(t: T) { open var foo: T = t @@ -15,4 +15,4 @@ open class B: A("") { set(value: String) { println("set:" + value) } -} \ No newline at end of file +} diff --git a/idea/testData/findUsages/kotlin/findPropertyUsages/javaPropertyReadUsages2.0.kt b/idea/testData/findUsages/kotlin/findPropertyUsages/javaPropertyReadUsages2.0.kt index 3ba5410f4e7..d653589e27d 100644 --- a/idea/testData/findUsages/kotlin/findPropertyUsages/javaPropertyReadUsages2.0.kt +++ b/idea/testData/findUsages/kotlin/findPropertyUsages/javaPropertyReadUsages2.0.kt @@ -1,6 +1,6 @@ // PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetParameter // OPTIONS: usages, skipWrite -package server; +package server open class A(open var foo: T) @@ -13,4 +13,4 @@ open class B: A("") { set(value: String) { println("set:" + value) } -} \ No newline at end of file +} diff --git a/idea/testData/findUsages/kotlin/findPropertyUsages/javaPropertyUsages.0.kt b/idea/testData/findUsages/kotlin/findPropertyUsages/javaPropertyUsages.0.kt index 98fa7698165..943b6af8f49 100644 --- a/idea/testData/findUsages/kotlin/findPropertyUsages/javaPropertyUsages.0.kt +++ b/idea/testData/findUsages/kotlin/findPropertyUsages/javaPropertyUsages.0.kt @@ -1,6 +1,6 @@ // PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetProperty // OPTIONS: usages -package server; +package server open class A(t: T) { open var foo: T = t @@ -15,4 +15,4 @@ open class B: A("") { set(value: String) { println("set:" + value) } -} \ No newline at end of file +} diff --git a/idea/testData/findUsages/kotlin/findPropertyUsages/javaPropertyUsages2.0.kt b/idea/testData/findUsages/kotlin/findPropertyUsages/javaPropertyUsages2.0.kt index ddb3ca8e1cc..919495da686 100644 --- a/idea/testData/findUsages/kotlin/findPropertyUsages/javaPropertyUsages2.0.kt +++ b/idea/testData/findUsages/kotlin/findPropertyUsages/javaPropertyUsages2.0.kt @@ -1,6 +1,6 @@ // PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetParameter // OPTIONS: usages -package server; +package server open class A(open var foo: T) @@ -13,4 +13,4 @@ open class B: A("") { set(value: String) { println("set:" + value) } -} \ No newline at end of file +} diff --git a/idea/testData/findUsages/kotlin/findPropertyUsages/javaPropertyWriteUsages.0.kt b/idea/testData/findUsages/kotlin/findPropertyUsages/javaPropertyWriteUsages.0.kt index bb1e15b06ab..121c3fa9382 100644 --- a/idea/testData/findUsages/kotlin/findPropertyUsages/javaPropertyWriteUsages.0.kt +++ b/idea/testData/findUsages/kotlin/findPropertyUsages/javaPropertyWriteUsages.0.kt @@ -1,6 +1,6 @@ // PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetProperty // OPTIONS: usages, skipRead -package server; +package server open class A(t: T) { open var foo: T = t @@ -15,4 +15,4 @@ open class B: A("") { set(value: String) { println("set:" + value) } -} \ No newline at end of file +} diff --git a/idea/testData/findUsages/kotlin/findPropertyUsages/javaPropertyWriteUsages2.0.kt b/idea/testData/findUsages/kotlin/findPropertyUsages/javaPropertyWriteUsages2.0.kt index 7e949dcb193..13f6ccb72bf 100644 --- a/idea/testData/findUsages/kotlin/findPropertyUsages/javaPropertyWriteUsages2.0.kt +++ b/idea/testData/findUsages/kotlin/findPropertyUsages/javaPropertyWriteUsages2.0.kt @@ -1,6 +1,6 @@ // PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetParameter // OPTIONS: usages, skipRead -package server; +package server open class A(open var foo: T) @@ -13,4 +13,4 @@ open class B: A("") { set(value: String) { println("set:" + value) } -} \ No newline at end of file +} diff --git a/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinPrivatePropertyUsages.0.kt b/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinPrivatePropertyUsages.0.kt index abadb880c09..7fed9844980 100644 --- a/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinPrivatePropertyUsages.0.kt +++ b/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinPrivatePropertyUsages.0.kt @@ -1,6 +1,6 @@ // PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetProperty // OPTIONS: usages -package server; +package server public open class Server() { private val foo = "foo" diff --git a/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinPrivatePropertyUsages2.0.kt b/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinPrivatePropertyUsages2.0.kt index 4775089504a..e2f870320e7 100644 --- a/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinPrivatePropertyUsages2.0.kt +++ b/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinPrivatePropertyUsages2.0.kt @@ -1,6 +1,6 @@ // PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetParameter // OPTIONS: usages -package server; +package server public open class Server(private val foo: String = "foo") { open fun processRequest() = foo diff --git a/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinPropertyReadUsages.0.kt b/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinPropertyReadUsages.0.kt index 7f4824231c7..9723e36f963 100644 --- a/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinPropertyReadUsages.0.kt +++ b/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinPropertyReadUsages.0.kt @@ -1,6 +1,6 @@ // PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetProperty // OPTIONS: usages, skipWrite -package server; +package server open class A { open var foo: T diff --git a/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinPropertyReadUsages2.0.kt b/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinPropertyReadUsages2.0.kt index 2ee5a06aad1..1a621a5bf1f 100644 --- a/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinPropertyReadUsages2.0.kt +++ b/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinPropertyReadUsages2.0.kt @@ -1,6 +1,6 @@ // PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetParameter // OPTIONS: usages, skipWrite -package server; +package server open class A(open var foo: T) diff --git a/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinPropertyUsages.0.kt b/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinPropertyUsages.0.kt index 1d385659ee6..f2f23dd130f 100644 --- a/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinPropertyUsages.0.kt +++ b/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinPropertyUsages.0.kt @@ -1,6 +1,6 @@ // PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetProperty // OPTIONS: usages -package server; +package server open class A { open var foo: T diff --git a/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinPropertyUsages2.0.kt b/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinPropertyUsages2.0.kt index 9b77f8d75ee..938d8fe8e70 100644 --- a/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinPropertyUsages2.0.kt +++ b/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinPropertyUsages2.0.kt @@ -1,6 +1,6 @@ // PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetParameter // OPTIONS: usages -package server; +package server open class A(open var foo: T) diff --git a/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinPropertyWriteUsages.0.kt b/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinPropertyWriteUsages.0.kt index 4bf8a6ae470..fbc39b548a5 100644 --- a/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinPropertyWriteUsages.0.kt +++ b/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinPropertyWriteUsages.0.kt @@ -1,6 +1,6 @@ // PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetProperty // OPTIONS: usages, skipRead -package server; +package server open class A { open var foo: T diff --git a/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinPropertyWriteUsages2.0.kt b/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinPropertyWriteUsages2.0.kt index 5ab9b9e4c6e..c13c6ffa4f2 100644 --- a/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinPropertyWriteUsages2.0.kt +++ b/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinPropertyWriteUsages2.0.kt @@ -1,6 +1,6 @@ // PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetParameter // OPTIONS: usages, skipRead -package server; +package server open class A(open var foo: T) diff --git a/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinTopLevelPropertyUsages.0.kt b/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinTopLevelPropertyUsages.0.kt index 7772120b44b..41c9db0c135 100644 --- a/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinTopLevelPropertyUsages.0.kt +++ b/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinTopLevelPropertyUsages.0.kt @@ -1,6 +1,6 @@ // PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetProperty // OPTIONS: usages -package server; +package server var foo: String = "foo" diff --git a/idea/testData/findUsages/kotlin/findWithStructuralGrouping/kotlinMethodUsages.0.kt b/idea/testData/findUsages/kotlin/findWithStructuralGrouping/kotlinMethodUsages.0.kt index a6debcf3a0c..2bf30983a66 100644 --- a/idea/testData/findUsages/kotlin/findWithStructuralGrouping/kotlinMethodUsages.0.kt +++ b/idea/testData/findUsages/kotlin/findWithStructuralGrouping/kotlinMethodUsages.0.kt @@ -1,7 +1,7 @@ // PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetNamedFunction // GROUPING_RULES: org.jetbrains.jet.plugin.findUsages.KotlinDeclarationGroupRuleProvider$KotlinDeclarationGroupingRule // OPTIONS: usages -package server; +package server public open class Server() { open fun processRequest() = "foo" diff --git a/idea/testData/findUsages/kotlin/findWithStructuralGrouping/kotlinPropertyUsages.0.kt b/idea/testData/findUsages/kotlin/findWithStructuralGrouping/kotlinPropertyUsages.0.kt index f16598e9708..483e27bde4d 100644 --- a/idea/testData/findUsages/kotlin/findWithStructuralGrouping/kotlinPropertyUsages.0.kt +++ b/idea/testData/findUsages/kotlin/findWithStructuralGrouping/kotlinPropertyUsages.0.kt @@ -1,7 +1,7 @@ // PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetProperty // GROUPING_RULES: org.jetbrains.jet.plugin.findUsages.KotlinDeclarationGroupRuleProvider$KotlinDeclarationGroupingRule // OPTIONS: usages -package server; +package server open class A { open var foo: T diff --git a/js/js.translator/testData/extensionProperty/cases/absExtension.kt b/js/js.translator/testData/extensionProperty/cases/absExtension.kt index 00bbe54958a..1cb61617b24 100644 --- a/js/js.translator/testData/extensionProperty/cases/absExtension.kt +++ b/js/js.translator/testData/extensionProperty/cases/absExtension.kt @@ -1,4 +1,4 @@ -package foo; +package foo val Double.abs: Double get() = if (this > 0) this else -this diff --git a/libraries/stdlib/test/MathTest.kt b/libraries/stdlib/test/MathTest.kt index f42b3129e14..9199204a492 100644 --- a/libraries/stdlib/test/MathTest.kt +++ b/libraries/stdlib/test/MathTest.kt @@ -1,4 +1,4 @@ -package test.collections; +package test.collections import kotlin.math.* import java.math.BigInteger