Merge pull request #15007 from Microsoft/joh/configInspect

WorkspaceConfiguration#inspect

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

@@ -9,6 +9,7 @@ import { TrieMap } from 'vs/base/common/map';
 import { score } from 'vs/editor/common/modes/languageSelector';
 import * as Platform from 'vs/base/common/platform';
 import { IThreadService } from 'vs/workbench/services/thread/common/threadService';
+import { WorkspaceConfigurationNode } from 'vs/workbench/services/configuration/common/configuration';
 import * as errors from 'vs/base/common/errors';
 import product from 'vs/platform/product';
 import pkg from 'vs/platform/package';
@@ -42,7 +43,7 @@ import * as vscode from 'vscode';
 import * as paths from 'vs/base/common/paths';
 import { realpathSync } from 'fs';
 import { ITelemetryInfo } from 'vs/platform/telemetry/common/telemetry';
-import { MainContext, ExtHostContext, InstanceCollection, IInitConfiguration } from './extHost.protocol';
+import { MainContext, ExtHostContext, InstanceCollection } from './extHost.protocol';
 import * as languageConfiguration from 'vs/editor/common/modes/languageConfiguration';
 
 
@@ -63,7 +64,7 @@ function proposedApiFunction<T>(extension: IExtensionDescription, fn: T): T {
 /**
  * This method instantiates and returns the extension API surface
  */
-export function createApiFactory(initDataConfiguration: IInitConfiguration, initTelemetryInfo: ITelemetryInfo, threadService: IThreadService, extensionService: ExtHostExtensionService, contextService: IWorkspaceContextService): IExtensionApiFactory {
+export function createApiFactory(initDataConfiguration: WorkspaceConfigurationNode, initTelemetryInfo: ITelemetryInfo, threadService: IThreadService, extensionService: ExtHostExtensionService, contextService: IWorkspaceContextService): IExtensionApiFactory {
 
 	// Addressable instances
 	const col = new InstanceCollection();

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

@@ -29,6 +29,7 @@ import * as modes from 'vs/editor/common/modes';
 import { IResourceEdit } from 'vs/editor/common/services/bulkEdit';
 
 import { ConfigurationTarget } from 'vs/workbench/services/configuration/common/configurationEditing';
+import { WorkspaceConfigurationNode } from 'vs/workbench/services/configuration/common/configuration';
 
 import { IPickOpenEntry, IPickOptions } from 'vs/workbench/services/quickopen/common/quickOpenService';
 import { SaveReason } from 'vs/workbench/services/textfile/common/textfiles';
@@ -43,10 +44,6 @@ export interface IEnvironment {
 	extensionTestsPath: string;
 }
 
-export interface IInitConfiguration {
-	_initConfigurationBrand: void;
-}
-
 export interface IInitData {
 	parentPid: number;
 	environment: IEnvironment;
@@ -54,7 +51,7 @@ export interface IInitData {
 		workspace: IWorkspace;
 	};
 	extensions: IExtensionDescription[];
-	configuration: IInitConfiguration;
+	configuration: WorkspaceConfigurationNode;
 	telemetryInfo: ITelemetryInfo;
 }
 
@@ -232,7 +229,7 @@ export abstract class ExtHostCommandsShape {
 }
 
 export abstract class ExtHostConfigurationShape {
-	$acceptConfigurationChanged(config: any) { throw ni(); }
+	$acceptConfigurationChanged(config: WorkspaceConfigurationNode) { throw ni(); }
 }
 
 export abstract class ExtHostDiagnosticsShape {

src/vs/workbench/api/node/extHostConfiguration.ts

@@ -9,24 +9,25 @@ import Event, { Emitter } from 'vs/base/common/event';
 import { WorkspaceConfiguration } from 'vscode';
 import { ExtHostConfigurationShape, MainThreadConfigurationShape } from './extHost.protocol';
 import { ConfigurationTarget } from 'vs/workbench/services/configuration/common/configurationEditing';
+import { WorkspaceConfigurationNode, IWorkspaceConfigurationValue } from 'vs/workbench/services/configuration/common/configuration';
 
 export class ExtHostConfiguration extends ExtHostConfigurationShape {
 
 	private _proxy: MainThreadConfigurationShape;
-	private _config: any;
+	private _config: WorkspaceConfigurationNode;
 	private _onDidChangeConfiguration = new Emitter<void>();
 
-	constructor(proxy: MainThreadConfigurationShape, configuration: any) {
+	constructor(proxy: MainThreadConfigurationShape, config: WorkspaceConfigurationNode) {
 		super();
 		this._proxy = proxy;
-		this._config = configuration;
+		this._config = config;
 	}
 
 	get onDidChangeConfiguration(): Event<void> {
 		return this._onDidChangeConfiguration && this._onDidChangeConfiguration.event;
 	}
 
-	public $acceptConfigurationChanged(config: any) {
+	public $acceptConfigurationChanged(config: WorkspaceConfigurationNode) {
 		this._config = config;
 		this._onDidChangeConfiguration.fire(undefined);
 	}
@@ -39,14 +40,17 @@ export class ExtHostConfiguration extends ExtHostConfigurationShape {
 
 		const result: WorkspaceConfiguration = {
 			has(key: string): boolean {
-				return typeof ExtHostConfiguration._lookUp(key, config) !== 'undefined';
+				return typeof ExtHostConfiguration._lookUp(key, <WorkspaceConfigurationNode>config) !== 'undefined';
 			},
-			get<T>(key: string, defaultValue?: T): T {
-				let result = ExtHostConfiguration._lookUp(key, config);
+			get<T>(key: string, defaultValue?: T): any {
+				let result = ExtHostConfiguration._lookUp(key, <WorkspaceConfigurationNode>config);
 				if (typeof result === 'undefined') {
-					result = defaultValue;
+					return defaultValue;
+				} else if (isConfigurationValue(result)) {
+					return result.value;
+				} else {
+					return ExtHostConfiguration._values(result);
 				}
-				return result;
 			},
 			update: (key: string, value: any, global: boolean = false) => {
 				key = section ? `${section}.${key}` : key;
@@ -56,26 +60,66 @@ export class ExtHostConfiguration extends ExtHostConfigurationShape {
 				} else {
 					return this._proxy.$removeConfigurationOption(target, key);
 				}
+			},
+			inspect(key: string) {
+				let result = ExtHostConfiguration._lookUp(key, <WorkspaceConfigurationNode>config);
+				if (isConfigurationValue(result)) {
+					return {
+						key: section ? `${section}.${key}` : key,
+						defaultValue: result.default,
+						globalValue: result.user,
+						workspaceValue: result.workspace
+					};
+				}
 			}
 		};
 
-		if (typeof config === 'object') {
-			mixin(result, config, false);
+		if (!isConfigurationValue(config)) {
+			mixin(result, ExtHostConfiguration._values(config), false);
 		}
 
 		return Object.freeze(result);
+
 	}
 
-	private static _lookUp(section: string, config: any) {
+	private static _lookUp(section: string, config: WorkspaceConfigurationNode): WorkspaceConfigurationNode | IWorkspaceConfigurationValue<any> {
 		if (!section) {
 			return;
 		}
 		let parts = section.split('.');
 		let node = config;
 		while (node && parts.length) {
-			node = node[parts.shift()];
+			let child = node[parts.shift()];
+			if (isConfigurationValue(child)) {
+				return child;
+			} else {
+				node = child;
+			}
 		}
 
 		return node;
 	}
+
+	private static _values(node: WorkspaceConfigurationNode): any {
+		let target = Object.create(null);
+		for (let key in node) {
+			let child = node[key];
+			if (isConfigurationValue(child)) {
+				target[key] = child.value;
+			} else {
+				target[key] = ExtHostConfiguration._values(child);
+			}
+		}
+		return target;
+	}
+}
+
+function isConfigurationValue(thing: any): thing is IWorkspaceConfigurationValue<any> {
+	return typeof thing === 'object'
+		// must have 'value'
+		&& typeof (<IWorkspaceConfigurationValue<any>>thing).value !== 'undefined'
+		// and at least one source 'default', 'user', or 'workspace'
+		&& (typeof (<IWorkspaceConfigurationValue<any>>thing).default !== 'undefined'
+			|| typeof (<IWorkspaceConfigurationValue<any>>thing).user !== 'undefined'
+			|| typeof (<IWorkspaceConfigurationValue<any>>thing).workspace !== 'undefined');
 }

src/vs/workbench/api/node/mainThreadConfiguration.ts

@@ -7,7 +7,7 @@
 import { TPromise } from 'vs/base/common/winjs.base';
 import { IDisposable, dispose } from 'vs/base/common/lifecycle';
 import { IThreadService } from 'vs/workbench/services/thread/common/threadService';
-import { IWorkspaceConfigurationService } from 'vs/workbench/services/configuration/common/configuration';
+import { IWorkspaceConfigurationService, getWorkspaceConfigurationTree } from 'vs/workbench/services/configuration/common/configuration';
 import { IConfigurationEditingService, ConfigurationTarget } from 'vs/workbench/services/configuration/common/configurationEditing';
 import { MainThreadConfigurationShape, ExtHostContext } from './extHost.protocol';
 
@@ -24,7 +24,11 @@ export class MainThreadConfiguration extends MainThreadConfigurationShape {
 		super();
 		this._configurationEditingService = configurationEditingService;
 		const proxy = threadService.get(ExtHostContext.ExtHostConfiguration);
-		this._toDispose = configurationService.onDidUpdateConfiguration(event => proxy.$acceptConfigurationChanged(event.config));
+
+		this._toDispose = configurationService.onDidUpdateConfiguration(() => {
+			const tree = getWorkspaceConfigurationTree(configurationService);
+			proxy.$acceptConfigurationChanged(tree);
+		});
 	}
 
 	public dispose(): void {