From d76b1428794e3dcbd58019cb14b84d08d4dc3e10 Mon Sep 17 00:00:00 2001 From: Max Medvedev Date: Wed, 5 Dec 2012 13:34:24 +0400 Subject: [PATCH] IDEA-96624 Groovy: don't complete primitive types with space in new-expression --- .../groovy/lang/completion/GroovyCompletionData.java | 3 ++- .../plugins/groovy/completion/GroovyCompletionTest.groovy | 7 +++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/GroovyCompletionData.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/GroovyCompletionData.java index d62bb6dcc548..d7920a915a20 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/GroovyCompletionData.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/GroovyCompletionData.java @@ -135,7 +135,8 @@ public class GroovyCompletionData { .afterLeaf(psiElement().withElementType(GroovyTokenTypes.kAS).withParent(GrSafeCastExpression.class)) .accepts(position); - addKeywords(result, !inCast, BUILT_IN_TYPES); + boolean inNew = psiElement().afterLeaf(psiElement(GroovyTokenTypes.kNEW)).accepts(position); + addKeywords(result, !inCast && !inNew, BUILT_IN_TYPES); } if (psiElement(GrReferenceExpression.class).inside(or(psiElement(GrWhileStatement.class), psiElement(GrForStatement.class))).accepts(parent)) { 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 aa1fad3d2b3c..d74a2514e62b 100644 --- a/plugins/groovy/test/org/jetbrains/plugins/groovy/completion/GroovyCompletionTest.groovy +++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/completion/GroovyCompletionTest.groovy @@ -1618,4 +1618,11 @@ new Foooo() ''') } + void testBooleanInNewExpr() { + doBasicTest('''\ +def b = new boolea +''', '''\ +def b = new boolean +''') + } } \ No newline at end of file