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

Fix JVMStatic annotation for UL-properties

Browse Source
This commit is contained in:
Igor Yakovlev
2019-04-30 21:56:52 +03:00
parent 5da6d9d438
commit bb071263b0
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/light-classes/src/org/jetbrains/kotlin/asJava/classes/ultraLightClass.kt
+1 -1
View File
@@ -546,7 +546,7 @@ open class KtUltraLightClass(classOrObject: KtClassOrObject, internal val suppor
return when (name) { return when (name) {
PsiModifier.FINAL -> !isInterface && outer !is KtConstructor<*> && isFinal(outer) PsiModifier.FINAL -> !isInterface && outer !is KtConstructor<*> && isFinal(outer)
PsiModifier.ABSTRACT -> isInterface || outer.hasModifier(ABSTRACT_KEYWORD) PsiModifier.ABSTRACT -> isInterface || outer.hasModifier(ABSTRACT_KEYWORD)
PsiModifier.STATIC -> forceStatic || isNamedObject() && isJvmStatic(outer) PsiModifier.STATIC -> forceStatic || isNamedObject() && (isJvmStatic(outer) || isJvmStatic(declaration))
PsiModifier.STRICTFP -> declaration is KtFunction && declaration.hasAnnotation(STRICTFP_ANNOTATION_FQ_NAME) PsiModifier.STRICTFP -> declaration is KtFunction && declaration.hasAnnotation(STRICTFP_ANNOTATION_FQ_NAME)
PsiModifier.SYNCHRONIZED -> declaration is KtFunction && declaration.hasAnnotation(SYNCHRONIZED_ANNOTATION_FQ_NAME) PsiModifier.SYNCHRONIZED -> declaration is KtFunction && declaration.hasAnnotation(SYNCHRONIZED_ANNOTATION_FQ_NAME)
else -> false else -> false
idea/testData/quickfix/autoImports/importKotlinStaticPropertyOverloadedSetterFromJava.test
Vendored
+1 -1
View File
@@ -17,7 +17,7 @@ public class Foo {
package foo package foo
object Bar { object Bar {
var variable: String var variable: String = ""
@JvmStatic set(value) { @JvmStatic set(value) {
field = value field = value
} }