Add indent rewrite tests

Author: adpi2

compiler/test/dotty/tools/dotc/CompilationTests.scala

@@ -82,9 +82,14 @@ class CompilationTests {
       compileFile("tests/rewrites/rewrites3x.scala", defaultOptions.and("-rewrite", "-source", "future-migration")),
       compileFile("tests/rewrites/filtering-fors.scala", defaultOptions.and("-rewrite", "-source", "3.2-migration")),
       compileFile("tests/rewrites/refutable-pattern-bindings.scala", defaultOptions.and("-rewrite", "-source", "3.2-migration")),
-      compileFile("tests/rewrites/i8982.scala", defaultOptions.and("-indent", "-rewrite")),
-      compileFile("tests/rewrites/i9632.scala", defaultOptions.and("-indent", "-rewrite")),
-      compileFile("tests/rewrites/i11895.scala", defaultOptions.and("-indent", "-rewrite")),
+      compileFile("tests/rewrites/i8982.scala", indentRewrite),
+      compileFile("tests/rewrites/i9632.scala", indentRewrite),
+      compileFile("tests/rewrites/i11895.scala", indentRewrite),
+      compileFile("tests/rewrites/indent-rewrite.scala", indentRewrite),
+      compileFile("tests/rewrites/indent-comments.scala", indentRewrite),
+      compileFile("tests/rewrites/indent-mix-tab-space.scala", indentRewrite),
+      compileFile("tests/rewrites/indent-3-spaces.scala", indentRewrite),
+      compileFile("tests/rewrites/indent-mix-brace.scala", indentRewrite),
       compileFile("tests/rewrites/i12340.scala", unindentOptions.and("-rewrite")),
       compileFile("tests/rewrites/i17187.scala", unindentOptions.and("-rewrite")),
       compileFile("tests/rewrites/i17399.scala", unindentOptions.and("-rewrite")),

compiler/test/dotty/tools/vulpix/TestConfiguration.scala

@@ -65,6 +65,7 @@ object TestConfiguration {
 
   val commonOptions = Array("-indent") ++ checkOptions ++ noCheckOptions ++ yCheckOptions
   val defaultOptions = TestFlags(basicClasspath, commonOptions)
+  val indentRewrite = defaultOptions.and("-rewrite")
   val unindentOptions = TestFlags(basicClasspath, Array("-no-indent") ++ checkOptions ++ noCheckOptions ++ yCheckOptions)
   val withCompilerOptions =
     defaultOptions.withClasspath(withCompilerClasspath).withRunClasspath(withCompilerClasspath)

tests/rewrites/indent-3-spaces.check

@@ -0,0 +1,21 @@
+// Rewrite to indent, keeping 3 spaces as indentation
+
+def m1 =
+   def m2 =
+      "" +
+         "" +
+         ""
+   m2
+
+def m4 =
+   def m5 =
+      def m6 =
+         val x = ""
+         x
+            .apply(0)
+            .toString
+      m6
+         .toString
+   m5 +
+      m5
+         .toString

tests/rewrites/indent-3-spaces.scala

@@ -0,0 +1,26 @@
+// Rewrite to indent, keeping 3 spaces as indentation
+
+def m1 = {
+   def m2 = {
+      "" +
+         "" +
+         ""
+   }
+   m2
+}
+
+def m4 = {
+   def m5 = {
+      def m6 = {
+         val x = ""
+         x
+            .apply(0)
+            .toString
+      }
+      m6
+         .toString
+   }
+   m5 +
+      m5
+         .toString
+}

tests/rewrites/indent-comments.check

@@ -0,0 +1,25 @@
+// Rewriting to indent should preserve comments
+class A: /* 1 */ /* 2 */
+  def m1(b: Boolean) = /* 3 */ /* 4 */
+    val x = if (b)
+    /* 5 */
+      "true"
+    /* 6 */
+    else
+    /* 7 */
+      "false"
+    /* 8 */
+    /* 9 */ x.toBoolean
+  /* 10 */ /* 11 */
+  /* 12 */def m2 = // 12
+    m1:// 14
+    /* 15 */// 16
+      true
+    /* 17 */// 18
+// because of the missing indent before {
+// the scanner inserts a new line between || and {
+// cannot rewrite to indentation without messing the comments up
+    true ||// 19
+    /* 20 */{
+      false
+    }// 21

tests/rewrites/indent-comments.scala

@@ -0,0 +1,27 @@
+// Rewriting to indent should preserve comments
+class A /* 1 */ { /* 2 */
+  def m1(b: Boolean) = /* 3 */ { /* 4 */
+    val x = if (b)
+    /* 5 */ {
+      "true"
+    } /* 6 */
+    else
+    { /* 7 */
+      "false"
+    /* 8 */ }
+/* 9 */ x.toBoolean
+  /* 10 */ } /* 11 */
+/* 12 */def m2 = {// 12
+m1// 14
+  /* 15 */{// 16
+true
+/* 17 */}// 18
+// because of the missing indent before {
+// the scanner inserts a new line between || and {
+// cannot rewrite to indentation without messing the comments up
+true ||// 19
+/* 20 */{
+  false
+}// 21
+}
+}

tests/rewrites/indent-mix-brace.check

@@ -0,0 +1,17 @@
+// A mix of nested in-brace regions and indented regions
+
+class A:
+  def m1 =
+    ""
+
+  def m2 =
+    def m3 =
+      val x = ""
+      x
+    m3
+
+class B:
+  def foo =
+    def bar =
+      ""
+    bar

tests/rewrites/indent-mix-brace.scala

@@ -0,0 +1,21 @@
+// A mix of nested in-brace regions and indented regions
+
+class A:
+  def m1 = {
+    ""
+  }
+
+  def m2 = {
+def m3 =
+  val x = ""
+  x
+m3
+  }
+
+class B {
+  def foo =
+    def bar = {
+      ""
+    }
+    bar
+}

tests/rewrites/indent-mix-tab-space.check

@@ -0,0 +1,22 @@
+// Contains an ugly but valid mix of spaces and tabs
+// Rewrite to significant indentation syntax
+
+def m1 =
+  def m2 =
+    "" +
+      "" +
+    	""
+  m2
+
+def m4 =
+  def m5 =
+  	def m6 =
+  		val x = ""
+  		x
+  		.apply(0)
+  		.toString
+  	m6
+  		.toString
+  m5 +
+  m5
+    	.toString

tests/rewrites/indent-mix-tab-space.scala

@@ -0,0 +1,27 @@
+// Contains an ugly but valid mix of spaces and tabs
+// Rewrite to significant indentation syntax
+
+def m1 = {
+  def m2 = {
+    "" +
+      "" +
+    	""
+  }
+    m2
+}
+
+def m4 = {
+  def m5 = {
+  	def m6 = {
+	    val x = ""
+	  x
+	.apply(0)
+	    	.toString
+	}
+  	  m6
+  		.toString
+  }
+    m5 +
+  m5
+    	.toString
+}