Fix indent after self type

Author: adpi2

compiler/src/dotty/tools/dotc/parsing/Parsers.scala

@@ -4278,7 +4278,7 @@ object Parsers {
             nextToken()
           else
             syntaxError(em"`=>` expected after self type")
-          indentedRegionAfterArrow(makeSelfDef(selfName, selfTpt))
+          makeSelfDef(selfName, selfTpt)
         }
       else EmptyValDef
 
@@ -4295,23 +4295,28 @@ object Parsers {
      */
     def templateStatSeq(): (ValDef, List[Tree]) = checkNoEscapingPlaceholders {
       val stats = new ListBuffer[Tree]
+      val startsAfterLineEnd = in.isAfterLineEnd
       val self = selfType()
-      while
-        var empty = false
-        if (in.token == IMPORT)
-          stats ++= importClause()
-        else if (in.token == EXPORT)
-          stats ++= exportClause()
-        else if isIdent(nme.extension) && followingIsExtension() then
-          stats += extension()
-        else if (isDefIntro(modifierTokensOrCase))
-          stats +++= defOrDcl(in.offset, defAnnotsMods(modifierTokens))
-        else if (isExprIntro)
-          stats += expr1(inStatSeq = true)
-        else
-          empty = true
-        statSepOrEnd(stats, noPrevStat = empty)
-      do ()
+      def loop =
+        while
+          var empty = false
+          if (in.token == IMPORT)
+            stats ++= importClause()
+          else if (in.token == EXPORT)
+            stats ++= exportClause()
+          else if isIdent(nme.extension) && followingIsExtension() then
+            stats += extension()
+          else if (isDefIntro(modifierTokensOrCase))
+            stats +++= defOrDcl(in.offset, defAnnotsMods(modifierTokens))
+          else if (isExprIntro)
+            stats += expr1(inStatSeq = true)
+          else
+            empty = true
+          statSepOrEnd(stats, noPrevStat = empty)
+        do ()
+      if self != null && !startsAfterLineEnd then
+        indentedRegionAfterArrow(loop)
+      else loop
       (self, if stats.isEmpty then List(EmptyTree) else stats.toList)
     }
 

tests/rewrites/indent-rewrite.check

@@ -1,10 +1,10 @@
 // A collection of patterns/bugs found when rewriting the community build to indent
 
-trait A:
+trait C1:
 
-  class B
+  class CC1
 // do not remove braces if empty region
-  class C {
+  class CC2 {
 
   }
 // do not remove braces if open brace is not followed by new line
@@ -213,3 +213,14 @@ do not indent in a multiline string"""
       given String = "bar"
       m18
     }
+
+// indent template after self type
+class C2 { self =>
+  val x = ""
+}
+trait C3:
+  self =>
+  val x = ""
+case class C4():
+  self =>
+  val y = ""

tests/rewrites/indent-rewrite.scala

@@ -1,10 +1,10 @@
 // A collection of patterns/bugs found when rewriting the community build to indent
 
-trait A {
+trait C1 {
 
-  class B
+  class CC1
 // do not remove braces if empty region
-class C {
+class CC2 {
 
 }
 // do not remove braces if open brace is not followed by new line
@@ -241,3 +241,16 @@ m10 { 5 } {
     }
   }
 }
+
+// indent template after self type
+class C2 { self =>
+val x = ""
+}
+trait C3 {
+  self =>
+val x = ""
+}
+case class C4() {
+self =>
+  val y = ""
+}