From 1d2c3f8a4838ea30c7fce071e610202716d4fa2b Mon Sep 17 00:00:00 2001 From: peter Date: Mon, 4 Jul 2011 15:19:26 +0200 Subject: [PATCH] tab completion shouldn't overwrite ) in groovy named arguments --- .../statements/arguments/GrArgumentLabelImpl.java | 3 ++- .../groovy/completion/GroovyCompletionTest.groovy | 12 ++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/arguments/GrArgumentLabelImpl.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/arguments/GrArgumentLabelImpl.java index 7e9d5fc342d3..74729b908916 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/arguments/GrArgumentLabelImpl.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/arguments/GrArgumentLabelImpl.java @@ -134,7 +134,8 @@ public class GrArgumentLabelImpl extends GroovyPsiElementImpl implements GrArgum } public PsiReference getReference() { - return this; + final PsiElement name = getNameElement(); + return name instanceof GrLiteral || name instanceof LeafPsiElement ? this : null; } @Nullable diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/completion/GroovyCompletionTest.groovy b/plugins/groovy/test/org/jetbrains/plugins/groovy/completion/GroovyCompletionTest.groovy index bdff87140540..ead6958b9487 100644 --- a/plugins/groovy/test/org/jetbrains/plugins/groovy/completion/GroovyCompletionTest.groovy +++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/completion/GroovyCompletionTest.groovy @@ -516,6 +516,18 @@ in""" myFixture.checkResult "def x = []; x.add() this" } + public void testEatingClosingParenthesis() { + checkCompletion """ +def xxxx = [] +def xxxy = [] +foo((xx):2) +""", '\t', """ +def xxxx = [] +def xxxy = [] +foo((xxxx):2) +""" + } + public void testDontAddStaticImportSecondTime() { configure """import static java.lang.String.format form"""