From 1f9458cbb98bd4fa5c271503362896db5de513cb Mon Sep 17 00:00:00 2001 From: zhuoli Date: Fri, 28 Apr 2023 14:19:45 +0800 Subject: [PATCH] fixed 6cf25b8 from https://gitee.com/zhuoli72/developtools_ace-ets2bundle/pulls/2187 Re-push !2152 [Fix ets_checker print warning message correctly] for it gets overlayed by gitee Issue: I6ZLIG Signed-off-by: zhuoli Change-Id: Iae237632e6aff2fc0cf49aaef137f392a68c6c5f --- compiler/src/ets_checker.ts | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/compiler/src/ets_checker.ts b/compiler/src/ets_checker.ts index 6263df39c..7c8cb1dc7 100644 --- a/compiler/src/ets_checker.ts +++ b/compiler/src/ets_checker.ts @@ -283,18 +283,22 @@ export function printDiagnostic(diagnostic: ts.Diagnostic): void { return; } + const logPrefix: string = diagnostic.category === ts.DiagnosticCategory.Error ? 'ERROR' : 'WARN'; + const etsCheckerLogger = fastBuildLogger ? fastBuildLogger : logger; + let logMessage: string; checkerResult.count += 1; if (diagnostic.file) { const { line, character }: ts.LineAndCharacter = diagnostic.file.getLineAndCharacterOfPosition(diagnostic.start!); - fastBuildLogger ? - fastBuildLogger.error('\u001b[31m' + - `ArkTS:ERROR File: ${diagnostic.file.fileName}:${line + 1}:${character + 1}\n ${message}\n`) : - logger.error('\u001b[31m', - `ArkTS:ERROR File: ${diagnostic.file.fileName}:${line + 1}:${character + 1}\n ${message}\n`); + logMessage = `ArkTS:${logPrefix} File: ${diagnostic.file.fileName}:${line + 1}:${character + 1}\n ${message}\n`; } else { - fastBuildLogger ? fastBuildLogger.error('\u001b[31m' + `ArkTS:ERROR: ${message}`) : - logger.error('\u001b[31m', `ArkTS:ERROR: ${message}`); + logMessage = `ArkTS:${logPrefix}: ${message}`; + } + + if (diagnostic.category === ts.DiagnosticCategory.Error) { + etsCheckerLogger.error('\u001b[31m' + logMessage); + } else { + etsCheckerLogger.warn('\u001b[33m' + logMessage); } } } -- Gitee