From 9cf9342225fdffd2c92fce5313b071da40655d98 Mon Sep 17 00:00:00 2001
From: peter <peter@jetbrains.com>
Date: Thu, 20 Oct 2011 16:32:18 +0200
Subject: [PATCH] fix named argument completion tests

---
 .../handlers/NamedArgumentInsertHandler.java         |  9 +++++----
 .../groovy/completion/GroovyCompletionTest.groovy    | 12 ++++++------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/handlers/NamedArgumentInsertHandler.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/handlers/NamedArgumentInsertHandler.java
index a06fc1cdbff0..f5664379cd05 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/handlers/NamedArgumentInsertHandler.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/handlers/NamedArgumentInsertHandler.java
@@ -86,16 +86,17 @@ public class NamedArgumentInsertHandler implements InsertHandler<LookupElement>
         else {
           m = Pattern.compile("([ \\t]*)([\\n \\t]*)[\\],](.*)", Pattern.DOTALL).matcher(s);
           if (m.matches()) {
-            editor.getDocument().replaceString(tailOffset, tailOffset + m.start(2), ": ");
-            editor.getCaretModel().moveToOffset(tailOffset + 2);
+            editor.getDocument().replaceString(tailOffset, tailOffset + m.start(2), ":");
+            editor.getCaretModel().moveToOffset(tailOffset + 1);
           }
           else {
             m = Pattern.compile("([ \\t]*)(.*)", Pattern.DOTALL).matcher(s);
             if (!m.matches()) throw new RuntimeException("This pattern must match any non-empty string! (" + s + ")");
             
-            String toInsert = m.group(2).startsWith("\n") ? ": ," : ": , ";
+            String toInsert = m.group(2).startsWith("\n") ? ":," : ":, ";
             editor.getDocument().replaceString(tailOffset, tailOffset + m.start(2), toInsert);
-            editor.getCaretModel().moveToOffset(tailOffset + 2);
+            editor.getCaretModel().moveToOffset(tailOffset + 1);
+            context.setTailOffset(tailOffset + 1);
           }
         }
       }
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 68578b865319..c0f6aafffcb7 100644
--- a/plugins/groovy/test/org/jetbrains/plugins/groovy/completion/GroovyCompletionTest.groovy
+++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/completion/GroovyCompletionTest.groovy
@@ -342,7 +342,7 @@ class A {
     myFixture.checkResult """
 class A {
  public int m(arg) { return arg.arg111 + arg.arg222 + arg.arg333; }
- { m (arg111: <caret>, zzz) }
+ { m (arg111:<caret>, zzz) }
 }
 """
   }
@@ -361,7 +361,7 @@ class A {
     myFixture.checkResult("""
 class A {
  public int m(arg) { return arg.arg111 + arg.arg222 + arg.arg333; }
- { m (arg111: <caret>, {
+ { m (arg111:<caret>, {
       out << "asdasdas"
  } ) }
 }
@@ -380,7 +380,7 @@ class A {
     myFixture.checkResult """
 class A {
  public int m(arg) { return arg.arg111 + arg.arg222 + arg.arg333; }
- { m([arg111: <caret>])}
+ { m([arg111:<caret>])}
 }
 """
   }
@@ -414,7 +414,7 @@ class A {
     myFixture.checkResult """
 class A {
  public int m(arg) { return arg.arg111 + arg.arg222 + arg.arg333; }
- { m(arg111: <caret>,)}
+ { m(arg111:<caret>,)}
 }
 """
   }
@@ -517,7 +517,7 @@ class A {
 class A {
  public int m(arg) { return arg.arg111 + arg.arg222 + arg.arg333; }
  {
-   m(arg111: <caret>,
+   m(arg111:<caret>,
      arg222: 222,
    )
  }
@@ -543,7 +543,7 @@ class A {
 class A {
  public int m(arg) { return arg.arg111 + arg.arg222 + arg.arg333; }
  {
-   m(arg111: <caret>
+   m(arg111:<caret>
      , arg222: 222,
      arg333: 333,
    )