From 3720d9515042e21c77d5975825e44e519f69c0b1 Mon Sep 17 00:00:00 2001 From: peter Date: Tue, 7 Aug 2012 13:43:27 +0200 Subject: [PATCH] unfocus autopopup in gant/gradle --- .../groovy/lang/completion/GroovyCompletionConfidence.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/GroovyCompletionConfidence.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/GroovyCompletionConfidence.java index 4df7481c0b13..9d96eb56de04 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/GroovyCompletionConfidence.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/GroovyCompletionConfidence.java @@ -20,8 +20,10 @@ import com.intellij.psi.PsiReference; import com.intellij.util.ThreeState; import org.jetbrains.annotations.NotNull; import org.jetbrains.plugins.groovy.console.GroovyShellAction; +import org.jetbrains.plugins.groovy.extensions.GroovyScriptTypeDetector; import org.jetbrains.plugins.groovy.lang.lexer.TokenSets; import org.jetbrains.plugins.groovy.lang.psi.GrReferenceElement; +import org.jetbrains.plugins.groovy.lang.psi.GroovyFile; import org.jetbrains.plugins.groovy.lang.psi.api.statements.GrForStatement; import org.jetbrains.plugins.groovy.lang.psi.api.statements.blocks.GrClosableBlock; import org.jetbrains.plugins.groovy.lang.psi.api.statements.expressions.GrExpression; @@ -45,6 +47,11 @@ public class GroovyCompletionConfidence extends CompletionConfidence { public ThreeState shouldFocusLookup(@NotNull CompletionParameters parameters) { final PsiElement position = parameters.getPosition(); + PsiFile file = position.getContainingFile(); + if (file instanceof GroovyFile && GroovyScriptTypeDetector.getScriptType((GroovyFile)file) != GroovyScriptTypeDetector.DEFAULT_TYPE) { + return ThreeState.NO; + } + if (position.getParent() instanceof GrReferenceElement && psiElement().afterLeaf(psiElement().withText("(").withParent(GrForStatement.class)).accepts(position)) { return ThreeState.NO;