Merge from vscode 91e99652cd5fcfc072387c64e151b435e39e8dcf (#6962)

This commit is contained in:
Anthony Dresser
2019-08-26 15:58:42 -07:00
committed by GitHub
parent edf470c8fa
commit 507bae90b7
103 changed files with 1743 additions and 1543 deletions

View File

@@ -558,6 +558,17 @@ const editorConfiguration: IConfigurationNode = {
'default': EDITOR_DEFAULTS.autoClosingQuotes,
'description': nls.localize('autoClosingQuotes', "Controls whether the editor should automatically close quotes after the user adds an opening quote.")
},
'editor.autoClosingOvertype': {
type: 'string',
enum: ['always', 'auto', 'never'],
enumDescriptions: [
nls.localize('editor.autoClosingOvertype.always', "Always type over closing quotes or brackets."),
nls.localize('editor.autoClosingOvertype.auto', "Type over closing quotes or brackets only if they were automatically inserted."),
nls.localize('editor.autoClosingOvertype.never', "Never type over closing quotes or brackets."),
],
'default': EDITOR_DEFAULTS.autoClosingOvertype,
'description': nls.localize('autoClosingOvertype', "Controls whether the editor should type over closing quotes or brackets.")
},
'editor.autoSurround': {
type: 'string',
enum: ['languageDefined', 'brackets', 'quotes', 'never'],