From f35758ab216790c31588bbbfd164bd8946725cb4 Mon Sep 17 00:00:00 2001 From: Matt Bierner Date: Thu, 23 Apr 2020 17:32:54 -0700 Subject: [PATCH] Rename supportsMultipleEditorsPerResource -> supportsMultipleEditorsPerDocument For #77131 --- extensions/image-preview/src/extension.ts | 2 +- src/vs/vscode.proposed.d.ts | 2 +- src/vs/workbench/api/browser/mainThreadWebview.ts | 8 ++++---- src/vs/workbench/api/common/extHost.api.impl.ts | 2 +- src/vs/workbench/api/common/extHost.protocol.ts | 2 +- src/vs/workbench/api/common/extHostWebview.ts | 4 ++-- .../contrib/customEditor/browser/customEditors.ts | 2 +- .../workbench/contrib/customEditor/common/customEditor.ts | 2 +- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/extensions/image-preview/src/extension.ts b/extensions/image-preview/src/extension.ts index 5a32a1a2066..e6b394fa29b 100644 --- a/extensions/image-preview/src/extension.ts +++ b/extensions/image-preview/src/extension.ts @@ -24,7 +24,7 @@ export function activate(context: vscode.ExtensionContext) { const previewManager = new PreviewManager(extensionRoot, sizeStatusBarEntry, binarySizeStatusBarEntry, zoomStatusBarEntry); context.subscriptions.push(vscode.window.registerCustomEditorProvider2(PreviewManager.viewType, previewManager, { - supportsMultipleEditorsPerResource: true, + supportsMultipleEditorsPerDocument: true, })); context.subscriptions.push(vscode.commands.registerCommand('imagePreview.zoomIn', () => { diff --git a/src/vs/vscode.proposed.d.ts b/src/vs/vscode.proposed.d.ts index 36871c6126f..b70937e6e4b 100644 --- a/src/vs/vscode.proposed.d.ts +++ b/src/vs/vscode.proposed.d.ts @@ -1491,7 +1491,7 @@ declare module 'vscode' { * When set, users can split and create copies of the custom editor. The custom editor must make sure it * can properly synchronize the states of all editor instances for a resource so that they are consistent. */ - readonly supportsMultipleEditorsPerResource?: boolean; + readonly supportsMultipleEditorsPerDocument?: boolean; } ): Disposable; } diff --git a/src/vs/workbench/api/browser/mainThreadWebview.ts b/src/vs/workbench/api/browser/mainThreadWebview.ts index 31ca00e86c1..0af4788840a 100644 --- a/src/vs/workbench/api/browser/mainThreadWebview.ts +++ b/src/vs/workbench/api/browser/mainThreadWebview.ts @@ -309,8 +309,8 @@ export class MainThreadWebviews extends Disposable implements extHostProtocol.Ma this.registerEditorProvider(ModelType.Text, extensionData, viewType, options, capabilities, true); } - public $registerCustomEditorProvider(extensionData: extHostProtocol.WebviewExtensionDescription, viewType: string, options: modes.IWebviewPanelOptions, supportsMultipleEditorsPerResource: boolean): void { - this.registerEditorProvider(ModelType.Custom, extensionData, viewType, options, {}, supportsMultipleEditorsPerResource); + public $registerCustomEditorProvider(extensionData: extHostProtocol.WebviewExtensionDescription, viewType: string, options: modes.IWebviewPanelOptions, supportsMultipleEditorsPerDocument: boolean): void { + this.registerEditorProvider(ModelType.Custom, extensionData, viewType, options, {}, supportsMultipleEditorsPerDocument); } private registerEditorProvider( @@ -319,14 +319,14 @@ export class MainThreadWebviews extends Disposable implements extHostProtocol.Ma viewType: string, options: modes.IWebviewPanelOptions, capabilities: extHostProtocol.CustomTextEditorCapabilities, - supportsMultipleEditorsPerResource: boolean, + supportsMultipleEditorsPerDocument: boolean, ): DisposableStore { if (this._editorProviders.has(viewType)) { throw new Error(`Provider for ${viewType} already registered`); } this._customEditorService.registerCustomEditorCapabilities(viewType, { - supportsMultipleEditorsPerResource + supportsMultipleEditorsPerDocument }); const extension = reviveWebviewExtension(extensionData); diff --git a/src/vs/workbench/api/common/extHost.api.impl.ts b/src/vs/workbench/api/common/extHost.api.impl.ts index 33b7ade6508..abdf14aee5d 100644 --- a/src/vs/workbench/api/common/extHost.api.impl.ts +++ b/src/vs/workbench/api/common/extHost.api.impl.ts @@ -588,7 +588,7 @@ export function createApiFactoryAndRegisterActors(accessor: ServicesAccessor): I registerCustomEditorProvider: (viewType: string, provider: vscode.CustomTextEditorProvider, options: { webviewOptions?: vscode.WebviewPanelOptions } = {}) => { return extHostWebviews.registerCustomEditorProvider(extension, viewType, provider, options); }, - registerCustomEditorProvider2: (viewType: string, provider: vscode.CustomEditorProvider, options: { webviewOptions?: vscode.WebviewPanelOptions, supportsMultipleEditorsPerResource?: boolean } = {}) => { + registerCustomEditorProvider2: (viewType: string, provider: vscode.CustomEditorProvider, options: { webviewOptions?: vscode.WebviewPanelOptions, supportsMultipleEditorsPerDocument?: boolean } = {}) => { checkProposedApiEnabled(extension); return extHostWebviews.registerCustomEditorProvider(extension, viewType, provider, options); }, diff --git a/src/vs/workbench/api/common/extHost.protocol.ts b/src/vs/workbench/api/common/extHost.protocol.ts index 101a938cb70..bae18569b5a 100644 --- a/src/vs/workbench/api/common/extHost.protocol.ts +++ b/src/vs/workbench/api/common/extHost.protocol.ts @@ -612,7 +612,7 @@ export interface MainThreadWebviewsShape extends IDisposable { $unregisterSerializer(viewType: string): void; $registerTextEditorProvider(extension: WebviewExtensionDescription, viewType: string, options: modes.IWebviewPanelOptions, capabilities: CustomTextEditorCapabilities): void; - $registerCustomEditorProvider(extension: WebviewExtensionDescription, viewType: string, options: modes.IWebviewPanelOptions, supportsMultipleEditorsPerResource: boolean): void; + $registerCustomEditorProvider(extension: WebviewExtensionDescription, viewType: string, options: modes.IWebviewPanelOptions, supportsMultipleEditorsPerDocument: boolean): void; $unregisterEditorProvider(viewType: string): void; $onDidEdit(resource: UriComponents, viewType: string, editId: number, label: string | undefined): void; diff --git a/src/vs/workbench/api/common/extHostWebview.ts b/src/vs/workbench/api/common/extHostWebview.ts index 5fe0c539953..2bf7e9a54d1 100644 --- a/src/vs/workbench/api/common/extHostWebview.ts +++ b/src/vs/workbench/api/common/extHostWebview.ts @@ -460,7 +460,7 @@ export class ExtHostWebviews implements extHostProtocol.ExtHostWebviewsShape { extension: IExtensionDescription, viewType: string, provider: vscode.CustomEditorProvider | vscode.CustomTextEditorProvider, - options: { webviewOptions?: vscode.WebviewPanelOptions, supportsMultipleEditorsPerResource?: boolean }, + options: { webviewOptions?: vscode.WebviewPanelOptions, supportsMultipleEditorsPerDocument?: boolean }, ): vscode.Disposable { const disposables = new DisposableStore(); if ('resolveCustomTextEditor' in provider) { @@ -470,7 +470,7 @@ export class ExtHostWebviews implements extHostProtocol.ExtHostWebviewsShape { }); } else { disposables.add(this._editorProviders.addCustomProvider(viewType, extension, provider)); - this._proxy.$registerCustomEditorProvider(toExtensionData(extension), viewType, options.webviewOptions || {}, !!options.supportsMultipleEditorsPerResource); + this._proxy.$registerCustomEditorProvider(toExtensionData(extension), viewType, options.webviewOptions || {}, !!options.supportsMultipleEditorsPerDocument); } return extHostTypes.Disposable.from( diff --git a/src/vs/workbench/contrib/customEditor/browser/customEditors.ts b/src/vs/workbench/contrib/customEditor/browser/customEditors.ts index a275ead51a0..2f64fa0f540 100644 --- a/src/vs/workbench/contrib/customEditor/browser/customEditors.ts +++ b/src/vs/workbench/contrib/customEditor/browser/customEditors.ts @@ -207,7 +207,7 @@ export class CustomEditorService extends Disposable implements ICustomEditorServ } const capabilities = this.getCustomEditorCapabilities(viewType) || {}; - if (!capabilities.supportsMultipleEditorsPerResource) { + if (!capabilities.supportsMultipleEditorsPerDocument) { const movedEditor = await this.tryRevealExistingEditorForResourceInGroup(resource, viewType, options, group); if (movedEditor) { return movedEditor; diff --git a/src/vs/workbench/contrib/customEditor/common/customEditor.ts b/src/vs/workbench/contrib/customEditor/common/customEditor.ts index 10a22fe2b63..59eff7d096a 100644 --- a/src/vs/workbench/contrib/customEditor/common/customEditor.ts +++ b/src/vs/workbench/contrib/customEditor/common/customEditor.ts @@ -22,7 +22,7 @@ export const CONTEXT_CUSTOM_EDITORS = new RawContextKey('customEditors', export const CONTEXT_FOCUSED_CUSTOM_EDITOR_IS_EDITABLE = new RawContextKey('focusedCustomEditorIsEditable', false); export interface CustomEditorCapabilities { - readonly supportsMultipleEditorsPerResource?: boolean; + readonly supportsMultipleEditorsPerDocument?: boolean; } export interface ICustomEditorService { -- GitLab