automatically remove paper AT comments

requires fun git magic when rebuilding patches...

Author: MiniDigger

.editorconfig

@@ -86,6 +86,3 @@ ij_kotlin_import_nested_classes = false
 
 [*.patch]
 trim_trailing_whitespace=false
-
-[*.patch]
-trim_trailing_whitespace=false

paperweight-core/src/test/resources/functional_test/.editorconfig

@@ -0,0 +1,2 @@
+[*.patch]
+trim_trailing_whitespace=false

paperweight-core/src/test/resources/functional_test/.gitignore

@@ -1,2 +1,4 @@
 .gradle
 gradle
+build
+.idea

paperweight-core/src/test/resources/functional_test/fake-patches/expected/0001-Feature.patch

@@ -5,11 +5,11 @@ Subject: [PATCH] Feature
 
 
 diff --git a/Test.java b/Test.java
-index 8bd0bab8fc2fb2f6a4459ed9f618214ec048afc4..2d8e20f42479672b0d390febbeffc65909b9da42 100644
+index 372d9f877b361130deb341f1918d8f8c3ed0cf27..b24553b410c3b559c568dad6c811adc0a0bc6540 100644
 --- a/Test.java
 +++ b/Test.java
 @@ -13,4 +13,8 @@ public class Test {
-     private final String getTest2() {// Paper-AT: private+f getTest2()Ljava/lang/String;
+     private final String getTest2() {
          return this.test + "2"; // Woo
      }
 +

paperweight-core/src/test/resources/functional_test/fake-patches/expected/Test.java.patch

@@ -8,9 +8,8 @@
 +        return this.test; // WOOOO
      }
 
--    private final String getTest2() {
+     private final String getTest2() {
 -        return this.test + "2";
-+    private final String getTest2() {// Paper-AT: private+f getTest2()Ljava/lang/String;
 +        return this.test + "2"; // Woo
      }
  }

paperweight-lib/src/main/kotlin/io/papermc/paperweight/tasks/softspoon/RebuildFilePatches.kt

@@ -43,6 +43,7 @@ import org.gradle.api.file.RegularFileProperty
 import org.gradle.api.provider.Property
 import org.gradle.api.tasks.*
 import org.gradle.api.tasks.options.Option
+import org.intellij.lang.annotations.Language
 import org.openrewrite.InMemoryExecutionContext
 import writeLF
 
@@ -99,7 +100,7 @@ abstract class RebuildFilePatches : BaseTask() {
         git("checkout", "file").executeSilently(silenceErr = true)
 
         // handle AT
-        var addedNewAts = false
+        val filesWithNewAts = mutableListOf<String>()
         baseDir.walk()
             .map { it.relativeTo(baseDir).toString().replace("\\", "/") }
             .filter {
@@ -110,8 +111,10 @@ abstract class RebuildFilePatches : BaseTask() {
                 val source = inputDir.resolve(it)
                 val decomp = baseDir.resolve(it)
                 val className = it.replace(".java", "")
-                addedNewAts = handleATInSource(source, ats, className) || addedNewAts
-                handleATInBase(decomp, ats, baseDir)
+                if (handleATInSource(source, ats, className)) {
+                    handleATInBase(decomp, ats, baseDir)
+                    filesWithNewAts.add(it)
+                }
                 oldAts.merge(ats)
             }
 
@@ -123,7 +126,8 @@ abstract class RebuildFilePatches : BaseTask() {
             )
         }
 
-        if (addedNewAts) {
+        if (filesWithNewAts.isNotEmpty()) {
+            // we removed the comment, we need to commit this
             git("add", ".").executeSilently(silenceErr = true)
             git("commit", "--amend", "--no-edit").executeSilently(silenceErr = true)
         }
@@ -148,9 +152,13 @@ abstract class RebuildFilePatches : BaseTask() {
             .operate()
 
         git("switch", "-").executeSilently(silenceErr = true)
-        if (addedNewAts) {
+        if (filesWithNewAts.isNotEmpty()) {
             try {
-                git("rebase", "file").executeSilently()
+                // todo detect if sed is not present (windows) and switch out sed for something else
+                @Language("Shell Script")
+                val sequenceEditor = "sed -i -e 0,/pick/{s/pick/drop/}"
+                val execs = filesWithNewAts.map { it -> "sed -i -e 's|// Paper-AT:.*||g' $it && ((git add $it && git commit --amend --no-edit) || true)" }.flatMap { listOf("--exec", it) }.toTypedArray()
+                git.withEnv(mapOf("GIT_SEQUENCE_EDITOR" to sequenceEditor))("rebase", "-i", "file", "--strategy-option=theirs", *execs).executeSilently()
             } catch (e: Exception) {
                 // TODO better message to inform the user on what to do
                 throw RuntimeException("Encountered conflicts while rebuilding file patches.", e)
@@ -193,8 +201,10 @@ abstract class RebuildFilePatches : BaseTask() {
     private fun handleATInSource(source: Path, newAts: AccessTransformSet, className: String): Boolean {
         val sourceLines = source.readLines()
         var foundNew = false
+        val fixedLines = ArrayList<String>(sourceLines.size)
         sourceLines.forEach { line ->
             if (!line.contains("// Paper-AT: ")) {
+                fixedLines.add(line)
                 return@forEach
             }
 
@@ -213,6 +223,12 @@ abstract class RebuildFilePatches : BaseTask() {
                 atClass.mergeMethod(MethodSignature.of(name.substring(0, index), name.substring(index)), accessTransform)
             }
             logger.lifecycle("Found new AT in $className: $at -> $accessTransform")
+
+            fixedLines.add(split[0])
+        }
+
+        if (foundNew) {
+            source.writeText(fixedLines.joinToString("\n", postfix = "\n"), Charsets.UTF_8)
         }
 
         return foundNew