Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-24 02:28:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

#28538 Proposed API to read configuration in a multi root workspace

Browse Source
This commit is contained in:
Sandeep Somavarapu
2017-06-26 12:52:16 +02:00
parent fbfe700750
commit a5248f3675
3 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/vs/workbench/api/node/extHostConfiguration.ts
View File

@@ -5,6 +5,7 @@
'use strict';
import { mixin } from 'vs/base/common/objects';
import URI from 'vs/base/common/uri';
import Event, { Emitter } from 'vs/base/common/event';
import { WorkspaceConfiguration } from 'vscode';
import { ExtHostWorkspace } from 'vs/workbench/api/node/extHostWorkspace';
@@ -46,11 +47,11 @@ export class ExtHostConfiguration extends ExtHostConfigurationShape {
this._onDidChangeConfiguration.fire(undefined);
}
getConfiguration(section?: string): WorkspaceConfiguration {
getConfiguration(section?: string, resource?: URI): WorkspaceConfiguration {
const config = section
? lookUp(this._configuration.getValue(), section)
: this._configuration.getValue();
? lookUp(this._configuration.getValue(null, { resource }), section)
: this._configuration.getValue(null, { resource });
const result: WorkspaceConfiguration = {
has(key: string): boolean {
@@ -72,7 +73,7 @@ export class ExtHostConfiguration extends ExtHostConfigurationShape {
return this._proxy.$removeConfigurationOption(target, key);
}
},
inspect: <T>(key: string): { key: string; defaultValue?: T; globalValue?: T; workspaceValue?: T } => {
inspect: <T>(key: string): { key: string; defaultValue?: T; globalValue?: T; workspaceValue?: T, folderValue?: T } => {
key = section ? `${section}.${key}` : key;
const config = this._configuration.values()[key];
if (config) {
@@ -80,7 +81,8 @@ export class ExtHostConfiguration extends ExtHostConfigurationShape {
key,
defaultValue: config.default,
globalValue: config.user,
workspaceValue: config.workspace
workspaceValue: config.workspace,
folderValue: config.folder
};
}
return undefined;