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 0a7364f00514c46c9caceece15e1f82f82e3712f

Browse Source
This commit is contained in:
ADS Merger
2020-07-22 03:06:57 +00:00
parent 53ec7585a9
commit 1b7b54ce14
229 changed files with 5099 additions and 3188 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/vs/editor/test/common/config/commonEditorConfig.test.ts
View File

@@ -211,4 +211,15 @@ suite('Common Editor Config', () => {
strings: false
});
});
test('issue #102920: Can\'t snap or split view with JSON files', () => {
const config = new TestConfiguration({ quickSuggestions: null! });
config.updateOptions({ quickSuggestions: { strings: true } });
const actual = <Readonly<Required<IQuickSuggestionsOptions>>>config.options.get(EditorOption.quickSuggestions);
assert.deepEqual(actual, {
other: true,
comments: false,
strings: true
});
});
});

26
src/vs/editor/test/common/services/languagesRegistry.test.ts
View File

@@ -221,6 +221,32 @@ suite('LanguagesRegistry', () => {
assert.deepEqual(registry.getExtensions('aName'), ['aExt', 'aExt2']);
});
test('extensions of primary language registration come first', () => {
let registry = new LanguagesRegistry(false);
registry._registerLanguages([{
id: 'a',
extensions: ['aExt3']
}]);
assert.deepEqual(registry.getExtensions('a')[0], 'aExt3');
registry._registerLanguages([{
id: 'a',
configuration: URI.file('conf.json'),
extensions: ['aExt']
}]);
assert.deepEqual(registry.getExtensions('a')[0], 'aExt');
registry._registerLanguages([{
id: 'a',
extensions: ['aExt2']
}]);
assert.deepEqual(registry.getExtensions('a')[0], 'aExt');
});
test('filenames', () => {
let registry = new LanguagesRegistry(false);