MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

[groovy] follow up @Synchronized IDEA-CR-13312

Browse Source
This commit is contained in:
Daniil Ovchinnikov
2016-08-26 18:42:04 +03:00
parent 9e90adcba5
commit 274b3f4313
2 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/transformations/impl/synch/impl.kt
+1 -1
View File
@@ -45,7 +45,7 @@ fun getImplicitLockUsages(field: GrField): Sequence<PsiAnnotation> {
}
private fun getImplicitLockUsages(clazz: PsiClass, static: Boolean) = clazz.methods.asSequence().filter { method ->
!static.xor(method.isStatic())
static == method.isStatic()
}.mapNotNull { method ->
AnnotationUtil.findAnnotation(method, ANNO_FQN)
}.filter { anno ->
plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/transformations/impl/synch/references.kt
+2 -5
View File
@@ -16,10 +16,10 @@
package org.jetbrains.plugins.groovy.transformations.impl.synch
import com.intellij.psi.*
import com.intellij.psi.util.PsiTreeUtil
import com.intellij.util.ProcessingContext
import org.jetbrains.plugins.groovy.lang.psi.api.statements.expressions.literals.GrLiteral
import org.jetbrains.plugins.groovy.lang.psi.api.statements.typedef.GrTypeDefinition
import org.jetbrains.plugins.groovy.lang.psi.api.statements.typedef.members.GrMethod
class SynchronizedReferenceContributor : PsiReferenceContributor() {
@@ -38,11 +38,8 @@ class SynchronizedReferenceProvider : PsiReferenceProvider() {
class FieldReference(literal: GrLiteral) : PsiReferenceBase<GrLiteral>(literal) {
private val GrLiteral.annotatedMethod: GrMethod?
get() = parent?.parent?.parent?.parent?.parent as? GrMethod
private val GrLiteral.containingClass: GrTypeDefinition?
get() = annotatedMethod?.containingClass as? GrTypeDefinition
get() = PsiTreeUtil.getParentOfType(this, GrTypeDefinition::class.java)
override fun getVariants(): Array<out Any> = element.containingClass?.codeFields ?: emptyArray()