Remove Position.index (#933)

internal/cli-diagnostics/buildCodeFrame.ts

@@ -113,15 +113,13 @@ type FormattedLine = {
 
 export default function buildCodeFrame(
 	{
-		sourceText,
 		lines: allLines,
 		truncateLines,
 		start,
 		end,
 		type,
 		markerMessage = markup``,
 	}: {
-		sourceText: string;
 		lines: ToLines;
 		type: "pointer" | "all";
 		truncateLines?: number;
@@ -302,9 +300,12 @@ export default function buildCodeFrame(
 
 	// If what the marker is highlighting equals the marker message then it's redundant so don't show the message
 	if (isEmptyMarkup(markerMessage) && start !== undefined && end !== undefined) {
-		const text = sourceText.slice(ob1Get0(start.index), ob1Get0(end.index));
-		if (cleanEquivalentString(text) === cleanEquivalentString(markerMessage)) {
-			markerMessage = markup``;
+		const line = allLines[ob1Get0(ob1Coerce1To0(start.line))];
+		if (line !== undefined) {
+			const text = line[0].slice(ob1Get0(start.column), ob1Get0(end.column));
+			if (cleanEquivalentString(text) === cleanEquivalentString(markerMessage)) {
+				markerMessage = markup``;
+			}
 		}
 	}
 

internal/cli-diagnostics/printAdvice.ts

@@ -36,7 +36,6 @@ import {
 	readMarkup,
 } from "@internal/markup";
 import {DiagnosticsPrinterFlags} from "./types";
-import {ob1Number0Neg1} from "@internal/ob1";
 import DiagnosticsPrinter, {DiagnosticsPrinterFileSources} from "./DiagnosticsPrinter";
 import {UnknownFilePathSet, createUnknownFilePath} from "@internal/path";
 import {MAX_CODE_LENGTH, MAX_CODE_LINES, MAX_LOG_LENGTH} from "./constants";
@@ -312,7 +311,6 @@ function printCode(
 
 	const {frame, truncated: truncatedLines} = buildCodeFrame({
 		type: "all",
-		sourceText: code,
 		truncateLines: MAX_CODE_LINES,
 		lines: toLines({
 			input: code,
@@ -388,7 +386,6 @@ function printFrame(
 
 	const {frame, truncated} = buildCodeFrame({
 		type: "pointer",
-		sourceText,
 		lines,
 		start,
 		end,
@@ -468,7 +465,6 @@ function printStacktrace(
 					filename,
 					language,
 					start: {
-						index: ob1Number0Neg1,
 						line,
 						column,
 					},
@@ -490,7 +486,6 @@ function printStacktrace(
 				column !== undefined
 			) {
 				const pos: Position = {
-					index: ob1Number0Neg1,
 					line,
 					column,
 				};

internal/cli-flags/serializeCLIFlags.ts

@@ -206,13 +206,11 @@ export function serializeCLIFlags(
 	let start: DiagnosticLocation["start"] = {
 		line: ob1Number1,
 		column: startColumn,
-		index: startColumn,
 	};
 
 	let end: DiagnosticLocation["end"] = {
 		line: ob1Number1,
 		column: endColumn,
-		index: endColumn,
 	};
 
 	if (target === "none") {

internal/cli-layout/Grid.ts

@@ -6,6 +6,7 @@
  */
 
 import {
+	AnyMarkup,
 	MarkupLineWrapMode,
 	MarkupParsedAttributes,
 	MarkupParsedChild,
@@ -871,7 +872,7 @@ export default class Grid {
 	}
 
 	parse(
-		sub: undefined | string,
+		sub: undefined | string | AnyMarkup,
 		offsetPosition: undefined | Position,
 	): MarkupParsedChildren {
 		if (sub === undefined) {

internal/cli-layout/format.ts

@@ -8,26 +8,25 @@
 import {
 	AnyMarkup,
 	MarkupLinesAndWidth,
+	isSingleEscaped,
 	joinMarkupLines,
 	readMarkup,
+	serializeLazyMarkup,
 } from "@internal/markup";
 import {GridOutputFormat, UserGridOptions} from "./types";
 import Grid from "./Grid";
 import {ob1Get1} from "@internal/ob1";
 import {splitChars, splitLines} from "@internal/string-utils";
 
 export function renderGrid(
-	safe: AnyMarkup,
+	safeMaybeLazy: AnyMarkup,
 	opts: UserGridOptions = {},
 	format: GridOutputFormat,
 ): MarkupLinesAndWidth {
+	const safe = serializeLazyMarkup(safeMaybeLazy);
+
 	// Optimization for rendering a single escaped string with no columns
-	if (
-		opts.columns === undefined &&
-		safe.type === "MARKUP" &&
-		safe.parts.length === 1 &&
-		typeof safe.parts[0] === "string"
-	) {
+	if (opts.columns === undefined && isSingleEscaped(safe)) {
 		let line = safe.parts[0];
 
 		if (opts.convertTabs) {
@@ -50,7 +49,7 @@ export function renderGrid(
 		sourceText: input,
 		view: {},
 	});
-	grid.drawChildren(grid.parse(input, undefined), []);
+	grid.drawChildren(grid.parse(safe, undefined), []);
 	return {
 		width: ob1Get1(grid.getWidth()),
 		lines: grid.getLines(format),

internal/codec-js-manifest/dependencies.test.md

@@ -46,12 +46,10 @@ npm {
 			filename: undefined
 			end: Object {
 				column: 4
-				index: 4
 				line: 1
 			}
 			start: Object {
 				column: 0
-				index: 0
 				line: 1
 			}
 		}
@@ -77,12 +75,10 @@ npm {
 			filename: undefined
 			end: Object {
 				column: 4
-				index: 4
 				line: 1
 			}
 			start: Object {
 				column: 0
-				index: 0
 				line: 1
 			}
 		}

internal/codec-js-manifest/name.ts

@@ -7,14 +7,14 @@
 
 import {Number0, ob1Add, ob1Coerce0, ob1Inc, ob1Number0} from "@internal/ob1";
 import {
-	DiagnosticDescriptionOptionalCategory,
+	DiagnosticDescriptionOptional,
 	descriptions,
 } from "@internal/diagnostics";
 import {ManifestName} from "./types";
 
 type NormalizeNameUnexpected = (
 	opts: {
-		description: DiagnosticDescriptionOptionalCategory;
+		description: DiagnosticDescriptionOptional;
 		start?: Number0;
 		end?: Number0;
 		at?: "prefix";