Correct test suite to handle changes where cursor inside of range

scala-ide · Sep 15, 2014 · 441a1e8 · 441a1e8
1 parent 960a9f8
commit 441a1e8
Showing 1 changed file with 31 additions and 4 deletions.
diff --git a/org.scala-ide.sdt.core.tests/src/org/scalaide/util/internal/eclipse/EditorUtilsTest.scala b/org.scala-ide.sdt.core.tests/src/org/scalaide/util/internal/eclipse/EditorUtilsTest.scala
@@ -47,11 +47,12 @@ class EditorUtilsTest {
         m
       else {
         val close = input.indexOf(']', open+1)
-        val s = (m.size)*2
+        val s = m.size*2
         if (open < selStart)
-          findBraces(close, m + ((open-s, close-s-1)))
-        else if (close < selEnd)
-          findBraces(close, m + ((open-s-1, close-s-1)))
+          if (close < selEnd)
+            findBraces(close, m + ((open-s, close-s-1)))
+          else
+            findBraces(close, m + ((open-s, close-s-2)))
         else
           findBraces(close, m + ((open-s-1, close-s-2)))
       }
@@ -367,4 +368,30 @@ class EditorUtilsTest {
     |  def f = 0+1^
     |}
     |""".stripMargin after Seq("def g = 0", "+1")
+
+  @Test
+  def remove_after_cursor_with_cursor_inside_of_range() = """|
+    |class X {
+    |  def f = 0[ ^ ]
+    |  [def g = 0]
+    |}
+    |""".stripMargin becomes """|
+    |class X {
+    |  def f = 0^
+    |  $
+    |}
+    |""".stripMargin after Seq("", "")
+
+  @Test
+  def remove_before_cursor_with_cursor_inside_of_range() = """|
+    |class X {
+    |  [def g = 0]
+    |  def f = 0[ ^ ]
+    |}
+    |""".stripMargin becomes """|
+    |class X {
+    |  $
+    |  def f = 0^
+    |}
+    |""".stripMargin after Seq("", "")
 }