From 7e7a71d7332d3583f711b716889b1d90976fa3a5 Mon Sep 17 00:00:00 2001 From: Johannes Rieken Date: Fri, 19 Feb 2021 13:47:35 +0100 Subject: [PATCH] :lipstick: more supportsBackup removal --- src/vs/workbench/api/browser/mainThreadNotebook.ts | 3 +-- src/vs/workbench/api/common/extHost.protocol.ts | 2 +- src/vs/workbench/api/common/extHostNotebook.ts | 3 +-- src/vs/workbench/contrib/notebook/common/notebookService.ts | 1 - 4 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/vs/workbench/api/browser/mainThreadNotebook.ts b/src/vs/workbench/api/browser/mainThreadNotebook.ts index 1e8aa1b9a5b..d5f8bf3b075 100644 --- a/src/vs/workbench/api/browser/mainThreadNotebook.ts +++ b/src/vs/workbench/api/browser/mainThreadNotebook.ts @@ -462,7 +462,7 @@ export class MainThreadNotebooks extends Disposable implements MainThreadNoteboo // } } - async $registerNotebookProvider(extension: NotebookExtensionDescription, viewType: string, supportBackup: boolean, options: { + async $registerNotebookProvider(extension: NotebookExtensionDescription, viewType: string, options: { transientOutputs: boolean; transientMetadata: TransientMetadata; viewOptions?: { displayName: string; filenamePattern: (string | IRelativePattern | INotebookExclusiveDocumentFilter)[]; exclusive: boolean; }; @@ -470,7 +470,6 @@ export class MainThreadNotebooks extends Disposable implements MainThreadNoteboo let contentOptions = { transientOutputs: options.transientOutputs, transientMetadata: options.transientMetadata }; const controller: IMainNotebookController = { - supportBackup, get options() { return contentOptions; }, diff --git a/src/vs/workbench/api/common/extHost.protocol.ts b/src/vs/workbench/api/common/extHost.protocol.ts index eba04409256..84f07247d3e 100644 --- a/src/vs/workbench/api/common/extHost.protocol.ts +++ b/src/vs/workbench/api/common/extHost.protocol.ts @@ -780,7 +780,7 @@ export interface INotebookDocumentShowOptions { export type INotebookCellStatusBarEntryDto = Dto; export interface MainThreadNotebookShape extends IDisposable { - $registerNotebookProvider(extension: NotebookExtensionDescription, viewType: string, supportBackup: boolean, options: { + $registerNotebookProvider(extension: NotebookExtensionDescription, viewType: string, options: { transientOutputs: boolean; transientMetadata: TransientMetadata; viewOptions?: { displayName: string; filenamePattern: (string | IRelativePattern | INotebookExclusiveDocumentFilter)[]; exclusive: boolean; }; diff --git a/src/vs/workbench/api/common/extHostNotebook.ts b/src/vs/workbench/api/common/extHostNotebook.ts index fbad27732be..fbc6258521f 100644 --- a/src/vs/workbench/api/common/extHostNotebook.ts +++ b/src/vs/workbench/api/common/extHostNotebook.ts @@ -328,7 +328,6 @@ export class ExtHostNotebookController implements ExtHostNotebookShape, ExtHostN }) : Disposable.None); - const supportBackup = !!provider.backupNotebook; const viewOptionsFilenamePattern = options?.viewOptions?.filenamePattern .map(pattern => typeConverters.NotebookExclusiveDocumentPattern.from(pattern)) @@ -338,7 +337,7 @@ export class ExtHostNotebookController implements ExtHostNotebookShape, ExtHostN console.warn(`Notebook content provider view options file name pattern is invalid ${options?.viewOptions?.filenamePattern}`); } - this._proxy.$registerNotebookProvider({ id: extension.identifier, location: extension.extensionLocation, description: extension.description }, viewType, supportBackup, { + this._proxy.$registerNotebookProvider({ id: extension.identifier, location: extension.extensionLocation, description: extension.description }, viewType, { transientOutputs: options?.transientOutputs || false, transientMetadata: options?.transientMetadata || {}, viewOptions: options?.viewOptions && viewOptionsFilenamePattern ? { displayName: options.viewOptions.displayName, filenamePattern: viewOptionsFilenamePattern, exclusive: options.viewOptions.exclusive || false } : undefined diff --git a/src/vs/workbench/contrib/notebook/common/notebookService.ts b/src/vs/workbench/contrib/notebook/common/notebookService.ts index f25bea8de6f..ac3b27a67c5 100644 --- a/src/vs/workbench/contrib/notebook/common/notebookService.ts +++ b/src/vs/workbench/contrib/notebook/common/notebookService.ts @@ -20,7 +20,6 @@ import { IRelativePattern } from 'vs/base/common/glob'; export const INotebookService = createDecorator('notebookService'); export interface IMainNotebookController { - supportBackup: boolean; viewOptions?: { displayName: string; filenamePattern: (string | IRelativePattern | INotebookExclusiveDocumentFilter)[]; exclusive: boolean; }; options: { transientOutputs: boolean; transientMetadata: TransientMetadata; }; openNotebook(viewType: string, uri: URI, backupId?: string): Promise<{ data: NotebookDataDto, transientOptions: TransientOptions; }>; -- GitLab