mirror of
https://github.com/ckaczor/azuredatastudio.git
synced 2026-02-16 10:58:30 -05:00
Merge from master
This commit is contained in:
Raj Musuku
@@ -2,19 +2,18 @@
|
||||
* Copyright (c) Microsoft Corporation. All rights reserved.
|
||||
* Licensed under the Source EULA. See License.txt in the project root for license information.
|
||||
*--------------------------------------------------------------------------------------------*/
|
||||
'use strict';
|
||||
|
||||
import * as nls from 'vs/nls';
|
||||
import { Event, Emitter } from 'vs/base/common/event';
|
||||
import { Emitter, Event } from 'vs/base/common/event';
|
||||
import { Disposable } from 'vs/base/common/lifecycle';
|
||||
import * as objects from 'vs/base/common/objects';
|
||||
import * as platform from 'vs/base/common/platform';
|
||||
import { Extensions, IConfigurationRegistry, IConfigurationNode, ConfigurationScope } from 'vs/platform/configuration/common/configurationRegistry';
|
||||
import { Registry } from 'vs/platform/registry/common/platform';
|
||||
import * as editorCommon from 'vs/editor/common/editorCommon';
|
||||
import { FontInfo, BareFontInfo } from 'vs/editor/common/config/fontInfo';
|
||||
import { EditorZoom } from 'vs/editor/common/config/editorZoom';
|
||||
import * as editorOptions from 'vs/editor/common/config/editorOptions';
|
||||
import { EditorZoom } from 'vs/editor/common/config/editorZoom';
|
||||
import { BareFontInfo, FontInfo } from 'vs/editor/common/config/fontInfo';
|
||||
import * as editorCommon from 'vs/editor/common/editorCommon';
|
||||
import { ConfigurationScope, Extensions, IConfigurationNode, IConfigurationRegistry } from 'vs/platform/configuration/common/configurationRegistry';
|
||||
import { Registry } from 'vs/platform/registry/common/platform';
|
||||
import EDITOR_DEFAULTS = editorOptions.EDITOR_DEFAULTS;
|
||||
import EDITOR_FONT_DEFAULTS = editorOptions.EDITOR_FONT_DEFAULTS;
|
||||
import EDITOR_MODEL_DEFAULTS = editorOptions.EDITOR_MODEL_DEFAULTS;
|
||||
@@ -83,9 +82,9 @@ export abstract class CommonEditorConfiguration extends Disposable implements ed
|
||||
this._rawOptions.minimap = objects.mixin({}, this._rawOptions.minimap || {});
|
||||
this._rawOptions.find = objects.mixin({}, this._rawOptions.find || {});
|
||||
this._rawOptions.hover = objects.mixin({}, this._rawOptions.hover || {});
|
||||
this._rawOptions.parameterHints = objects.mixin({}, this._rawOptions.parameterHints || {});
|
||||
|
||||
this._validatedOptions = editorOptions.EditorOptionsValidator.validate(this._rawOptions, EDITOR_DEFAULTS);
|
||||
this.editor = null;
|
||||
this._isDominatedByLongLines = false;
|
||||
this._lineNumbersDigitCount = 1;
|
||||
|
||||
@@ -282,19 +281,17 @@ const editorConfiguration: IConfigurationNode = {
|
||||
'type': 'number',
|
||||
'default': EDITOR_MODEL_DEFAULTS.tabSize,
|
||||
'minimum': 1,
|
||||
'description': nls.localize('tabSize', "The number of spaces a tab is equal to. This setting is overridden based on the file contents when `#editor.detectIndentation#` is on."),
|
||||
'errorMessage': nls.localize('tabSize.errorMessage', "Expected 'number'. Note that the value \"auto\" has been replaced by the `editor.detectIndentation` setting.")
|
||||
'markdownDescription': nls.localize('tabSize', "The number of spaces a tab is equal to. This setting is overridden based on the file contents when `#editor.detectIndentation#` is on.")
|
||||
},
|
||||
'editor.insertSpaces': {
|
||||
'type': 'boolean',
|
||||
'default': EDITOR_MODEL_DEFAULTS.insertSpaces,
|
||||
'description': nls.localize('insertSpaces', "Insert spaces when pressing `Tab`. This setting is overridden based on the file contents when `#editor.detectIndentation#` is on."),
|
||||
'errorMessage': nls.localize('insertSpaces.errorMessage', "Expected 'boolean'. Note that the value \"auto\" has been replaced by the `editor.detectIndentation` setting.")
|
||||
'markdownDescription': nls.localize('insertSpaces', "Insert spaces when pressing `Tab`. This setting is overridden based on the file contents when `#editor.detectIndentation#` is on.")
|
||||
},
|
||||
'editor.detectIndentation': {
|
||||
'type': 'boolean',
|
||||
'default': EDITOR_MODEL_DEFAULTS.detectIndentation,
|
||||
'description': nls.localize('detectIndentation', "Controls whether `#editor.tabSize#` and `#editor.insertSpaces#` will be automatically detected when a file is opened based on the file contents.")
|
||||
'markdownDescription': nls.localize('detectIndentation', "Controls whether `#editor.tabSize#` and `#editor.insertSpaces#` will be automatically detected when a file is opened based on the file contents.")
|
||||
},
|
||||
'editor.roundedSelection': {
|
||||
'type': 'boolean',
|
||||
@@ -351,7 +348,7 @@ const editorConfiguration: IConfigurationNode = {
|
||||
'editor.hover.delay': {
|
||||
'type': 'number',
|
||||
'default': EDITOR_DEFAULTS.contribInfo.hover.delay,
|
||||
'description': nls.localize('hover.delay', "Time delay in milliseconds after which to the hover is shown.")
|
||||
'description': nls.localize('hover.delay', "Controls the delay in milliseconds after which the hover is shown.")
|
||||
},
|
||||
'editor.hover.sticky': {
|
||||
'type': 'boolean',
|
||||
@@ -366,7 +363,7 @@ const editorConfiguration: IConfigurationNode = {
|
||||
'editor.find.autoFindInSelection': {
|
||||
'type': 'boolean',
|
||||
'default': EDITOR_DEFAULTS.contribInfo.find.autoFindInSelection,
|
||||
'description': nls.localize('find.autoFindInSelection', "Controls whether the find operation is carried on selected text or the entire file in the editor.")
|
||||
'description': nls.localize('find.autoFindInSelection', "Controls whether the find operation is carried out on selected text or the entire file in the editor.")
|
||||
},
|
||||
'editor.find.globalFindClipboard': {
|
||||
'type': 'boolean',
|
||||
@@ -377,7 +374,7 @@ const editorConfiguration: IConfigurationNode = {
|
||||
'editor.wordWrap': {
|
||||
'type': 'string',
|
||||
'enum': ['off', 'on', 'wordWrapColumn', 'bounded'],
|
||||
'enumDescriptions': [
|
||||
'markdownEnumDescriptions': [
|
||||
nls.localize('wordWrap.off', "Lines will never wrap."),
|
||||
nls.localize('wordWrap.on', "Lines will wrap at the viewport width."),
|
||||
nls.localize({
|
||||
@@ -407,7 +404,7 @@ const editorConfiguration: IConfigurationNode = {
|
||||
'type': 'integer',
|
||||
'default': EDITOR_DEFAULTS.wordWrapColumn,
|
||||
'minimum': 1,
|
||||
'description': nls.localize({
|
||||
'markdownDescription': nls.localize({
|
||||
key: 'wordWrapColumn',
|
||||
comment: [
|
||||
'- `editor.wordWrap` refers to a different setting and should not be localized.',
|
||||
@@ -430,17 +427,17 @@ const editorConfiguration: IConfigurationNode = {
|
||||
'editor.mouseWheelScrollSensitivity': {
|
||||
'type': 'number',
|
||||
'default': EDITOR_DEFAULTS.viewInfo.scrollbar.mouseWheelScrollSensitivity,
|
||||
'description': nls.localize('mouseWheelScrollSensitivity', "A multiplier to be used on the `deltaX` and `deltaY` of mouse wheel scroll events.")
|
||||
'markdownDescription': nls.localize('mouseWheelScrollSensitivity', "A multiplier to be used on the `deltaX` and `deltaY` of mouse wheel scroll events.")
|
||||
},
|
||||
'editor.multiCursorModifier': {
|
||||
'type': 'string',
|
||||
'enum': ['ctrlCmd', 'alt'],
|
||||
'enumDescriptions': [
|
||||
'markdownEnumDescriptions': [
|
||||
nls.localize('multiCursorModifier.ctrlCmd', "Maps to `Control` on Windows and Linux and to `Command` on macOS."),
|
||||
nls.localize('multiCursorModifier.alt', "Maps to `Alt` on Windows and Linux and to `Option` on macOS.")
|
||||
],
|
||||
'default': 'alt',
|
||||
'description': nls.localize({
|
||||
'markdownDescription': nls.localize({
|
||||
key: 'multiCursorModifier',
|
||||
comment: [
|
||||
'- `ctrlCmd` refers to a value the setting can take and should not be localized.',
|
||||
@@ -488,16 +485,53 @@ const editorConfiguration: IConfigurationNode = {
|
||||
'minimum': 0,
|
||||
'description': nls.localize('quickSuggestionsDelay', "Controls the delay in milliseconds after which quick suggestions will show up.")
|
||||
},
|
||||
'editor.parameterHints': {
|
||||
'editor.parameterHints.enabled': {
|
||||
'type': 'boolean',
|
||||
'default': EDITOR_DEFAULTS.contribInfo.parameterHints,
|
||||
'description': nls.localize('parameterHints', "Enables a pop-up that shows parameter documentation and type information as you type.")
|
||||
'default': EDITOR_DEFAULTS.contribInfo.parameterHints.enabled,
|
||||
'description': nls.localize('parameterHints.enabled', "Enables a pop-up that shows parameter documentation and type information as you type.")
|
||||
},
|
||||
'editor.parameterHints.cycle': {
|
||||
'type': 'boolean',
|
||||
'default': EDITOR_DEFAULTS.contribInfo.parameterHints.cycle,
|
||||
'description': nls.localize('parameterHints.cycle', "Controls whether the parameter hints menu cycles or closes when reaching the end of the list.")
|
||||
},
|
||||
'editor.autoClosingBrackets': {
|
||||
'type': 'boolean',
|
||||
type: 'string',
|
||||
enum: ['always', 'languageDefined', 'beforeWhitespace', 'never'],
|
||||
enumDescriptions: [
|
||||
'',
|
||||
nls.localize('editor.autoClosingBrackets.languageDefined', "Use language configurations to determine when to autoclose brackets."),
|
||||
nls.localize('editor.autoClosingBrackets.beforeWhitespace', "Autoclose brackets only when the cursor is to the left of whitespace."),
|
||||
'',
|
||||
|
||||
],
|
||||
'default': EDITOR_DEFAULTS.autoClosingBrackets,
|
||||
'description': nls.localize('autoClosingBrackets', "Controls whether the editor should automatically close brackets after the user adds an opening bracket.")
|
||||
},
|
||||
'editor.autoClosingQuotes': {
|
||||
type: 'string',
|
||||
enum: ['always', 'languageDefined', 'beforeWhitespace', 'never'],
|
||||
enumDescriptions: [
|
||||
'',
|
||||
nls.localize('editor.autoClosingQuotes.languageDefined', "Use language configurations to determine when to autoclose quotes."),
|
||||
nls.localize('editor.autoClosingQuotes.beforeWhitespace', "Autoclose quotes only when the cursor is to the left of whitespace."),
|
||||
'',
|
||||
],
|
||||
'default': EDITOR_DEFAULTS.autoClosingQuotes,
|
||||
'description': nls.localize('autoClosingQuotes', "Controls whether the editor should automatically close quotes after the user adds an opening quote.")
|
||||
},
|
||||
'editor.autoSurround': {
|
||||
type: 'string',
|
||||
enum: ['languageDefined', 'brackets', 'quotes', 'never'],
|
||||
enumDescriptions: [
|
||||
nls.localize('editor.autoSurround.languageDefined', "Use language configurations to determine when to automatically surround selections."),
|
||||
nls.localize('editor.autoSurround.brackets', "Surround with brackets but not quotes."),
|
||||
nls.localize('editor.autoSurround.quotes', "Surround with quotes but not brackets."),
|
||||
''
|
||||
],
|
||||
'default': EDITOR_DEFAULTS.autoSurround,
|
||||
'description': nls.localize('autoSurround', "Controls whether the editor should automatically surround selections.")
|
||||
},
|
||||
'editor.formatOnType': {
|
||||
'type': 'boolean',
|
||||
'default': EDITOR_DEFAULTS.contribInfo.formatOnType,
|
||||
@@ -522,17 +556,17 @@ const editorConfiguration: IConfigurationNode = {
|
||||
'type': 'string',
|
||||
'enum': ['on', 'smart', 'off'],
|
||||
'default': EDITOR_DEFAULTS.contribInfo.acceptSuggestionOnEnter,
|
||||
'enumDescriptions': [
|
||||
'markdownEnumDescriptions': [
|
||||
'',
|
||||
nls.localize('acceptSuggestionOnEnterSmart', "Only accept a suggestion with `Enter` when it makes a textual change."),
|
||||
''
|
||||
],
|
||||
'description': nls.localize('acceptSuggestionOnEnter', "Controls whether suggestions should be accepted on `Enter`, in addition to `Tab`. Helps to avoid ambiguity between inserting new lines or accepting suggestions.")
|
||||
'markdownDescription': nls.localize('acceptSuggestionOnEnter', "Controls whether suggestions should be accepted on `Enter`, in addition to `Tab`. Helps to avoid ambiguity between inserting new lines or accepting suggestions.")
|
||||
},
|
||||
'editor.acceptSuggestionOnCommitCharacter': {
|
||||
'type': 'boolean',
|
||||
'default': EDITOR_DEFAULTS.contribInfo.acceptSuggestionOnCommitCharacter,
|
||||
'description': nls.localize('acceptSuggestionOnCommitCharacter', "Controls whether suggestions should be accepted on commit characters. For example, in JavaScript, the semi-colon (`;`) can be a commit character that accepts a suggestion and types that character.")
|
||||
'markdownDescription': nls.localize('acceptSuggestionOnCommitCharacter', "Controls whether suggestions should be accepted on commit characters. For example, in JavaScript, the semi-colon (`;`) can be a commit character that accepts a suggestion and types that character.")
|
||||
},
|
||||
'editor.snippetSuggestions': {
|
||||
'type': 'string',
|
||||
@@ -551,6 +585,11 @@ const editorConfiguration: IConfigurationNode = {
|
||||
'default': EDITOR_DEFAULTS.emptySelectionClipboard,
|
||||
'description': nls.localize('emptySelectionClipboard', "Controls whether copying without a selection copies the current line.")
|
||||
},
|
||||
'editor.copyWithSyntaxHighlighting': {
|
||||
'type': 'boolean',
|
||||
'default': EDITOR_DEFAULTS.copyWithSyntaxHighlighting,
|
||||
'description': nls.localize('copyWithSyntaxHighlighting', "Controls whether syntax highlighting should be copied into the clipboard.")
|
||||
},
|
||||
'editor.wordBasedSuggestions': {
|
||||
'type': 'boolean',
|
||||
'default': EDITOR_DEFAULTS.contribInfo.wordBasedSuggestions,
|
||||
@@ -559,7 +598,7 @@ const editorConfiguration: IConfigurationNode = {
|
||||
'editor.suggestSelection': {
|
||||
'type': 'string',
|
||||
'enum': ['first', 'recentlyUsed', 'recentlyUsedByPrefix'],
|
||||
'enumDescriptions': [
|
||||
'markdownEnumDescriptions': [
|
||||
nls.localize('suggestSelection.first', "Always select the first suggestion."),
|
||||
nls.localize('suggestSelection.recentlyUsed', "Select recent suggestions unless further typing selects one, e.g. `console.| -> console.log` because `log` has been completed recently."),
|
||||
nls.localize('suggestSelection.recentlyUsedByPrefix', "Select suggestions based on previous prefixes that have completed those suggestions, e.g. `co -> console` and `con -> const`."),
|
||||
@@ -571,19 +610,35 @@ const editorConfiguration: IConfigurationNode = {
|
||||
'type': 'integer',
|
||||
'default': 0,
|
||||
'minimum': 0,
|
||||
'description': nls.localize('suggestFontSize', "Font size for the suggest widget.")
|
||||
'markdownDescription': nls.localize('suggestFontSize', "Font size for the suggest widget. When set to `0`, the value of `#editor.fontSize#` is used.")
|
||||
},
|
||||
'editor.suggestLineHeight': {
|
||||
'type': 'integer',
|
||||
'default': 0,
|
||||
'minimum': 0,
|
||||
'description': nls.localize('suggestLineHeight', "Line height for the suggest widget.")
|
||||
'markdownDescription': nls.localize('suggestLineHeight', "Line height for the suggest widget. When set to `0`, the value of `#editor.lineHeight#` is used.")
|
||||
},
|
||||
'editor.tabCompletion': {
|
||||
type: 'string',
|
||||
default: 'off',
|
||||
enum: ['on', 'off', 'onlySnippets'],
|
||||
enumDescriptions: [
|
||||
nls.localize('tabCompletion.on', "Tab complete will insert the best matching suggestion when pressing tab."),
|
||||
nls.localize('tabCompletion.off', "Disable tab completions."),
|
||||
nls.localize('tabCompletion.onlySnippets', "Tab complete snippets when their prefix match. Works best when 'quickSuggestions' aren't enabled."),
|
||||
],
|
||||
description: nls.localize('tabCompletion', "Enables tab completions.")
|
||||
},
|
||||
'editor.suggest.filterGraceful': {
|
||||
type: 'boolean',
|
||||
default: true,
|
||||
description: nls.localize('suggest.filterGraceful', "Controls whether filtering and sorting suggestions accounts for small typos.")
|
||||
},
|
||||
'editor.suggest.localityBonus': {
|
||||
type: 'boolean',
|
||||
default: false,
|
||||
description: nls.localize('suggest.localityBonus', "Controls whether sorting favours words that appear close to the cursor.")
|
||||
},
|
||||
'editor.suggest.snippetsPreventQuickSuggestions': {
|
||||
type: 'boolean',
|
||||
default: true,
|
||||
@@ -618,7 +673,12 @@ const editorConfiguration: IConfigurationNode = {
|
||||
'editor.mouseWheelZoom': {
|
||||
'type': 'boolean',
|
||||
'default': EDITOR_DEFAULTS.viewInfo.mouseWheelZoom,
|
||||
'description': nls.localize('mouseWheelZoom', "Zoom the font of the editor when using mouse wheel and holding `Ctrl`.")
|
||||
'markdownDescription': nls.localize('mouseWheelZoom', "Zoom the font of the editor when using mouse wheel and holding `Ctrl`.")
|
||||
},
|
||||
'editor.cursorSmoothCaretAnimation': {
|
||||
'type': 'boolean',
|
||||
'default': EDITOR_DEFAULTS.viewInfo.cursorSmoothCaretAnimation,
|
||||
'description': nls.localize('cursorSmoothCaretAnimation', "Controls whether the smooth caret animation should be enabled.")
|
||||
},
|
||||
'editor.cursorStyle': {
|
||||
'type': 'string',
|
||||
@@ -629,7 +689,7 @@ const editorConfiguration: IConfigurationNode = {
|
||||
'editor.cursorWidth': {
|
||||
'type': 'integer',
|
||||
'default': EDITOR_DEFAULTS.viewInfo.cursorWidth,
|
||||
'description': nls.localize('cursorWidth', "Controls the width of the cursor when `#editor.cursorStyle#` is set to `line`.")
|
||||
'markdownDescription': nls.localize('cursorWidth', "Controls the width of the cursor when `#editor.cursorStyle#` is set to `line`.")
|
||||
},
|
||||
'editor.fontLigatures': {
|
||||
'type': 'boolean',
|
||||
@@ -693,7 +753,7 @@ const editorConfiguration: IConfigurationNode = {
|
||||
'type': 'string',
|
||||
'enum': ['auto', 'indentation'],
|
||||
'default': EDITOR_DEFAULTS.contribInfo.foldingStrategy,
|
||||
'description': nls.localize('foldingStrategy', "Controls the strategy for computing folding ranges. `auto` uses a language specific folding strategy, if available. `indentation` uses the indentation based folding strategy.")
|
||||
'markdownDescription': nls.localize('foldingStrategy', "Controls the strategy for computing folding ranges. `auto` uses a language specific folding strategy, if available. `indentation` uses the indentation based folding strategy.")
|
||||
},
|
||||
'editor.showFoldingControls': {
|
||||
'type': 'string',
|
||||
@@ -724,7 +784,7 @@ const editorConfiguration: IConfigurationNode = {
|
||||
'editor.stablePeek': {
|
||||
'type': 'boolean',
|
||||
'default': false,
|
||||
'description': nls.localize('stablePeek', "Keep peek editors open even when double clicking their content or when hitting `Escape`.")
|
||||
'markdownDescription': nls.localize('stablePeek', "Keep peek editors open even when double clicking their content or when hitting `Escape`.")
|
||||
},
|
||||
'editor.dragAndDrop': {
|
||||
'type': 'boolean',
|
||||
@@ -810,12 +870,12 @@ const editorConfiguration: IConfigurationNode = {
|
||||
}
|
||||
};
|
||||
|
||||
let cachedEditorConfigurationKeys: { [key: string]: boolean; } = null;
|
||||
let cachedEditorConfigurationKeys: { [key: string]: boolean; } | null = null;
|
||||
function getEditorConfigurationKeys(): { [key: string]: boolean; } {
|
||||
if (cachedEditorConfigurationKeys === null) {
|
||||
cachedEditorConfigurationKeys = Object.create(null);
|
||||
Object.keys(editorConfiguration.properties).forEach((prop) => {
|
||||
cachedEditorConfigurationKeys[prop] = true;
|
||||
cachedEditorConfigurationKeys = <{ [key: string]: boolean; }>Object.create(null);
|
||||
Object.keys(editorConfiguration.properties!).forEach((prop) => {
|
||||
cachedEditorConfigurationKeys![prop] = true;
|
||||
});
|
||||
}
|
||||
return cachedEditorConfigurationKeys;
|
||||
|
||||
Reference in New Issue
Block a user