diff --git a/src/vs/workbench/api/browser/mainThreadNotebook.ts b/src/vs/workbench/api/browser/mainThreadNotebook.ts index d144bec6070d5260929052bc1ca3ea5abae3deee..b0c3cc0dadd8b2fe06d542e97819cfa552219227 100644 --- a/src/vs/workbench/api/browser/mainThreadNotebook.ts +++ b/src/vs/workbench/api/browser/mainThreadNotebook.ts @@ -18,7 +18,7 @@ import { INotebookCellStatusBarService } from 'vs/workbench/contrib/notebook/com import { ACCESSIBLE_NOTEBOOK_DISPLAY_ORDER, CellEditType, CellKind, DisplayOrderKey, ICellEditOperation, ICellRange, IEditor, INotebookDocumentFilter, NotebookCellMetadata, NotebookCellOutputsSplice, NotebookDocumentMetadata, NOTEBOOK_DISPLAY_ORDER, TransientMetadata } from 'vs/workbench/contrib/notebook/common/notebookCommon'; import { IMainNotebookController, INotebookService } from 'vs/workbench/contrib/notebook/common/notebookService'; import { IEditorService } from 'vs/workbench/services/editor/common/editorService'; -import { ExtHostContext, ExtHostNotebookShape, IExtHostContext, INotebookCellStatusBarEntryDto, INotebookDocumentsAndEditorsDelta, MainContext, MainThreadNotebookShape, NotebookEditorRevealType, NotebookExtensionDescription } from '../common/extHost.protocol'; +import { ExtHostContext, ExtHostNotebookShape, IExtHostContext, INotebookCellStatusBarEntryDto, INotebookDocumentsAndEditorsDelta, INotebookModelAddedData, MainContext, MainThreadNotebookShape, NotebookEditorRevealType, NotebookExtensionDescription } from '../common/extHost.protocol'; class DocumentAndEditorState { static ofSets(before: Set, after: Set): { removed: T[], added: T[] } { @@ -84,10 +84,9 @@ class DocumentAndEditorState { const visibleEditorDelta = DocumentAndEditorState.ofMaps(before.visibleEditors, after.visibleEditors); return { - addedDocuments: documentDelta.added.map(e => { + addedDocuments: documentDelta.added.map((e: NotebookTextModel): INotebookModelAddedData => { return { viewType: e.viewType, - handle: e.handle, uri: e.uri, metadata: e.metadata, versionId: e.versionId, @@ -640,4 +639,3 @@ export class MainThreadNotebooks extends Disposable implements MainThreadNoteboo } } } - diff --git a/src/vs/workbench/api/common/extHost.protocol.ts b/src/vs/workbench/api/common/extHost.protocol.ts index 4b7946662950f18179a5b6e3552abd39e68ca80e..94a655ceb78824ce1ba8f0c1438fb0db44399a49 100644 --- a/src/vs/workbench/api/common/extHost.protocol.ts +++ b/src/vs/workbench/api/common/extHost.protocol.ts @@ -1648,7 +1648,6 @@ export interface INotebookDocumentPropertiesChangeData { export interface INotebookModelAddedData { uri: UriComponents; - handle: number; versionId: number; cells: IMainCellDto[], viewType: string; diff --git a/src/vs/workbench/test/browser/api/extHostNotebook.test.ts b/src/vs/workbench/test/browser/api/extHostNotebook.test.ts index 70070cd869b5a016c2d52d90112b13e3dd72fe29..2f6156164f1f7a100ca55c48a8bb32be8d360c1e 100644 --- a/src/vs/workbench/test/browser/api/extHostNotebook.test.ts +++ b/src/vs/workbench/test/browser/api/extHostNotebook.test.ts @@ -56,7 +56,6 @@ suite('NotebookCell#Document', function () { }); extHostNotebooks.$acceptDocumentAndEditorsDelta({ addedDocuments: [{ - handle: 0, uri: notebookUri, viewType: 'test', versionId: 0, diff --git a/src/vs/workbench/test/browser/api/extHostNotebookConcatDocument.test.ts b/src/vs/workbench/test/browser/api/extHostNotebookConcatDocument.test.ts index f2ca94c32d5a11d6601921def310d0500a4dcf17..c9f18c332a97065f31f060995e7d8093620a0a86 100644 --- a/src/vs/workbench/test/browser/api/extHostNotebookConcatDocument.test.ts +++ b/src/vs/workbench/test/browser/api/extHostNotebookConcatDocument.test.ts @@ -56,7 +56,6 @@ suite('NotebookConcatDocument', function () { }); extHostNotebooks.$acceptDocumentAndEditorsDelta({ addedDocuments: [{ - handle: 0, uri: notebookUri, viewType: 'test', cells: [{