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

Merge from vscode a416c77e56ef0314ae00633faa04878151610de8 (#8600)

Browse Source 
* Merge from vscode a416c77e56ef0314ae00633faa04878151610de8

* distro

* fix tests

* fix tests
This commit is contained in:
Anthony Dresser
2019-12-07 17:19:16 -08:00
committed by GitHub
parent a7ff238653
commit d614116b63
155 changed files with 1982 additions and 1599 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/vs/editor/common/config/editorOptions.ts
View File

@@ -481,9 +481,9 @@ export interface IEditorOptions {
showFoldingControls?: 'always' | 'mouseover';
/**
* Enable highlighting of matching brackets.
* Defaults to true.
* Defaults to 'always'.
*/
matchBrackets?: boolean;
matchBrackets?: 'never' | 'near' | 'always';
/**
* Enable rendering of whitespace.
* Defaults to none.
@@ -2277,7 +2277,7 @@ class EditorRulers extends SimpleEditorOption<EditorOption.rulers, number[]> {
for (let value of input) {
rulers.push(EditorIntOption.clampedInt(value, 0, 0, 10000));
}
rulers.sort();
rulers.sort((a, b) => a - b);
return rulers;
}
return this.defaultValue;
@@ -3364,9 +3364,11 @@ export const EditorOptions = {
EditorOption.links, 'links', true,
{ description: nls.localize('links', "Controls whether the editor should detect links and make them clickable.") }
)),
matchBrackets: register(new EditorBooleanOption(
EditorOption.matchBrackets, 'matchBrackets', true,
{ description: nls.localize('matchBrackets', "Highlight matching brackets when one of them is selected.") }
matchBrackets: register(new EditorStringEnumOption(
EditorOption.matchBrackets, 'matchBrackets',
'always' as 'never' | 'near' | 'always',
['always', 'near', 'never'] as const,
{ description: nls.localize('matchBrackets', "Highlight matching brackets.") }
)),
minimap: register(new EditorMinimap()),
mouseStyle: register(new EditorStringEnumOption(