Merge pull request #2728 from tgodzik/fix-indented-macro

Don't allow indentation for macro definitions
scalameta · Apr 14, 2022 · 62e10b7 · 62e10b7
2 parents 0d26443 + cc6275b
commit 62e10b7
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 1 deletion.
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
@@ -329,9 +329,14 @@ class ScannerTokens(tokens: Tokens, input: Input)(implicit dialect: Dialect) {
     trait CanStartIndent {
       def unapply(token: Token): Boolean = token match {
         case _: KwYield | _: KwTry | _: KwCatch | _: KwFinally | _: KwMatch | _: KwDo | _: KwFor |
-            _: KwThen | _: KwElse | _: Equals | _: KwWhile | _: KwIf | _: RightArrow | _: KwReturn |
+            _: KwThen | _: KwElse | _: KwWhile | _: KwIf | _: RightArrow | _: KwReturn |
             _: LeftArrow | _: ContextArrow =>
           true
+        case _: Equals =>
+          token.next match {
+            case _: KwMacro => false
+            case _ => true
+          }
         case _: KwWith =>
           token.next match {
             case _: KwImport | _: KwExport | DefIntro() => true

diff --git a/tests/shared/src/test/scala/scala/meta/tests/parsers/dotty/MinorDottySuite.scala b/tests/shared/src/test/scala/scala/meta/tests/parsers/dotty/MinorDottySuite.scala
@@ -1300,4 +1300,23 @@ class MinorDottySuite extends BaseDottySuite {
     )
   }
 
+  test("#2727-newline-macro") {
+
+    runTestAssert[Stat](
+      """|implicit def generate[T](value: T): Clue[T] =
+         |  macro MacroCompatScala2.clueImpl""".stripMargin,
+      assertLayout =
+        Some("implicit def generate[T](value: T): Clue[T] = macro MacroCompatScala2.clueImpl")
+    )(
+      Defn.Macro(
+        List(Mod.Implicit()),
+        Term.Name("generate"),
+        List(Type.Param(Nil, Type.Name("T"), Nil, Type.Bounds(None, None), Nil, Nil)),
+        List(List(Term.Param(Nil, Term.Name("value"), Some(Type.Name("T")), None))),
+        Some(Type.Apply(Type.Name("Clue"), List(Type.Name("T")))),
+        Term.Select(Term.Name("MacroCompatScala2"), Term.Name("clueImpl"))
+      )
+    )
+  }
+
 }