From bfdb5e0b1732903bdf547971870ad39dd1314fbb Mon Sep 17 00:00:00 2001 From: Chris Smowton Date: Wed, 27 Nov 2024 16:29:31 +0000 Subject: [PATCH] Add error function taking a throwable to LoggerBase --- java/kotlin-extractor2/src/main/kotlin/KotlinExtractor.kt | 2 +- java/kotlin-extractor2/src/main/kotlin/utils/Logger.kt | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/java/kotlin-extractor2/src/main/kotlin/KotlinExtractor.kt b/java/kotlin-extractor2/src/main/kotlin/KotlinExtractor.kt index 7105f2225b4..d2161502d58 100644 --- a/java/kotlin-extractor2/src/main/kotlin/KotlinExtractor.kt +++ b/java/kotlin-extractor2/src/main/kotlin/KotlinExtractor.kt @@ -292,7 +292,7 @@ fun doAnalysis( // stack overflow or an assertion failure in one file. } catch (e: Throwable) { fileExtractionProblems.setNonRecoverableProblem() - loggerBase.error(dtw, "Extraction failed while extracting '${psiFile.virtualFilePath}'.", e.stackTraceToString()) + loggerBase.error(dtw, "Extraction failed while extracting '${psiFile.virtualFilePath}'.", e) } } else { System.out.println("Warning: Not a KtFile") diff --git a/java/kotlin-extractor2/src/main/kotlin/utils/Logger.kt b/java/kotlin-extractor2/src/main/kotlin/utils/Logger.kt index 7615e865929..b5656da5a88 100644 --- a/java/kotlin-extractor2/src/main/kotlin/utils/Logger.kt +++ b/java/kotlin-extractor2/src/main/kotlin/utils/Logger.kt @@ -286,6 +286,10 @@ class LoggerBase(val diagnosticCounter: DiagnosticCounter) : BasicLogger { error(dtw, msg, extraInfo, null) } + fun error(dtw: DiagnosticTrapWriter, msg: String, exn: Throwable) { + error(dtw, msg, exn.stackTraceToString()) + } + fun error(dtw: DiagnosticTrapWriter, msg: String, extraInfo: String?, loggerState: LoggerState?) { if (verbosity >= 1) { diagnostic(dtw, Severity.Error, msg, extraInfo, loggerState) @@ -385,7 +389,7 @@ open class Logger(val loggerBase: LoggerBase, val dtw: DiagnosticTrapWriter) : B } fun error(msg: String, exn: Throwable) { - error(msg, exn.stackTraceToString()) + loggerBase.error(dtw, msg, exn) } }