Kotlin: Tweak the definition of "eqwuivalent TRAP file"

igfoo · igfoo · commit 059d6798bbef · 2022-05-10T18:45:55.000+01:00
TRAP files that only differ in their comments are equivalent
diff --git a/java/kotlin-extractor/src/main/kotlin/KotlinExtractorExtension.kt b/java/kotlin-extractor/src/main/kotlin/KotlinExtractorExtension.kt
@@ -195,16 +195,20 @@ class TrapWriter (
     }
 }
 
-private fun identical(f1: File, f2: File): Boolean {
+private fun equivalentTrap(f1: File, f2: File): Boolean {
     f1.bufferedReader().use { bw1 ->
         f2.bufferedReader().use { bw2 ->
             while(true) {
                 val l1 = bw1.readLine()
                 val l2 = bw2.readLine()
-                if (l1 != l2) {
-                    return false
-                } else if (l1 == null) {
+                if (l1 == null && l2 == null) {
                     return true
+                } else if (l1 == null || l2 == null) {
+                    return false
+                } else if (l1 != l2) {
+                    if (!l1.startsWith("//") || !l2.startsWith("//")) {
+                        return false
+                    }
                 }
             }
         }
@@ -242,7 +246,7 @@ fun doFile(invocationTrapFile: String, checkTrapIdentical: Boolean, logger: Logg
             fileExtractor.extractFile(id)
         }
         if (checkTrapIdentical && trapFile.exists()) {
-            if(identical(trapTmpFile, trapFile)) {
+            if(equivalentTrap(trapTmpFile, trapFile)) {
                 if(!trapTmpFile.delete()) {
                     logger.warn("Failed to delete $trapTmpFile")
                 }

Original file line number	Diff line number	Diff line change
`@@ -195,16 +195,20 @@ class TrapWriter (`
`195`	`195`	`}`
`196`	`196`	`}`
`197`	`197`
`198`		`-private fun identical(f1: File, f2: File): Boolean {`
	`198`	`+private fun equivalentTrap(f1: File, f2: File): Boolean {`
`199`	`199`	`f1.bufferedReader().use { bw1 ->`
`200`	`200`	`f2.bufferedReader().use { bw2 ->`
`201`	`201`	`while(true) {`
`202`	`202`	`val l1 = bw1.readLine()`
`203`	`203`	`val l2 = bw2.readLine()`
`204`		`- if (l1 != l2) {`
`205`		`- return false`
`206`		`- } else if (l1 == null) {`
	`204`	`+ if (l1 == null && l2 == null) {`
`207`	`205`	`return true`
	`206`	`+ } else if (l1 == null \|\| l2 == null) {`
	`207`	`+ return false`
	`208`	`+ } else if (l1 != l2) {`
	`209`	`+ if (!l1.startsWith("//") \|\| !l2.startsWith("//")) {`
	`210`	`+ return false`
	`211`	`+ }`
`208`	`212`	`}`
`209`	`213`	`}`
`210`	`214`	`}`
`@@ -242,7 +246,7 @@ fun doFile(invocationTrapFile: String, checkTrapIdentical: Boolean, logger: Logg`
`242`	`246`	`fileExtractor.extractFile(id)`
`243`	`247`	`}`
`244`	`248`	`if (checkTrapIdentical && trapFile.exists()) {`
`245`		`- if(identical(trapTmpFile, trapFile)) {`
	`249`	`+ if(equivalentTrap(trapTmpFile, trapFile)) {`
`246`	`250`	`if(!trapTmpFile.delete()) {`
`247`	`251`	`logger.warn("Failed to delete $trapTmpFile")`
`248`	`252`	`}`