From 1472eed7b7aaa57e57ea822fadc46693590bc922 Mon Sep 17 00:00:00 2001 From: peter Date: Wed, 6 Jul 2011 15:37:09 +0200 Subject: [PATCH] IDEA-71339 If completion of method call without parameters is finished by space two spaces are inserted --- .../codeInsight/completion/JavaCompletionUtil.java | 2 +- .../codeInsight/completion/normal/NoArgsMethodSpace.java | 8 ++++++++ .../completion/normal/NoArgsMethodSpace_after.java | 8 ++++++++ .../codeInsight/completion/NormalCompletionTest.groovy | 1 + 4 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 java/java-tests/testData/codeInsight/completion/normal/NoArgsMethodSpace.java create mode 100644 java/java-tests/testData/codeInsight/completion/normal/NoArgsMethodSpace_after.java diff --git a/java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionUtil.java b/java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionUtil.java index 5830100ffc05..f95b28b23350 100644 --- a/java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionUtil.java +++ b/java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionUtil.java @@ -811,7 +811,7 @@ public class JavaCompletionUtil { final boolean hasTail = tailType != TailType.NONE && tailType != TailType.UNKNOWN; final boolean smart = completionChar == Lookup.COMPLETE_STATEMENT_SELECT_CHAR; - if (completionChar == '(' || completionChar == '.' || completionChar == ',' || completionChar == ';' || completionChar == ':') { + if (completionChar == '(' || completionChar == '.' || completionChar == ',' || completionChar == ';' || completionChar == ':' || completionChar == ' ') { context.setAddCompletionChar(false); } diff --git a/java/java-tests/testData/codeInsight/completion/normal/NoArgsMethodSpace.java b/java/java-tests/testData/codeInsight/completion/normal/NoArgsMethodSpace.java new file mode 100644 index 000000000000..2e9557719138 --- /dev/null +++ b/java/java-tests/testData/codeInsight/completion/normal/NoArgsMethodSpace.java @@ -0,0 +1,8 @@ +class Foo { + int foo1() {} + int foo2() {} + + { + foo + } +} \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/completion/normal/NoArgsMethodSpace_after.java b/java/java-tests/testData/codeInsight/completion/normal/NoArgsMethodSpace_after.java new file mode 100644 index 000000000000..9f138526aba3 --- /dev/null +++ b/java/java-tests/testData/codeInsight/completion/normal/NoArgsMethodSpace_after.java @@ -0,0 +1,8 @@ +class Foo { + int foo1() {} + int foo2() {} + + { + foo1() + } +} \ No newline at end of file diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/completion/NormalCompletionTest.groovy b/java/java-tests/testSrc/com/intellij/codeInsight/completion/NormalCompletionTest.groovy index 110a74567f77..01b75f420ec5 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/completion/NormalCompletionTest.groovy +++ b/java/java-tests/testSrc/com/intellij/codeInsight/completion/NormalCompletionTest.groovy @@ -875,6 +875,7 @@ public class NormalCompletionTest extends LightFixtureCompletionTestCase { public void testCommaAfterVariable() throws Throwable { doTest(',') } public void testClassAngleBracket() throws Throwable { doTest('<') } + public void testNoArgsMethodSpace() throws Throwable { doTest(' ') } public void testClassSquareBracket() throws Throwable { doTest('[') } public void testPrimitiveSquareBracket() throws Throwable { doTest('[') }