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

Merge branch 'master' of git.labs.intellij.net:idea/community

Browse Source
This commit is contained in:
Michael Golubev
2012-03-16 19:42:47 +01:00
parent 44b6a31bfa 71f2c2815b
commit 40d2ffa1cf
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/groovy/src/org/jetbrains/plugins/groovy/console/GroovyShellAction.java
+3 -1
View File
@@ -39,7 +39,7 @@ import com.intellij.openapi.roots.ui.configuration.ModulesAlphaComparator;
import com.intellij.openapi.ui.popup.JBPopupFactory;
import com.intellij.openapi.ui.popup.PopupStep;
import com.intellij.openapi.ui.popup.util.BaseListPopupStep;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.openapi.util.Key;
import com.intellij.util.PlatformIcons;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.plugins.groovy.GroovyFileType;
@@ -54,6 +54,7 @@ import java.util.*;
public class GroovyShellAction extends DumbAwareAction {
private static final String GROOVY_SHELL_LAST_MODULE = "Groovy.Shell.LastModule";
public static final Key<Boolean> GROOVY_SHELL_FILE = Key.create("GROOVY_SHELL_FILE");
private static List<Module> getGroovyCompatibleModules(Project project) {
ArrayList<Module> result = new ArrayList<Module>();
@@ -149,6 +150,7 @@ public class GroovyShellAction extends DumbAwareAction {
GroovyFileImpl file = (GroovyFileImpl)res.getConsole().getFile();
assert file.getContext() == null;
file.putUserData(GROOVY_SHELL_FILE, Boolean.TRUE);
file.setContext(shellRunner.getContext(module));
plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/GroovyCompletionConfidence.java
+4
View File
@@ -20,6 +20,7 @@ import com.intellij.psi.PsiReference;
import com.intellij.util.ThreeState;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.plugins.groovy.console.GroovyShellAction;
import org.jetbrains.plugins.groovy.lang.lexer.TokenSets;
import org.jetbrains.plugins.groovy.lang.psi.GrReferenceElement;
import org.jetbrains.plugins.groovy.lang.psi.api.statements.GrForStatement;
@@ -55,6 +56,9 @@ public class GroovyCompletionConfidence extends CompletionConfidence {
final GrExpression qualifier = ref.getQualifierExpression();
if (qualifier == null) {
if (isPossibleClosureParameter(ref)) return ThreeState.NO;
if (parameters.getOriginalFile().getUserData(GroovyShellAction.GROOVY_SHELL_FILE) == Boolean.TRUE) {
return ThreeState.NO;
}
GrExpression runtimeQualifier = PsiImplUtil.getRuntimeQualifier(ref);
if (runtimeQualifier != null && runtimeQualifier.getType() == null) {