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 c58aaab8a1cc22a7139b761166a0d4f37d41e998 (#7880)

Browse Source 
* Merge from vscode c58aaab8a1cc22a7139b761166a0d4f37d41e998

* fix pipelines

* fix strict-null-checks

* add missing files
This commit is contained in:
Anthony Dresser
2019-10-21 22:12:22 -07:00
committed by GitHub
parent 7c9be74970
commit 1e22f47304
913 changed files with 18898 additions and 16536 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -207,6 +207,17 @@ function migrateOptions(options: IEditorOptions): void {
enabled: false
};
}
const parameterHints = options.parameterHints;
if (<any>parameterHints === true) {
options.parameterHints = {
enabled: true
};
} else if (<any>parameterHints === false) {
options.parameterHints = {
enabled: false
};
}
}
function deepCloneAndMigrateOptions(_options: IEditorOptions): IEditorOptions {
@@ -463,6 +474,11 @@ const editorConfiguration: IConfigurationNode = {
default: 750,
description: nls.localize('codeActionsOnSaveTimeout', "Timeout in milliseconds after which the code actions that are run on save are cancelled.")
},
'diffEditor.maxComputationTime': {
type: 'number',
default: 5000,
description: nls.localize('maxComputationTime', "Timeout in milliseconds after which diff computation is cancelled. Use 0 for no timeout.")
},
'diffEditor.renderSideBySide': {
type: 'boolean',
default: true,