From f085deb2e0769c65b4576e0bb399d2de357f3237 Mon Sep 17 00:00:00 2001 From: Matt Bierner Date: Thu, 21 Nov 2019 20:33:06 -0800 Subject: [PATCH] Remove test editing code from preview --- extensions/image-preview/package.json | 10 -------- extensions/image-preview/src/extension.ts | 15 ------------ extensions/image-preview/src/preview.ts | 24 ++----------------- .../customEditor/common/customEditorModel.ts | 2 -- 4 files changed, 2 insertions(+), 49 deletions(-) diff --git a/extensions/image-preview/package.json b/extensions/image-preview/package.json index f39fc9b6012..8be8486a54b 100644 --- a/extensions/image-preview/package.json +++ b/extensions/image-preview/package.json @@ -44,11 +44,6 @@ "command": "imagePreview.zoomOut", "title": "%command.zoomOut%", "category": "Image Preview" - }, - { - "command": "imagePreview.testing.makeEdit", - "title": "Make test edit", - "category": "Image Preview" } ], "menus": { @@ -62,11 +57,6 @@ "command": "imagePreview.zoomOut", "when": "imagePreviewFocus", "group": "1_imagePreview" - }, - { - "command": "imagePreview.testing.makeEdit", - "when": "imagePreviewTestMode", - "group": "1_imagePreview" } ] } diff --git a/extensions/image-preview/src/extension.ts b/extensions/image-preview/src/extension.ts index d1079ccdfa6..63bc3973e49 100644 --- a/extensions/image-preview/src/extension.ts +++ b/extensions/image-preview/src/extension.ts @@ -38,20 +38,5 @@ export function activate(context: vscode.ExtensionContext) { context.subscriptions.push(vscode.commands.registerCommand('imagePreview.zoomOut', () => { previewManager.activePreview?.zoomOut(); })); - - context.subscriptions.push(vscode.commands.registerCommand('imagePreview.testing.makeEdit', () => { - previewManager.activePreview?.test_makeEdit(); - })); - - context.subscriptions.push(vscode.workspace.onDidChangeConfiguration(e => { - if (e.affectsConfiguration('imagePreview.customEditorTestMode')) { - updateTestMode(); - } - })); - updateTestMode(); } -function updateTestMode() { - const isInTestMode = vscode.workspace.getConfiguration('imagePreview').get('customEditorTestMode', false); - vscode.commands.executeCommand('setContext', 'imagePreviewTestMode', isInTestMode); -} diff --git a/extensions/image-preview/src/preview.ts b/extensions/image-preview/src/preview.ts index dd461b519e0..1a3207c22d0 100644 --- a/extensions/image-preview/src/preview.ts +++ b/extensions/image-preview/src/preview.ts @@ -45,9 +45,7 @@ export class PreviewManager { } }); - return { - editingCapability: preview - }; + return {}; } public get activePreview() { return this._activePreview; } @@ -68,7 +66,7 @@ const enum PreviewState { Active, } -class Preview extends Disposable implements vscode.WebviewEditorEditingCapability { +class Preview extends Disposable { private readonly id: string = `${Date.now()}-${Math.random().toString()}`; @@ -251,24 +249,6 @@ class Preview extends Disposable implements vscode.WebviewEditorEditingCapabilit path: this.extensionRoot.path + path })); } - - //#region WebviewEditorCapabilities - private readonly _onEdit = this._register(new vscode.EventEmitter<{ now: number }>()); - public readonly onEdit = this._onEdit.event; - - async save() { console.log('save'); } - - async hotExit() { } - - async undoEdits(edits: any[]) { console.log('undo', edits); } - - async applyEdits(edits: any[]) { console.log('apply', edits); } - - //#endregion - - public test_makeEdit() { - this._onEdit.fire({ now: Date.now() }); - } } function escapeAttribute(value: string | vscode.Uri): string { diff --git a/src/vs/workbench/contrib/customEditor/common/customEditorModel.ts b/src/vs/workbench/contrib/customEditor/common/customEditorModel.ts index d2d770cb43a..ee49e9aaa14 100644 --- a/src/vs/workbench/contrib/customEditor/common/customEditorModel.ts +++ b/src/vs/workbench/contrib/customEditor/common/customEditorModel.ts @@ -122,5 +122,3 @@ export class CustomEditorModel extends Disposable implements ICustomEditorModel this.updateDirty(); } } - - -- GitLab