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

KE2: Pull out a LoggerState

Browse Source
This commit is contained in:
Ian Lynagh
2024-09-09 16:46:32 +01:00
parent 3c0ef3de51
commit e2c127b85f
2 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
java/kotlin-extractor2/src/main/kotlin/KotlinFileExtractor.kt
View File

@@ -120,7 +120,7 @@ OLD: KE1
else -> "<no name>"
}
val loc = tw.getLocationString(element)
val context = logger.extractorContextStack
val context = logger.loggerState.extractorContextStack
context.push(ExtractorContext(kind, element, name, loc))
try {
val depth = context.size

25
java/kotlin-extractor2/src/main/kotlin/utils/Logger.kt
View File

@@ -165,7 +165,7 @@ OLD: KE1
severity: Severity,
msg: String,
extraInfo: String?,
extractorContextStack: Stack<ExtractorContext>?,
loggerState: LoggerState?,
locationString: String? = null,
mkLocationId: () -> Label<DbLocation> = { dtw.unknownLocation }
) {
@@ -193,7 +193,8 @@ OLD: KE1
fullMsgBuilder.append(extraInfo)
}
if (extractorContextStack != null) {
if (loggerState != null) {
val extractorContextStack = loggerState.extractorContextStack
val iter = extractorContextStack.listIterator(extractorContextStack.size)
while (iter.hasPrevious()) {
val x = iter.previous()
@@ -272,9 +273,9 @@ OLD: KE1
warn(dtw, msg, extraInfo, null)
}
fun warn(dtw: DiagnosticTrapWriter, msg: String, extraInfo: String?, extractorContextStack: Stack<ExtractorContext>?) {
fun warn(dtw: DiagnosticTrapWriter, msg: String, extraInfo: String?, loggerState: LoggerState?) {
if (verbosity >= 2) {
diagnostic(dtw, Severity.Warn, msg, extraInfo, extractorContextStack)
diagnostic(dtw, Severity.Warn, msg, extraInfo, loggerState)
}
}
@@ -282,9 +283,9 @@ OLD: KE1
error(dtw, msg, extraInfo, null)
}
fun error(dtw: DiagnosticTrapWriter, msg: String, extraInfo: String?, extractorContextStack: Stack<ExtractorContext>?) {
fun error(dtw: DiagnosticTrapWriter, msg: String, extraInfo: String?, loggerState: LoggerState?) {
if (verbosity >= 1) {
diagnostic(dtw, Severity.Error, msg, extraInfo, extractorContextStack)
diagnostic(dtw, Severity.Error, msg, extraInfo, loggerState)
}
}
@@ -314,11 +315,15 @@ OLD: KE1
}
}
data class LoggerState (
val extractorContextStack: Stack<ExtractorContext>
)
/**
* Logger is the high-level interface for writint log messages.
*/
open class Logger(val loggerBase: LoggerBase, val dtw: DiagnosticTrapWriter): BasicLogger {
val extractorContextStack = Stack<ExtractorContext>()
val loggerState = LoggerState(Stack<ExtractorContext>())
override fun flush() {
dtw.flush()
@@ -354,7 +359,7 @@ open class Logger(val loggerBase: LoggerBase, val dtw: DiagnosticTrapWriter): Ba
}
override fun warn(dtw: DiagnosticTrapWriter, msg: String, extraInfo: String?) {
loggerBase.warn(dtw, msg, extraInfo, extractorContextStack)
loggerBase.warn(dtw, msg, extraInfo, loggerState)
}
private fun warn(msg: String, extraInfo: String?) {
@@ -370,7 +375,7 @@ open class Logger(val loggerBase: LoggerBase, val dtw: DiagnosticTrapWriter): Ba
}
override fun error(dtw: DiagnosticTrapWriter, msg: String, extraInfo: String?) {
loggerBase.error(dtw, msg, extraInfo, extractorContextStack)
loggerBase.error(dtw, msg, extraInfo, loggerState)
}
private fun error(msg: String, extraInfo: String?) {
@@ -412,7 +417,7 @@ OLD: KE1
Severity.Error,
msg,
null, // OLD: KE1: exn?.stackTraceToString(),
extractorContextStack,
loggerState,
locationString,
mkLocationId
)