hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2026-04-30 03:05:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

Kotlin: Fix warnElement counting

Browse Source 
We were counting calls of warnElement, whereas we want to count its
callers.
This commit is contained in:
Ian Lynagh
2021-09-20 15:36:48 +01:00
parent c64c950d9a
commit bb3ebd7325
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
java/kotlin-extractor/src/main/kotlin/utils/Logger.kt
View File

@@ -42,13 +42,13 @@ open class Logger(val logCounter: LogCounter, open val tw: TrapWriter) {
tw.writeTrap("// " + fullMsg.replace("\n", "\n//") + "\n")
println(fullMsg)
}
fun warn(severity: Severity, msg: String, locationString: String? = null, locationId: Label<DbLocation> = tw.unknownLocation) {
fun warn(severity: Severity, msg: String, locationString: String? = null, locationId: Label<DbLocation> = tw.unknownLocation, stackIndex: Int = 1) {
val st = Exception().stackTrace
val suffix =
if(st.size < 2) {
if(st.size < stackIndex + 1) {
" Missing caller information.\n"
} else {
val caller = st[1].toString()
val caller = st[stackIndex].toString()
val count = logCounter.warningCounts.getOrDefault(caller, 0) + 1
logCounter.warningCounts[caller] = count
when {
@@ -79,9 +79,9 @@ class FileLogger(logCounter: LogCounter, override val tw: FileTrapWriter): Logge
return "[${SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(Date())} K]"
}
fun warnElement(severity: Severity, msg: String, element: IrElement) {
fun warnElement(severity: Severity, msg: String, element: IrElement, stackIndex: Int = 2) {
val locationString = tw.getLocationString(element)
val locationId = tw.getLocation(element)
warn(severity, msg, locationString, locationId)
warn(severity, msg, locationString, locationId, stackIndex)
}
}