some renames

src/vs/workbench/electron-browser/main.ts

@@ -18,7 +18,7 @@ import {IResourceInput} from 'vs/platform/editor/common/editor';
 import {EventService} from 'vs/platform/event/common/eventService';
 import {LegacyWorkspaceContextService} from 'vs/workbench/services/workspace/common/contextService';
 import {IWorkspace} from 'vs/platform/workspace/common/workspace';
-import {ConfigurationService} from 'vs/workbench/services/configuration/node/configurationService';
+import {WorkspaceConfigurationService} from 'vs/workbench/services/configuration/node/configurationService';
 import {IProcessEnvironment} from 'vs/code/electron-main/env';
 import {ParsedArgs} from 'vs/code/node/argv';
 import {EnvironmentService} from 'vs/platform/environment/node/environmentService';
@@ -131,7 +131,7 @@ function openWorkbench(environment: IWindowConfiguration, workspace: IWorkspace,
 	const eventService = new EventService();
 	const environmentService = new EnvironmentService(environment, environment.execPath);
 	const contextService = new LegacyWorkspaceContextService(workspace, options);
-	const configurationService = new ConfigurationService(contextService, eventService, environmentService);
+	const configurationService = new WorkspaceConfigurationService(contextService, eventService, environmentService);
 
 	// Since the configuration service is one of the core services that is used in so many places, we initialize it
 	// right before startup of the workbench shell to have its data ready for consumers

src/vs/workbench/services/configuration/node/configurationService.ts

@@ -39,7 +39,10 @@ interface IContent {
 	value: string;
 }
 
-export class ConfigurationService implements IWorkbenchConfigurationService, IDisposable {
+/**
+ * Wraps around the basic configuration service and adds knowledge about workspace settings.
+ */
+export class WorkspaceConfigurationService implements IWorkbenchConfigurationService, IDisposable {
 
 	public _serviceBrand: any;
 
@@ -74,7 +77,7 @@ export class ConfigurationService implements IWorkbenchConfigurationService, IDi
 		this.baseConfigurationService = new BaseConfigurationService(environmentService);
 		this.toDispose.push(this.baseConfigurationService);
 
-		this.reloadConfigurationScheduler = new RunOnceScheduler(() => this.doLoadConfiguration().then(config => this._onDidUpdateConfiguration.fire({ config })).done(null, errors.onUnexpectedError), ConfigurationService.RELOAD_CONFIGURATION_DELAY);
+		this.reloadConfigurationScheduler = new RunOnceScheduler(() => this.doLoadConfiguration().then(config => this._onDidUpdateConfiguration.fire({ config })).done(null, errors.onUnexpectedError), WorkspaceConfigurationService.RELOAD_CONFIGURATION_DELAY);
 		this.toDispose.push(this.reloadConfigurationScheduler);
 
 		this.registerListeners();