Merge from vscode c58aaab8a1cc22a7139b761166a0d4f37d41e998 (#7880)

* 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

View File

@@ -38,13 +38,13 @@ export function registerConfiguration(): IDisposable {
},
'configurationSync.enableSettings': {
type: 'boolean',
description: localize('configurationSync.enableSettings', "When enabled settings are synchronised while synchronising configuration."),
description: localize('configurationSync.enableSettings', "When enabled settings are synchronised while synchronizing configuration."),
default: true,
scope: ConfigurationScope.APPLICATION,
},
'configurationSync.enableExtensions': {
type: 'boolean',
description: localize('configurationSync.enableExtensions', "When enabled extensions are synchronised while synchronising configuration."),
description: localize('configurationSync.enableExtensions', "When enabled extensions are synchronised while synchronizing configuration."),
default: true,
scope: ConfigurationScope.APPLICATION,
},
@@ -91,6 +91,7 @@ export interface IUserData {
}
export enum UserDataSyncStoreErrorCode {
Unauthroized = 'Unauthroized',
Rejected = 'Rejected',
Unknown = 'Unknown'
}