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

KT-2752: move some diagnostics from entire declarations to their headers

Browse Source
This commit is contained in:
Alexey Andreev
2016-06-23 18:04:56 +03:00
parent fb7f221158
commit 49022fd5bc
17 changed files with 41 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/diagnostics/testsWithJsStdLib/name/classLevelMethodAndProperty.kt
Vendored
+2 -2
View File
@@ -1,7 +1,7 @@
package foo package foo
class A { class A {
<!JS_NAME_CLASH!>fun bar() = 23<!> <!JS_NAME_CLASH!>fun bar()<!> = 23
<!JS_NAME_CLASH!>val bar = 23<!> <!JS_NAME_CLASH!>val bar<!> = 23
} }
compiler/testData/diagnostics/testsWithJsStdLib/name/conflictingNamesFromSuperclass.kt
Vendored
+4 -4
View File
@@ -7,12 +7,12 @@ interface B {
} }
class C : A, B { class C : A, B {
<!JS_NAME_CLASH!>override fun f() {}<!> <!JS_NAME_CLASH!>override fun f()<!> {}
<!JS_NAME_CLASH!>override fun g() {}<!> <!JS_NAME_CLASH!>override fun g()<!> {}
} }
<!JS_NAME_CLASH_SYNTHETIC!>abstract class D : A, B<!> abstract class <!JS_NAME_CLASH_SYNTHETIC!>D<!> : A, B
open class E { open class E {
open fun f() {} open fun f() {}
@@ -20,4 +20,4 @@ open class E {
open fun g() {} open fun g() {}
} }
<!JS_NAME_CLASH_SYNTHETIC!>class F : E(), A, B<!> class <!JS_NAME_CLASH_SYNTHETIC!>F<!> : E(), A, B
compiler/testData/diagnostics/testsWithJsStdLib/name/extensionPropertyAndMethod.kt
Vendored
+2 -2
View File
@@ -2,7 +2,7 @@ package foo
class A class A
<!JS_NAME_CLASH!>fun A.get_bar() = 23<!> <!JS_NAME_CLASH!>fun A.get_bar()<!> = 23
val A.bar: Int val A.bar: Int
<!JS_NAME_CLASH!>get() = 42<!> <!JS_NAME_CLASH!>get()<!> = 42
compiler/testData/diagnostics/testsWithJsStdLib/name/jsNameAndOverridden.kt
Vendored
+2 -2
View File
@@ -1,9 +1,9 @@
package foo package foo
open class Super { open class Super {
<!JS_NAME_CLASH!>fun foo() = 23<!> <!JS_NAME_CLASH!>fun foo()<!> = 23
} }
class Sub : Super() { class Sub : Super() {
<!JS_NAME_CLASH!>@JsName("foo") fun bar() = 42<!> <!JS_NAME_CLASH!>@JsName("foo") fun bar()<!> = 42
} }
compiler/testData/diagnostics/testsWithJsStdLib/name/jsNameClash.kt
Vendored
+2 -2
View File
@@ -1,5 +1,5 @@
package foo package foo
<!JS_NAME_CLASH!>@JsName("x") fun foo(x: Int) = x<!> <!JS_NAME_CLASH!>@JsName("x") fun foo(x: Int)<!> = x
<!JS_NAME_CLASH!>@JsName("x") fun bar() = 42<!> <!JS_NAME_CLASH!>@JsName("x") fun bar()<!> = 42
compiler/testData/diagnostics/testsWithJsStdLib/name/jsNameClashWithDefault.kt
Vendored
+2 -2
View File
@@ -1,5 +1,5 @@
package foo package foo
<!JS_NAME_CLASH!>@JsName("bar") fun foo(x: Int) = x<!> <!JS_NAME_CLASH!>@JsName("bar") fun foo(x: Int)<!> = x
<!JS_NAME_CLASH!>fun bar() = 42<!> <!JS_NAME_CLASH!>fun bar()<!> = 42
compiler/testData/diagnostics/testsWithJsStdLib/name/jsNameMissingOnAccessors.kt
Vendored
+8 -8
View File
@@ -1,23 +1,23 @@
package foo package foo
class A { class A {
<!JS_NAME_IS_NOT_ON_ALL_ACCESSORS!>var x: Int <!JS_NAME_IS_NOT_ON_ALL_ACCESSORS!>var x: Int<!>
@JsName("get_x") get() = 23 @JsName("get_x") get() = 23
set(value) {}<!> set(value) {}
<!JS_NAME_IS_NOT_ON_ALL_ACCESSORS!>var y: Int <!JS_NAME_IS_NOT_ON_ALL_ACCESSORS!>var y: Int<!>
@JsName("get_y") get() = 23 @JsName("get_y") get() = 23
set(value) {}<!> set(value) {}
var z: Int var z: Int
@JsName("get_z") get() = 23 @JsName("get_z") get() = 23
@JsName("set_z") set(value) {} @JsName("set_z") set(value) {}
} }
<!JS_NAME_IS_NOT_ON_ALL_ACCESSORS!>var xx: Int <!JS_NAME_IS_NOT_ON_ALL_ACCESSORS!>var xx: Int<!>
@JsName("get_xx") get() = 23 @JsName("get_xx") get() = 23
set(value) {}<!> set(value) {}
<!JS_NAME_IS_NOT_ON_ALL_ACCESSORS!>var A.ext: Int <!JS_NAME_IS_NOT_ON_ALL_ACCESSORS!>var A.ext: Int<!>
@JsName("get_ext") get() = 23 @JsName("get_ext") get() = 23
set(value) {}<!> set(value) {}
compiler/testData/diagnostics/testsWithJsStdLib/name/jsNameOnAccessors.kt
Vendored
+2 -2
View File
@@ -2,6 +2,6 @@ package foo
class A { class A {
var x: Int var x: Int
<!JS_NAME_CLASH!>@JsName("xx") get() = 0<!> <!JS_NAME_CLASH!>@JsName("xx") get()<!> = 0
<!JS_NAME_CLASH!>@JsName("xx") set(value) {}<!> <!JS_NAME_CLASH!>@JsName("xx") set(value)<!> {}
} }
compiler/testData/diagnostics/testsWithJsStdLib/name/jsNameUseTargetOnProperty.kt
Vendored
+1 -1
View File
@@ -1,5 +1,5 @@
class A { class A {
@property:JsName("x_") <!JS_NAME_ON_ACCESSOR_AND_PROPERTY!>@get:JsName("getX_")<!> val x: Int = 0 @property:JsName("x_") <!JS_NAME_ON_ACCESSOR_AND_PROPERTY!>@get:JsName("getX_")<!> val x: Int = 0
<!JS_NAME_IS_NOT_ON_ALL_ACCESSORS!>@get:JsName("getY_") var y: Int = 0<!> <!JS_NAME_IS_NOT_ON_ALL_ACCESSORS!>@get:JsName("getY_") var y: Int<!> = 0
} }
compiler/testData/diagnostics/testsWithJsStdLib/name/methodAndMethod.kt
Vendored
+2 -2
View File
@@ -1,5 +1,5 @@
package foo package foo
<!JS_NAME_CLASH!>fun bar(x: Int) = x<!> <!JS_NAME_CLASH!>fun bar(x: Int)<!> = x
<!JS_NAME_CLASH!>fun `bar_za3lpa$`() = 42<!> <!JS_NAME_CLASH!>fun `bar_za3lpa$`()<!> = 42
compiler/testData/diagnostics/testsWithJsStdLib/name/packageAndMethod.kt
Vendored
+1 -1
View File
@@ -2,7 +2,7 @@
package foo package foo
<!JS_NAME_CLASH!>fun bar() = 23<!> <!JS_NAME_CLASH!>fun bar()<!> = 23
// FILE: foobar.kt // FILE: foobar.kt
compiler/testData/diagnostics/testsWithJsStdLib/name/packageAndProperty.kt
Vendored
+1 -1
View File
@@ -2,7 +2,7 @@
package foo package foo
<!JS_NAME_CLASH!>val bar = 23<!> <!JS_NAME_CLASH!>val bar<!> = 23
// FILE: foobar.kt // FILE: foobar.kt
compiler/testData/diagnostics/testsWithJsStdLib/name/privateJsNameClash.kt
Vendored
+2 -2
View File
@@ -1,5 +1,5 @@
package foo package foo
<!JS_NAME_CLASH!>@JsName("bar") private fun foo(x: Int) = x<!> <!JS_NAME_CLASH!>@JsName("bar") private fun foo(x: Int)<!> = x
<!JS_NAME_CLASH!>fun bar() = 42<!> <!JS_NAME_CLASH!>fun bar()<!> = 42
compiler/testData/diagnostics/testsWithJsStdLib/name/propertyAndMethodInSubclass.kt
Vendored
+2 -2
View File
@@ -1,9 +1,9 @@
package foo package foo
open class Super { open class Super {
<!JS_NAME_CLASH!>val foo = 23<!> <!JS_NAME_CLASH!>val foo<!> = 23
} }
class Sub : Super() { class Sub : Super() {
<!JS_NAME_CLASH!>fun foo() = 42<!> <!JS_NAME_CLASH!>fun foo()<!> = 42
} }
compiler/testData/diagnostics/testsWithJsStdLib/name/topLevelMethodAndJsNameConstructor.kt
Vendored
+2 -2
View File
@@ -1,7 +1,7 @@
package foo package foo
class A(val x: String) { class A(val x: String) {
<!JS_NAME_CLASH!>@JsName("aa") constructor(x: Int) : this("int $x")<!> @JsName("aa") <!JS_NAME_CLASH!>constructor(x: Int)<!> : this("int $x")
} }
<!JS_NAME_CLASH!>fun aa() {}<!> <!JS_NAME_CLASH!>fun aa()<!> {}
compiler/testData/diagnostics/testsWithJsStdLib/name/topLevelMethodAndProperty.kt
Vendored
+2 -2
View File
@@ -1,5 +1,5 @@
package foo package foo
<!JS_NAME_CLASH!>fun bar() = 23<!> <!JS_NAME_CLASH!>fun bar()<!> = 23
<!JS_NAME_CLASH!>val bar = 32<!> <!JS_NAME_CLASH!>val bar<!> = 32
js/js.frontend/src/org/jetbrains/kotlin/js/resolve/diagnostics/ErrorsJs.java
+4 -3
View File
@@ -42,12 +42,13 @@ public interface ErrorsJs {
DiagnosticFactory1<KtElement, KtElement> REFERENCE_TO_BUILTIN_MEMBERS_NOT_SUPPORTED = DiagnosticFactory1.create(ERROR, DEFAULT); DiagnosticFactory1<KtElement, KtElement> REFERENCE_TO_BUILTIN_MEMBERS_NOT_SUPPORTED = DiagnosticFactory1.create(ERROR, DEFAULT);
DiagnosticFactory0<KtExpression> JSCODE_NO_JAVASCRIPT_PRODUCED = DiagnosticFactory0.create(ERROR, DEFAULT); DiagnosticFactory0<KtExpression> JSCODE_NO_JAVASCRIPT_PRODUCED = DiagnosticFactory0.create(ERROR, DEFAULT);
DiagnosticFactory0<KtExpression> NATIVE_INNER_CLASS_PROHIBITED = DiagnosticFactory0.create(ERROR); DiagnosticFactory0<KtExpression> NATIVE_INNER_CLASS_PROHIBITED = DiagnosticFactory0.create(ERROR);
DiagnosticFactory2<KtElement, String, DeclarationDescriptor> JS_NAME_CLASH = DiagnosticFactory2.create(ERROR); DiagnosticFactory2<KtElement, String, DeclarationDescriptor> JS_NAME_CLASH = DiagnosticFactory2.create(
ERROR, DECLARATION_SIGNATURE_OR_DEFAULT);
DiagnosticFactory3<KtElement, String, DeclarationDescriptor, DeclarationDescriptor> JS_NAME_CLASH_SYNTHETIC = DiagnosticFactory3<KtElement, String, DeclarationDescriptor, DeclarationDescriptor> JS_NAME_CLASH_SYNTHETIC =
DiagnosticFactory3.create(ERROR); DiagnosticFactory3.create(ERROR, DECLARATION_SIGNATURE_OR_DEFAULT);
DiagnosticFactory0<KtElement> JS_NAME_ON_PRIMARY_CONSTRUCTOR_PROHIBITED = DiagnosticFactory0.create(ERROR); DiagnosticFactory0<KtElement> JS_NAME_ON_PRIMARY_CONSTRUCTOR_PROHIBITED = DiagnosticFactory0.create(ERROR);
DiagnosticFactory0<KtElement> JS_NAME_ON_ACCESSOR_AND_PROPERTY = DiagnosticFactory0.create(ERROR); DiagnosticFactory0<KtElement> JS_NAME_ON_ACCESSOR_AND_PROPERTY = DiagnosticFactory0.create(ERROR);
DiagnosticFactory0<PsiElement> JS_NAME_IS_NOT_ON_ALL_ACCESSORS = DiagnosticFactory0.create(ERROR); DiagnosticFactory0<PsiElement> JS_NAME_IS_NOT_ON_ALL_ACCESSORS = DiagnosticFactory0.create(ERROR, DECLARATION_SIGNATURE_OR_DEFAULT);
DiagnosticFactory0<PsiElement> JS_NAME_PROHIBITED_FOR_OVERRIDE = DiagnosticFactory0.create(ERROR); DiagnosticFactory0<PsiElement> JS_NAME_PROHIBITED_FOR_OVERRIDE = DiagnosticFactory0.create(ERROR);
DiagnosticFactory0<PsiElement> JS_NAME_PROHIBITED_FOR_EXTENSION_PROPERTY = DiagnosticFactory0.create(ERROR); DiagnosticFactory0<PsiElement> JS_NAME_PROHIBITED_FOR_EXTENSION_PROPERTY = DiagnosticFactory0.create(ERROR);