From 8457c8d536979b98b8cb16f70dd654a7ef5e195c Mon Sep 17 00:00:00 2001 From: BeniBenj Date: Fri, 24 Oct 2025 15:09:32 +0200 Subject: [PATCH 1/3] remove error from endoflife --- src/vs/editor/common/languages.ts | 1 - .../browser/model/inlineSuggestionItem.ts | 4 ---- .../browser/model/provideInlineCompletions.ts | 10 ---------- .../contrib/inlineCompletions/browser/telemetry.ts | 2 -- .../browser/view/inlineEdits/inlineEditsModel.ts | 6 ------ .../browser/view/inlineEdits/inlineEditsView.ts | 4 ++-- .../view/inlineEdits/inlineEditsViewInterface.ts | 1 - src/vs/monaco.d.ts | 1 - .../api/browser/mainThreadLanguageFeatures.ts | 1 - 9 files changed, 2 insertions(+), 28 deletions(-) diff --git a/src/vs/editor/common/languages.ts b/src/vs/editor/common/languages.ts index b2729dd3a384c..d0ecd3c1627ce 100644 --- a/src/vs/editor/common/languages.ts +++ b/src/vs/editor/common/languages.ts @@ -1033,7 +1033,6 @@ export type LifetimeSummary = { notShownReason: string | undefined; editorType: string; viewKind: string | undefined; - error: string | undefined; preceeded: boolean; languageId: string; requestReason: string; diff --git a/src/vs/editor/contrib/inlineCompletions/browser/model/inlineSuggestionItem.ts b/src/vs/editor/contrib/inlineCompletions/browser/model/inlineSuggestionItem.ts index bfd2af15d05d3..701355e61801a 100644 --- a/src/vs/editor/contrib/inlineCompletions/browser/model/inlineSuggestionItem.ts +++ b/src/vs/editor/contrib/inlineCompletions/browser/model/inlineSuggestionItem.ts @@ -118,10 +118,6 @@ abstract class InlineSuggestionItemBase { this._data.setEndOfLifeReason(reason); } - public reportInlineEditError(reason: string): void { - this._data.reportInlineEditError(reason); - } - public setIsPreceeded(item: InlineSuggestionItem): void { this._data.setIsPreceeded(item.partialAccepts); } diff --git a/src/vs/editor/contrib/inlineCompletions/browser/model/provideInlineCompletions.ts b/src/vs/editor/contrib/inlineCompletions/browser/model/provideInlineCompletions.ts index 1a377b78c6844..4c9eed414c712 100644 --- a/src/vs/editor/contrib/inlineCompletions/browser/model/provideInlineCompletions.ts +++ b/src/vs/editor/contrib/inlineCompletions/browser/model/provideInlineCompletions.ts @@ -275,7 +275,6 @@ export type InlineSuggestViewData = { editorType: InlineCompletionEditorType; renderData?: InlineCompletionViewData; viewKind?: InlineCompletionViewKind; - error?: string; }; export class InlineSuggestData { @@ -395,7 +394,6 @@ export class InlineSuggestData { requestReason: this._requestInfo.reason, viewKind: this._viewData.viewKind, notShownReason: this._notShownReason, - error: this._viewData.error, typingInterval: this._requestInfo.typingInterval, typingIntervalCharacterCount: this._requestInfo.typingIntervalCharacterCount, availableProviders: this._requestInfo.availableProviders.map(p => p.toString()).join(','), @@ -405,14 +403,6 @@ export class InlineSuggestData { } } - public reportInlineEditError(message: string): void { - if (this._viewData.error) { - this._viewData.error += `; ${message}`; - } else { - this._viewData.error = message; - } - } - public setIsPreceeded(partialAccepts: PartialAcceptance): void { this._isPreceeded = true; diff --git a/src/vs/editor/contrib/inlineCompletions/browser/telemetry.ts b/src/vs/editor/contrib/inlineCompletions/browser/telemetry.ts index bda92ed5c8422..b8f1ca93c6c30 100644 --- a/src/vs/editor/contrib/inlineCompletions/browser/telemetry.ts +++ b/src/vs/editor/contrib/inlineCompletions/browser/telemetry.ts @@ -38,7 +38,6 @@ export type InlineCompletionEndOfLifeEvent = { partiallyAcceptedCharactersSinceOriginal: number | undefined; preceeded: boolean | undefined; superseded: boolean | undefined; - error: string | undefined; notShownReason: string | undefined; // rendering viewKind: string | undefined; @@ -78,7 +77,6 @@ type InlineCompletionsEndOfLifeClassification = { preceeded: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'Whether the inline completion was preceeded by another one' }; languageId: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The language ID of the document where the inline completion was shown' }; requestReason: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The reason for the inline completion request' }; - error: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The error message if the inline completion failed' }; typingInterval: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The average typing interval of the user at the moment the inline completion was requested' }; typingIntervalCharacterCount: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The character count involved in the typing interval calculation' }; superseded: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'Whether the inline completion was superseded by another one' }; diff --git a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsModel.ts b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsModel.ts index a99ca8009b46f..c475f9b654597 100644 --- a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsModel.ts +++ b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsModel.ts @@ -49,12 +49,6 @@ export class InlineEditModel implements IInlineEditModel { this._model.jump(); } - abort(reason: string) { - console.error(reason); - this.inlineEdit.inlineCompletion.reportInlineEditError(reason); - this._model.stop(); - } - handleInlineEditShown(viewKind: InlineCompletionViewKind, viewData: InlineCompletionViewData) { this._model.handleInlineSuggestionShown(this.inlineEdit.inlineCompletion, viewKind, viewData); } diff --git a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsView.ts b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsView.ts index 2d3babdead7bd..ddb9e0ff55991 100644 --- a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsView.ts +++ b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsView.ts @@ -5,7 +5,7 @@ import { $ } from '../../../../../../base/browser/dom.js'; import { equalsIfDefined, itemEquals } from '../../../../../../base/common/equals.js'; -import { BugIndicatingError } from '../../../../../../base/common/errors.js'; +import { BugIndicatingError, onUnexpectedError } from '../../../../../../base/common/errors.js'; import { Event } from '../../../../../../base/common/event.js'; import { Disposable } from '../../../../../../base/common/lifecycle.js'; import { autorun, autorunWithStore, derived, derivedOpts, IObservable, IReader, ISettableObservable, mapObservableArrayCached, observableValue } from '../../../../../../base/common/observable.js'; @@ -85,7 +85,7 @@ export class InlineEditsView extends Disposable { let state = this.determineRenderState(model, reader, diff, new StringText(newText)); if (!state) { - model.abort(`unable to determine view: tried to render ${this._previousView?.view}`); + onUnexpectedError(`unable to determine view: tried to render ${this._previousView?.view}`); return undefined; } diff --git a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViewInterface.ts b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViewInterface.ts index 0f7f8cb25f2d8..d93a10438dc53 100644 --- a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViewInterface.ts +++ b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViewInterface.ts @@ -39,7 +39,6 @@ export interface IInlineEditModel { handleInlineEditShown(viewKind: string, viewData?: InlineCompletionViewData): void; accept(): void; jump(): void; - abort(reason: string): void; } // TODO: Move this out of here as it is also includes ghosttext diff --git a/src/vs/monaco.d.ts b/src/vs/monaco.d.ts index cad4767ed9621..f8c6a3648cb37 100644 --- a/src/vs/monaco.d.ts +++ b/src/vs/monaco.d.ts @@ -7671,7 +7671,6 @@ declare namespace monaco.languages { notShownReason: string | undefined; editorType: string; viewKind: string | undefined; - error: string | undefined; preceeded: boolean; languageId: string; requestReason: string; diff --git a/src/vs/workbench/api/browser/mainThreadLanguageFeatures.ts b/src/vs/workbench/api/browser/mainThreadLanguageFeatures.ts index 799de991883b9..60c3eb0e0c26a 100644 --- a/src/vs/workbench/api/browser/mainThreadLanguageFeatures.ts +++ b/src/vs/workbench/api/browser/mainThreadLanguageFeatures.ts @@ -731,7 +731,6 @@ export class MainThreadLanguageFeatures extends Disposable implements MainThread viewKind: lifetimeSummary.viewKind, preceeded: lifetimeSummary.preceeded, requestReason: lifetimeSummary.requestReason, - error: lifetimeSummary.error, typingInterval: lifetimeSummary.typingInterval, typingIntervalCharacterCount: lifetimeSummary.typingIntervalCharacterCount, languageId: lifetimeSummary.languageId, From 87b5e61cc490d7999f4066437f19f077ed588460 Mon Sep 17 00:00:00 2001 From: Benjamin Christopher Simmonds <44439583+benibenj@users.noreply.github.com> Date: Fri, 24 Oct 2025 15:13:52 +0200 Subject: [PATCH 2/3] Update src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsView.ts Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- .../browser/view/inlineEdits/inlineEditsView.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsView.ts b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsView.ts index ddb9e0ff55991..c96c8849218df 100644 --- a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsView.ts +++ b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsView.ts @@ -85,7 +85,7 @@ export class InlineEditsView extends Disposable { let state = this.determineRenderState(model, reader, diff, new StringText(newText)); if (!state) { - onUnexpectedError(`unable to determine view: tried to render ${this._previousView?.view}`); + onUnexpectedError(new Error(`unable to determine view: tried to render ${this._previousView?.view}`)); return undefined; } From 64003bc2128239567baebf7358f2697e949dca05 Mon Sep 17 00:00:00 2001 From: BeniBenj Date: Mon, 27 Oct 2025 09:05:06 +0100 Subject: [PATCH 3/3] :lipstick: --- .../inlineCompletions/browser/model/inlineCompletionsSource.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/src/vs/editor/contrib/inlineCompletions/browser/model/inlineCompletionsSource.ts b/src/vs/editor/contrib/inlineCompletions/browser/model/inlineCompletionsSource.ts index 9303f54ea2792..68961626e9b70 100644 --- a/src/vs/editor/contrib/inlineCompletions/browser/model/inlineCompletionsSource.ts +++ b/src/vs/editor/contrib/inlineCompletions/browser/model/inlineCompletionsSource.ts @@ -418,7 +418,6 @@ export class InlineCompletionsSource extends Disposable { timeUntilProviderResponse: undefined, viewKind: undefined, preceeded: undefined, - error: undefined, superseded: undefined, reason: undefined, correlationId: undefined,