#29462 IConfigurationService.keys

- Provide folder specific keys

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

@@ -43,7 +43,7 @@ export interface IConfigurationService {
 	 * Returns the defined keys of configurations in the different scopes
 	 * the key is defined.
 	 */
-	keys(): IConfigurationKeys;
+	keys(overrides?: IConfigurationOverrides): IConfigurationKeys;
 
 	/**
 	 * Similar to #getConfiguration() but ensures that the latest configuration
@@ -91,6 +91,7 @@ export interface IConfigurationKeys {
 	default: string[];
 	user: string[];
 	workspace: string[];
+	folder: string[];
 }
 
 /**
@@ -268,11 +269,13 @@ export class Configuration<T> {
 		};
 	}
 
-	keys(): IConfigurationKeys {
+	keys(overrides: IConfigurationOverrides = {}): IConfigurationKeys {
+		const folderConfigurationModel = this.getFolderConfigurationModelForResource(overrides.resource);
 		return {
 			default: this._defaults.keys,
 			user: this._user.keys,
-			workspace: this._workspaceConfiguration.keys
+			workspace: this._workspaceConfiguration.keys,
+			folder: folderConfigurationModel ? folderConfigurationModel.keys : []
 		};
 	}
 

src/vs/platform/configuration/node/configurationService.ts

@@ -72,12 +72,12 @@ export class ConfigurationService<T> extends Disposable implements IConfiguratio
 		return this.configuration().getValue<C>(section, options);
 	}
 
-	public lookup<C>(key: string, options?: IConfigurationOverrides): IConfigurationValue<C> {
-		return this.configuration().lookup<C>(key, options);
+	public lookup<C>(key: string, overrides?: IConfigurationOverrides): IConfigurationValue<C> {
+		return this.configuration().lookup<C>(key, overrides);
 	}
 
-	public keys(): IConfigurationKeys {
-		return this.configuration().keys();
+	public keys(overrides?: IConfigurationOverrides): IConfigurationKeys {
+		return this.configuration().keys(overrides);
 	}
 
 	public values<V>(): IConfigurationValues {

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

@@ -50,7 +50,8 @@ export class TestConfigurationService extends EventEmitter implements IConfigura
 		return {
 			default: getConfigurationKeys(),
 			user: Object.keys(this.configuration),
-			workspace: []
+			workspace: [],
+			folder: []
 		};
 	}
 

src/vs/platform/telemetry/test/electron-browser/telemetryService.test.ts

@@ -696,7 +696,7 @@ suite('TelemetryService', () => {
 						folder: null
 					};
 				},
-				keys() { return { default: [], user: [], workspace: [] }; },
+				keys() { return { default: [], user: [], workspace: [], folder: [] }; },
 				values() { return {}; },
 				onDidUpdateConfiguration: emitter.event
 			});

src/vs/workbench/parts/terminal/test/electron-browser/terminalConfigHelper.test.ts

@@ -19,7 +19,7 @@ class MockConfigurationService implements IConfigurationService {
 	public constructor(private configuration: any = {}) { }
 	public reloadConfiguration<T>(section?: string): TPromise<T> { return TPromise.as(this.getConfiguration()); }
 	public lookup<T>(key: string, overrides?: IConfigurationOverrides): IConfigurationValue<T> { return { value: getConfigurationValue<T>(this.getConfiguration(), key), default: getConfigurationValue<T>(this.getConfiguration(), key), user: getConfigurationValue<T>(this.getConfiguration(), key), workspace: void 0, folder: void 0 }; }
-	public keys() { return { default: [], user: [], workspace: [] }; }
+	public keys() { return { default: [], user: [], workspace: [], folder: [] }; }
 	public values() { return {}; }
 	public getConfiguration(): any { return this.configuration; }
 	public getConfigurationData(): any { return null; }

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

@@ -256,8 +256,8 @@ export class WorkspaceService extends Disposable implements IWorkspaceConfigurat
 		return this._configuration.lookup<C>(key, overrides);
 	}
 
-	public keys(): IConfigurationKeys {
-		return this._configuration.keys();
+	public keys(overrides?: IConfigurationOverrides): IConfigurationKeys {
+		return this._configuration.keys(overrides);
 	}
 
 	public values<V>(): IConfigurationValues {

src/vs/workbench/services/configurationResolver/test/node/configurationResolverService.test.ts

@@ -343,7 +343,7 @@ class MockConfigurationService implements IConfigurationService {
 	public constructor(private configuration: any = {}) { }
 	public reloadConfiguration<T>(section?: string): TPromise<T> { return TPromise.as(this.getConfiguration()); }
 	public lookup<T>(key: string, overrides?: IConfigurationOverrides): IConfigurationValue<T> { return { value: getConfigurationValue<T>(this.getConfiguration(), key), default: getConfigurationValue<T>(this.getConfiguration(), key), user: getConfigurationValue<T>(this.getConfiguration(), key), workspace: void 0, folder: void 0 }; }
-	public keys() { return { default: [], user: [], workspace: [] }; }
+	public keys() { return { default: [], user: [], workspace: [], folder: [] }; }
 	public values() { return {}; }
 	public getConfiguration(): any { return this.configuration; }
 	public getConfigurationData(): any { return null; }