💄

src/vs/platform/configuration/common/configuration.ts

@@ -37,17 +37,17 @@ export enum ConfigurationTarget {
 }
 
 export interface IConfigurationChangeEvent {
-	affectedKeys: string[];
 
+	source: ConfigurationTarget;
+	affectedKeys: string[];
 	affectsConfiguration(configuration: string, resource?: URI): boolean;
 
 	// Following data is used for telemetry
-	source: ConfigurationTarget;
 	sourceConfig: any;
 
 	// Following data is used for Extension host configuration event
-	changedConfiguration: IConfiguraionModel;
-	changedConfigurationByResource: StrictResourceMap<IConfiguraionModel>;
+	changedConfiguration: IConfigurationModel;
+	changedConfigurationByResource: StrictResourceMap<IConfigurationModel>;
 }
 
 export interface IConfigurationService {
@@ -90,7 +90,7 @@ export interface IConfigurationService {
 	};
 }
 
-export interface IConfiguraionModel {
+export interface IConfigurationModel {
 	contents: any;
 	keys: string[];
 	overrides: IOverrides[];
@@ -102,13 +102,13 @@ export interface IOverrides {
 }
 
 export interface IConfigurationData {
-	defaults: IConfiguraionModel;
-	user: IConfiguraionModel;
-	workspace: IConfiguraionModel;
-	folders: { [folder: string]: IConfiguraionModel };
+	defaults: IConfigurationModel;
+	user: IConfigurationModel;
+	workspace: IConfigurationModel;
+	folders: { [folder: string]: IConfigurationModel };
 }
 
-export function compare(from: IConfiguraionModel, to: IConfiguraionModel): { added: string[], removed: string[], updated: string[] } {
+export function compare(from: IConfigurationModel, to: IConfigurationModel): { added: string[], removed: string[], updated: string[] } {
 	const added = to.keys.filter(key => from.keys.indexOf(key) === -1);
 	const removed = from.keys.filter(key => to.keys.indexOf(key) === -1);
 	const updated = [];

src/vs/platform/configuration/common/configurationModels.ts

@@ -11,10 +11,10 @@ import * as objects from 'vs/base/common/objects';
 import URI from 'vs/base/common/uri';
 import { Registry } from 'vs/platform/registry/common/platform';
 import { IConfigurationRegistry, Extensions, OVERRIDE_PROPERTY_PATTERN } from 'vs/platform/configuration/common/configurationRegistry';
-import { IOverrides, overrideIdentifierFromKey, addToValueTree, toValuesTree, IConfiguraionModel, merge, getConfigurationValue, IConfigurationOverrides, IConfigurationData, getDefaultValues, getConfigurationKeys, IConfigurationChangeEvent, ConfigurationTarget, removeFromValueTree } from 'vs/platform/configuration/common/configuration';
+import { IOverrides, overrideIdentifierFromKey, addToValueTree, toValuesTree, IConfigurationModel, merge, getConfigurationValue, IConfigurationOverrides, IConfigurationData, getDefaultValues, getConfigurationKeys, IConfigurationChangeEvent, ConfigurationTarget, removeFromValueTree } from 'vs/platform/configuration/common/configuration';
 import { Workspace } from 'vs/platform/workspace/common/workspace';
 
-export class ConfigurationModel implements IConfiguraionModel {
+export class ConfigurationModel implements IConfigurationModel {
 
 	constructor(protected _contents: any = {}, protected _keys: string[] = [], protected _overrides: IOverrides[] = []) {
 	}
@@ -134,7 +134,7 @@ export class ConfigurationModel implements IConfiguraionModel {
 		return false;
 	}
 
-	toJSON(): IConfiguraionModel {
+	toJSON(): IConfigurationModel {
 		return {
 			contents: this.contents,
 			overrides: this.overrides,
@@ -458,7 +458,7 @@ export class Configuration {
 		return new Configuration(defaultConfiguration, userConfiguration, workspaceConfiguration, folders, new ConfigurationModel(), new StrictResourceMap<ConfigurationModel>(), workspace);
 	}
 
-	private static parseConfigurationModel(model: IConfiguraionModel): ConfigurationModel {
+	private static parseConfigurationModel(model: IConfigurationModel): ConfigurationModel {
 		return new ConfigurationModel(model.contents, model.keys, model.overrides);
 	}
 }
@@ -501,7 +501,7 @@ export class AllKeysConfigurationChangeEvent extends AbstractConfigurationChange
 		return this._changedConfiguration;
 	}
 
-	get changedConfigurationByResource(): StrictResourceMap<IConfiguraionModel> {
+	get changedConfigurationByResource(): StrictResourceMap<IConfigurationModel> {
 		return new StrictResourceMap();
 	}
 
@@ -521,11 +521,11 @@ export class ConfigurationChangeEvent extends AbstractConfigurationChangeEvent i
 		super();
 	}
 
-	get changedConfiguration(): IConfiguraionModel {
+	get changedConfiguration(): IConfigurationModel {
 		return this._changedConfiguration;
 	}
 
-	get changedConfigurationByResource(): StrictResourceMap<IConfiguraionModel> {
+	get changedConfigurationByResource(): StrictResourceMap<IConfigurationModel> {
 		return this._changedConfigurationByResource;
 	}
 

src/vs/workbench/api/node/extHost.protocol.ts

@@ -28,7 +28,7 @@ import * as editorCommon from 'vs/editor/common/editorCommon';
 import * as modes from 'vs/editor/common/modes';
 import { ITextSource } from 'vs/editor/common/model/textSource';
 
-import { IConfigurationData, ConfigurationTarget, IConfiguraionModel } from 'vs/platform/configuration/common/configuration';
+import { IConfigurationData, ConfigurationTarget, IConfigurationModel } from 'vs/platform/configuration/common/configuration';
 
 import { IPickOpenEntry, IPickOptions } from 'vs/platform/quickOpen/common/quickOpen';
 import { SaveReason } from 'vs/workbench/services/textfile/common/textfiles';
@@ -78,8 +78,8 @@ export interface IInitData {
 }
 
 export interface IWorkspaceConfigurationChangeEventData {
-	changedConfiguration: IConfiguraionModel;
-	changedConfigurationByResource: { [folder: string]: IConfiguraionModel };
+	changedConfiguration: IConfigurationModel;
+	changedConfigurationByResource: { [folder: string]: IConfigurationModel };
 }
 
 export interface IExtHostContext {

src/vs/workbench/services/configuration/common/configurationModels.ts

@@ -5,7 +5,7 @@
 'use strict';
 
 import { clone, equals } from 'vs/base/common/objects';
-import { compare, toValuesTree, IConfigurationChangeEvent, ConfigurationTarget, IConfiguraionModel } from 'vs/platform/configuration/common/configuration';
+import { compare, toValuesTree, IConfigurationChangeEvent, ConfigurationTarget, IConfigurationModel } from 'vs/platform/configuration/common/configuration';
 import { ConfigurationModel, Configuration as BaseConfiguration, CustomConfigurationModel, ConfigurationChangeEvent } from 'vs/platform/configuration/common/configurationModels';
 import { Registry } from 'vs/platform/registry/common/platform';
 import { IConfigurationRegistry, IConfigurationPropertySchema, Extensions, ConfigurationScope } from 'vs/platform/configuration/common/configurationRegistry';
@@ -272,11 +272,11 @@ export class WorkspaceConfigurationChangeEvent implements IConfigurationChangeEv
 
 	constructor(private configurationChangeEvent: IConfigurationChangeEvent, private workspace: Workspace) { }
 
-	get changedConfiguration(): IConfiguraionModel {
+	get changedConfiguration(): IConfigurationModel {
 		return this.configurationChangeEvent.changedConfiguration;
 	}
 
-	get changedConfigurationByResource(): StrictResourceMap<IConfiguraionModel> {
+	get changedConfigurationByResource(): StrictResourceMap<IConfigurationModel> {
 		return this.configurationChangeEvent.changedConfigurationByResource;
 	}