@@ -1127,11 +1127,11 @@ class RegisterConfigurationSchemasContribution extends Disposable implements IWo
1127
1127
1128
1128
const userSettingsSchema : IJSONSchema = this . environmentService . remoteAuthority ?
1129
1129
{
1130
- properties : {
1131
- ... applicationSettings . properties ,
1132
- ... windowSettings . properties ,
1133
- ... resourceSettings . properties
1134
- } ,
1130
+ properties : Object . assign ( { } ,
1131
+ applicationSettings . properties ,
1132
+ windowSettings . properties ,
1133
+ resourceSettings . properties
1134
+ ) ,
1135
1135
patternProperties : allSettings . patternProperties ,
1136
1136
additionalProperties : true ,
1137
1137
allowTrailingCommas : true ,
@@ -1140,37 +1140,37 @@ class RegisterConfigurationSchemasContribution extends Disposable implements IWo
1140
1140
: allSettingsSchema ;
1141
1141
1142
1142
const profileSettingsSchema : IJSONSchema = {
1143
- properties : {
1144
- ... machineSettings . properties ,
1145
- ... machineOverridableSettings . properties ,
1146
- ... windowSettings . properties ,
1147
- ... resourceSettings . properties
1148
- } ,
1143
+ properties : Object . assign ( { } ,
1144
+ machineSettings . properties ,
1145
+ machineOverridableSettings . properties ,
1146
+ windowSettings . properties ,
1147
+ resourceSettings . properties
1148
+ ) ,
1149
1149
patternProperties : allSettings . patternProperties ,
1150
1150
additionalProperties : true ,
1151
1151
allowTrailingCommas : true ,
1152
1152
allowComments : true
1153
1153
} ;
1154
1154
1155
1155
const machineSettingsSchema : IJSONSchema = {
1156
- properties : {
1157
- ... machineSettings . properties ,
1158
- ... machineOverridableSettings . properties ,
1159
- ... windowSettings . properties ,
1160
- ... resourceSettings . properties
1161
- } ,
1156
+ properties : Object . assign ( { } ,
1157
+ machineSettings . properties ,
1158
+ machineOverridableSettings . properties ,
1159
+ windowSettings . properties ,
1160
+ resourceSettings . properties
1161
+ ) ,
1162
1162
patternProperties : allSettings . patternProperties ,
1163
1163
additionalProperties : true ,
1164
1164
allowTrailingCommas : true ,
1165
1165
allowComments : true
1166
1166
} ;
1167
1167
1168
1168
const workspaceSettingsSchema : IJSONSchema = {
1169
- properties : {
1170
- ... this . checkAndFilterPropertiesRequiringTrust ( machineOverridableSettings . properties ) ,
1171
- ... this . checkAndFilterPropertiesRequiringTrust ( windowSettings . properties ) ,
1172
- ... this . checkAndFilterPropertiesRequiringTrust ( resourceSettings . properties )
1173
- } ,
1169
+ properties : Object . assign ( { } ,
1170
+ this . checkAndFilterPropertiesRequiringTrust ( machineOverridableSettings . properties ) ,
1171
+ this . checkAndFilterPropertiesRequiringTrust ( windowSettings . properties ) ,
1172
+ this . checkAndFilterPropertiesRequiringTrust ( resourceSettings . properties )
1173
+ ) ,
1174
1174
patternProperties : allSettings . patternProperties ,
1175
1175
additionalProperties : true ,
1176
1176
allowTrailingCommas : true ,
@@ -1179,17 +1179,11 @@ class RegisterConfigurationSchemasContribution extends Disposable implements IWo
1179
1179
1180
1180
jsonRegistry . registerSchema ( defaultSettingsSchemaId , {
1181
1181
properties : Object . keys ( allSettings . properties ) . reduce < IJSONSchemaMap > ( ( result , key ) => {
1182
- result [ key ] = {
1183
- ...allSettings . properties [ key ] ,
1184
- deprecationMessage : undefined
1185
- } ;
1182
+ result [ key ] = Object . assign ( { deprecationMessage : undefined } , allSettings . properties [ key ] ) ;
1186
1183
return result ;
1187
1184
} , { } ) ,
1188
1185
patternProperties : Object . keys ( allSettings . patternProperties ) . reduce < IJSONSchemaMap > ( ( result , key ) => {
1189
- result [ key ] = {
1190
- ...allSettings . patternProperties [ key ] ,
1191
- deprecationMessage : undefined
1192
- } ;
1186
+ result [ key ] = Object . assign ( { deprecationMessage : undefined } , allSettings . patternProperties [ key ] ) ;
1193
1187
return result ;
1194
1188
} , { } ) ,
1195
1189
additionalProperties : true ,
@@ -1202,10 +1196,10 @@ class RegisterConfigurationSchemasContribution extends Disposable implements IWo
1202
1196
1203
1197
if ( WorkbenchState . WORKSPACE === this . workspaceContextService . getWorkbenchState ( ) ) {
1204
1198
const folderSettingsSchema : IJSONSchema = {
1205
- properties : {
1206
- ... this . checkAndFilterPropertiesRequiringTrust ( machineOverridableSettings . properties ) ,
1207
- ... this . checkAndFilterPropertiesRequiringTrust ( resourceSettings . properties )
1208
- } ,
1199
+ properties : Object . assign ( { } ,
1200
+ this . checkAndFilterPropertiesRequiringTrust ( machineOverridableSettings . properties ) ,
1201
+ this . checkAndFilterPropertiesRequiringTrust ( resourceSettings . properties )
1202
+ ) ,
1209
1203
patternProperties : allSettings . patternProperties ,
1210
1204
additionalProperties : true ,
1211
1205
allowTrailingCommas : true ,
@@ -1221,11 +1215,11 @@ class RegisterConfigurationSchemasContribution extends Disposable implements IWo
1221
1215
jsonRegistry . registerSchema ( configurationDefaultsSchemaId , {
1222
1216
type : 'object' ,
1223
1217
description : localize ( 'configurationDefaults.description' , 'Contribute defaults for configurations' ) ,
1224
- properties : {
1225
- ... machineOverridableSettings . properties ,
1226
- ... windowSettings . properties ,
1227
- ... resourceSettings . properties
1228
- } ,
1218
+ properties : Object . assign ( { } ,
1219
+ machineOverridableSettings . properties ,
1220
+ windowSettings . properties ,
1221
+ resourceSettings . properties
1222
+ ) ,
1229
1223
patternProperties : {
1230
1224
[ OVERRIDE_PROPERTY_PATTERN ] : {
1231
1225
type : 'object' ,
0 commit comments