Improves error messages.

extension/src/DataSource/DataExtractionProvider/ConfiguredDataExtractionProviderFactory.ts

@@ -6,7 +6,11 @@ import {
 } from "./DataExtractionProvider";
 import { Config, DebugAdapterConfig } from "../../Config";
 import { GenericDataExtractionProvider } from "./GenericDataExtractionProviderFactory";
+import { registerUpdateReconciler, hotClass } from "@hediet/node-reload";
 
+registerUpdateReconciler(module);
+
+@hotClass(module)
 export class ConfiguredDataExtractionProviderFactory
 	implements DataExtractionProviderFactory {
 	constructor(private readonly config: Config) {}

extension/src/DataSource/DataExtractionProvider/DataExtractionProvider.ts

@@ -3,6 +3,7 @@ import {
 	DataExtractorId,
 } from "@hediet/debug-visualizer-data-extraction";
 import { VsCodeDebugSession } from "../../VsCodeDebugger";
+import { FormattedMessage } from "../../contract";
 
 export interface DataExtractionProviderFactory {
 	createDataExtractionProvider(
@@ -15,7 +16,7 @@ export interface DataExtractionProvider {
 		args: DataExtractionProviderArgs
 	): Promise<
 		| { kind: "data"; result: DataExtractionResult }
-		| { kind: "error"; message: string }
+		| { kind: "error"; message: FormattedMessage }
 	>;
 }
 

extension/src/DataSource/DataExtractionProvider/GenericDataExtractionProviderFactory.ts

@@ -9,7 +9,12 @@ import {
 	DataExtractionProviderArgs,
 } from "./DataExtractionProvider";
 import { parseEvaluationResultFromGenericDebugAdapter } from "./parseEvaluationResultFromGenericDebugAdapter";
+import { FormattedMessage } from "../../contract";
+import { hotClass, registerUpdateReconciler } from "@hediet/node-reload";
 
+registerUpdateReconciler(module);
+
+@hotClass(module)
 export class GenericDataExtractionProviderFactory
 	implements DataExtractionProviderFactory {
 	createDataExtractionProvider(
@@ -28,7 +33,7 @@ export class GenericDataExtractionProvider implements DataExtractionProvider {
 		frameId,
 	}: DataExtractionProviderArgs): Promise<
 		| { kind: "data"; result: DataExtractionResult }
-		| { kind: "error"; message: string }
+		| { kind: "error"; message: FormattedMessage }
 	> {
 		const finalExpression = this.getFinalExpression({
 			expression,
@@ -44,7 +49,20 @@ export class GenericDataExtractionProvider implements DataExtractionProvider {
 		} catch (error) {
 			return {
 				kind: "error",
-				message: error.message,
+				message: {
+					kind: "list",
+					items: [
+						error.message,
+						`Used debug adapter: ${this.session.session.configuration.type}`,
+						{
+							kind: "inlineList",
+							items: [
+								"Evaluated expression is",
+								{ kind: "code", content: finalExpression },
+							],
+						},
+					],
+				},
 			};
 		}
 

extension/src/DataSource/DataExtractionProvider/JsDataExtractionProviderFactory.ts

@@ -11,7 +11,12 @@ import {
 	DataExtractionProvider,
 	DataExtractionProviderArgs,
 } from "./DataExtractionProvider";
+import { FormattedMessage } from "../../contract";
+import { registerUpdateReconciler, hotClass } from "@hediet/node-reload";
 
+registerUpdateReconciler(module);
+
+@hotClass(module)
 export class JsDataExtractionProviderFactory
 	implements DataExtractionProviderFactory {
 	createDataExtractionProvider(
@@ -39,7 +44,7 @@ class JsDataEvaluator implements DataExtractionProvider {
 		frameId,
 	}: DataExtractionProviderArgs): Promise<
 		| { kind: "data"; result: DataExtractionResult }
-		| { kind: "error"; message: string }
+		| { kind: "error"; message: FormattedMessage }
 	> {
 		while (true) {
 			try {

extension/src/DataSource/DataExtractionProvider/parseEvaluationResultFromGenericDebugAdapter.ts

@@ -2,12 +2,13 @@ import {
 	DataExtractionResult,
 	isExtractedData,
 } from "@hediet/debug-visualizer-data-extraction";
+import { FormattedMessage } from "../../contract";
 
 export function parseEvaluationResultFromGenericDebugAdapter(
 	resultText: string
 ):
 	| { kind: "data"; result: DataExtractionResult }
-	| { kind: "error"; message: string } {
+	| { kind: "error"; message: FormattedMessage } {
 	const jsonData = resultText.trim();
 
 	let resultObj;
@@ -37,7 +38,26 @@ export function parseEvaluationResultFromGenericDebugAdapter(
 		if (!isExtractedData(resultObj)) {
 			return {
 				kind: "error",
-				message: "Data does not match ExtractedData interface.",
+				message: {
+					kind: "list",
+					items: [
+						"Evaluation result does not match ExtractedData interface.",
+						{
+							kind: "inlineList",
+							items: [
+								"Evaluation result was:",
+								{
+									kind: "code",
+									content: JSON.stringify(
+										resultObj,
+										undefined,
+										4
+									),
+								},
+							],
+						},
+					],
+				},
 			};
 		}
 	} catch (e) {
@@ -69,8 +89,26 @@ function parseJson(str: string) {
 	try {
 		return JSON.parse(str);
 	} catch (error) {
-		throw new Error(
-			`Could not parse \`${str}\` as JSON.\n${error.message}`
-		);
+		throw new FormattedError({
+			kind: "list",
+			items: [
+				"Could not parse evaluation result as JSON:",
+				error.message,
+				{
+					kind: "inlineList",
+					items: [
+						"Evaluation result was:",
+						{
+							kind: "code",
+							content: str,
+						},
+					],
+				},
+			],
+		});
 	}
 }
+
+class FormattedError {
+	constructor(public readonly message: FormattedMessage) {}
+}

extension/src/contract.ts

@@ -18,9 +18,24 @@ function unchecked<T>(): types.Type<T, any, unknown> {
 	);
 }
 
+export type FormattedMessage =
+	| string
+	| {
+			kind: "list";
+			items: FormattedMessage[];
+	  }
+	| {
+			kind: "inlineList";
+			items: FormattedMessage[];
+	  }
+	| {
+			kind: "code";
+			content: string;
+	  };
+
 export type DataExtractionState =
 	| { kind: "loading" }
-	| { kind: "error"; message: string }
+	| { kind: "error"; message: FormattedMessage }
 	| { kind: "noDebugSession" }
 	| {
 			kind: "data";