ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-16 10:58:30 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge from vscode 4d91d96e5e121b38d33508cdef17868bab255eae

Browse Source
This commit is contained in:
ADS Merger
2020-06-18 04:32:54 +00:00
committed by AzureDataStudio
parent a971aee5bd
commit 5e7071e466
1002 changed files with 24201 additions and 13193 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/vs/workbench/services/keybinding/common/keybindingEditing.ts
View File

@@ -30,7 +30,7 @@ export const IKeybindingEditingService = createDecorator<IKeybindingEditingServi
export interface IKeybindingEditingService {
_serviceBrand: undefined;
readonly _serviceBrand: undefined;
editKeybinding(keybindingItem: ResolvedKeybindingItem, key: string, when: string | undefined): Promise<void>;

2
src/vs/workbench/services/keybinding/common/keymapInfo.ts
View File

@@ -94,7 +94,7 @@ export type IKeyboardLayoutInfo = (IWindowsKeyboardLayoutInfo | ILinuxKeyboardLa
export const IKeymapService = createDecorator<IKeymapService>('keymapService');
export interface IKeymapService {
_serviceBrand: undefined;
readonly _serviceBrand: undefined;
onDidChangeKeyboardMapper: Event<void>;
getKeyboardMapper(dispatchConfig: DispatchConfig): IKeyboardMapper;
getCurrentKeyboardLayout(): IKeyboardLayoutInfo | null;

3
src/vs/workbench/services/keybinding/test/electron-browser/keybindingEditing.test.ts
View File

@@ -58,6 +58,8 @@ import { TestTextResourcePropertiesService, TestContextService, TestWorkingCopyS
import { IThemeService } from 'vs/platform/theme/common/themeService';
import { TestThemeService } from 'vs/platform/theme/test/common/testThemeService';
import { IPathService } from 'vs/workbench/services/path/common/pathService';
import { IUriIdentityService } from 'vs/workbench/services/uriIdentity/common/uriIdentity';
import { UriIdentityService } from 'vs/workbench/services/uriIdentity/common/uriIdentityService';
class TestEnvironmentService extends NativeWorkbenchEnvironmentService {
@@ -117,6 +119,7 @@ suite('KeybindingsEditing', () => {
fileService.registerProvider(Schemas.file, diskFileSystemProvider);
fileService.registerProvider(Schemas.userData, new FileUserDataProvider(environmentService.appSettingsHome, environmentService.backupHome, diskFileSystemProvider, environmentService, new NullLogService()));
instantiationService.stub(IFileService, fileService);
instantiationService.stub(IUriIdentityService, new UriIdentityService(fileService));
instantiationService.stub(IWorkingCopyService, new TestWorkingCopyService());
instantiationService.stub(IWorkingCopyFileService, instantiationService.createInstance(WorkingCopyFileService));
instantiationService.stub(ITextFileService, instantiationService.createInstance(TestTextFileService));

10
src/vs/workbench/services/keybinding/test/electron-browser/macLinuxFallbackKeyboardMapper.test.ts
View File

@@ -107,9 +107,9 @@ suite('keyboardMapper - MAC fallback', () => {
},
{
label: '⌘',
ariaLabel: 'Command+',
ariaLabel: 'Command',
electronAccelerator: null,
userSettingsLabel: 'cmd+',
userSettingsLabel: 'cmd',
isWYSIWYG: true,
isChord: false,
dispatchParts: [null],
@@ -228,10 +228,10 @@ suite('keyboardMapper - LINUX fallback', () => {
code: null!
},
{
label: 'Ctrl+',
ariaLabel: 'Control+',
label: 'Ctrl',
ariaLabel: 'Control',
electronAccelerator: null,
userSettingsLabel: 'ctrl+',
userSettingsLabel: 'ctrl',
isWYSIWYG: true,
isChord: false,
dispatchParts: [null],

40
src/vs/workbench/services/keybinding/test/electron-browser/macLinuxKeyboardMapper.test.ts
View File

@@ -344,9 +344,9 @@ suite('keyboardMapper - MAC de_ch', () => {
},
{
label: '⌘',
ariaLabel: 'Command+',
ariaLabel: 'Command',
electronAccelerator: null,
userSettingsLabel: 'cmd+',
userSettingsLabel: 'cmd',
isWYSIWYG: true,
isChord: false,
dispatchParts: [null],
@@ -368,9 +368,9 @@ suite('keyboardMapper - MAC de_ch', () => {
},
{
label: '⌘',
ariaLabel: 'Command+',
ariaLabel: 'Command',
electronAccelerator: null,
userSettingsLabel: 'cmd+',
userSettingsLabel: 'cmd',
isWYSIWYG: true,
isChord: false,
dispatchParts: [null],
@@ -425,9 +425,9 @@ suite('keyboardMapper - MAC en_us', () => {
},
{
label: '⌘',
ariaLabel: 'Command+',
ariaLabel: 'Command',
electronAccelerator: null,
userSettingsLabel: 'cmd+',
userSettingsLabel: 'cmd',
isWYSIWYG: true,
isChord: false,
dispatchParts: [null],
@@ -449,9 +449,9 @@ suite('keyboardMapper - MAC en_us', () => {
},
{
label: '⌘',
ariaLabel: 'Command+',
ariaLabel: 'Command',
electronAccelerator: null,
userSettingsLabel: 'cmd+',
userSettingsLabel: 'cmd',
isWYSIWYG: true,
isChord: false,
dispatchParts: [null],
@@ -780,10 +780,10 @@ suite('keyboardMapper - LINUX de_ch', () => {
code: 'ControlLeft'
},
{
label: 'Ctrl+',
ariaLabel: 'Control+',
label: 'Ctrl',
ariaLabel: 'Control',
electronAccelerator: null,
userSettingsLabel: 'ctrl+',
userSettingsLabel: 'ctrl',
isWYSIWYG: true,
isChord: false,
dispatchParts: [null],
@@ -804,10 +804,10 @@ suite('keyboardMapper - LINUX de_ch', () => {
code: 'ControlRight'
},
{
label: 'Ctrl+',
ariaLabel: 'Control+',
label: 'Ctrl',
ariaLabel: 'Control',
electronAccelerator: null,
userSettingsLabel: 'ctrl+',
userSettingsLabel: 'ctrl',
isWYSIWYG: true,
isChord: false,
dispatchParts: [null],
@@ -1180,10 +1180,10 @@ suite('keyboardMapper - LINUX en_us', () => {
code: 'ControlLeft'
},
{
label: 'Ctrl+',
ariaLabel: 'Control+',
label: 'Ctrl',
ariaLabel: 'Control',
electronAccelerator: null,
userSettingsLabel: 'ctrl+',
userSettingsLabel: 'ctrl',
isWYSIWYG: true,
isChord: false,
dispatchParts: [null],
@@ -1204,10 +1204,10 @@ suite('keyboardMapper - LINUX en_us', () => {
code: 'ControlRight'
},
{
label: 'Ctrl+',
ariaLabel: 'Control+',
label: 'Ctrl',
ariaLabel: 'Control',
electronAccelerator: null,
userSettingsLabel: 'ctrl+',
userSettingsLabel: 'ctrl',
isWYSIWYG: true,
isChord: false,
dispatchParts: [null],

12
src/vs/workbench/services/keybinding/test/electron-browser/windowsKeyboardMapper.test.ts
View File

@@ -308,10 +308,10 @@ suite('keyboardMapper - WINDOWS de_ch', () => {
code: null!
},
{
label: 'Ctrl+',
ariaLabel: 'Control+',
label: 'Ctrl',
ariaLabel: 'Control',
electronAccelerator: null,
userSettingsLabel: 'ctrl+',
userSettingsLabel: 'ctrl',
isWYSIWYG: true,
isChord: false,
dispatchParts: [null],
@@ -396,10 +396,10 @@ suite('keyboardMapper - WINDOWS en_us', () => {
code: null!
},
{
label: 'Ctrl+',
ariaLabel: 'Control+',
label: 'Ctrl',
ariaLabel: 'Control',
electronAccelerator: null,
userSettingsLabel: 'ctrl+',
userSettingsLabel: 'ctrl',
isWYSIWYG: true,
isChord: false,
dispatchParts: [null],