hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2025-12-17 01:03:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Kotlin: Tweak the definition of "eqwuivalent TRAP file"

Browse Source 
TRAP files that only differ in their comments are equivalent
This commit is contained in:
Ian Lynagh
2021-09-06 14:25:08 +01:00
parent c3dd35d98b
commit 059d6798bb
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
java/kotlin-extractor/src/main/kotlin/KotlinExtractorExtension.kt
View File

@@ -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")
}