ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-03-31 01:00:29 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge from vscode 6e530127a1bb8ffbd1bfb77dc680c321dc0d71f5 (#6844)

Browse Source
This commit is contained in:
Anthony Dresser
2019-08-20 21:07:47 -07:00
committed by GitHub
parent 1f00249646
commit ecb80f14f0
221 changed files with 3140 additions and 1552 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/vs/workbench/contrib/preferences/browser/keybindingsEditor.ts
View File

@@ -789,7 +789,7 @@ class KeybindingItemRenderer implements IListRenderer<IKeybindingItemEntry, Keyb
get templateId(): string { return KEYBINDING_ENTRY_TEMPLATE_ID; }
constructor(
private keybindingsEditor: IKeybindingsEditor,
private keybindingsEditor: KeybindingsEditor,
private instantiationService: IInstantiationService
) { }

14
src/vs/workbench/contrib/preferences/browser/settingsTreeModels.ts
View File

@@ -9,12 +9,12 @@ import { isArray, withUndefinedAsNull } from 'vs/base/common/types';
import { URI } from 'vs/base/common/uri';
import { localize } from 'vs/nls';
import { ConfigurationTarget, IConfigurationService } from 'vs/platform/configuration/common/configuration';
import { ConfigurationScope } from 'vs/platform/configuration/common/configurationRegistry';
import { SettingsTarget } from 'vs/workbench/contrib/preferences/browser/preferencesWidgets';
import { ITOCEntry, knownAcronyms, knownTermMappings } from 'vs/workbench/contrib/preferences/browser/settingsLayout';
import { MODIFIED_SETTING_TAG } from 'vs/workbench/contrib/preferences/common/preferences';
import { IExtensionSetting, ISearchResult, ISetting, SettingValueType } from 'vs/workbench/services/preferences/common/preferences';
import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
import { FOLDER_SCOPES, WORKSPACE_SCOPES, REMOTE_MACHINE_SCOPES, LOCAL_MACHINE_SCOPES } from 'vs/workbench/services/configuration/common/configuration';
export const ONLINE_SERVICES_SETTING_TAG = 'usesOnlineServices';
@@ -227,20 +227,24 @@ export class SettingsTreeSettingElement extends SettingsTreeElement {
matchesScope(scope: SettingsTarget, isRemote: boolean): boolean {
const configTarget = URI.isUri(scope) ? ConfigurationTarget.WORKSPACE_FOLDER : scope;
if (!this.setting.scope) {
return true;
}
if (configTarget === ConfigurationTarget.WORKSPACE_FOLDER) {
return this.setting.scope === ConfigurationScope.RESOURCE;
return FOLDER_SCOPES.indexOf(this.setting.scope) !== -1;
}
if (configTarget === ConfigurationTarget.WORKSPACE) {
return this.setting.scope === ConfigurationScope.WINDOW || this.setting.scope === ConfigurationScope.RESOURCE;
return WORKSPACE_SCOPES.indexOf(this.setting.scope) !== -1;
}
if (configTarget === ConfigurationTarget.USER_REMOTE) {
return this.setting.scope === ConfigurationScope.MACHINE || this.setting.scope === ConfigurationScope.WINDOW || this.setting.scope === ConfigurationScope.RESOURCE;
return REMOTE_MACHINE_SCOPES.indexOf(this.setting.scope) !== -1;
}
if (configTarget === ConfigurationTarget.USER_LOCAL && isRemote) {
return this.setting.scope !== ConfigurationScope.MACHINE;
return LOCAL_MACHINE_SCOPES.indexOf(this.setting.scope) !== -1;
}
return true;

1
src/vs/workbench/contrib/preferences/common/preferences.ts
View File

@@ -55,7 +55,6 @@ export interface IKeybindingsEditor extends IEditor {
focusKeybindings(): void;
recordSearchKeys(): void;
toggleSortByPrecedence(): void;
layoutColumns(columns: HTMLElement[]): void;
selectKeybinding(keybindingEntry: IKeybindingItemEntry): void;
defineKeybinding(keybindingEntry: IKeybindingItemEntry): Promise<void>;
defineWhenExpression(keybindingEntry: IKeybindingItemEntry): void;