Fixed Pull Up to generate correct annotation syntax
This commit is contained in:
+1
-1
@@ -60,7 +60,7 @@ public class JavaToKotlinPreconversionPullUpHelper(
|
||||
private val fieldsToUsages = HashMap<PsiField, List<EncapsulateFieldUsageInfo>>()
|
||||
private val dummyAccessorByName = HashMap<String, PsiMethod>()
|
||||
|
||||
private val jvmStaticAnnotation = JetPsiFactory(data.sourceClass.project).createAnnotationEntry("kotlin.jvm.JvmStatic")
|
||||
private val jvmStaticAnnotation = JetPsiFactory(data.sourceClass.project).createAnnotationEntry("@kotlin.jvm.JvmStatic")
|
||||
|
||||
companion object {
|
||||
private var PsiMember.originalMember: PsiMember? by CopyableUserDataProperty(Key.create("ORIGINAL_MEMBER"))
|
||||
|
||||
@@ -21,7 +21,7 @@ abstract class A {
|
||||
var X = "1" + "2"
|
||||
|
||||
// INFO: {"checked": "true"}
|
||||
JvmStatic fun foo2(n: Int): String {
|
||||
@JvmStatic fun foo2(n: Int): String {
|
||||
return "_" + n + "_"
|
||||
}
|
||||
}
|
||||
|
||||
+1
-1
@@ -19,7 +19,7 @@ abstract class A {
|
||||
var X = "1" + "2"
|
||||
|
||||
// INFO: {"checked": "true", "toAbstract": "true"}
|
||||
JvmStatic fun foo2(n: Int): String {
|
||||
@JvmStatic fun foo2(n: Int): String {
|
||||
return "_" + n + "_"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -15,7 +15,7 @@ interface A {
|
||||
var X = "1" + "2"
|
||||
|
||||
// INFO: {"checked": "true"}
|
||||
JvmStatic fun foo2(n: Int): String {
|
||||
@JvmStatic fun foo2(n: Int): String {
|
||||
return "_" + n + "_"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -23,7 +23,7 @@ class T {
|
||||
var X = "1" + "2"
|
||||
|
||||
// INFO: {"checked": "true"}
|
||||
JvmStatic fun foo2(n: Int): String {
|
||||
@JvmStatic fun foo2(n: Int): String {
|
||||
return "_" + n + "_"
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user