Rewrite: expect a method to convert to Input

scalameta · Feb 9, 2022 · 663ebff · 663ebff
1 parent ce02954
commit 663ebff
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/scalafmt-core/shared/src/main/scala/org/scalafmt/Scalafmt.scala b/scalafmt-core/shared/src/main/scala/org/scalafmt/Scalafmt.scala
@@ -159,7 +159,8 @@ object Scalafmt {
     if (code.matches("\\s*")) Try("\n")
     else {
       val runner = style.runner
-      val parsed = runner.parse(Rewrite(Input.VirtualFile(file, code), style))
+      def codeToInput(srcCode: String) = Input.VirtualFile(file, srcCode)
+      val parsed = runner.parse(Rewrite(codeToInput(code), style, codeToInput))
       parsed.fold(
         _.details match {
           case ed: ParseException =>

diff --git a/scalafmt-core/shared/src/main/scala/org/scalafmt/rewrite/Rewrite.scala b/scalafmt-core/shared/src/main/scala/org/scalafmt/rewrite/Rewrite.scala
@@ -141,7 +141,11 @@ object Rewrite {
 
   val default: Seq[Rewrite] = name2rewrite.values.toSeq
 
-  def apply(input: VirtualFile, style: ScalafmtConfig): VirtualFile = {
+  def apply(
+      input: VirtualFile,
+      style: ScalafmtConfig,
+      toInput: String => Input
+  ): Input = {
     val rewrites = style.rewrite.rewriteFactoryRules
     if (rewrites.isEmpty) {
       input
@@ -157,7 +161,7 @@ object Rewrite {
             }
           }
           traverser(ast)
-          input.copy(value = ctx.applyPatches)
+          toInput(ctx.applyPatches)
         case _ => input
       }
     }