Skip to content

Commit 8ad77ef

Browse files
rebornixrebornix
committed
mimetype and remove revert.
1 parent 89e41e3 commit 8ad77ef

8 files changed

Lines changed: 6 additions & 30 deletions

File tree

‎src/vs/vscode.proposed.d.ts‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1525,8 +1525,7 @@ declare module 'vscode' {
15251525
}
15261526

15271527
export interface NotebookOutputSelector {
1528-
type: string;
1529-
subTypes?: string[];
1528+
mimeTypes?: string[];
15301529
}
15311530

15321531
export interface NotebookRenderRequest {
@@ -1640,10 +1639,10 @@ declare module 'vscode' {
16401639

16411640
export interface NotebookContentProvider {
16421641
openNotebook(uri: Uri, openContext: NotebookDocumentOpenContext): NotebookData | Promise<NotebookData>;
1642+
resolveNotebook(document: NotebookDocument): Promise<void>;
16431643
saveNotebook(document: NotebookDocument, cancellation: CancellationToken): Promise<void>;
16441644
saveNotebookAs(targetResource: Uri, document: NotebookDocument, cancellation: CancellationToken): Promise<void>;
16451645
readonly onDidChangeNotebook: Event<NotebookDocumentEditEvent>;
1646-
revertNotebook(document: NotebookDocument, cancellation: CancellationToken): Promise<void>;
16471646
backupNotebook(document: NotebookDocument, context: NotebookDocumentBackupContext, cancellation: CancellationToken): Promise<NotebookDocumentBackup>;
16481647

16491648
kernel?: NotebookKernel;

‎src/vs/workbench/api/browser/mainThreadNotebook.ts‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -662,10 +662,6 @@ export class MainThreadNotebookController implements IMainNotebookController {
662662
const backupId = await this._proxy.$backup(this._viewType, uri, token);
663663
return backupId;
664664
}
665-
666-
async revert(uri: URI, token: CancellationToken): Promise<void> {
667-
return this._proxy.$revert(this._viewType, uri, token);
668-
}
669665
}
670666

671667
export class MainThreadNotebookKernel implements INotebookKernelInfo {

‎src/vs/workbench/api/common/extHost.protocol.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1586,7 +1586,6 @@ export interface ExtHostNotebookShape {
15861586
$executeNotebook2(kernelId: string, viewType: string, uri: UriComponents, cellHandle: number | undefined, token: CancellationToken): Promise<void>;
15871587
$saveNotebook(viewType: string, uri: UriComponents, token: CancellationToken): Promise<boolean>;
15881588
$saveNotebookAs(viewType: string, uri: UriComponents, target: UriComponents, token: CancellationToken): Promise<boolean>;
1589-
$revert(viewType: string, uri: UriComponents, cancellation: CancellationToken): Promise<void>;
15901589
$backup(viewType: string, uri: UriComponents, cancellation: CancellationToken): Promise<string | undefined>;
15911590
$acceptDisplayOrder(displayOrder: INotebookDisplayOrder): void;
15921591
$renderOutputs(uriComponents: UriComponents, id: string, request: IOutputRenderRequest<UriComponents>): Promise<IOutputRenderResponse<UriComponents> | undefined>;

‎src/vs/workbench/api/common/extHostNotebook.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -666,8 +666,8 @@ export class ExtHostNotebookOutputRenderer {
666666
}
667667

668668
matches(mimeType: string): boolean {
669-
if (this.filter.subTypes) {
670-
if (this.filter.subTypes.indexOf(mimeType) >= 0) {
669+
if (this.filter.mimeTypes) {
670+
if (this.filter.mimeTypes.indexOf(mimeType) >= 0) {
671671
return true;
672672
}
673673
}

‎src/vs/workbench/contrib/notebook/browser/notebookServiceImpl.ts‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -751,16 +751,6 @@ export class NotebookService extends Disposable implements INotebookService, ICu
751751
return;
752752
}
753753

754-
async revert(viewType: string, uri: URI, token: CancellationToken): Promise<void> {
755-
let provider = this._notebookProviders.get(viewType);
756-
757-
if (provider) {
758-
return provider.controller.revert(uri, token);
759-
}
760-
761-
return;
762-
}
763-
764754
onDidReceiveMessage(viewType: string, editorId: string, message: any): void {
765755
let provider = this._notebookProviders.get(viewType);
766756

‎src/vs/workbench/contrib/notebook/common/notebookCommon.ts‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,8 +99,7 @@ export interface INotebookDisplayOrder {
9999
}
100100

101101
export interface INotebookMimeTypeSelector {
102-
type: string;
103-
subTypes?: string[];
102+
mimeTypes?: string[];
104103
}
105104

106105
export interface INotebookRendererInfo {

‎src/vs/workbench/contrib/notebook/common/notebookEditorModel.ts‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -114,12 +114,7 @@ export class NotebookEditorModel extends EditorModel implements IWorkingCopy, IN
114114
return;
115115
}
116116

117-
if (this._notebook.supportBackup) {
118-
const tokenSource = new CancellationTokenSource();
119-
await this.notebookService.revert(this.viewType, this.resource, tokenSource.token);
120-
} else {
121-
await this.load({ forceReadFromDisk: true });
122-
}
117+
await this.load({ forceReadFromDisk: true });
123118

124119
this._dirty = false;
125120
this._onDidChangeDirty.fire();

‎src/vs/workbench/contrib/notebook/common/notebookService.ts‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ export interface IMainNotebookController {
2727
save(uri: URI, token: CancellationToken): Promise<boolean>;
2828
saveAs(uri: URI, target: URI, token: CancellationToken): Promise<boolean>;
2929
backup(uri: URI, token: CancellationToken): Promise<string | undefined>;
30-
revert(uri: URI, token: CancellationToken): Promise<void>;
3130
}
3231

3332
export interface INotebookService {
@@ -67,7 +66,6 @@ export interface INotebookService {
6766
save(viewType: string, resource: URI, token: CancellationToken): Promise<boolean>;
6867
saveAs(viewType: string, resource: URI, target: URI, token: CancellationToken): Promise<boolean>;
6968
backup(viewType: string, uri: URI, token: CancellationToken): Promise<string | undefined>;
70-
revert(viewType: string, uri: URI, token: CancellationToken): Promise<void>;
7169
onDidReceiveMessage(viewType: string, editorId: string, message: any): void;
7270
setToCopy(items: NotebookCellTextModel[]): void;
7371
getToCopy(): NotebookCellTextModel[] | undefined;

0 commit comments

Comments
 (0)