fix: log line and column

fi3ework · Jul 8, 2021 · 6a0d247 · 6a0d247
1 parent a4bb9ce
commit 6a0d247
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 14 deletions.
diff --git a/packages/vite-plugin-checker/src/logger.ts b/packages/vite-plugin-checker/src/logger.ts
@@ -55,9 +55,13 @@ export function diagnosticToTerminalLog(d: NormalizedDiagnostic): string {
 
   const levelLabel = labelMap[d.level || DiagnosticCategory.Error]
   const fileLabel = chalk.green.bold('FILE') + ' '
+  const position = d.loc
+    ? chalk.yellow(d.loc.start.line) + ':' + chalk.yellow(d.loc.start.column)
+    : ''
+
   return [
     levelLabel + ' ' + d.message,
-    fileLabel + d.id + os.EOL,
+    fileLabel + d.id + ':' + position + os.EOL,
     d.codeFrame + os.EOL,
     d.conclusion,
   ]
@@ -70,13 +74,13 @@ export function diagnosticToViteError(d: NormalizedDiagnostic): ErrorPayload['er
   if (d.loc) {
     loc = {
       file: d.id,
-      line: d.loc.start.line + 1,
-      column: typeof d.loc.start.column === 'number' ? d.loc.start.column + 1 : 0,
+      line: d.loc.start.line,
+      column: typeof d.loc.start.column === 'number' ? d.loc.start.column : 0,
     }
   }
 
   return {
-    message: d.message ?? '',
+    message: d.message + os.EOL + d.stripedCodeFrame,
     stack:
       typeof d.stack === 'string' ? d.stack : Array.isArray(d.stack) ? d.stack.join(os.EOL) : '',
     id: d.id,

diff --git a/packages/vite-plugin-checker/src/utils.ts b/packages/vite-plugin-checker/src/utils.ts
@@ -35,17 +35,18 @@ export function tsDiagnosticToViteError(d: ts.Diagnostic): ErrorPayload['err'] {
   // has detail message
   if (d.file && typeof d.start === 'number' && typeof d.length === 'number') {
     return {
-      message:
+      message: strip(
         ts.flattenDiagnosticMessageText(d.messageText, formatHost.getNewLine()) +
-        os.EOL +
-        os.EOL +
-        createFrame({
-          source: d.file!.text,
-          location: tsLocationToBabelLocation({
-            start: d.file?.getLineAndCharacterOfPosition(d.start),
-            end: d.file?.getLineAndCharacterOfPosition(d.start + d.length),
-          }),
-        }),
+          os.EOL +
+          os.EOL +
+          createFrame({
+            source: d.file!.text,
+            location: tsLocationToBabelLocation({
+              start: d.file?.getLineAndCharacterOfPosition(d.start),
+              end: d.file?.getLineAndCharacterOfPosition(d.start + d.length),
+            }),
+          })
+      ),
       stack: '',
       id: d.file?.fileName,
       plugin: 'vite-plugin-checker',