@vmz/diagnostic 0.3.13 → 0.3.14

package/dist/pretty.js

@@ -1,4 +1,4 @@
-import { scalarColumnToIndex, utf8LineAt } from './utf8.js';
+import { displayWidth, expandTabs, utf8ByteSlice, utf8LineAt } from './utf8.js';
 const ANSI = {
     reset: '\x1b[0m',
     bold: '\x1b[1m',
@@ -26,21 +26,20 @@ function severityStyle(severity) {
 function severityLabel(severity) {
     return severity === 'warning' ? 'warning' : severity;
 }
-function formatLocation(path, line, column) {
+function formatLocation(path, line, column, gutterWidth = 1) {
     const where = path ? `${path}:${line}:${column}` : `${line}:${column}`;
-    return paint(`  --> ${where}`, ANSI.bold, ANSI.blue);
+    return paint(`${' '.repeat(gutterWidth + 1)}--> ${where}`, ANSI.bold, ANSI.blue);
 }
 function canRenderSnippet(d, opts) {
-    return (opts.style ?? 'pretty') === 'pretty' && Boolean(opts.sourceText && opts.position && d.span && d.span.end > d.span.start);
+    return ((opts.style ?? 'pretty') === 'pretty' &&
+        Boolean(opts.sourceText && opts.position && d.span && d.span.end >= d.span.start));
 }
-function renderSnippetLine(out, gutterWidth, lineNum, lineText, colStart, colEnd, severity) {
+function renderSnippetLine(out, gutterWidth, lineNum, lineText, startCell, endCell, severity) {
     const gutter = paint(`${String(lineNum).padStart(gutterWidth)} | `, ANSI.dim);
-    out.push(`${gutter}${lineText}`);
-    const startIdx = scalarColumnToIndex(lineText, colStart);
-    const endIdx = Math.max(startIdx + 1, scalarColumnToIndex(lineText, colEnd + 1));
+    out.push(`${gutter}${expandTabs(lineText)}`);
     const marker = paint(`${' '.repeat(gutterWidth)} | `, ANSI.dim) +
-        ' '.repeat(startIdx) +
-        paint('^'.repeat(endIdx - startIdx), ...severityStyle(severity));
+        ' '.repeat(startCell) +
+        paint('^'.repeat(Math.max(1, endCell - startCell)), ...severityStyle(severity));
     out.push(marker);
 }
 export function formatDiagnosticPretty(d, message, opts) {
@@ -62,19 +61,19 @@ export function formatDiagnosticPretty(d, message, opts) {
     const span = d.span;
     const path = d.path || '';
     const startPos = position.lineCol(span.start);
-    const endPos = position.lineCol(Math.max(span.start, span.end - 1));
-    lines.push(formatLocation(path, startPos.line, startPos.column));
     const startLine = utf8LineAt(source, span.start);
     const endLine = utf8LineAt(source, Math.max(span.start, span.end - 1));
     const gutterWidth = String(endLine.line).length;
+    lines.push(formatLocation(path, startPos.line, startPos.column, gutterWidth));
     if (startLine.line === endLine.line) {
-        renderSnippetLine(lines, gutterWidth, startLine.line, startLine.text, startPos.column, endPos.column, d.severity);
+        renderSnippetLine(lines, gutterWidth, startLine.line, startLine.text, displayWidth(utf8ByteSlice(source, startLine.lineStart, span.start)), displayWidth(utf8ByteSlice(source, startLine.lineStart, Math.min(span.end, startLine.lineEnd))), d.severity);
     }
     else {
-        renderSnippetLine(lines, gutterWidth, startLine.line, startLine.text, startPos.column, startLine.text.length + 1, d.severity);
+        renderSnippetLine(lines, gutterWidth, startLine.line, startLine.text, displayWidth(utf8ByteSlice(source, startLine.lineStart, span.start)), displayWidth(startLine.text), d.severity);
         if (endLine.line > startLine.line + 1) {
             lines.push(paint(`${' '.repeat(gutterWidth + 3)}...`, ANSI.dim));
         }
+        renderSnippetLine(lines, gutterWidth, endLine.line, endLine.text, 0, displayWidth(utf8ByteSlice(source, endLine.lineStart, Math.min(span.end, endLine.lineEnd))), d.severity);
     }
     return lines.join('\n');
 }

package/dist/utf8.d.ts

@@ -11,5 +11,16 @@ export type Utf8LineSlice = {
 export declare function utf8LineAt(source: string, offset: number): Utf8LineSlice;
 /** 1-based Unicode scalar column within a line slice (matches compiler OffsetIndex). */
 export declare function unicodeScalarColumn(lineText: string, byteOffsetInLine: number): number;
-/** Map 1-based scalar column to JS string index for underline rendering. */
-export declare function scalarColumnToIndex(lineText: string, column: number): number;
+/** Terminal cells occupied by one Unicode scalar (wide CJK/emoji render as two, CR as zero). */
+export declare function scalarDisplayWidth(ch: string): number;
+/** Tab stops used when rendering source snippets, matching rustc and miette defaults. */
+export declare const SNIPPET_TAB_WIDTH = 4;
+/** Display width of a line fragment in terminal cells (tabs advance to the next stop). */
+export declare function displayWidth(text: string): number;
+/**
+ * Expand tabs to spaces so the printed source line and the caret row agree in
+ * any terminal, regardless of that terminal's own tab-stop configuration.
+ * Carriage returns from CRLF sources are dropped because they terminate the
+ * line rather than occupy a cell.
+ */
+export declare function expandTabs(text: string): string;

package/dist/utf8.js

@@ -40,17 +40,75 @@ export function unicodeScalarColumn(lineText, byteOffsetInLine) {
         return 1;
     return buf.subarray(0, end).toString('utf8').length > 0 ? [...buf.subarray(0, end).toString('utf8')].length : 1;
 }
-/** Map 1-based scalar column to JS string index for underline rendering. */
-export function scalarColumnToIndex(lineText, column) {
-    if (column <= 1)
+const ZERO_WIDTH_PATTERN = /\p{Mn}|\p{Me}|\p{Cf}/u;
+function isWideCodePoint(cp) {
+    return ((cp >= 0x1100 && cp <= 0x115f) ||
+        cp === 0x2329 ||
+        cp === 0x232a ||
+        (cp >= 0x2e80 && cp <= 0x303e) ||
+        (cp >= 0x3041 && cp <= 0x33ff) ||
+        (cp >= 0x3400 && cp <= 0x4dbf) ||
+        (cp >= 0x4e00 && cp <= 0x9fff) ||
+        (cp >= 0xa000 && cp <= 0xa4cf) ||
+        (cp >= 0xa960 && cp <= 0xa97f) ||
+        (cp >= 0xac00 && cp <= 0xd7a3) ||
+        (cp >= 0xf900 && cp <= 0xfaff) ||
+        (cp >= 0xfe10 && cp <= 0xfe19) ||
+        (cp >= 0xfe30 && cp <= 0xfe6f) ||
+        (cp >= 0xff00 && cp <= 0xff60) ||
+        (cp >= 0xffe0 && cp <= 0xffe6) ||
+        (cp >= 0x1b000 && cp <= 0x1b2ff) ||
+        (cp >= 0x1f000 && cp <= 0x1f02f) ||
+        (cp >= 0x1f0a0 && cp <= 0x1f0ff) ||
+        (cp >= 0x1f100 && cp <= 0x1f1ad) ||
+        (cp >= 0x1f300 && cp <= 0x1f64f) ||
+        (cp >= 0x1f680 && cp <= 0x1f6ff) ||
+        (cp >= 0x1f900 && cp <= 0x1f9ff) ||
+        (cp >= 0x1fa70 && cp <= 0x1faff) ||
+        (cp >= 0x20000 && cp <= 0x3fffd));
+}
+/** Terminal cells occupied by one Unicode scalar (wide CJK/emoji render as two, CR as zero). */
+export function scalarDisplayWidth(ch) {
+    const cp = ch.codePointAt(0) ?? 0;
+    if (cp === 0 || cp === 0x0d || ZERO_WIDTH_PATTERN.test(ch))
         return 0;
-    let pos = 1;
-    let index = 0;
-    for (const ch of lineText) {
-        if (pos >= column)
-            break;
-        index += ch.length;
-        pos += 1;
+    return isWideCodePoint(cp) ? 2 : 1;
+}
+/** Tab stops used when rendering source snippets, matching rustc and miette defaults. */
+export const SNIPPET_TAB_WIDTH = 4;
+/** Display width of a line fragment in terminal cells (tabs advance to the next stop). */
+export function displayWidth(text) {
+    let cells = 0;
+    for (const ch of text) {
+        if (ch === '\t') {
+            cells += SNIPPET_TAB_WIDTH - (cells % SNIPPET_TAB_WIDTH);
+        }
+        else {
+            cells += scalarDisplayWidth(ch);
+        }
+    }
+    return cells;
+}
+/**
+ * Expand tabs to spaces so the printed source line and the caret row agree in
+ * any terminal, regardless of that terminal's own tab-stop configuration.
+ * Carriage returns from CRLF sources are dropped because they terminate the
+ * line rather than occupy a cell.
+ */
+export function expandTabs(text) {
+    let cells = 0;
+    let out = '';
+    for (const ch of text) {
+        if (ch === '\r')
+            continue;
+        if (ch === '\t') {
+            const pad = SNIPPET_TAB_WIDTH - (cells % SNIPPET_TAB_WIDTH);
+            out += ' '.repeat(pad);
+            cells += pad;
+            continue;
+        }
+        out += ch;
+        cells += scalarDisplayWidth(ch);
     }
-    return index;
+    return out;
 }

package/package.json

@@ -39,5 +39,5 @@
   },
   "type": "module",
   "types": "./dist/index.d.ts",
-  "version": "0.3.13"
+  "version": "0.3.14"
 }