diff --git a/extensions/configuration-editing/src/settingsDocumentHelper.ts b/extensions/configuration-editing/src/settingsDocumentHelper.ts index 6c52bb5a511..110494fdb3e 100644 --- a/extensions/configuration-editing/src/settingsDocumentHelper.ts +++ b/extensions/configuration-editing/src/settingsDocumentHelper.ts @@ -266,7 +266,7 @@ export class SettingsDocument { const languageOverrideRange = languageOverridesRanges.find(range => range.contains(position)); /** - * Skip if suggestsions are for first language override range + * Skip if suggestions are for first language override range * Since VSCode registers language overrides to the schema, JSON language server does suggestions for first language override. */ if (languageOverrideRange && !languageOverrideRange.isEqual(languageOverridesRanges[0])) { diff --git a/src/vs/platform/configuration/common/configuration.ts b/src/vs/platform/configuration/common/configuration.ts index c12b9bac4a0..d922c48fd60 100644 --- a/src/vs/platform/configuration/common/configuration.ts +++ b/src/vs/platform/configuration/common/configuration.ts @@ -121,7 +121,7 @@ export interface IConfigurationService { * Fetches the value of the section for the given overrides. * Value can be of native type or an object keyed off the section name. * - * @param section - Section of the configuraion. Can be `null` or `undefined`. + * @param section - Section of the configuration. Can be `null` or `undefined`. * @param overrides - Overrides that has to be applied while fetching * */ @@ -139,7 +139,7 @@ export interface IConfigurationService { * * Passing a resource through overrides will update the configuration in the workspace folder containing that resource. * - * *Note 1:* Updating configuraiton to a default value will remove the configuration from the requested target. If not target is passed, it will be removed from all writeable targets. + * *Note 1:* Updating configuration to a default value will remove the configuration from the requested target. If not target is passed, it will be removed from all writeable targets. * * *Note 2:* Use `undefined` value to remove the configuration from the given target. If not target is passed, it will be removed from all writeable targets. * diff --git a/src/vs/platform/configuration/common/configurationModels.ts b/src/vs/platform/configuration/common/configurationModels.ts index d5abc192713..f05974df9ef 100644 --- a/src/vs/platform/configuration/common/configurationModels.ts +++ b/src/vs/platform/configuration/common/configurationModels.ts @@ -1012,7 +1012,7 @@ export class Configuration { this._defaultConfiguration.keys.forEach(key => keys.add(key)); this.userConfiguration.keys.forEach(key => keys.add(key)); this._workspaceConfiguration.keys.forEach(key => keys.add(key)); - this._folderConfigurations.forEach(folderConfiguraiton => folderConfiguraiton.keys.forEach(key => keys.add(key))); + this._folderConfigurations.forEach(folderConfiguration => folderConfiguration.keys.forEach(key => keys.add(key))); return [...keys.values()]; } @@ -1021,7 +1021,7 @@ export class Configuration { this._defaultConfiguration.getAllOverrideIdentifiers().forEach(key => keys.add(key)); this.userConfiguration.getAllOverrideIdentifiers().forEach(key => keys.add(key)); this._workspaceConfiguration.getAllOverrideIdentifiers().forEach(key => keys.add(key)); - this._folderConfigurations.forEach(folderConfiguraiton => folderConfiguraiton.getAllOverrideIdentifiers().forEach(key => keys.add(key))); + this._folderConfigurations.forEach(folderConfiguration => folderConfiguration.getAllOverrideIdentifiers().forEach(key => keys.add(key))); return [...keys.values()]; } @@ -1030,7 +1030,7 @@ export class Configuration { this._defaultConfiguration.getKeysForOverrideIdentifier(overrideIdentifier).forEach(key => keys.add(key)); this.userConfiguration.getKeysForOverrideIdentifier(overrideIdentifier).forEach(key => keys.add(key)); this._workspaceConfiguration.getKeysForOverrideIdentifier(overrideIdentifier).forEach(key => keys.add(key)); - this._folderConfigurations.forEach(folderConfiguraiton => folderConfiguraiton.getKeysForOverrideIdentifier(overrideIdentifier).forEach(key => keys.add(key))); + this._folderConfigurations.forEach(folderConfiguration => folderConfiguration.getKeysForOverrideIdentifier(overrideIdentifier).forEach(key => keys.add(key))); return [...keys.values()]; } diff --git a/src/vs/workbench/services/configuration/browser/configurationService.ts b/src/vs/workbench/services/configuration/browser/configurationService.ts index 4d68798fc9a..bc3a08c3cbd 100644 --- a/src/vs/workbench/services/configuration/browser/configurationService.ts +++ b/src/vs/workbench/services/configuration/browser/configurationService.ts @@ -789,8 +789,8 @@ export class WorkspaceService extends Disposable implements IWorkbenchConfigurat private onApplicationConfigurationChanged(applicationConfiguration: ConfigurationModel): void { const previous = { data: this._configuration.toData(), workspace: this.workspace }; const change = this._configuration.compareAndUpdateApplicationConfiguration(applicationConfiguration); - const configuraitonProperties = this.configurationRegistry.getConfigurationProperties(); - change.keys = change.keys.filter(key => configuraitonProperties[key]?.scope === ConfigurationScope.APPLICATION); + const configurationProperties = this.configurationRegistry.getConfigurationProperties(); + change.keys = change.keys.filter(key => configurationProperties[key]?.scope === ConfigurationScope.APPLICATION); this.triggerConfigurationChange(change, previous, ConfigurationTarget.USER); }