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

KT-12877: fix code formatting in tests

Browse Source
This commit is contained in:
Alexey Andreev
2016-11-21 14:29:31 +03:00
committed by Alexey Andreev
parent d63a727474
commit d1820b42ef
7 changed files with 48 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/diagnostics/testsWithJsStdLib/module/dualModuleFromUmd.kt
Vendored
+4 -2
View File
@@ -4,13 +4,15 @@ package foo
import kotlin.js.* import kotlin.js.*
@JsModule("A") @native object A { @JsModule("A")
@native object A {
fun f(): Int fun f(): Int
val g: Int val g: Int
} }
@JsNonModule @native open class B { @JsNonModule
@native open class B {
fun foo(): Int fun foo(): Int
} }
compiler/testData/diagnostics/testsWithJsStdLib/module/jsVarProhibited.kt
Vendored
+4 -2
View File
@@ -1,5 +1,7 @@
package foo package foo
<!JS_MODULE_PROHIBITED_ON_VAR!>@JsModule("bar") @native var bar: Int<!> = noImpl <!JS_MODULE_PROHIBITED_ON_VAR!>@JsModule("bar")
@native var bar: Int<!> = noImpl
<!JS_MODULE_PROHIBITED_ON_VAR!>@JsNonModule @native var baz: Int<!> = noImpl <!JS_MODULE_PROHIBITED_ON_VAR!>@JsNonModule
@native var baz: Int<!> = noImpl
compiler/testData/diagnostics/testsWithJsStdLib/module/nestedProhibited.kt
Vendored
+10 -5
View File
@@ -1,12 +1,17 @@
@file:JsModule("foo") @file:JsModule("foo")
package foo package foo
@JsModule("A") @native class <!NESTED_JS_MODULE_PROHIBITED!>A<!> @JsModule("A")
@native class <!NESTED_JS_MODULE_PROHIBITED!>A<!>
@JsModule("B") @native <!NESTED_JS_MODULE_PROHIBITED!>object B<!> @JsModule("B")
@native <!NESTED_JS_MODULE_PROHIBITED!>object B<!>
<!NESTED_JS_MODULE_PROHIBITED!>@JsModule("foo") @native fun foo()<!> = 23 <!NESTED_JS_MODULE_PROHIBITED!>@JsModule("foo")
@native fun foo()<!> = 23
<!NESTED_JS_MODULE_PROHIBITED!>@JsModule("bar") @native val bar<!> = 42 <!NESTED_JS_MODULE_PROHIBITED!>@JsModule("bar")
@native val bar<!> = 42
<!NESTED_JS_MODULE_PROHIBITED!>@JsNonModule @native val baz<!> = 99 <!NESTED_JS_MODULE_PROHIBITED!>@JsNonModule
@native val baz<!> = 99
compiler/testData/diagnostics/testsWithJsStdLib/module/nonTopLevelProhibited.kt
Vendored
+8 -4
View File
@@ -1,15 +1,19 @@
package foo package foo
class A { class A {
<!JS_MODULE_PROHIBITED_ON_NON_TOPLEVEL!>@JsModule("foo") @native fun foo(): Int<!> <!JS_MODULE_PROHIBITED_ON_NON_TOPLEVEL!>@JsModule("foo")
@native fun foo(): Int<!>
} }
object B { object B {
<!JS_MODULE_PROHIBITED_ON_NON_TOPLEVEL!>@JsModule("foo") @native fun bar(): Int<!> <!JS_MODULE_PROHIBITED_ON_NON_TOPLEVEL!>@JsModule("foo")
@native fun bar(): Int<!>
} }
fun baz() { fun baz() {
<!JS_MODULE_PROHIBITED_ON_NON_TOPLEVEL!>@JsModule("bzz") @native fun bzz(): Int<!> <!JS_MODULE_PROHIBITED_ON_NON_TOPLEVEL!>@JsModule("bzz")
@native fun bzz(): Int<!>
@JsModule("bzz") @native class <!JS_MODULE_PROHIBITED_ON_NON_TOPLEVEL!>C<!> @JsModule("bzz")
@native class <!JS_MODULE_PROHIBITED_ON_NON_TOPLEVEL!>C<!>
} }
compiler/testData/diagnostics/testsWithJsStdLib/module/prohibitedOnNonNative.kt
Vendored
+10 -5
View File
@@ -1,11 +1,16 @@
package foo package foo
@JsModule("A") class <!JS_MODULE_PROHIBITED_ON_NON_NATIVE!>A<!> @JsModule("A")
class <!JS_MODULE_PROHIBITED_ON_NON_NATIVE!>A<!>
@JsModule("B") <!JS_MODULE_PROHIBITED_ON_NON_NATIVE!>object B<!> @JsModule("B")
<!JS_MODULE_PROHIBITED_ON_NON_NATIVE!>object B<!>
<!JS_MODULE_PROHIBITED_ON_NON_NATIVE!>@JsModule("foo") fun foo()<!> = 23 <!JS_MODULE_PROHIBITED_ON_NON_NATIVE!>@JsModule("foo")
fun foo()<!> = 23
<!JS_MODULE_PROHIBITED_ON_NON_NATIVE!>@JsModule("bar") val bar<!> = 42 <!JS_MODULE_PROHIBITED_ON_NON_NATIVE!>@JsModule("bar")
val bar<!> = 42
<!JS_MODULE_PROHIBITED_ON_NON_NATIVE!>@JsNonModule val baz<!> = 99 <!JS_MODULE_PROHIBITED_ON_NON_NATIVE!>@JsNonModule
val baz<!> = 99
compiler/testData/diagnostics/testsWithJsStdLib/module/wrongCallToModule.kt
Vendored
+6 -3
View File
@@ -4,17 +4,20 @@ package foo
import kotlin.js.* import kotlin.js.*
@JsModule("A") @native object A { @JsModule("A")
@native object A {
fun f(): Int fun f(): Int
val g: Int val g: Int
} }
@JsModule("B") @native open class B { @JsModule("B")
@native open class B {
fun foo(): Int fun foo(): Int
} }
@JsModule("bar") @native fun bar(): Unit @JsModule("bar")
@native fun bar(): Unit
// MODULE: m2(m1) // MODULE: m2(m1)
// FILE: b.kt // FILE: b.kt
compiler/testData/diagnostics/testsWithJsStdLib/module/wrongCallToNonModule.kt
Vendored
+6 -3
View File
@@ -4,17 +4,20 @@ package foo
import kotlin.js.* import kotlin.js.*
@JsNonModule @native object A { @JsNonModule
@native object A {
fun f(): Int fun f(): Int
val g: Int val g: Int
} }
@JsNonModule @native open class B { @JsNonModule
@native open class B {
fun foo(): Int fun foo(): Int
} }
@JsNonModule @native fun bar(): Unit @JsNonModule
@native fun bar(): Unit
// MODULE: m2(m1) // MODULE: m2(m1)
// MODULE_KIND: AMD // MODULE_KIND: AMD