提交 73f16e03 编写于 作者: R Rob Lourens

excluded -> included, and property is included by default if 'included' is unspecified

上级 5a44cc3a
......@@ -613,7 +613,7 @@ const editorConfiguration: IConfigurationNode = {
'type': 'boolean',
'default': EDITOR_DEFAULTS.contribInfo.selectionClipboard,
'description': nls.localize('selectionClipboard', "Controls if the Linux primary clipboard should be supported."),
'excluded': !platform.isLinux
'included': platform.isLinux
},
'diffEditor.renderSideBySide': {
'type': 'boolean',
......
......@@ -72,7 +72,7 @@ export interface IConfigurationPropertySchema extends IJSONSchema {
isExecutable?: boolean;
scope?: ConfigurationScope;
notMultiRootAdopted?: boolean;
excluded?: boolean;
included?: boolean;
}
export interface IConfigurationNode {
......@@ -200,8 +200,9 @@ class ConfigurationRegistry implements IConfigurationRegistry {
property.scope = scope;
}
// add to properties maps
if (properties[key].excluded) {
// Add to properties maps
// Property is included by default if 'included' is unspecified
if (properties[key].hasOwnProperty('included') && !properties[key].included) {
this.excludedConfigurationProperties[key] = properties[key];
delete properties[key];
continue;
......
......@@ -359,32 +359,32 @@ configurationRegistry.registerConfiguration({
],
'default': 'default',
'description': nls.localize('menuBarVisibility', "Control the visibility of the menu bar. A setting of 'toggle' means that the menu bar is hidden and a single press of the Alt key will show it. By default, the menu bar will be visible, unless the window is full screen."),
'excluded': !isWindows && !isLinux
'included': isWindows || isLinux
},
'window.enableMenuBarMnemonics': {
'type': 'boolean',
'default': true,
'description': nls.localize('enableMenuBarMnemonics', "If enabled, the main menus can be opened via Alt-key shortcuts. Disabling mnemonics allows to bind these Alt-key shortcuts to editor commands instead."),
'excluded': !isWindows && !isLinux
'included': isWindows || isLinux
},
'window.autoDetectHighContrast': {
'type': 'boolean',
'default': true,
'description': nls.localize('autoDetectHighContrast', "If enabled, will automatically change to high contrast theme if Windows is using a high contrast theme, and to dark theme when switching away from a Windows high contrast theme."),
'excluded': !isWindows
'included': !isWindows
},
'window.titleBarStyle': {
'type': 'string',
'enum': ['native', 'custom'],
'default': 'custom',
'description': nls.localize('titleBarStyle', "Adjust the appearance of the window title bar. Changes require a full restart to apply."),
'excluded': !isMacintosh
'included': isMacintosh
},
'window.nativeTabs': {
'type': 'boolean',
'default': false,
'description': nls.localize('window.nativeTabs', "Enables macOS Sierra window tabs. Note that changes require a full restart to apply and that native tabs will disable a custom title bar style if configured."),
'excluded': !isMacintosh || parseFloat(os.release()) < 16 // Minimum: macOS Sierra (10.12.x = darwin 16.x)
'included': isMacintosh && parseFloat(os.release()) >= 16 // Minimum: macOS Sierra (10.12.x = darwin 16.x)
}
}
});
......
......@@ -582,7 +582,7 @@ const keyboardConfiguration: IConfigurationNode = {
'enum': ['code', 'keyCode'],
'default': 'code',
'description': nls.localize('dispatch', "Controls the dispatching logic for key presses to use either `code` (recommended) or `keyCode`."),
'excluded': OS !== OperatingSystem.Macintosh && OS !== OperatingSystem.Linux
'included': OS === OperatingSystem.Macintosh || OS === OperatingSystem.Linux
}
}
};
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册