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

Merge VS Code 1.23.1 (#1520)

Browse Source
This commit is contained in:
Matt Irvine
2018-06-05 11:24:51 -07:00
committed by GitHub
parent e3baf5c443
commit 0c58f09e59
3651 changed files with 74249 additions and 48599 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
src/vs/editor/common/config/commonEditorConfig.ts
View File

@@ -5,7 +5,7 @@
'use strict';
import * as nls from 'vs/nls';
import Event, { Emitter } from 'vs/base/common/event';
import { Event, Emitter } 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';
@@ -34,8 +34,8 @@ export interface ITabFocus {
export const TabFocus: ITabFocus = new class implements ITabFocus {
private _tabFocus: boolean = false;
private _onDidChangeTabFocus: Emitter<boolean> = new Emitter<boolean>();
public onDidChangeTabFocus: Event<boolean> = this._onDidChangeTabFocus.event;
private readonly _onDidChangeTabFocus: Emitter<boolean> = new Emitter<boolean>();
public readonly onDidChangeTabFocus: Event<boolean> = this._onDidChangeTabFocus.event;
public getTabFocusMode(): boolean {
return this._tabFocus;
@@ -70,7 +70,7 @@ export abstract class CommonEditorConfiguration extends Disposable implements ed
private _lineNumbersDigitCount: number;
private _onDidChange = this._register(new Emitter<editorOptions.IConfigurationChangedEvent>());
public onDidChange: Event<editorOptions.IConfigurationChangedEvent> = this._onDidChange.event;
public readonly onDidChange: Event<editorOptions.IConfigurationChangedEvent> = this._onDidChange.event;
constructor(options: editorOptions.IEditorOptions) {
super();
@@ -166,7 +166,7 @@ export abstract class CommonEditorConfiguration extends Disposable implements ed
}
const configurationRegistry = <IConfigurationRegistry>Registry.as(Extensions.Configuration);
const configurationRegistry = Registry.as<IConfigurationRegistry>(Extensions.Configuration);
const editorConfiguration: IConfigurationNode = {
'id': 'editor',
'order': 5,
@@ -211,7 +211,7 @@ const editorConfiguration: IConfigurationNode = {
nls.localize('lineNumbers.interval', "Line numbers are rendered every 10 lines.")
],
'default': 'on',
'description': nls.localize('lineNumbers', "Controls the display of line numbers. Possible values are 'on', 'off', 'relative' and 'interval'.")
'description': nls.localize('lineNumbers', "Controls the display of line numbers.")
},
'editor.rulers': {
'type': 'array',
@@ -268,13 +268,13 @@ const editorConfiguration: IConfigurationNode = {
'type': 'string',
'enum': ['left', 'right'],
'default': EDITOR_DEFAULTS.viewInfo.minimap.side,
'description': nls.localize('minimap.side', "Controls the side where to render the minimap. Possible values are \'right\' and \'left\'")
'description': nls.localize('minimap.side', "Controls the side where to render the minimap.")
},
'editor.minimap.showSlider': {
'type': 'string',
'enum': ['always', 'mouseover'],
'default': EDITOR_DEFAULTS.viewInfo.minimap.showSlider,
'description': nls.localize('minimap.showSlider', "Controls whether the minimap slider is automatically hidden. Possible values are \'always\' and \'mouseover\'")
'description': nls.localize('minimap.showSlider', "Controls whether the minimap slider is automatically hidden.")
},
'editor.minimap.renderCharacters': {
'type': 'boolean',
@@ -370,6 +370,11 @@ const editorConfiguration: IConfigurationNode = {
]
}, "The modifier to be used to add multiple cursors with the mouse. `ctrlCmd` maps to `Control` on Windows and Linux and to `Command` on macOS. The Go To Definition and Open Link mouse gestures will adapt such that they do not conflict with the multicursor modifier.")
},
'editor.multiCursorMergeOverlapping': {
'type': 'boolean',
'default': EDITOR_DEFAULTS.multiCursorMergeOverlapping,
'description': nls.localize('multiCursorMergeOverlapping', "Merge multiple cursors when they are overlapping.")
},
'editor.quickSuggestions': {
'anyOf': [
{
@@ -515,7 +520,7 @@ const editorConfiguration: IConfigurationNode = {
'type': 'string',
'enum': ['blink', 'smooth', 'phase', 'expand', 'solid'],
'default': editorOptions.blinkingStyleToString(EDITOR_DEFAULTS.viewInfo.cursorBlinking),
'description': nls.localize('cursorBlinking', "Control the cursor animation style, possible values are 'blink', 'smooth', 'phase', 'expand' and 'solid'")
'description': nls.localize('cursorBlinking', "Control the cursor animation style.")
},
'editor.mouseWheelZoom': {
'type': 'boolean',
@@ -568,13 +573,23 @@ const editorConfiguration: IConfigurationNode = {
'editor.codeLens': {
'type': 'boolean',
'default': EDITOR_DEFAULTS.contribInfo.codeLens,
'description': nls.localize('codeLens', "Controls if the editor shows code lenses")
'description': nls.localize('codeLens', "Controls if the editor shows CodeLens")
},
'editor.folding': {
'type': 'boolean',
'default': EDITOR_DEFAULTS.contribInfo.folding,
'description': nls.localize('folding', "Controls whether the editor has code folding enabled")
},
'editor.foldingStrategy': {
'type': 'string',
'enum': ['auto', 'indentation'],
'enumDescriptions': [
nls.localize('foldingStrategyAuto', 'If available, use a language specific folding strategy, otherwise falls back to the indentation based strategy.'),
nls.localize('foldingStrategyIndentation', 'Always use the indentation based folding strategy')
],
'default': EDITOR_DEFAULTS.contribInfo.foldingStrategy,
'description': nls.localize('foldingStrategy', "Controls the way folding ranges are computed. 'auto' picks uses a language specific folding strategy, if available. 'indentation' forces that the indentation based folding strategy is used.")
},
'editor.showFoldingControls': {
'type': 'string',
'enum': ['always', 'mouseover'],
@@ -637,6 +652,25 @@ const editorConfiguration: IConfigurationNode = {
'default': EDITOR_DEFAULTS.contribInfo.lightbulbEnabled,
'description': nls.localize('codeActions', "Enables the code action lightbulb")
},
'editor.codeActionsOnSave': {
'type': 'object',
'properties': {
'source.organizeImports': {
'type': 'boolean',
'description': nls.localize('codeActionsOnSave.organizeImports', "Run organize imports on save?")
}
},
'additionalProperties': {
'type': 'boolean'
},
'default': EDITOR_DEFAULTS.contribInfo.codeActionsOnSave,
'description': nls.localize('codeActionsOnSave', "Code action kinds to be run on save.")
},
'editor.codeActionsOnSaveTimeout': {
'type': 'number',
'default': EDITOR_DEFAULTS.contribInfo.codeActionsOnSaveTimeout,
'description': nls.localize('codeActionsOnSaveTimeout', "Timeout for code actions run on save.")
},
'editor.selectionClipboard': {
'type': 'boolean',
'default': EDITOR_DEFAULTS.contribInfo.selectionClipboard,
@@ -653,6 +687,11 @@ const editorConfiguration: IConfigurationNode = {
'default': true,
'description': nls.localize('ignoreTrimWhitespace', "Controls if the diff editor shows changes in leading or trailing whitespace as diffs")
},
'editor.largeFileOptimizations': {
'type': 'boolean',
'default': EDITOR_MODEL_DEFAULTS.largeFileOptimizations,
'description': nls.localize('largeFileOptimizations', "Special handling for large files to disable certain memory intensive features.")
},
'diffEditor.renderIndicators': {
'type': 'boolean',
'default': true,