From 89b37671d121b95bfe0ad6f0d4c9b904854b8d78 Mon Sep 17 00:00:00 2001 From: peter Date: Fri, 20 Sep 2013 12:14:52 +0200 Subject: [PATCH] disable autopopup in groovy shell if selection by chars is enabled (IDEA-112820) --- .../groovy/lang/completion/GroovyCompletionConfidence.java | 5 +++++ 1 file changed, 5 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 bae24c8b8a7e..6850885ebe0a 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 @@ -12,6 +12,7 @@ */ package org.jetbrains.plugins.groovy.lang.completion; +import com.intellij.codeInsight.CodeInsightSettings; import com.intellij.codeInsight.completion.CompletionConfidence; import com.intellij.codeInsight.completion.CompletionParameters; import com.intellij.patterns.ElementPattern; @@ -93,6 +94,10 @@ public class GroovyCompletionConfidence extends CompletionConfidence { @NotNull @Override public ThreeState shouldSkipAutopopup(@NotNull PsiElement contextElement, @NotNull PsiFile psiFile, int offset) { + if (CodeInsightSettings.getInstance().SELECT_AUTOPOPUP_SUGGESTIONS_BY_CHARS && psiFile.getUserData(GroovyShellAction.GROOVY_SHELL_FILE) == Boolean.TRUE) { + return ThreeState.YES; + } + if (com.intellij.psi.impl.PsiImplUtil.isLeafElementOfType(contextElement, TokenSets.STRING_LITERALS)) { @SuppressWarnings("ConstantConditions") PsiElement parent = contextElement.getParent();