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

Java to Kotlin: Deprecated annotation conversion

Browse Source
This commit is contained in:
Valentin Kipyatkov
2014-06-16 18:30:48 +04:00
parent a8c61b377a
commit 65b3ec6dfd
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
j2k/src/org/jetbrains/jet/j2k/Converter.kt
+5
View File
@@ -634,6 +634,11 @@ public class Converter private(val project: Project, val settings: ConverterSett
} }
public fun convertAnnotation(annotation: PsiAnnotation, brackets: Boolean): Annotation? { public fun convertAnnotation(annotation: PsiAnnotation, brackets: Boolean): Annotation? {
val qualifiedName = annotation.getQualifiedName()
if (qualifiedName == CommonClassNames.JAVA_LANG_DEPRECATED && annotation.getParameterList().getAttributes().isEmpty()) {
return Annotation(Identifier("deprecated"), listOf(null to LiteralExpression("\"\"")), brackets) //TODO: insert comment
}
val name = Identifier((annotation.getNameReferenceElement() ?: return null).getText()!!) val name = Identifier((annotation.getNameReferenceElement() ?: return null).getText()!!)
val annotationClass = annotation.getNameReferenceElement()?.resolve() as? PsiClass val annotationClass = annotation.getNameReferenceElement()?.resolve() as? PsiClass
val lastMethod = annotationClass?.getMethods()?.lastOrNull() val lastMethod = annotationClass?.getMethods()?.lastOrNull()
j2k/tests/testData/ast/annotations/annotationUsages.kt
+3 -3
View File
@@ -7,7 +7,7 @@ Anon4("x", "y")
Anon5(1) Anon5(1)
Anon6(array<String>("x", "y")) Anon6(array<String>("x", "y"))
class C() { class C() {
Anon5(1) Deprecated private var field1: Int = 0 Anon5(1) deprecated("") private var field1: Int = 0
Anon5(1) Anon5(1)
private var field2: Int = 0 private var field2: Int = 0
@@ -18,8 +18,8 @@ class C() {
var field4: Int = 0 var field4: Int = 0
Anon6(array<String>()) Anon6(array<String>())
fun foo(Deprecated p1: Int, Deprecated Anon5(2) p2: Char) { fun foo(deprecated("") p1: Int, deprecated("") Anon5(2) p2: Char) {
[Deprecated] [Anon5(3)] val c = 'a' [deprecated("")] [Anon5(3)] val c = 'a'
} }
Anon5(1) fun bar() { Anon5(1) fun bar() {