improve error messages

Author: legomushroom

src/vs/workbench/contrib/chat/browser/attachments/promptAttachments/promptAttachmentWidget.ts

@@ -118,7 +118,7 @@ export class PromptAttachmentWidget extends Disposable {
 		// add the issue details in the hover title for the attachment, one
 		// error/warning at a time because there is a limited space available
 		if (topError) {
-			const { isRootError, message: details } = topError;
+			const { isRootError, localizedMessage: details } = topError;
 			const isWarning = !isRootError;
 
 			this.domNode.classList.add(

src/vs/workbench/contrib/chat/common/promptFileReferenceErrors.ts

@@ -8,7 +8,7 @@ import { URI } from '../../../../base/common/uri.js';
 /**
  * Base prompt parsing error class.
  */
-export abstract class ParseError extends Error {
+abstract class ParseError extends Error {
 	/**
 	 * Error type name.
 	 */

src/vs/workbench/contrib/chat/common/promptSyntax/contentProviders/filePromptContentsProvider.ts

@@ -11,7 +11,7 @@ import { CancellationError } from '../../../../../../base/common/errors.js';
 import { PromptContentsProviderBase } from './promptContentsProviderBase.js';
 import { VSBufferReadableStream } from '../../../../../../base/common/buffer.js';
 import { CancellationToken } from '../../../../../../base/common/cancellation.js';
-import { OpenFailed, NotPromptFile, ParseError, FolderReference } from '../../promptFileReferenceErrors.js';
+import { OpenFailed, NotPromptFile, ResolveError, FolderReference } from '../../promptFileReferenceErrors.js';
 import { FileChangesEvent, FileChangeType, IFileService } from '../../../../../../platform/files/common/files.js';
 
 /**
@@ -81,7 +81,7 @@ export class FilePromptContentProvider extends PromptContentsProviderBase<FileCh
 
 			fileStream = await this.fileService.readFileStream(this.uri);
 		} catch (error) {
-			if (error instanceof ParseError) {
+			if (error instanceof ResolveError) {
 				throw error;
 			}
 

src/vs/workbench/contrib/chat/common/promptSyntax/contentProviders/promptContentsProviderBase.ts

@@ -12,14 +12,14 @@ import { VSBufferReadableStream } from '../../../../../../base/common/buffer.js'
 import { CancellationToken } from '../../../../../../base/common/cancellation.js';
 import { isPromptFile } from '../../../../../../platform/prompts/common/constants.js';
 import { ObservableDisposable } from '../../../../../../base/common/observableDisposable.js';
-import { FailedToResolveContentsStream, ParseError } from '../../promptFileReferenceErrors.js';
+import { FailedToResolveContentsStream, ResolveError } from '../../promptFileReferenceErrors.js';
 import { cancelPreviousCalls } from '../../../../../../base/common/decorators/cancelPreviousCalls.js';
 
 /**
  * Base class for prompt contents providers. Classes that extend this one are responsible to:
  *
  * - implement the {@linkcode getContentsStream} method to provide the contents stream
- *   of a prompt; this method should throw a `ParseError` or its derivative if the contents
+ *   of a prompt; this method should throw a `ResolveError` or its derivative if the contents
  *   cannot be parsed for any reason
  * - fire a {@linkcode TChangeEvent} event on the {@linkcode onChangeEmitter} event when
  * 	 prompt contents change
@@ -49,7 +49,7 @@ export abstract class PromptContentsProviderBase<
 
 	/**
 	 * Function to get contents stream for the provider. This function should
-	 * throw a `ParseError` or its derivative if the contents cannot be parsed.
+	 * throw a `ResolveError` or its derivative if the contents cannot be parsed.
 	 *
 	 * @param changesEvent The event that triggered the change. The special
 	 * `'full'` value means  that everything has changed hence entire prompt
@@ -75,12 +75,12 @@ export abstract class PromptContentsProviderBase<
 	 * Event emitter for the prompt contents change event.
 	 * See {@linkcode onContentChanged} for more details.
 	 */
-	private readonly onContentChangedEmitter = this._register(new Emitter<VSBufferReadableStream | ParseError>());
+	private readonly onContentChangedEmitter = this._register(new Emitter<VSBufferReadableStream | ResolveError>());
 
 	/**
 	 * Event that fires when the prompt contents change. The event is either
 	 * a `VSBufferReadableStream` stream with changed contents or an instance of
-	 * the `ParseError` class representing a parsing failure case.
+	 * the `ResolveError` class representing a parsing failure case.
 	 *
 	 * `Note!` this field is meant to be used by the external consumers of the prompt
 	 *         contents provider that the classes that extend this abstract class.
@@ -112,7 +112,7 @@ export abstract class PromptContentsProviderBase<
 				this.onContentChangedEmitter.fire(stream);
 			})
 			.catch((error) => {
-				if (error instanceof ParseError) {
+				if (error instanceof ResolveError) {
 					this.onContentChangedEmitter.fire(error);
 
 					return;

src/vs/workbench/contrib/chat/common/promptSyntax/languageFeatures/promptLinkDiagnosticsProvider.ts

@@ -78,10 +78,12 @@ class PromptLinkDiagnosticsProvider extends ObservableDisposable {
 				continue;
 			}
 
+			const { originalError } = topError;
+
 			// the `NotPromptFile` error is allowed because we allow users
 			// to include non-prompt file links in the prompt files
 			// note! this check also handles the `FolderReference` error
-			if (topError instanceof NotPromptFile) {
+			if (originalError instanceof NotPromptFile) {
 				continue;
 			}
 
@@ -106,17 +108,19 @@ const toMarker = (
 	const { topError, linkRange } = link;
 
 	// a sanity check because this function must be
-	// used only if these attributes are present
+	// used only if these link attributes are present
 	assertDefined(
 		topError,
-		'Error condition must to be defined.',
+		'Top error must to be defined.',
 	);
 	assertDefined(
 		linkRange,
 		'Link range must to be defined.',
 	);
+
+	const { originalError } = topError;
 	assert(
-		!(topError instanceof NotPromptFile),
+		!(originalError instanceof NotPromptFile),
 		'Error must not be of "not prompt file" type.',
 	);
 
@@ -127,7 +131,7 @@ const toMarker = (
 		: MarkerSeverity.Warning;
 
 	return {
-		message: topError.message,
+		message: topError.localizedMessage,
 		severity,
 		...linkRange,
 	};