Minor: drop semicolon in package declaration everywhere.

This commit is contained in:
Zalim Bashorov
2014-09-11 21:22:42 +04:00
parent 0f136d5adc
commit 30208d5532
60 changed files with 87 additions and 87 deletions
@@ -1,4 +1,4 @@
package test; package test
import library.ClassWithWrongKotlinSignatures import library.ClassWithWrongKotlinSignatures
+2 -2
View File
@@ -1,5 +1,5 @@
package foo; package foo
fun main(args : Array<String>) { fun main(args : Array<String>) {
} }
@@ -1,4 +1,4 @@
package foo; package foo
import kotlin.InlineOption.* import kotlin.InlineOption.*
@@ -39,4 +39,4 @@ class Bar {
} }
} }
} }
@@ -1,4 +1,4 @@
package foo; package foo
import kotlin.InlineOption.* import kotlin.InlineOption.*
@@ -47,4 +47,4 @@ class Bar {
} }
} }
} }
@@ -1,4 +1,4 @@
package foo; package foo
class Foo { class Foo {
@@ -39,4 +39,4 @@ val packageObjectLiteral = object {
fun packageMethod(f : Foo) { fun packageMethod(f : Foo) {
class PackageLocalClass {} class PackageLocalClass {}
class PackageLocalObject {} class PackageLocalObject {}
} }
@@ -1,4 +1,4 @@
package interactive; package interactive
class Shape(var height : Double = 1.0, var fillColor : String = "#AAAAAA") { class Shape(var height : Double = 1.0, var fillColor : String = "#AAAAAA") {
@@ -8,4 +8,4 @@ fun box() : String {
var a : Shape? = Shape() var a : Shape? = Shape()
a?.height = 1.0 a?.height = 1.0
return "OK" return "OK"
} }
+2 -2
View File
@@ -1,5 +1,5 @@
package foo; package foo
fun box1() = { fun box1() = {
1 1
} }
+2 -2
View File
@@ -1,5 +1,5 @@
package foo; package foo
fun box2() = { fun box2() = {
1 1
} }
@@ -1,7 +1,7 @@
// !DIAGNOSTICS: -UNUSED_PARAMETER // !DIAGNOSTICS: -UNUSED_PARAMETER
// FILE: p/Sam.java // FILE: p/Sam.java
package p; package p
public interface Sam { public interface Sam {
void sam(); void sam();
@@ -9,7 +9,7 @@ public interface Sam {
// FILE: p/Foo.java // FILE: p/Foo.java
package p; package p
public class Foo { public class Foo {
public void foo(Sam sam); public void foo(Sam sam);
@@ -24,4 +24,4 @@ open class K0 : Foo()
class K : K0() { class K : K0() {
fun foo(f: () -> Unit) {} fun foo(f: () -> Unit) {}
} }
@@ -1,12 +1,12 @@
// FILE: java/util/Collection.java // FILE: java/util/Collection.java
package java.util; package java.util
public class Collection { public class Collection {
public void foo() {} public void foo() {}
} }
// FILE: test/Usage.java // FILE: test/Usage.java
package test; package test
import java.util.*; import java.util.*;
@@ -1,5 +1,5 @@
// FILE: aa/A.java // FILE: aa/A.java
package aa; package aa
public class A { public class A {
public void f() { } public void f() { }
@@ -1,5 +1,5 @@
// FILE: a/Test.java // FILE: a/Test.java
package a; package a
public class Test<T> { public class Test<T> {
T t() {return null;} T t() {return null;}
@@ -1,5 +1,5 @@
// FILE: a/M.java // FILE: a/M.java
package a; package a
public class M { public class M {
public class Inner { public class Inner {
@@ -1,12 +1,12 @@
// FILE: a/M.java // FILE: a/M.java
package a; package a
public class M { public class M {
int m; int m;
} }
// FILE: b/F.java // FILE: b/F.java
package b; package b
import a.M; import a.M;
@@ -20,4 +20,4 @@ import b.F
fun f() { fun f() {
F().<!INVISIBLE_MEMBER!>m<!> F().<!INVISIBLE_MEMBER!>m<!>
} }
@@ -1,5 +1,5 @@
// FILE: a/M.java // FILE: a/M.java
package a; package a
public class M { public class M {
public static class Inner { public static class Inner {
@@ -1,6 +1,6 @@
//FILE: a/C.java //FILE: a/C.java
// KT-1431 StackOverflowException in IDE when using JavaFX builders // KT-1431 StackOverflowException in IDE when using JavaFX builders
package a; package a
public class C<B extends C<B>> { public class C<B extends C<B>> {
public static C<?> create() { return null; } public static C<?> create() { return null; }
@@ -14,4 +14,4 @@ import a.C
fun test() { fun test() {
C.create()<!UNSAFE_CALL!>.<!>foo() C.create()<!UNSAFE_CALL!>.<!>foo()
} }
@@ -1,5 +1,5 @@
//FILE:_03_collections/CollectionTest.java //FILE:_03_collections/CollectionTest.java
package _03_collections; package _03_collections
import java.util.List; import java.util.List;
@@ -17,4 +17,4 @@ import java.util.ArrayList
fun test() { fun test() {
val <!UNUSED_VARIABLE!>c<!> = CollectionTest() val <!UNUSED_VARIABLE!>c<!> = CollectionTest()
CollectionTest.add(ArrayList()) CollectionTest.add(ArrayList())
} }
@@ -1,5 +1,5 @@
//FILE:a/JC.java //FILE:a/JC.java
package a; package a
import java.util.Iterator; import java.util.Iterator;
@@ -26,4 +26,4 @@ fun foo(c: JC<Int>, iterator: Iterator<Int>, iterable: Iterable<Int>) {
val mutableIterable: MutableIterable<Int>? = c.getIterable() val mutableIterable: MutableIterable<Int>? = c.getIterable()
c.setIterable(mutableIterable) c.setIterable(mutableIterable)
c.setIterable(iterable) c.setIterable(iterable)
} }
@@ -2,7 +2,7 @@
// FILE: foo/Bar.java // FILE: foo/Bar.java
package foo; package foo
class Bar { class Bar {
static void baz() {} static void baz() {}
@@ -1,5 +1,5 @@
//FILE: a/MyJavaClass.java //FILE: a/MyJavaClass.java
package a; package a
class MyJavaClass { class MyJavaClass {
static int staticMethod() { static int staticMethod() {
@@ -2,7 +2,7 @@
// FILE: javaPackage/Foo.java // FILE: javaPackage/Foo.java
package javaPackage; package javaPackage
public class Foo { public class Foo {
private static class Bar { private static class Bar {
@@ -1,6 +1,6 @@
// FILE: test/JavaClass.java // FILE: test/JavaClass.java
package test; package test
public class JavaClass { public class JavaClass {
protected static int field; protected static int field;
@@ -1,12 +1,12 @@
// FILE: j/OnSubscribe.java // FILE: j/OnSubscribe.java
package j; package j
public interface OnSubscribe<T> { public interface OnSubscribe<T> {
void f(); void f();
} }
// FILE: j/Observable.java // FILE: j/Observable.java
package j; package j
public class Observable<T> { public class Observable<T> {
@@ -18,4 +18,4 @@ public class Observable<T> {
import j.* import j.*
class K : Observable<String>({}) class K : Observable<String>({})
@@ -1,6 +1,6 @@
// FILE: test/J.java // FILE: test/J.java
package test; package test
public class J { public class J {
public J(String s, Runnable r, Boolean z) { public J(String s, Runnable r, Boolean z) {
@@ -1,6 +1,6 @@
// FILE: test/J.java // FILE: test/J.java
package test; package test
public class J { public class J {
public static void foo(String s, Runnable r, Boolean z) { public static void foo(String s, Runnable r, Boolean z) {
@@ -1,7 +1,7 @@
// FILE: this.kt // FILE: this.kt
// KT-362 Don't allow autocasts on vals that are not internal // KT-362 Don't allow autocasts on vals that are not internal
package example; package example
fun test() { fun test() {
val p = test.Public() val p = test.Public()
@@ -26,4 +26,4 @@ internal class Internal() {
public val public : Int? = 1; public val public : Int? = 1;
protected val protected : Int? = 1; protected val protected : Int? = 1;
val internal : Int? = 1 val internal : Int? = 1
} }
@@ -1,6 +1,6 @@
// FILE: p/Nameless.java // FILE: p/Nameless.java
package p; package p
public class Nameless { public class Nameless {
void () {} void () {}
@@ -14,4 +14,4 @@ import p.*
class K : <!INVISIBLE_MEMBER!>Nameless<!>() { class K : <!INVISIBLE_MEMBER!>Nameless<!>() {
fun<!SYNTAX!><!> () {} fun<!SYNTAX!><!> () {}
val<!SYNTAX!><!> : Int = 1 val<!SYNTAX!><!> : Int = 1
} }
@@ -1,6 +1,6 @@
//FILE:a/C.java //FILE:a/C.java
//KT-1942 Package local members from Java are visible in subclasses //KT-1942 Package local members from Java are visible in subclasses
package a; package a
public class C { public class C {
int myValue; int myValue;
@@ -1,4 +1,4 @@
package example; package example
trait T { trait T {
fun foo() {} fun foo() {}
@@ -61,4 +61,4 @@ class ERROR<E>() : <!UNRESOLVED_REFERENCE!>UR<!> {
fun test() { fun test() {
super.<!UNRESOLVED_REFERENCE!>foo<!>() super.<!UNRESOLVED_REFERENCE!>foo<!>()
} }
} }
@@ -1,4 +1,4 @@
package test; package test
public open class NotNullField() { public open class NotNullField() {
public var hi: String = ""; public var hi: String = "";
@@ -1,4 +1,4 @@
package some; package some
open class MyClass() { open class MyClass() {
} }
@@ -1,6 +1,6 @@
// PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetClass // PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetClass
// OPTIONS: usages, constructorUsages // OPTIONS: usages, constructorUsages
package server; package server
public open class Server() { public open class Server() {
private class <caret>Foo { private class <caret>Foo {
@@ -1,6 +1,6 @@
// PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetNamedFunction // PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetNamedFunction
// OPTIONS: usages // OPTIONS: usages
package testing; package testing
public open class Server() { public open class Server() {
public open fun <caret>processRequest() = "foo" public open fun <caret>processRequest() = "foo"
@@ -1,6 +1,6 @@
// PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetNamedFunction // PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetNamedFunction
// OPTIONS: usages // OPTIONS: usages
package server; package server
public open class Server() { public open class Server() {
open fun <caret>processRequest() = "foo" open fun <caret>processRequest() = "foo"
@@ -1,6 +1,6 @@
// PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetNamedFunction // PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetNamedFunction
// OPTIONS: usages // OPTIONS: usages
package server; package server
public open class Server() { public open class Server() {
private fun <caret>doProcessRequest() = "foo" private fun <caret>doProcessRequest() = "foo"
@@ -1,6 +1,6 @@
// PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetNamedFunction // PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetNamedFunction
// OPTIONS: usages // OPTIONS: usages
package server; package server
fun <caret>processRequest() = "foo" fun <caret>processRequest() = "foo"
@@ -1,6 +1,6 @@
// PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetNamedFunction // PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetNamedFunction
// OPTIONS: usages, skipImports // OPTIONS: usages, skipImports
package server; package server
fun <caret>processRequest() = "foo" fun <caret>processRequest() = "foo"
@@ -1,5 +1,5 @@
// PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetObjectDeclaration // PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetObjectDeclaration
package server; package server
object <caret>O { object <caret>O {
var foo: String = "foo" var foo: String = "foo"
@@ -1,5 +1,5 @@
// PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetObjectDeclaration // PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetObjectDeclaration
package server; package server
object <caret>O { object <caret>O {
var foo: String = "foo" var foo: String = "foo"
@@ -1,6 +1,6 @@
// PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetObjectDeclaration // PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetObjectDeclaration
// OPTIONS: usages // OPTIONS: usages
package server; package server
public open class Server() { public open class Server() {
private object <caret>Foo { private object <caret>Foo {
@@ -1,9 +1,9 @@
// PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetProperty // PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetProperty
// OPTIONS: usages // OPTIONS: usages
package server; package server
class A { class A {
class object { class object {
var <caret>foo: String = "foo" var <caret>foo: String = "foo"
} }
} }
@@ -1,6 +1,6 @@
// PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetProperty // PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetProperty
// OPTIONS: usages, skipWrite // OPTIONS: usages, skipWrite
package server; package server
open class A<T>(t: T) { open class A<T>(t: T) {
open var <caret>foo: T = t open var <caret>foo: T = t
@@ -15,4 +15,4 @@ open class B: A<String>("") {
set(value: String) { set(value: String) {
println("set:" + value) println("set:" + value)
} }
} }
@@ -1,6 +1,6 @@
// PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetParameter // PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetParameter
// OPTIONS: usages, skipWrite // OPTIONS: usages, skipWrite
package server; package server
open class A<T>(open var <caret>foo: T) open class A<T>(open var <caret>foo: T)
@@ -13,4 +13,4 @@ open class B: A<String>("") {
set(value: String) { set(value: String) {
println("set:" + value) println("set:" + value)
} }
} }
@@ -1,6 +1,6 @@
// PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetProperty // PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetProperty
// OPTIONS: usages // OPTIONS: usages
package server; package server
open class A<T>(t: T) { open class A<T>(t: T) {
open var <caret>foo: T = t open var <caret>foo: T = t
@@ -15,4 +15,4 @@ open class B: A<String>("") {
set(value: String) { set(value: String) {
println("set:" + value) println("set:" + value)
} }
} }
@@ -1,6 +1,6 @@
// PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetParameter // PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetParameter
// OPTIONS: usages // OPTIONS: usages
package server; package server
open class A<T>(open var <caret>foo: T) open class A<T>(open var <caret>foo: T)
@@ -13,4 +13,4 @@ open class B: A<String>("") {
set(value: String) { set(value: String) {
println("set:" + value) println("set:" + value)
} }
} }
@@ -1,6 +1,6 @@
// PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetProperty // PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetProperty
// OPTIONS: usages, skipRead // OPTIONS: usages, skipRead
package server; package server
open class A<T>(t: T) { open class A<T>(t: T) {
open var <caret>foo: T = t open var <caret>foo: T = t
@@ -15,4 +15,4 @@ open class B: A<String>("") {
set(value: String) { set(value: String) {
println("set:" + value) println("set:" + value)
} }
} }
@@ -1,6 +1,6 @@
// PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetParameter // PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetParameter
// OPTIONS: usages, skipRead // OPTIONS: usages, skipRead
package server; package server
open class A<T>(open var <caret>foo: T) open class A<T>(open var <caret>foo: T)
@@ -13,4 +13,4 @@ open class B: A<String>("") {
set(value: String) { set(value: String) {
println("set:" + value) println("set:" + value)
} }
} }
@@ -1,6 +1,6 @@
// PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetProperty // PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetProperty
// OPTIONS: usages // OPTIONS: usages
package server; package server
public open class Server() { public open class Server() {
private val <caret>foo = "foo" private val <caret>foo = "foo"
@@ -1,6 +1,6 @@
// PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetParameter // PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetParameter
// OPTIONS: usages // OPTIONS: usages
package server; package server
public open class Server(private val <caret>foo: String = "foo") { public open class Server(private val <caret>foo: String = "foo") {
open fun processRequest() = foo open fun processRequest() = foo
@@ -1,6 +1,6 @@
// PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetProperty // PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetProperty
// OPTIONS: usages, skipWrite // OPTIONS: usages, skipWrite
package server; package server
open class A<T> { open class A<T> {
open var <caret>foo: T open var <caret>foo: T
@@ -1,6 +1,6 @@
// PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetParameter // PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetParameter
// OPTIONS: usages, skipWrite // OPTIONS: usages, skipWrite
package server; package server
open class A<T>(open var <caret>foo: T) open class A<T>(open var <caret>foo: T)
@@ -1,6 +1,6 @@
// PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetProperty // PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetProperty
// OPTIONS: usages // OPTIONS: usages
package server; package server
open class A<T> { open class A<T> {
open var <caret>foo: T open var <caret>foo: T
@@ -1,6 +1,6 @@
// PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetParameter // PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetParameter
// OPTIONS: usages // OPTIONS: usages
package server; package server
open class A<T>(open var <caret>foo: T) open class A<T>(open var <caret>foo: T)
@@ -1,6 +1,6 @@
// PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetProperty // PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetProperty
// OPTIONS: usages, skipRead // OPTIONS: usages, skipRead
package server; package server
open class A<T> { open class A<T> {
open var <caret>foo: T open var <caret>foo: T
@@ -1,6 +1,6 @@
// PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetParameter // PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetParameter
// OPTIONS: usages, skipRead // OPTIONS: usages, skipRead
package server; package server
open class A<T>(open var <caret>foo: T) open class A<T>(open var <caret>foo: T)
@@ -1,6 +1,6 @@
// PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetProperty // PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetProperty
// OPTIONS: usages // OPTIONS: usages
package server; package server
var <caret>foo: String = "foo" var <caret>foo: String = "foo"
@@ -1,7 +1,7 @@
// PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetNamedFunction // PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetNamedFunction
// GROUPING_RULES: org.jetbrains.jet.plugin.findUsages.KotlinDeclarationGroupRuleProvider$KotlinDeclarationGroupingRule // GROUPING_RULES: org.jetbrains.jet.plugin.findUsages.KotlinDeclarationGroupRuleProvider$KotlinDeclarationGroupingRule
// OPTIONS: usages // OPTIONS: usages
package server; package server
public open class Server() { public open class Server() {
open fun <caret>processRequest() = "foo" open fun <caret>processRequest() = "foo"
@@ -1,7 +1,7 @@
// PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetProperty // PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetProperty
// GROUPING_RULES: org.jetbrains.jet.plugin.findUsages.KotlinDeclarationGroupRuleProvider$KotlinDeclarationGroupingRule // GROUPING_RULES: org.jetbrains.jet.plugin.findUsages.KotlinDeclarationGroupRuleProvider$KotlinDeclarationGroupingRule
// OPTIONS: usages // OPTIONS: usages
package server; package server
open class A<T> { open class A<T> {
open var <caret>foo: T open var <caret>foo: T
@@ -1,4 +1,4 @@
package foo; package foo
val Double.abs: Double val Double.abs: Double
get() = if (this > 0) this else -this get() = if (this > 0) this else -this
+1 -1
View File
@@ -1,4 +1,4 @@
package test.collections; package test.collections
import kotlin.math.* import kotlin.math.*
import java.math.BigInteger import java.math.BigInteger