提交 f35758ab 编写于 作者: M Matt Bierner

Rename supportsMultipleEditorsPerResource -> supportsMultipleEditorsPerDocument

For #77131
上级 e5194075
...@@ -24,7 +24,7 @@ export function activate(context: vscode.ExtensionContext) { ...@@ -24,7 +24,7 @@ export function activate(context: vscode.ExtensionContext) {
const previewManager = new PreviewManager(extensionRoot, sizeStatusBarEntry, binarySizeStatusBarEntry, zoomStatusBarEntry); const previewManager = new PreviewManager(extensionRoot, sizeStatusBarEntry, binarySizeStatusBarEntry, zoomStatusBarEntry);
context.subscriptions.push(vscode.window.registerCustomEditorProvider2(PreviewManager.viewType, previewManager, { context.subscriptions.push(vscode.window.registerCustomEditorProvider2(PreviewManager.viewType, previewManager, {
supportsMultipleEditorsPerResource: true, supportsMultipleEditorsPerDocument: true,
})); }));
context.subscriptions.push(vscode.commands.registerCommand('imagePreview.zoomIn', () => { context.subscriptions.push(vscode.commands.registerCommand('imagePreview.zoomIn', () => {
......
...@@ -1491,7 +1491,7 @@ declare module 'vscode' { ...@@ -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 * 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. * can properly synchronize the states of all editor instances for a resource so that they are consistent.
*/ */
readonly supportsMultipleEditorsPerResource?: boolean; readonly supportsMultipleEditorsPerDocument?: boolean;
} }
): Disposable; ): Disposable;
} }
......
...@@ -309,8 +309,8 @@ export class MainThreadWebviews extends Disposable implements extHostProtocol.Ma ...@@ -309,8 +309,8 @@ export class MainThreadWebviews extends Disposable implements extHostProtocol.Ma
this.registerEditorProvider(ModelType.Text, extensionData, viewType, options, capabilities, true); this.registerEditorProvider(ModelType.Text, extensionData, viewType, options, capabilities, true);
} }
public $registerCustomEditorProvider(extensionData: extHostProtocol.WebviewExtensionDescription, viewType: string, options: modes.IWebviewPanelOptions, supportsMultipleEditorsPerResource: boolean): void { public $registerCustomEditorProvider(extensionData: extHostProtocol.WebviewExtensionDescription, viewType: string, options: modes.IWebviewPanelOptions, supportsMultipleEditorsPerDocument: boolean): void {
this.registerEditorProvider(ModelType.Custom, extensionData, viewType, options, {}, supportsMultipleEditorsPerResource); this.registerEditorProvider(ModelType.Custom, extensionData, viewType, options, {}, supportsMultipleEditorsPerDocument);
} }
private registerEditorProvider( private registerEditorProvider(
...@@ -319,14 +319,14 @@ export class MainThreadWebviews extends Disposable implements extHostProtocol.Ma ...@@ -319,14 +319,14 @@ export class MainThreadWebviews extends Disposable implements extHostProtocol.Ma
viewType: string, viewType: string,
options: modes.IWebviewPanelOptions, options: modes.IWebviewPanelOptions,
capabilities: extHostProtocol.CustomTextEditorCapabilities, capabilities: extHostProtocol.CustomTextEditorCapabilities,
supportsMultipleEditorsPerResource: boolean, supportsMultipleEditorsPerDocument: boolean,
): DisposableStore { ): DisposableStore {
if (this._editorProviders.has(viewType)) { if (this._editorProviders.has(viewType)) {
throw new Error(`Provider for ${viewType} already registered`); throw new Error(`Provider for ${viewType} already registered`);
} }
this._customEditorService.registerCustomEditorCapabilities(viewType, { this._customEditorService.registerCustomEditorCapabilities(viewType, {
supportsMultipleEditorsPerResource supportsMultipleEditorsPerDocument
}); });
const extension = reviveWebviewExtension(extensionData); const extension = reviveWebviewExtension(extensionData);
......
...@@ -588,7 +588,7 @@ export function createApiFactoryAndRegisterActors(accessor: ServicesAccessor): I ...@@ -588,7 +588,7 @@ export function createApiFactoryAndRegisterActors(accessor: ServicesAccessor): I
registerCustomEditorProvider: (viewType: string, provider: vscode.CustomTextEditorProvider, options: { webviewOptions?: vscode.WebviewPanelOptions } = {}) => { registerCustomEditorProvider: (viewType: string, provider: vscode.CustomTextEditorProvider, options: { webviewOptions?: vscode.WebviewPanelOptions } = {}) => {
return extHostWebviews.registerCustomEditorProvider(extension, viewType, provider, options); 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); checkProposedApiEnabled(extension);
return extHostWebviews.registerCustomEditorProvider(extension, viewType, provider, options); return extHostWebviews.registerCustomEditorProvider(extension, viewType, provider, options);
}, },
......
...@@ -612,7 +612,7 @@ export interface MainThreadWebviewsShape extends IDisposable { ...@@ -612,7 +612,7 @@ export interface MainThreadWebviewsShape extends IDisposable {
$unregisterSerializer(viewType: string): void; $unregisterSerializer(viewType: string): void;
$registerTextEditorProvider(extension: WebviewExtensionDescription, viewType: string, options: modes.IWebviewPanelOptions, capabilities: CustomTextEditorCapabilities): 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; $unregisterEditorProvider(viewType: string): void;
$onDidEdit(resource: UriComponents, viewType: string, editId: number, label: string | undefined): void; $onDidEdit(resource: UriComponents, viewType: string, editId: number, label: string | undefined): void;
......
...@@ -460,7 +460,7 @@ export class ExtHostWebviews implements extHostProtocol.ExtHostWebviewsShape { ...@@ -460,7 +460,7 @@ export class ExtHostWebviews implements extHostProtocol.ExtHostWebviewsShape {
extension: IExtensionDescription, extension: IExtensionDescription,
viewType: string, viewType: string,
provider: vscode.CustomEditorProvider | vscode.CustomTextEditorProvider, provider: vscode.CustomEditorProvider | vscode.CustomTextEditorProvider,
options: { webviewOptions?: vscode.WebviewPanelOptions, supportsMultipleEditorsPerResource?: boolean }, options: { webviewOptions?: vscode.WebviewPanelOptions, supportsMultipleEditorsPerDocument?: boolean },
): vscode.Disposable { ): vscode.Disposable {
const disposables = new DisposableStore(); const disposables = new DisposableStore();
if ('resolveCustomTextEditor' in provider) { if ('resolveCustomTextEditor' in provider) {
...@@ -470,7 +470,7 @@ export class ExtHostWebviews implements extHostProtocol.ExtHostWebviewsShape { ...@@ -470,7 +470,7 @@ export class ExtHostWebviews implements extHostProtocol.ExtHostWebviewsShape {
}); });
} else { } else {
disposables.add(this._editorProviders.addCustomProvider(viewType, extension, provider)); 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( return extHostTypes.Disposable.from(
......
...@@ -207,7 +207,7 @@ export class CustomEditorService extends Disposable implements ICustomEditorServ ...@@ -207,7 +207,7 @@ export class CustomEditorService extends Disposable implements ICustomEditorServ
} }
const capabilities = this.getCustomEditorCapabilities(viewType) || {}; const capabilities = this.getCustomEditorCapabilities(viewType) || {};
if (!capabilities.supportsMultipleEditorsPerResource) { if (!capabilities.supportsMultipleEditorsPerDocument) {
const movedEditor = await this.tryRevealExistingEditorForResourceInGroup(resource, viewType, options, group); const movedEditor = await this.tryRevealExistingEditorForResourceInGroup(resource, viewType, options, group);
if (movedEditor) { if (movedEditor) {
return movedEditor; return movedEditor;
......
...@@ -22,7 +22,7 @@ export const CONTEXT_CUSTOM_EDITORS = new RawContextKey<string>('customEditors', ...@@ -22,7 +22,7 @@ export const CONTEXT_CUSTOM_EDITORS = new RawContextKey<string>('customEditors',
export const CONTEXT_FOCUSED_CUSTOM_EDITOR_IS_EDITABLE = new RawContextKey<boolean>('focusedCustomEditorIsEditable', false); export const CONTEXT_FOCUSED_CUSTOM_EDITOR_IS_EDITABLE = new RawContextKey<boolean>('focusedCustomEditorIsEditable', false);
export interface CustomEditorCapabilities { export interface CustomEditorCapabilities {
readonly supportsMultipleEditorsPerResource?: boolean; readonly supportsMultipleEditorsPerDocument?: boolean;
} }
export interface ICustomEditorService { export interface ICustomEditorService {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册