Merge pull request #2732 from tgodzik/produce-lf

Remove LF when soft keywords are used
scalameta · Apr 19, 2022 · d21ee31 · d21ee31
2 parents 48244ff + cf2ba15
commit d21ee31
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 0 deletions.
diff --git a/scalameta/parsers/shared/src/main/scala/scala/meta/internal/parsers/ScannerTokens.scala b/scalameta/parsers/shared/src/main/scala/scala/meta/internal/parsers/ScannerTokens.scala
@@ -362,6 +362,7 @@ class ScannerTokens(tokens: Tokens, input: Input)(implicit dialect: Dialect) {
     @classifier
     trait CanEndStat {
       def unapply(token: Token): Boolean = token match {
+        case SoftModifier() => false
         case _: Ident | _: KwGiven | _: Literal | _: Interpolation.End | _: Xml.End | _: KwReturn |
             _: KwThis | _: KwType | _: RightParen | _: RightBracket | _: RightBrace |
             _: Underscore | _: Ellipsis | _: Unquote =>

diff --git a/tests/shared/src/test/scala/scala/meta/tests/parsers/dotty/InlineSuite.scala b/tests/shared/src/test/scala/scala/meta/tests/parsers/dotty/InlineSuite.scala
@@ -477,6 +477,23 @@ class InlineSuite extends BaseDottySuite {
     )
   }
 
+  test("transparent-trait-newlines") {
+    runTestAssert[Stat](
+      """|transparent 
+         |
+         |trait S""".stripMargin,
+      assertLayout = Some("transparent trait S")
+    )(
+      Defn.Trait(
+        List(Mod.Transparent()),
+        Type.Name("S"),
+        Nil,
+        Ctor.Primary(Nil, Name(""), Nil),
+        Template(Nil, Nil, Self(Name(""), None), Nil, Nil)
+      )
+    )
+  }
+
   test("transparent-inline-with-constant") {
     runTestAssert[Stat](
       """|transparent inline def f: String =