MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

fix named argument completion tests

Browse Source
This commit is contained in:
peter
2011-10-20 16:33:45 +02:00
parent 551040d040
commit 9cf9342225
2 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/handlers/NamedArgumentInsertHandler.java
+5 -4
View File
@@ -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);
}
}
}
plugins/groovy/test/org/jetbrains/plugins/groovy/completion/GroovyCompletionTest.groovy
+6 -6
View File
@@ -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,
)