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

Java Deprecated is mapped in accordance with Java Target / Retention, some diagnostic changed

Browse Source
This commit is contained in:
Mikhail Glukhikh
2015-07-23 12:39:12 +03:00
parent 219ffa4fb3
commit a86857fbb5
8 changed files with 33 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/diagnostics/tests/annotations/AmbigiousAnnotationConstructor.kt
Vendored
+1 -1
View File
@@ -2,4 +2,4 @@ import java.util.ArrayList
<!NONE_APPLICABLE!>ArrayList<!><Int>(1, 1) fun b() {}
<!UNRESOLVED_REFERENCE!>Xoo<!>(<!UNRESOLVED_REFERENCE!>x<!>) fun c() {}
<!PLATFORM_CLASS_MAPPED_TO_KOTLIN!>Deprecated<!>(<!UNRESOLVED_REFERENCE, TOO_MANY_ARGUMENTS!>x<!>) fun a() {}
<!DEPRECATED_JAVA_ANNOTATION!>Deprecated(<!UNRESOLVED_REFERENCE, TOO_MANY_ARGUMENTS!>x<!>)<!> fun a() {}
compiler/testData/diagnostics/tests/annotations/AnnotatedConstructorParams.kt
Vendored
+4 -4
View File
@@ -1,15 +1,15 @@
package a
import <!PLATFORM_CLASS_MAPPED_TO_KOTLIN!>java.lang.Deprecated<!> as deprecated
import java.lang.Deprecated as deprecated
import java.lang.SuppressWarnings as suppresswarnings
<!PLATFORM_CLASS_MAPPED_TO_KOTLIN!>deprecated<!> suppresswarnings val s: String = "";
<!DEPRECATED_JAVA_ANNOTATION!>deprecated<!> suppresswarnings val s: String = "";
<!PLATFORM_CLASS_MAPPED_TO_KOTLIN!>deprecated<!> suppresswarnings fun main(args : Array<String>) {
<!DEPRECATED_JAVA_ANNOTATION!>deprecated<!> suppresswarnings fun main(args : Array<String>) {
System.out.println("Hello, world!")
}
class Test(<!PLATFORM_CLASS_MAPPED_TO_KOTLIN!>deprecated<!> val s: String,
class Test(<!DEPRECATED_JAVA_ANNOTATION!>deprecated<!> val s: String,
suppresswarnings val x : Int) {}
compiler/testData/diagnostics/tests/annotations/AnnotationsForClasses.kt
Vendored
+2 -2
View File
@@ -1,2 +1,2 @@
annotation @<!PLATFORM_CLASS_MAPPED_TO_KOTLIN!>java.lang.Deprecated<!> class my
annotation <!PLATFORM_CLASS_MAPPED_TO_KOTLIN!>Deprecated<!> class my1
annotation <!DEPRECATED_JAVA_ANNOTATION!>@java.lang.Deprecated<!> class my
annotation <!DEPRECATED_JAVA_ANNOTATION!>Deprecated<!> class my1
compiler/testData/diagnostics/tests/annotations/Deprecated.kt
Vendored
+3 -3
View File
@@ -1,5 +1,5 @@
import <!PLATFORM_CLASS_MAPPED_TO_KOTLIN!>java.lang.Deprecated<!> as deprecated
import java.lang.Deprecated as deprecated
<!PLATFORM_CLASS_MAPPED_TO_KOTLIN!>Deprecated<!> fun foo() {}
<!DEPRECATED_JAVA_ANNOTATION!>Deprecated<!> fun foo() {}
<!PLATFORM_CLASS_MAPPED_TO_KOTLIN!>deprecated<!> fun foo1() {}
<!DEPRECATED_JAVA_ANNOTATION!>deprecated<!> fun foo1() {}