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

IDEA-104739 completion for binding variables

Browse Source
This commit is contained in:
Max Medvedev
2013-04-16 16:27:58 +04:00
parent dc4c39e61f
commit 33a37e4aca
3 changed files with 81 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/expressions/CompleteReferenceExpression.java
+38
View File
@@ -36,7 +36,9 @@ import org.jetbrains.annotations.Nullable;
import org.jetbrains.plugins.groovy.GroovyFileType;
import org.jetbrains.plugins.groovy.lang.completion.GroovyCompletionUtil;
import org.jetbrains.plugins.groovy.lang.lexer.GroovyTokenTypes;
import org.jetbrains.plugins.groovy.lang.psi.GroovyFile;
import org.jetbrains.plugins.groovy.lang.psi.GroovyPsiElement;
import org.jetbrains.plugins.groovy.lang.psi.GroovyRecursiveElementVisitor;
import org.jetbrains.plugins.groovy.lang.psi.api.GroovyResolveResult;
import org.jetbrains.plugins.groovy.lang.psi.api.SpreadState;
import org.jetbrains.plugins.groovy.lang.psi.api.auxiliary.modifiers.annotation.GrAnnotation;
@@ -44,6 +46,7 @@ import org.jetbrains.plugins.groovy.lang.psi.api.auxiliary.modifiers.annotation.
import org.jetbrains.plugins.groovy.lang.psi.api.statements.GrField;
import org.jetbrains.plugins.groovy.lang.psi.api.statements.GrVariable;
import org.jetbrains.plugins.groovy.lang.psi.api.statements.blocks.GrClosableBlock;
import org.jetbrains.plugins.groovy.lang.psi.api.statements.expressions.GrAssignmentExpression;
import org.jetbrains.plugins.groovy.lang.psi.api.statements.expressions.GrExpression;
import org.jetbrains.plugins.groovy.lang.psi.api.statements.expressions.GrReferenceExpression;
import org.jetbrains.plugins.groovy.lang.psi.api.statements.typedef.GrTypeDefinition;
@@ -53,6 +56,7 @@ import org.jetbrains.plugins.groovy.lang.psi.api.statements.typedef.members.GrRe
import org.jetbrains.plugins.groovy.lang.psi.impl.GroovyPsiManager;
import org.jetbrains.plugins.groovy.lang.psi.impl.GroovyResolveResultImpl;
import org.jetbrains.plugins.groovy.lang.psi.impl.PsiImplUtil;
import org.jetbrains.plugins.groovy.lang.psi.impl.synthetic.GrBindingVariable;
import org.jetbrains.plugins.groovy.lang.psi.typeEnhancers.ClosureParameterEnhancer;
import org.jetbrains.plugins.groovy.lang.psi.util.PsiUtil;
import org.jetbrains.plugins.groovy.lang.resolve.ClosureMissingMethodContributor;
@@ -128,6 +132,8 @@ public class CompleteReferenceExpression {
if (qualifier != null) {
getVariantsFromQualifier(refExpr, processor, qualifier);
}
getBindings(refExpr, processor);
}
else {
if (refExpr.getDotTokenType() != GroovyTokenTypes.mSPREAD_DOT) {
@@ -145,6 +151,38 @@ public class CompleteReferenceExpression {
ResolveUtil.processCategoryMembers(refExpr, processor, ResolveState.initial());
}
private static void getBindings(final GrReferenceExpression refExpr, final CompleteReferenceProcessor processor) {
final PsiClass containingClass = PsiTreeUtil.getParentOfType(refExpr, PsiClass.class);
if (containingClass != null) return;
final PsiFile file = refExpr.getContainingFile();
if (file instanceof GroovyFile) {
((GroovyFile)file).accept(new GroovyRecursiveElementVisitor() {
@Override
public void visitAssignmentExpression(GrAssignmentExpression expression) {
super.visitAssignmentExpression(expression);
final GrExpression value = expression.getLValue();
if (value instanceof GrReferenceExpression && !((GrReferenceExpression)value).isQualified()) {
final PsiElement resolved = ((GrReferenceExpression)value).resolve();
if (resolved instanceof GrBindingVariable) {
processor.execute(resolved, ResolveState.initial());
}
else if (resolved == null) {
processor.execute(new GrBindingVariable((GroovyFile)file, ((GrReferenceExpression)value).getReferenceName(), true),
ResolveState.initial());
}
}
}
@Override
public void visitTypeDefinition(GrTypeDefinition typeDefinition) {
//don't go into classes
}
});
}
}
private static void getVariantsFromQualifierForSpreadOperator(GrReferenceExpression refExpr,
ResolverProcessor processor,
GrExpression qualifier) {
plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/synthetic/GrBindingVariable.java
+6
View File
@@ -28,6 +28,7 @@ import org.jetbrains.plugins.groovy.lang.psi.api.statements.GrVariable;
import org.jetbrains.plugins.groovy.lang.psi.api.statements.expressions.GrAssignmentExpression;
import org.jetbrains.plugins.groovy.lang.psi.api.statements.expressions.GrExpression;
import org.jetbrains.plugins.groovy.lang.psi.api.statements.expressions.GrReferenceExpression;
import org.jetbrains.plugins.groovy.lang.psi.api.statements.typedef.GrTypeDefinition;
import org.jetbrains.plugins.groovy.lang.psi.api.types.GrTypeElement;
import javax.swing.*;
@@ -121,6 +122,11 @@ public class GrBindingVariable extends GrLightVariable implements GrVariable {
super.visitAssignmentExpression(expression);
}
@Override
public void visitTypeDefinition(GrTypeDefinition typeDefinition) {
//don't go inside type definitions
}
@Override
public void visitElement(GroovyPsiElement element) {
if (myHasWriteAccess == null) {
plugins/groovy/test/org/jetbrains/plugins/groovy/completion/GroovyCompletionTest.groovy
+37
View File
@@ -1734,4 +1734,41 @@ class Inheritor extends Base {
doVariantableTest('Inheritor.fo<caret>','', CompletionType.BASIC, CompletionResult.equal, 'foo', 'forName', 'forName')
}
void testBinding1() {
doCompletionTest('''\
aaa = 5
print aa<caret>
''', '''\
aaa = 5
print aaa<caret>
''', CompletionType.BASIC)
}
void testBinding2() {
doCompletionTest('''\
def foo() {
aaa = 5
}
print aa<caret>
''', '''\
def foo() {
aaa = 5
}
print aaa<caret>
''', CompletionType.BASIC)
}
void testBinding3() {
doVariantableTest('''\
def x() {
aaa = 5
}
aaaa = 6
print aa<caret>
''', CompletionType.BASIC, 'aaa', 'aaaa')
}
}