From e69927a07d3cd201b318be6d34fc5caa58504512 Mon Sep 17 00:00:00 2001 From: Max Medvedev Date: Tue, 19 Mar 2013 10:43:17 +0400 Subject: [PATCH] synchronized fixer --- ...dFixer.groovy => GrSynchronizedFixer.java} | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) rename plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/smartEnter/fixers/{GrSynchronizedFixer.groovy => GrSynchronizedFixer.java} (83%) diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/smartEnter/fixers/GrSynchronizedFixer.groovy b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/smartEnter/fixers/GrSynchronizedFixer.java similarity index 83% rename from plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/smartEnter/fixers/GrSynchronizedFixer.groovy rename to plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/smartEnter/fixers/GrSynchronizedFixer.java index f30a19ee176a..aeffca7f9d8a 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/smartEnter/fixers/GrSynchronizedFixer.groovy +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/smartEnter/fixers/GrSynchronizedFixer.java @@ -13,26 +13,25 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jetbrains.plugins.groovy.lang.completion.smartEnter.fixers +package org.jetbrains.plugins.groovy.lang.completion.smartEnter.fixers; -import com.intellij.lang.SmartEnterProcessorWithFixers -import com.intellij.openapi.editor.Document -import com.intellij.openapi.editor.Editor -import com.intellij.psi.PsiElement -import com.intellij.psi.util.PsiTreeUtil -import org.jetbrains.annotations.NotNull -import org.jetbrains.plugins.groovy.lang.completion.smartEnter.GroovySmartEnterProcessor -import org.jetbrains.plugins.groovy.lang.psi.api.statements.GrSynchronizedStatement +import com.intellij.lang.SmartEnterProcessorWithFixers; +import com.intellij.openapi.editor.Document; +import com.intellij.openapi.editor.Editor; +import com.intellij.psi.PsiElement; +import com.intellij.psi.util.PsiTreeUtil; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.plugins.groovy.lang.completion.smartEnter.GroovySmartEnterProcessor; +import org.jetbrains.plugins.groovy.lang.psi.api.statements.GrSynchronizedStatement; -/** - * @author Max Medvedev - */ public class GrSynchronizedFixer extends SmartEnterProcessorWithFixers.Fixer { public void apply(@NotNull Editor editor, @NotNull GroovySmartEnterProcessor processor, @NotNull PsiElement psiElement) { GrSynchronizedStatement synchronizedStatement = PsiTreeUtil.getParentOfType(psiElement, GrSynchronizedStatement.class); if (synchronizedStatement == null || synchronizedStatement.getBody() != null) return; + if (!PsiTreeUtil.isAncestor(synchronizedStatement.getMonitor(), psiElement, false)) return; + final Document doc = editor.getDocument(); PsiElement eltToInsertAfter = synchronizedStatement.getRParenth(); @@ -41,6 +40,7 @@ public class GrSynchronizedFixer extends SmartEnterProcessorWithFixers.Fixer