Merge notebook and text observable document interfaces (#544)

Author: DonJayamanne

src/extension/inlineEdits/vscode-node/parts/vscodeWorkspace.ts

@@ -12,7 +12,7 @@ import { DocumentId } from '../../../../platform/inlineEdits/common/dataTypes/do
 import { LanguageId } from '../../../../platform/inlineEdits/common/dataTypes/languageId';
 import { EditReason } from '../../../../platform/inlineEdits/common/editReason';
 import { IObservableDocument, ObservableWorkspace, StringEditWithReason } from '../../../../platform/inlineEdits/common/observableWorkspace';
-import { createAlternativeNotebookDocument, IAlternativeNotebookDocument, toAltDiagnostics, toAltNotebookCellChangeEdit, toAltNotebookChangeEdit } from '../../../../platform/notebook/common/alternativeNotebookTextDocument';
+import { createAlternativeNotebookDocument, IAlternativeNotebookDocument, toAltNotebookCellChangeEdit, toAltNotebookChangeEdit } from '../../../../platform/notebook/common/alternativeNotebookTextDocument';
 import { getDefaultLanguage } from '../../../../platform/notebook/common/helpers';
 import { IExperimentationService } from '../../../../platform/telemetry/common/nullExperimentationService';
 import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry';
@@ -366,7 +366,7 @@ export class VSCodeWorkspace extends ObservableWorkspace implements IDisposable
 }
 
 
-export interface IBaseVSCodeObservableDocument extends IObservableDocument {
+export interface IVSCodeObservableDocument extends IObservableDocument {
 	/**
 	 * Converts the OffsetRange of the Observable document to a range within the provided Text document.
 	 * If this is a Text Document, performs a simple OffsetRange to Range translation.
@@ -410,7 +410,7 @@ export interface IBaseVSCodeObservableDocument extends IObservableDocument {
 	getCodeActions(range: OffsetRange, itemResolveCount: number, token: CancellationToken): Promise<CodeActionData[] | undefined>;
 }
 
-export interface IVSCodeObservableTextDocument extends IObservableDocument, IBaseVSCodeObservableDocument {
+export interface IVSCodeObservableTextDocument extends IObservableDocument, IVSCodeObservableDocument {
 	kind: 'textDocument';
 	readonly textDocument: TextDocument;
 }
@@ -518,14 +518,7 @@ class VSCodeObservableTextDocument extends AbstractVSCodeObservableDocument impl
 	}
 }
 
-export interface IVSCodeObservableNotebookDocument extends IObservableDocument, IBaseVSCodeObservableDocument {
-	kind: 'notebookDocument';
-	readonly notebook: NotebookDocument;
-	/** @deprecated Do not use this. Use diagnostics property instead. */
-	projectDiagnostics(cell: TextDocument, diagnostics: readonly Diagnostic[]): Diagnostic[];
-}
-
-class VSCodeObservableNotebookDocument extends AbstractVSCodeObservableDocument implements IVSCodeObservableNotebookDocument {
+class VSCodeObservableNotebookDocument extends AbstractVSCodeObservableDocument implements IVSCodeObservableDocument {
 	/** @deprecated Do not use this */
 	public kind: 'notebookDocument' = 'notebookDocument';
 
@@ -582,13 +575,6 @@ class VSCodeObservableNotebookDocument extends AbstractVSCodeObservableDocument
 		const offsetRanges = this.altNotebook.toAltOffsetRange(cell, [range]);
 		return offsetRanges.length ? offsetRanges[0] : undefined;
 	}
-	projectDiagnostics(textDocument: TextDocument, diagnostics: readonly Diagnostic[]): Diagnostic[] {
-		const cell = this.altNotebook.getCell(textDocument);
-		if (!cell) {
-			return [];
-		}
-		return toAltDiagnostics(this.altNotebook, cell, diagnostics);
-	}
 	toRange(textDocument: TextDocument, range: Range): Range | undefined {
 		const cell = this.altNotebook.getCell(textDocument);
 		if (!cell) {
@@ -623,8 +609,6 @@ class VSCodeObservableNotebookDocument extends AbstractVSCodeObservableDocument
 	}
 }
 
-export type IVSCodeObservableDocument = IVSCodeObservableTextDocument | IVSCodeObservableNotebookDocument;
-
 function getTextDocuments(excludeNotebookCells: boolean): IObservable<readonly TextDocument[]> {
 	return observableFromEvent(undefined, e => {
 		const d1 = workspace.onDidOpenTextDocument(e);

src/platform/notebook/common/alternativeNotebookTextDocument.ts

@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import type { Diagnostic, DiagnosticRelatedInformation, NotebookCell, NotebookDocument, NotebookDocumentContentChange, TextDocument, TextDocumentContentChangeEvent } from 'vscode';
+import type { NotebookCell, NotebookDocument, NotebookDocumentContentChange, TextDocument, TextDocumentContentChangeEvent } from 'vscode';
 import { coalesce } from '../../../util/vs/base/common/arrays';
 import { findLastIdxMonotonous } from '../../../util/vs/base/common/arraysFind';
 import { StringEdit } from '../../../util/vs/editor/common/core/edits/stringEdit';
@@ -14,8 +14,6 @@ import { PositionOffsetTransformer } from '../../editing/common/positionOffsetTr
 import { generateCellTextMarker, getBlockComment, getLineCommentStart } from './alternativeContentProvider.text';
 import { EOL, summarize } from './helpers';
 import { CrLfOffsetTranslator } from './offsetTranslator';
-import { ResourceMap } from '../../../util/vs/base/common/map';
-import { isEqual } from '../../../util/vs/base/common/resources';
 
 
 class AlternativeNotebookCellSnapshot {
@@ -452,39 +450,3 @@ function toAltCellTextDocumentContentChangeEvents(notebook: AbstractAlternativeN
 		} as typeof e;
 	}));
 }
-
-export function toAltDiagnostics(notebook: AbstractAlternativeNotebookDocument, cell: NotebookCell, diagnostics: readonly Diagnostic[]): Diagnostic[] {
-	const cellUris = new ResourceMap(notebook.cells.map(cell => [cell.altCell.cell.document.uri, cell.altCell.cell] as const));
-	if (!cellUris.get(cell.document.uri)) {
-		return [];
-	}
-	return coalesce(diagnostics.map(diagnostic => toAltDiagnostic(notebook, cell, diagnostic)));
-}
-
-function toAltDiagnostic(notebook: AbstractAlternativeNotebookDocument, cell: NotebookCell, diagnostic: Diagnostic): Diagnostic | undefined {
-	const altDiagnostic = { ...diagnostic };
-	const altRanges = notebook.toAltRange(cell, [diagnostic.range]);
-	if (!altRanges.length) {
-		return;
-	}
-	altDiagnostic.range = altRanges[0];
-	if (altDiagnostic.relatedInformation) {
-		altDiagnostic.relatedInformation = coalesce(altDiagnostic.relatedInformation.map(info => {
-			if (!isEqual(info.location.uri, cell.document.uri)) {
-				return info;
-			}
-			const altRange = notebook.toAltRange(cell, [info.location.range]);
-			if (!altRange.length) {
-				return;
-			}
-			return {
-				...info,
-				location: {
-					uri: notebook.notebook.uri,
-					range: altRange[0],
-				},
-			} satisfies DiagnosticRelatedInformation;
-		}));
-	}
-	return altDiagnostic;
-}