From baefccf5bd211290963d3e7548fed943443cd220 Mon Sep 17 00:00:00 2001 From: peter Date: Mon, 8 Jul 2013 12:11:10 +0200 Subject: [PATCH] groovy: don't suggest methods/fields after new --- .../groovy/lang/completion/GroovyCompletionContributor.java | 4 +++- .../plugins/groovy/completion/GroovyAutoPopupTest.groovy | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/GroovyCompletionContributor.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/GroovyCompletionContributor.java index 95dbc1ddc002..2ca5c7e7fd29 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/GroovyCompletionContributor.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/GroovyCompletionContributor.java @@ -308,7 +308,9 @@ public class GroovyCompletionContributor extends CompletionContributor { }); if (reference.getQualifier() == null) { - GroovySmartCompletionContributor.addExpectedClassMembers(parameters, result); + if (!GroovySmartCompletionContributor.AFTER_NEW.accepts(position)) { + GroovySmartCompletionContributor.addExpectedClassMembers(parameters, result); + } if (isClassNamePossible(position) && JavaCompletionContributor.mayStartClassName(result)) { result.stopHere(); diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/completion/GroovyAutoPopupTest.groovy b/plugins/groovy/test/org/jetbrains/plugins/groovy/completion/GroovyAutoPopupTest.groovy index 2f3437f0132e..163be05e8563 100644 --- a/plugins/groovy/test/org/jetbrains/plugins/groovy/completion/GroovyAutoPopupTest.groovy +++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/completion/GroovyAutoPopupTest.groovy @@ -283,7 +283,9 @@ Abcdefg ''' void foo(File... files) { } foo(new ) ''' - type 'File(' + type 'File' + myFixture.assertPreferredCompletionItems 0, 'File', 'File', 'FileInputStream' + type '(' assert myFixture.editor.document.text.contains('new File()') }