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

IDEA-81291 Groovy: Introduce Closure Parameter: add spaces around closure body when introducing a single-line closure

Browse Source
This commit is contained in:
Maxim.Medvedev
2012-03-30 12:12:49 +04:00
parent 5ed15daca2
commit 34e210dc82
2 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/extract/closure/ExtractClosureProcessorBase.java
+2 -2
View File
@@ -63,7 +63,7 @@ public abstract class ExtractClosureProcessorBase extends BaseRefactoringProcess
public static GrClosableBlock generateClosure(GrIntroduceParameterSettings helper) {
StringBuilder buffer = new StringBuilder();
buffer.append('{');
buffer.append("{ ");
final String[] params = ExtractUtil.getParameterString(helper, true);
if (params.length > 0) {
@@ -77,7 +77,7 @@ public abstract class ExtractClosureProcessorBase extends BaseRefactoringProcess
}
ExtractUtil.generateBody(helper, false, buffer, helper.isForceReturn());
buffer.append('}');
buffer.append(" }");
return GroovyPsiElementFactory.getInstance(helper.getProject()).createClosureFromText(buffer.toString(), helper.getToReplaceIn());
}
plugins/groovy/test/org/jetbrains/plugins/groovy/refactoring/introduceParameter/ExtractClosureTest.groovy
+12 -12
View File
@@ -79,7 +79,7 @@ def foo(String s, Closure closure) {
<selection>closure(s)</selection>
}
foo('a') {String s -> print s}
foo('a') { String s -> print s }
''', [], [], false)
}
@@ -99,7 +99,7 @@ class X {
}
}
new X().foo {print 'a'}
new X().foo { print 'a' }
''', [0], [0], false)
}
@@ -144,7 +144,7 @@ class X {
}
final X x = new X()
x.foo {x.bar()}
x.foo { x.bar() }
''', [0], [], false)
}
@@ -163,7 +163,7 @@ def foo(Closure closure) {
<selection>closure(a)</selection>
}
foo {int a -> print 45 + 3 + a}
foo { int a -> print 45 + 3 + a }
''', [0, 1], [0], false)
}
@@ -213,7 +213,7 @@ def killMonsters(){2}
def collectLoot(){3}
def becomeTownGuard(){}
''', '''
adventure {return killMonsters() + collectLoot()}
adventure { return killMonsters() + collectLoot() }
def adventure(Closure<Integer> closure) {
try {
@@ -271,7 +271,7 @@ foo()
void foo(Closure<Character> closure) {
def s = <selection><caret>closure()</selection>
}
foo {return "zxcvbn".substring(2).charAt(1)}
foo { return "zxcvbn".substring(2).charAt(1) }
''')
}
}
@@ -291,7 +291,7 @@ def foo = {String s, Closure closure ->
<selection>closure(s)</selection>
}
foo('a') {String s -> print s}
foo('a') { String s -> print s }
''', [], [], false)
}
@@ -312,7 +312,7 @@ class X {
}
final X x = new X()
x.foo {x.print 'a'}
x.foo { x.print 'a' }
''', [0], [0], false)
}
@@ -357,7 +357,7 @@ class X {
}
final X x = new X()
x.foo {x.bar()}
x.foo { x.bar() }
''', [0], [], false)
}
@@ -376,7 +376,7 @@ def foo = {Closure closure ->
<selection>closure(a)</selection>
}
foo {int a -> print 45 + 3 + a}
foo { int a -> print 45 + 3 + a }
''', [0, 1], [0], false)
}
@@ -435,7 +435,7 @@ def adventure = {Closure<Integer> closure ->
}
}
adventure {return killMonsters() + collectLoot()}
adventure { return killMonsters() + collectLoot() }
class ArrowToKneeException extends Exception{}
def killMonsters(){2}
@@ -487,7 +487,7 @@ foo()
void foo = {Closure<Character> closure ->
def s = <selection><caret>closure()</selection>
}
foo {return "zxcvbn".substring(2).charAt(1)}
foo { return "zxcvbn".substring(2).charAt(1) }
''')
}
}