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

Rename custom editors discretion to priority

Fixes #81785
上级 04d0cf6a
......@@ -22,7 +22,7 @@ import { IWorkbenchContribution } from 'vs/workbench/common/contributions';
import { EditorInput, EditorOptions, IEditor, IEditorInput } from 'vs/workbench/common/editor';
import { DiffEditorInput } from 'vs/workbench/common/editor/diffEditorInput';
import { webviewEditorsExtensionPoint } from 'vs/workbench/contrib/customEditor/browser/extensionPoint';
import { CustomEditorDiscretion, CustomEditorInfo, CustomEditorSelector, ICustomEditorService } from 'vs/workbench/contrib/customEditor/common/customEditor';
import { CustomEditorPriority, CustomEditorInfo, CustomEditorSelector, ICustomEditorService } from 'vs/workbench/contrib/customEditor/common/customEditor';
import { FileEditorInput } from 'vs/workbench/contrib/files/common/editors/fileEditorInput';
import { IWebviewService } from 'vs/workbench/contrib/webview/browser/webview';
import { IEditorGroup } from 'vs/workbench/services/editor/common/editorGroupsService';
......@@ -37,7 +37,7 @@ const defaultEditorInfo: CustomEditorInfo = {
selector: [
{ filenamePattern: '*' }
],
discretion: CustomEditorDiscretion.default,
priority: CustomEditorPriority.default,
};
export class CustomEditorStore {
......@@ -88,7 +88,7 @@ export class CustomEditorService implements ICustomEditorService {
id: webviewEditorContribution.viewType,
displayName: webviewEditorContribution.displayName,
selector: webviewEditorContribution.selector || [],
discretion: webviewEditorContribution.discretion || CustomEditorDiscretion.default,
priority: webviewEditorContribution.priority || CustomEditorPriority.default,
});
}
}
......@@ -231,7 +231,7 @@ export class CustomEditorContribution implements IWorkbenchContribution {
return;
}
const defaultEditors = contributedEditors.filter(editor => editor.discretion === CustomEditorDiscretion.default);
const defaultEditors = contributedEditors.filter(editor => editor.priority === CustomEditorPriority.default);
if (defaultEditors.length === 1) {
return {
override: this.customEditorService.openWith(resource, defaultEditors[0].id, options, group),
......
......@@ -5,7 +5,7 @@
import { IJSONSchema } from 'vs/base/common/jsonSchema';
import * as nls from 'vs/nls';
import { CustomEditorDiscretion, CustomEditorSelector } from 'vs/workbench/contrib/customEditor/common/customEditor';
import { CustomEditorPriority, CustomEditorSelector } from 'vs/workbench/contrib/customEditor/common/customEditor';
import { ExtensionsRegistry } from 'vs/workbench/services/extensions/common/extensionsRegistry';
import { languagesExtPoint } from 'vs/workbench/services/mode/common/workbenchModeService';
......@@ -13,14 +13,14 @@ namespace WebviewEditorContribution {
export const viewType = 'viewType';
export const displayName = 'displayName';
export const selector = 'selector';
export const discretion = 'discretion';
export const priority = 'priority';
}
interface IWebviewEditorsExtensionPoint {
readonly [WebviewEditorContribution.viewType]: string;
readonly [WebviewEditorContribution.displayName]: string;
readonly [WebviewEditorContribution.selector]?: readonly CustomEditorSelector[];
readonly [WebviewEditorContribution.discretion]?: CustomEditorDiscretion;
readonly [WebviewEditorContribution.priority]?: CustomEditorPriority;
}
const webviewEditorsContribution: IJSONSchema = {
......@@ -60,16 +60,16 @@ const webviewEditorsContribution: IJSONSchema = {
}
}
},
[WebviewEditorContribution.discretion]: {
[WebviewEditorContribution.priority]: {
type: 'string',
description: nls.localize('contributes.discretion', 'Controls when the custom editor is used. May be overridden by users.'),
description: nls.localize('contributes.priority', 'Controls when the custom editor is used. May be overridden by users.'),
enum: [
CustomEditorDiscretion.default,
CustomEditorDiscretion.option
CustomEditorPriority.default,
CustomEditorPriority.option
],
enumDescriptions: [
nls.localize('contributes.discretion.default', 'Editor is automatically used for a resource if no other default custom editors are registered for it.'),
nls.localize('contributes.discretion.option', 'Editor is not automatically used but can be selected by a user.'),
nls.localize('contributes.priority.default', 'Editor is automatically used for a resource if no other default custom editors are registered for it.'),
nls.localize('contributes.priority.option', 'Editor is not automatically used but can be selected by a user.'),
],
default: 'default'
}
......
......@@ -23,7 +23,7 @@ export interface ICustomEditorService {
promptOpenWith(resource: URI, options?: ITextEditorOptions, group?: IEditorGroup): Promise<IEditor | undefined>;
}
export const enum CustomEditorDiscretion {
export const enum CustomEditorPriority {
default = 'default',
option = 'option',
}
......@@ -36,6 +36,6 @@ export interface CustomEditorSelector {
export interface CustomEditorInfo {
readonly id: string;
readonly displayName: string;
readonly discretion: CustomEditorDiscretion;
readonly priority: CustomEditorPriority;
readonly selector: readonly CustomEditorSelector[];
}
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册