diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/refactoring/inline/InlineMethodTest.java b/plugins/groovy/test/org/jetbrains/plugins/groovy/refactoring/inline/InlineMethodTest.java
index aecba785d9db..87de00c74412 100644
--- a/plugins/groovy/test/org/jetbrains/plugins/groovy/refactoring/inline/InlineMethodTest.java
+++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/refactoring/inline/InlineMethodTest.java
@@ -42,9 +42,6 @@ import java.util.List;
  * @author ilyas
  */
 public class InlineMethodTest extends LightCodeInsightFixtureTestCase {
-  public static final String CARET_MARKER = "<caret>";
-  public static final String BEGIN_MARKER = "<begin>";
-  public static final String END_MARKER = "<end>";
 
   @Override
   protected String getBasePath() {
@@ -130,17 +127,13 @@ public class InlineMethodTest extends LightCodeInsightFixtureTestCase {
     final List<String> data = TestUtils.readInput(testFile);
     String fileText = data.get(0);
 
-    int startOffset = fileText.indexOf(BEGIN_MARKER);
-    fileText = TestUtils.removeBeginMarker(fileText);
-    int endOffset = fileText.indexOf(END_MARKER);
-    fileText = TestUtils.removeEndMarker(fileText);
-
     fixture.configureByText(GroovyFileType.GROOVY_FILE_TYPE, fileText);
 
     final PsiFile file = fixture.getFile();
     final Editor editor = fixture.getEditor();
     setIndentationToNode(file.getNode());
-    editor.getSelectionModel().setSelection(startOffset, endOffset);
+    int startOffset = editor.getSelectionModel().getSelectionStart();
+    int endOffset = editor.getSelectionModel().getSelectionEnd();
     editor.getCaretModel().moveToOffset(endOffset);
 
     GroovyPsiElement selectedArea = GroovyRefactoringUtil.findElementInRange(((GroovyFileBase) file), startOffset, endOffset, GrReferenceExpression.class);
diff --git a/plugins/groovy/testdata/groovy/refactoring/inlineLocal/GRVY_1232.test b/plugins/groovy/testdata/groovy/refactoring/inlineLocal/GRVY_1232.test
index d29eada29354..f728a4fd0371 100644
--- a/plugins/groovy/testdata/groovy/refactoring/inlineLocal/GRVY_1232.test
+++ b/plugins/groovy/testdata/groovy/refactoring/inlineLocal/GRVY_1232.test
@@ -1,6 +1,6 @@
 {
   int a = 1
-  <begin>a<end> + b
+  <selection>a</selection> + b
 }
 -----
 {
diff --git a/plugins/groovy/testdata/groovy/refactoring/inlineLocal/GRVY_1248.test b/plugins/groovy/testdata/groovy/refactoring/inlineLocal/GRVY_1248.test
index a05e617334ee..1ac81de35fbb 100644
--- a/plugins/groovy/testdata/groovy/refactoring/inlineLocal/GRVY_1248.test
+++ b/plugins/groovy/testdata/groovy/refactoring/inlineLocal/GRVY_1248.test
@@ -1,4 +1,4 @@
 New var = new New();
-<begin>var<end>.foo()
+<selection>var</selection>.foo()
 -----
 new New()<caret>.foo()
\ No newline at end of file
diff --git a/plugins/groovy/testdata/groovy/refactoring/inlineLocal/field.test b/plugins/groovy/testdata/groovy/refactoring/inlineLocal/field.test
index 2b2463d70490..cfb818be74a1 100644
--- a/plugins/groovy/testdata/groovy/refactoring/inlineLocal/field.test
+++ b/plugins/groovy/testdata/groovy/refactoring/inlineLocal/field.test
@@ -1,5 +1,5 @@
 class Foo {
-  final def <begin>foo<end> = 2+2
+  final def <selection>foo</selection> = 2+2
 
   def a() {
     print foo.intValue()
diff --git a/plugins/groovy/testdata/groovy/refactoring/inlineLocal/var1.test b/plugins/groovy/testdata/groovy/refactoring/inlineLocal/var1.test
index fd4f8271e527..fdebf6953c07 100644
--- a/plugins/groovy/testdata/groovy/refactoring/inlineLocal/var1.test
+++ b/plugins/groovy/testdata/groovy/refactoring/inlineLocal/var1.test
@@ -1,4 +1,4 @@
 def var = 1
-<begin>var<end>
+<selection>var</selection>
 -----
 1<caret>
\ No newline at end of file
diff --git a/plugins/groovy/testdata/groovy/refactoring/inlineLocal/var2.test b/plugins/groovy/testdata/groovy/refactoring/inlineLocal/var2.test
index 9e9aef1afec1..e8788a8abfe4 100644
--- a/plugins/groovy/testdata/groovy/refactoring/inlineLocal/var2.test
+++ b/plugins/groovy/testdata/groovy/refactoring/inlineLocal/var2.test
@@ -1,4 +1,4 @@
-def <begin>preved<end> = 42
+def <selection>preved</selection> = 42
 println preved + preved * preved
 -----
 <caret>println 42 + 42 * 42
\ No newline at end of file
diff --git a/plugins/groovy/testdata/groovy/refactoring/inlineLocal/var3.test b/plugins/groovy/testdata/groovy/refactoring/inlineLocal/var3.test
index fa32766ddd5c..25eedcb915e7 100644
--- a/plugins/groovy/testdata/groovy/refactoring/inlineLocal/var3.test
+++ b/plugins/groovy/testdata/groovy/refactoring/inlineLocal/var3.test
@@ -1,4 +1,4 @@
 def sum = 2 + 2
-def mul = 3 * <begin>sum<end>
+def mul = 3 * <selection>sum</selection>
 -----
 def mul = 3 * (2 + 2)<caret>
\ No newline at end of file
diff --git a/plugins/groovy/testdata/groovy/refactoring/inlineLocal/var4.test b/plugins/groovy/testdata/groovy/refactoring/inlineLocal/var4.test
index c740b5daf8e2..ddc87407149c 100644
--- a/plugins/groovy/testdata/groovy/refactoring/inlineLocal/var4.test
+++ b/plugins/groovy/testdata/groovy/refactoring/inlineLocal/var4.test
@@ -1,4 +1,4 @@
 def sum = 2 + 2
-def diff = 3 - <begin>sum<end>
+def diff = 3 - <selection>sum</selection>
 -----
 def diff = 3 - (2 + 2)<caret>
\ No newline at end of file
diff --git a/plugins/groovy/testdata/groovy/refactoring/inlineLocal/var5.test b/plugins/groovy/testdata/groovy/refactoring/inlineLocal/var5.test
index d437ca2f3275..6b62fada30f0 100644
--- a/plugins/groovy/testdata/groovy/refactoring/inlineLocal/var5.test
+++ b/plugins/groovy/testdata/groovy/refactoring/inlineLocal/var5.test
@@ -1,4 +1,4 @@
 def sum = (2 + 2)
-def diff = <begin>sum<end> - 3
+def diff = <selection>sum</selection> - 3
 -----
 def diff = 2 + 2<caret> - 3
\ No newline at end of file
diff --git a/plugins/groovy/testdata/groovy/refactoring/inlineLocal/var6.test b/plugins/groovy/testdata/groovy/refactoring/inlineLocal/var6.test
index e8dab33d98c8..8de3f1b12597 100644
--- a/plugins/groovy/testdata/groovy/refactoring/inlineLocal/var6.test
+++ b/plugins/groovy/testdata/groovy/refactoring/inlineLocal/var6.test
@@ -1,4 +1,4 @@
 def sum = new A()
-def diff = <begin>sum<end>.dec()
+def diff = <selection>sum</selection>.dec()
 -----
 def diff = new A()<caret>.dec()
\ No newline at end of file
diff --git a/plugins/groovy/testdata/groovy/refactoring/inlineLocal/varInGString.test b/plugins/groovy/testdata/groovy/refactoring/inlineLocal/varInGString.test
index 2c4c76f1a84c..7a901a68fa00 100644
--- a/plugins/groovy/testdata/groovy/refactoring/inlineLocal/varInGString.test
+++ b/plugins/groovy/testdata/groovy/refactoring/inlineLocal/varInGString.test
@@ -1,4 +1,4 @@
-def <begin>s<end>="$x+$y"
+def <selection>s</selection>="$x+$y"
 print "${s}wow+$s"
 -----
 <caret>print "$x+${y}wow+$x+$y"
\ No newline at end of file
diff --git a/plugins/groovy/testdata/groovy/refactoring/inlineLocal/varInGString2.test b/plugins/groovy/testdata/groovy/refactoring/inlineLocal/varInGString2.test
index e49915730325..76be9303159b 100644
--- a/plugins/groovy/testdata/groovy/refactoring/inlineLocal/varInGString2.test
+++ b/plugins/groovy/testdata/groovy/refactoring/inlineLocal/varInGString2.test
@@ -1,4 +1,4 @@
-def <begin>s<end>='abc"cde';
+def <selection>s</selection>='abc"cde';
 print "$s"
 -----
 <caret>print "abc\"cde"
diff --git a/plugins/groovy/testdata/groovy/refactoring/inlineMethod/abstr1.test b/plugins/groovy/testdata/groovy/refactoring/inlineMethod/abstr1.test
index f83ff52887eb..9a69f5bd9242 100644
--- a/plugins/groovy/testdata/groovy/refactoring/inlineMethod/abstr1.test
+++ b/plugins/groovy/testdata/groovy/refactoring/inlineMethod/abstr1.test
@@ -3,7 +3,7 @@ abstract class A{
     abstract def foo()
 
     def boo() {
-        <begin>foo<end>()
+        <selection>foo</selection>()
     }
 
 }
diff --git a/plugins/groovy/testdata/groovy/refactoring/inlineMethod/block1.test b/plugins/groovy/testdata/groovy/refactoring/inlineMethod/block1.test
index e99463412698..02a1e5d08666 100644
--- a/plugins/groovy/testdata/groovy/refactoring/inlineMethod/block1.test
+++ b/plugins/groovy/testdata/groovy/refactoring/inlineMethod/block1.test
@@ -2,7 +2,7 @@ def tail(int jjj) {
         println jjj
 
         if (true)
-                return <begin>fact<end>(jjj)
+                return <selection>fact</selection>(jjj)
         else
                 return fact(jjj)
 }
diff --git a/plugins/groovy/testdata/groovy/refactoring/inlineMethod/block2.test b/plugins/groovy/testdata/groovy/refactoring/inlineMethod/block2.test
index 35458626338e..ae82df4edf86 100644
--- a/plugins/groovy/testdata/groovy/refactoring/inlineMethod/block2.test
+++ b/plugins/groovy/testdata/groovy/refactoring/inlineMethod/block2.test
@@ -4,7 +4,7 @@ def tail(int jjj) {
         if (true)
                 return fact(jjj)
         else
-                return <begin>fact<end>(jjj)
+                return <selection>fact</selection>(jjj)
 }
 
 
diff --git a/plugins/groovy/testdata/groovy/refactoring/inlineMethod/block3.test b/plugins/groovy/testdata/groovy/refactoring/inlineMethod/block3.test
index 8f7c8a01bbb0..0a8f64bfc4d9 100644
--- a/plugins/groovy/testdata/groovy/refactoring/inlineMethod/block3.test
+++ b/plugins/groovy/testdata/groovy/refactoring/inlineMethod/block3.test
@@ -2,7 +2,7 @@ def tail(int jjj) {
         println jjj
         if (true)
                 return 1 + fact(jjj)
-        else 1 + <begin>fact<end>(jjj)
+        else 1 + <selection>fact</selection>(jjj)
 }
 
 int fact(int n) {
diff --git a/plugins/groovy/testdata/groovy/refactoring/inlineMethod/block4.test b/plugins/groovy/testdata/groovy/refactoring/inlineMethod/block4.test
index 593c2b876246..87e4cb7b782a 100644
--- a/plugins/groovy/testdata/groovy/refactoring/inlineMethod/block4.test
+++ b/plugins/groovy/testdata/groovy/refactoring/inlineMethod/block4.test
@@ -1,6 +1,6 @@
 def baal(int jjj) {
         while (true)
-                println(<begin>fact<end>(jjj))
+                println(<selection>fact</selection>(jjj))
 }
 
 
diff --git a/plugins/groovy/testdata/groovy/refactoring/inlineMethod/case1.test b/plugins/groovy/testdata/groovy/refactoring/inlineMethod/case1.test
index d38a5893344c..351072c128f8 100644
--- a/plugins/groovy/testdata/groovy/refactoring/inlineMethod/case1.test
+++ b/plugins/groovy/testdata/groovy/refactoring/inlineMethod/case1.test
@@ -5,7 +5,7 @@ int fact(int n) {
 
 def foo(int i) {
         switch (i) {
-                case 42: return <begin>fact<end>(5)
+                case 42: return <selection>fact</selection>(5)
                 default:
                         return fact(7)
         }
diff --git a/plugins/groovy/testdata/groovy/refactoring/inlineMethod/case2.test b/plugins/groovy/testdata/groovy/refactoring/inlineMethod/case2.test
index a987c6e5dfe4..1f838ce1ae52 100644
--- a/plugins/groovy/testdata/groovy/refactoring/inlineMethod/case2.test
+++ b/plugins/groovy/testdata/groovy/refactoring/inlineMethod/case2.test
@@ -7,7 +7,7 @@ def foo(int i) {
         switch (i) {
                 case 42: return fact(5)
                 default:
-                        return <begin>fact<end>(7)
+                        return <selection>fact</selection>(7)
         }
 }
 -----
diff --git a/plugins/groovy/testdata/groovy/refactoring/inlineMethod/clos_arg1.test b/plugins/groovy/testdata/groovy/refactoring/inlineMethod/clos_arg1.test
index 17c2f600bf0b..63cdbe6e2c58 100644
--- a/plugins/groovy/testdata/groovy/refactoring/inlineMethod/clos_arg1.test
+++ b/plugins/groovy/testdata/groovy/refactoring/inlineMethod/clos_arg1.test
@@ -1,4 +1,4 @@
-def cl = <begin>qwerty<end>({int x -> return x + 1})
+def cl = <selection>qwerty</selection>({int x -> return x + 1})
 
 def qwerty(Closure cl){
         def call = cl.call()
diff --git a/plugins/groovy/testdata/groovy/refactoring/inlineMethod/clos_arg2.test b/plugins/groovy/testdata/groovy/refactoring/inlineMethod/clos_arg2.test
index 68963294cbe1..33c0f44a62e9 100644
--- a/plugins/groovy/testdata/groovy/refactoring/inlineMethod/clos_arg2.test
+++ b/plugins/groovy/testdata/groovy/refactoring/inlineMethod/clos_arg2.test
@@ -1,4 +1,4 @@
-def cl = <begin>qwerty<end>{int x -> return x + 1}{int x -> return x + 1}
+def cl = <selection>qwerty</selection>{int x -> return x + 1}{int x -> return x + 1}
 
  def qwerty(Closure cl, Closure cl2){
         def call = cl(42)
diff --git a/plugins/groovy/testdata/groovy/refactoring/inlineMethod/clos_arg3.test b/plugins/groovy/testdata/groovy/refactoring/inlineMethod/clos_arg3.test
index fe6998eecd14..084ca5f7ac87 100644
--- a/plugins/groovy/testdata/groovy/refactoring/inlineMethod/clos_arg3.test
+++ b/plugins/groovy/testdata/groovy/refactoring/inlineMethod/clos_arg3.test
@@ -1,4 +1,4 @@
-def cl = <begin>qwerty<end>(45){int x -> return x + 1}
+def cl = <selection>qwerty</selection>(45){int x -> return x + 1}
 
  def qwerty(int i, Closure cl){
         def call = cl(42)
diff --git a/plugins/groovy/testdata/groovy/refactoring/inlineMethod/cond.test b/plugins/groovy/testdata/groovy/refactoring/inlineMethod/cond.test
index 6568349e9a06..df8ecca407fc 100644
--- a/plugins/groovy/testdata/groovy/refactoring/inlineMethod/cond.test
+++ b/plugins/groovy/testdata/groovy/refactoring/inlineMethod/cond.test
@@ -1,6 +1,6 @@
 def cond = true
 
-if (<begin>qqqqq<end>(cond)) {
+if (<selection>qqqqq</selection>(cond)) {
         println "a"
 } else {
         println ("b")
diff --git a/plugins/groovy/testdata/groovy/refactoring/inlineMethod/expr1.test b/plugins/groovy/testdata/groovy/refactoring/inlineMethod/expr1.test
index dfc5e0532240..e85edf15d6da 100644
--- a/plugins/groovy/testdata/groovy/refactoring/inlineMethod/expr1.test
+++ b/plugins/groovy/testdata/groovy/refactoring/inlineMethod/expr1.test
@@ -2,7 +2,7 @@ int foo(int a, b = 13, c, t = 14, m = 18, n = 19, d, e = 11) {
         return a + b + c + t + m + n + d + e
 }
 
-println(<begin>foo<end>())
+println(<selection>foo</selection>())
 -----
 int foo(int a, b = 13, c, t = 14, m = 18, n = 19, d, e = 11) {
         return a + b + c + t + m + n + d + e
diff --git a/plugins/groovy/testdata/groovy/refactoring/inlineMethod/expr2.test b/plugins/groovy/testdata/groovy/refactoring/inlineMethod/expr2.test
index 0228067913df..e0bc8d8f1148 100644
--- a/plugins/groovy/testdata/groovy/refactoring/inlineMethod/expr2.test
+++ b/plugins/groovy/testdata/groovy/refactoring/inlineMethod/expr2.test
@@ -2,7 +2,7 @@ int foo(int a, b = 13, c, t = 14, m = 18, n = 19, d, e = 11) {
         return a + b + c + t + m + n + d + e
 }
 
-println(<begin>foo<end>(1,2,3,4))
+println(<selection>foo</selection>(1,2,3,4))
 -----
 int foo(int a, b = 13, c, t = 14, m = 18, n = 19, d, e = 11) {
         return a + b + c + t + m + n + d + e
diff --git a/plugins/groovy/testdata/groovy/refactoring/inlineMethod/expr3.test b/plugins/groovy/testdata/groovy/refactoring/inlineMethod/expr3.test
index b32f5daae78f..5e10dca35f63 100644
--- a/plugins/groovy/testdata/groovy/refactoring/inlineMethod/expr3.test
+++ b/plugins/groovy/testdata/groovy/refactoring/inlineMethod/expr3.test
@@ -2,7 +2,7 @@ int foo(int a, b = 13, c, t = 14, m = 18, n = 19, d, e = 11) {
         return a + b + c + t + m + n + d + e
 }
 
-println(<begin>foo<end>(1,2,3,4,5,6,7))
+println(<selection>foo</selection>(1,2,3,4,5,6,7))
 -----
 int foo(int a, b = 13, c, t = 14, m = 18, n = 19, d, e = 11) {
         return a + b + c + t + m + n + d + e
diff --git a/plugins/groovy/testdata/groovy/refactoring/inlineMethod/expr4.test b/plugins/groovy/testdata/groovy/refactoring/inlineMethod/expr4.test
index fcbe4463d084..9b568bfab7e4 100644
--- a/plugins/groovy/testdata/groovy/refactoring/inlineMethod/expr4.test
+++ b/plugins/groovy/testdata/groovy/refactoring/inlineMethod/expr4.test
@@ -2,7 +2,7 @@ int foo(int a, b = 13, c, t = 14, m = 18, n = 19, d, e = 11) {
         a + b + c + t + m + n + d + e
 }
 
-println(<begin>foo<end>(1,2,3,4,5,6,7,8,9,10))
+println(<selection>foo</selection>(1,2,3,4,5,6,7,8,9,10))
 -----
 int foo(int a, b = 13, c, t = 14, m = 18, n = 19, d, e = 11) {
         a + b + c + t + m + n + d + e
diff --git a/plugins/groovy/testdata/groovy/refactoring/inlineMethod/expressionInParameter.test b/plugins/groovy/testdata/groovy/refactoring/inlineMethod/expressionInParameter.test
index 08fa7b696a24..2b8b4b4dd613 100644
--- a/plugins/groovy/testdata/groovy/refactoring/inlineMethod/expressionInParameter.test
+++ b/plugins/groovy/testdata/groovy/refactoring/inlineMethod/expressionInParameter.test
@@ -5,7 +5,7 @@ class X {
     }
 
     int x(final int x, int y) {
-        return <begin>foo<end>(x + y);
+        return <selection>foo</selection>(x + y);
     }
 }
 -----
diff --git a/plugins/groovy/testdata/groovy/refactoring/inlineMethod/fact.test b/plugins/groovy/testdata/groovy/refactoring/inlineMethod/fact.test
index 239e6a80cb87..a2475e8ebcc4 100644
--- a/plugins/groovy/testdata/groovy/refactoring/inlineMethod/fact.test
+++ b/plugins/groovy/testdata/groovy/refactoring/inlineMethod/fact.test
@@ -3,7 +3,7 @@ int fact(int n) {
         else return 1;
 }
 
-println(<begin>fact<end>(3))
+println(<selection>fact</selection>(3))
 -----
 int fact(int n) {
     if (n > 0) return n * fact(n-1);
diff --git a/plugins/groovy/testdata/groovy/refactoring/inlineMethod/fact2.test b/plugins/groovy/testdata/groovy/refactoring/inlineMethod/fact2.test
index 372475f30c2d..ff7345dd8f63 100644
--- a/plugins/groovy/testdata/groovy/refactoring/inlineMethod/fact2.test
+++ b/plugins/groovy/testdata/groovy/refactoring/inlineMethod/fact2.test
@@ -1,5 +1,5 @@
 int fact(int n) {
-        if (n > 0) return n * <begin>fact<end>(n - 1);
+        if (n > 0) return n * <selection>fact</selection>(n - 1);
         else return 1;
 }
 -----
diff --git a/plugins/groovy/testdata/groovy/refactoring/inlineMethod/fieldAsParameter.test b/plugins/groovy/testdata/groovy/refactoring/inlineMethod/fieldAsParameter.test
index 71943f10da07..4070a43f6caf 100644
--- a/plugins/groovy/testdata/groovy/refactoring/inlineMethod/fieldAsParameter.test
+++ b/plugins/groovy/testdata/groovy/refactoring/inlineMethod/fieldAsParameter.test
@@ -6,7 +6,7 @@ class X {
     }
 
     {
-        <begin>foo<end>(a);
+        <selection>foo</selection>(a);
     }
 }
 -----
diff --git a/plugins/groovy/testdata/groovy/refactoring/inlineMethod/finalParameter.test b/plugins/groovy/testdata/groovy/refactoring/inlineMethod/finalParameter.test
index 2fadda83af1b..aa446a6df3a3 100644
--- a/plugins/groovy/testdata/groovy/refactoring/inlineMethod/finalParameter.test
+++ b/plugins/groovy/testdata/groovy/refactoring/inlineMethod/finalParameter.test
@@ -4,7 +4,7 @@ def foo(int x) {
 }
 
 final i = 5;
-print <begin>foo<end>(i);
+print <selection>foo</selection>(i);
 -----
 def foo(int x) {
     x++;
diff --git a/plugins/groovy/testdata/groovy/refactoring/inlineMethod/init1.test b/plugins/groovy/testdata/groovy/refactoring/inlineMethod/init1.test
index c41e60e15d5d..479f7f1c47fe 100644
--- a/plugins/groovy/testdata/groovy/refactoring/inlineMethod/init1.test
+++ b/plugins/groovy/testdata/groovy/refactoring/inlineMethod/init1.test
@@ -1,6 +1,6 @@
 def result = 26
 
-def bar(int h = <begin>foo<end>(42, 239)) {}
+def bar(int h = <selection>foo</selection>(42, 239)) {}
 
 def foo(int i, def j) {
         if (i > 42) {
diff --git a/plugins/groovy/testdata/groovy/refactoring/inlineMethod/inlineAll.test b/plugins/groovy/testdata/groovy/refactoring/inlineMethod/inlineAll.test
index be9d37dd4653..7465f2b94eec 100644
--- a/plugins/groovy/testdata/groovy/refactoring/inlineMethod/inlineAll.test
+++ b/plugins/groovy/testdata/groovy/refactoring/inlineMethod/inlineAll.test
@@ -6,7 +6,7 @@ class X {
 
     {
         int x = 6, y = 3;
-        return foo(foo(x) + <begin>foo<end>(y))
+        return foo(foo(x) + <selection>foo</selection>(y))
     }
 }
 -----
diff --git a/plugins/groovy/testdata/groovy/refactoring/inlineMethod/inlineInGString.test b/plugins/groovy/testdata/groovy/refactoring/inlineMethod/inlineInGString.test
index f88356a5aae0..6a2a6281f45a 100644
--- a/plugins/groovy/testdata/groovy/refactoring/inlineMethod/inlineInGString.test
+++ b/plugins/groovy/testdata/groovy/refactoring/inlineMethod/inlineInGString.test
@@ -2,7 +2,7 @@ def foo(int x) {
     return "foo(x = $x)";
 }
 
-print "foo(2) = ${<begin>foo<end>(2)}";
+print "foo(2) = ${<selection>foo</selection>(2)}";
 -----
 def foo(int x) {
     return "foo(x = $x)";
diff --git a/plugins/groovy/testdata/groovy/refactoring/inlineMethod/map_arg1.test b/plugins/groovy/testdata/groovy/refactoring/inlineMethod/map_arg1.test
index 47d4462187c3..fd000192ffad 100644
--- a/plugins/groovy/testdata/groovy/refactoring/inlineMethod/map_arg1.test
+++ b/plugins/groovy/testdata/groovy/refactoring/inlineMethod/map_arg1.test
@@ -2,7 +2,7 @@ int bar(args1, i, k = 5, j) {
         return args1.c + i + k + j
 }
 
-def t = <begin>bar<end>(24, a: 1, b: 2, c: 3, d: 1, e: 2, f: 3, 23)
+def t = <selection>bar</selection>(24, a: 1, b: 2, c: 3, d: 1, e: 2, f: 3, 23)
 -----
 int bar(args1, i, k = 5, j) {
         return args1.c + i + k + j
diff --git a/plugins/groovy/testdata/groovy/refactoring/inlineMethod/parameterIsUsedAfterCall.test b/plugins/groovy/testdata/groovy/refactoring/inlineMethod/parameterIsUsedAfterCall.test
index 41cab6c2dc98..866438c9d800 100644
--- a/plugins/groovy/testdata/groovy/refactoring/inlineMethod/parameterIsUsedAfterCall.test
+++ b/plugins/groovy/testdata/groovy/refactoring/inlineMethod/parameterIsUsedAfterCall.test
@@ -4,7 +4,7 @@ def foo(def x) {
 }
 
 int i = 5;
-<begin>foo<end>(i);
+<selection>foo</selection>(i);
 i++;
 -----
 def foo(def x) {
diff --git a/plugins/groovy/testdata/groovy/refactoring/inlineMethod/qual1.test b/plugins/groovy/testdata/groovy/refactoring/inlineMethod/qual1.test
index 69c6d0f55c35..336d115f6ae0 100644
--- a/plugins/groovy/testdata/groovy/refactoring/inlineMethod/qual1.test
+++ b/plugins/groovy/testdata/groovy/refactoring/inlineMethod/qual1.test
@@ -1,6 +1,6 @@
 def getGeneratedFileNames() {
         if (true) {
-                return <begin>QasdWfsdEdfgh.foo().f.test<end>()
+                return <selection>QasdWfsdEdfgh.foo().f.test</selection>()
         }
         else 42
 }
diff --git a/plugins/groovy/testdata/groovy/refactoring/inlineMethod/qual2.test b/plugins/groovy/testdata/groovy/refactoring/inlineMethod/qual2.test
index 8b1312784f9a..02832184e3c3 100644
--- a/plugins/groovy/testdata/groovy/refactoring/inlineMethod/qual2.test
+++ b/plugins/groovy/testdata/groovy/refactoring/inlineMethod/qual2.test
@@ -1,6 +1,6 @@
 def getGeneratedFileNames() {
         if (true) {
-                return <begin>QQQ.test<end>()
+                return <selection>QQQ.test</selection>()
         }
         else 42
 }
diff --git a/plugins/groovy/testdata/groovy/refactoring/inlineMethod/qual3.test b/plugins/groovy/testdata/groovy/refactoring/inlineMethod/qual3.test
index 6659b77cac19..7325ad2c8754 100644
--- a/plugins/groovy/testdata/groovy/refactoring/inlineMethod/qual3.test
+++ b/plugins/groovy/testdata/groovy/refactoring/inlineMethod/qual3.test
@@ -1,6 +1,6 @@
 def getGeneratedFileNames() {
         if (true) {
-                return <begin>new QQQ().test<end>()
+                return <selection>new QQQ().test</selection>()
         }
         else 42
 }
diff --git a/plugins/groovy/testdata/groovy/refactoring/inlineMethod/qual4.test b/plugins/groovy/testdata/groovy/refactoring/inlineMethod/qual4.test
index 43951b04183c..ca4a74fc2ebe 100644
--- a/plugins/groovy/testdata/groovy/refactoring/inlineMethod/qual4.test
+++ b/plugins/groovy/testdata/groovy/refactoring/inlineMethod/qual4.test
@@ -1,7 +1,7 @@
 def getGeneratedFileNames() {
         def qqq = 239
         if (true)
-                return <begin>new QQQ().test<end>()
+                return <selection>new QQQ().test</selection>()
         else 42
 }
 
diff --git a/plugins/groovy/testdata/groovy/refactoring/inlineMethod/qual5.test b/plugins/groovy/testdata/groovy/refactoring/inlineMethod/qual5.test
index 7b8566f6ed3e..e18917bee1ec 100644
--- a/plugins/groovy/testdata/groovy/refactoring/inlineMethod/qual5.test
+++ b/plugins/groovy/testdata/groovy/refactoring/inlineMethod/qual5.test
@@ -2,7 +2,7 @@ def getGeneratedFileNames() {
         def qqq = 239
         if (true) {
                 def qqq1 = new QQQ()
-                return <begin>qqq1.test<end>()
+                return <selection>qqq1.test</selection>()
         }
         else 42
 }
diff --git a/plugins/groovy/testdata/groovy/refactoring/inlineMethod/ref1.test b/plugins/groovy/testdata/groovy/refactoring/inlineMethod/ref1.test
index d3bbec68cb74..f3e91e6d942e 100644
--- a/plugins/groovy/testdata/groovy/refactoring/inlineMethod/ref1.test
+++ b/plugins/groovy/testdata/groovy/refactoring/inlineMethod/ref1.test
@@ -1,7 +1,7 @@
 protected static def getGeneratedFileNames() {
         def foo = 0
         while (true) {
-                foo = <begin>asd<end>()
+                foo = <selection>asd</selection>()
         }
 
         int t = foo
diff --git a/plugins/groovy/testdata/groovy/refactoring/inlineMethod/rename1.test b/plugins/groovy/testdata/groovy/refactoring/inlineMethod/rename1.test
index 11e2f757a27a..77cc8480beab 100644
--- a/plugins/groovy/testdata/groovy/refactoring/inlineMethod/rename1.test
+++ b/plugins/groovy/testdata/groovy/refactoring/inlineMethod/rename1.test
@@ -1,7 +1,7 @@
 protected static def getGeneratedFileNames() {
         foo = 0
         while (true) {
-                foo = <begin>test<end>()
+                foo = <selection>test</selection>()
         }
         int t = foo
 }
diff --git a/plugins/groovy/testdata/groovy/refactoring/inlineMethod/rename2.test b/plugins/groovy/testdata/groovy/refactoring/inlineMethod/rename2.test
index 27aada6405e2..f50df20b72ab 100644
--- a/plugins/groovy/testdata/groovy/refactoring/inlineMethod/rename2.test
+++ b/plugins/groovy/testdata/groovy/refactoring/inlineMethod/rename2.test
@@ -1,7 +1,7 @@
 protected static def getGeneratedFileNames() {
         foo = 0
         while (true) {
-                foo = <begin>test<end>()
+                foo = <selection>test</selection>()
         }
         int t = foo
 }
diff --git a/plugins/groovy/testdata/groovy/refactoring/inlineMethod/ret1.test b/plugins/groovy/testdata/groovy/refactoring/inlineMethod/ret1.test
index 7a204cb837dd..a0220203b2ff 100644
--- a/plugins/groovy/testdata/groovy/refactoring/inlineMethod/ret1.test
+++ b/plugins/groovy/testdata/groovy/refactoring/inlineMethod/ret1.test
@@ -4,7 +4,7 @@ int bar(i = 8, k = i + 1, j = k) {
         return i + k + j + q + q + q
 }
 
-def t = <begin>bar<end>()
+def t = <selection>bar</selection>()
 -----
 int bar(i = 8, k = i + 1, j = k) {
     def q = 6
diff --git a/plugins/groovy/testdata/groovy/refactoring/inlineMethod/ret2.test b/plugins/groovy/testdata/groovy/refactoring/inlineMethod/ret2.test
index d1ff16d305f9..12520b1da33c 100644
--- a/plugins/groovy/testdata/groovy/refactoring/inlineMethod/ret2.test
+++ b/plugins/groovy/testdata/groovy/refactoring/inlineMethod/ret2.test
@@ -4,7 +4,7 @@ int bar(i = 8, k = i + 1, j = k) {
         return i + k + j + q + q + q
 }
 
-println(<begin>bar<end>())
+println(<selection>bar</selection>())
 -----
 int bar(i = 8, k = i + 1, j = k) {
     def q = 6
diff --git a/plugins/groovy/testdata/groovy/refactoring/inlineMethod/ret3.test b/plugins/groovy/testdata/groovy/refactoring/inlineMethod/ret3.test
index 73b36c77fd10..f824a555127b 100644
--- a/plugins/groovy/testdata/groovy/refactoring/inlineMethod/ret3.test
+++ b/plugins/groovy/testdata/groovy/refactoring/inlineMethod/ret3.test
@@ -1,6 +1,6 @@
 def result = 26
 
-int i = <begin>foo<end>(42, 239)
+int i = <selection>foo</selection>(42, 239)
 
 def foo(int i, def j) {
         if (i > 42) {
diff --git a/plugins/groovy/testdata/groovy/refactoring/inlineMethod/ret4.test b/plugins/groovy/testdata/groovy/refactoring/inlineMethod/ret4.test
index 280440486c93..b4b5cbc16401 100644
--- a/plugins/groovy/testdata/groovy/refactoring/inlineMethod/ret4.test
+++ b/plugins/groovy/testdata/groovy/refactoring/inlineMethod/ret4.test
@@ -1,6 +1,6 @@
 def result = 26
 
-int i = <begin>foo<end>(42, 239)
+int i = <selection>foo</selection>(42, 239)
 
 def foo(int i, def j) {
         if (i > 42) {
diff --git a/plugins/groovy/testdata/groovy/refactoring/inlineMethod/ret5.test b/plugins/groovy/testdata/groovy/refactoring/inlineMethod/ret5.test
index 22040bf9f241..5ca2ab647e29 100644
--- a/plugins/groovy/testdata/groovy/refactoring/inlineMethod/ret5.test
+++ b/plugins/groovy/testdata/groovy/refactoring/inlineMethod/ret5.test
@@ -1,6 +1,6 @@
 def result = 26
 
-int i = <begin>foo<end>(42, 239)
+int i = <selection>foo</selection>(42, 239)
 
 def foo(int i, def j) {
         if (i > 42) {
diff --git a/plugins/groovy/testdata/groovy/refactoring/inlineMethod/singleExpression.test b/plugins/groovy/testdata/groovy/refactoring/inlineMethod/singleExpression.test
index 5a6e1c25020c..02b427b704e3 100644
--- a/plugins/groovy/testdata/groovy/refactoring/inlineMethod/singleExpression.test
+++ b/plugins/groovy/testdata/groovy/refactoring/inlineMethod/singleExpression.test
@@ -8,7 +8,7 @@ class Child {
 
 class User {
     void meth() {
-        <begin>new Child().doSmth<end>()
+        <selection>new Child().doSmth</selection>()
     }
 }
 -----
diff --git a/plugins/groovy/testdata/groovy/refactoring/inlineMethod/tail1.test b/plugins/groovy/testdata/groovy/refactoring/inlineMethod/tail1.test
index 4bcbe1965ccc..5fa2894a35de 100644
--- a/plugins/groovy/testdata/groovy/refactoring/inlineMethod/tail1.test
+++ b/plugins/groovy/testdata/groovy/refactoring/inlineMethod/tail1.test
@@ -1,7 +1,7 @@
 def result = 26
 
 def cl = { int x ->
-        <begin>foo<end>(x, 239)
+        <selection>foo</selection>(x, 239)
 }
 
 def foo(int i, def j) {
diff --git a/plugins/groovy/testdata/groovy/refactoring/inlineMethod/tail1_1.test b/plugins/groovy/testdata/groovy/refactoring/inlineMethod/tail1_1.test
index 4800e5c76cf3..2b23070059be 100644
--- a/plugins/groovy/testdata/groovy/refactoring/inlineMethod/tail1_1.test
+++ b/plugins/groovy/testdata/groovy/refactoring/inlineMethod/tail1_1.test
@@ -1,7 +1,7 @@
 def tail(int jjj) {
         println jjj
 
-        println (<begin>fact<end>(jjj))
+        println (<selection>fact</selection>(jjj))
 }
 
 int fact(int n) {
diff --git a/plugins/groovy/testdata/groovy/refactoring/inlineMethod/tail2.test b/plugins/groovy/testdata/groovy/refactoring/inlineMethod/tail2.test
index 589199807f1d..79a34d763947 100644
--- a/plugins/groovy/testdata/groovy/refactoring/inlineMethod/tail2.test
+++ b/plugins/groovy/testdata/groovy/refactoring/inlineMethod/tail2.test
@@ -1,7 +1,7 @@
 def tail(int jjj) {
         println jjj
 
-        <begin>fact<end>(jjj)
+        <selection>fact</selection>(jjj)
 }
 
 int fact(int n) {
diff --git a/plugins/groovy/testdata/groovy/refactoring/inlineMethod/tail3.test b/plugins/groovy/testdata/groovy/refactoring/inlineMethod/tail3.test
index 67893c834a53..eb7fd78d9c7d 100644
--- a/plugins/groovy/testdata/groovy/refactoring/inlineMethod/tail3.test
+++ b/plugins/groovy/testdata/groovy/refactoring/inlineMethod/tail3.test
@@ -1,7 +1,7 @@
 def tail(int jjj) {
         println jjj
 
-        return <begin>fact<end>(jjj)
+        return <selection>fact</selection>(jjj)
 }
 
 int fact(int n) {
diff --git a/plugins/groovy/testdata/groovy/refactoring/inlineMethod/tail4.test b/plugins/groovy/testdata/groovy/refactoring/inlineMethod/tail4.test
index 49207401245f..093cd1316b6e 100644
--- a/plugins/groovy/testdata/groovy/refactoring/inlineMethod/tail4.test
+++ b/plugins/groovy/testdata/groovy/refactoring/inlineMethod/tail4.test
@@ -2,7 +2,7 @@ def tail(int jjj) {
         println jjj
 
         if (true) {
-            return <begin>fact<end>(jjj)
+            return <selection>fact</selection>(jjj)
         }
         return 42
 }
diff --git a/plugins/groovy/testdata/groovy/refactoring/inlineMethod/tail5.test b/plugins/groovy/testdata/groovy/refactoring/inlineMethod/tail5.test
index 1457961fe44a..5a44a12c7726 100644
--- a/plugins/groovy/testdata/groovy/refactoring/inlineMethod/tail5.test
+++ b/plugins/groovy/testdata/groovy/refactoring/inlineMethod/tail5.test
@@ -2,7 +2,7 @@ def tail(int jjj) {
         println jjj
 
         if (true) {
-            return <begin>fact<end>(jjj)
+            return <selection>fact</selection>(jjj)
         }
         else {
             return 42
diff --git a/plugins/groovy/testdata/groovy/refactoring/inlineMethod/tail6.test b/plugins/groovy/testdata/groovy/refactoring/inlineMethod/tail6.test
index a8a95637d2d1..879e81791a67 100644
--- a/plugins/groovy/testdata/groovy/refactoring/inlineMethod/tail6.test
+++ b/plugins/groovy/testdata/groovy/refactoring/inlineMethod/tail6.test
@@ -1,7 +1,7 @@
 def tail = { jjj ->
         println jjj
 
-        return <begin>fact<end>(jjj)
+        return <selection>fact</selection>(jjj)
 }
 
 int fact(int n) {
diff --git a/plugins/groovy/testdata/groovy/refactoring/inlineMethod/ven_tail.test b/plugins/groovy/testdata/groovy/refactoring/inlineMethod/ven_tail.test
index 6f165ef44286..b389dba10327 100644
--- a/plugins/groovy/testdata/groovy/refactoring/inlineMethod/ven_tail.test
+++ b/plugins/groovy/testdata/groovy/refactoring/inlineMethod/ven_tail.test
@@ -1,7 +1,7 @@
 class DC {
         def r() {
                 String s1 = ""
-                return <begin>getBytes<end>(s1)
+                return <selection>getBytes</selection>(s1)
         }
 
         private byte[] getBytes(String s1) {
diff --git a/plugins/groovy/testdata/groovy/refactoring/inlineMethod/ven_tail2.test b/plugins/groovy/testdata/groovy/refactoring/inlineMethod/ven_tail2.test
index df2bee556c01..27e77bbfab03 100644
--- a/plugins/groovy/testdata/groovy/refactoring/inlineMethod/ven_tail2.test
+++ b/plugins/groovy/testdata/groovy/refactoring/inlineMethod/ven_tail2.test
@@ -1,7 +1,7 @@
 class DC {
         def r() {
                 String s1 = ""
-                <begin>getBytes<end>(s1)
+                <selection>getBytes</selection>(s1)
         }
 
         private byte[] getBytes(String s1) {
diff --git a/plugins/groovy/testdata/groovy/refactoring/inlineMethod/void.test b/plugins/groovy/testdata/groovy/refactoring/inlineMethod/void.test
index 33ba125c5a27..e83f9dec37ca 100644
--- a/plugins/groovy/testdata/groovy/refactoring/inlineMethod/void.test
+++ b/plugins/groovy/testdata/groovy/refactoring/inlineMethod/void.test
@@ -1,4 +1,4 @@
-def foo = <begin>edronax<end>(32)
+def foo = <selection>edronax</selection>(32)
 
 void edronax(int g) {
         if (g > 40) {
diff --git a/plugins/groovy/testdata/groovy/refactoring/inlineMethod/writableVariable.test b/plugins/groovy/testdata/groovy/refactoring/inlineMethod/writableVariable.test
index ff4b2a55255a..8b11b515cae2 100644
--- a/plugins/groovy/testdata/groovy/refactoring/inlineMethod/writableVariable.test
+++ b/plugins/groovy/testdata/groovy/refactoring/inlineMethod/writableVariable.test
@@ -9,7 +9,7 @@ class X {
     {
         int i = 5;
         i++;
-        print <begin>foo<end>(i);
+        print <selection>foo</selection>(i);
     }
 }
 -----