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 Take workspace as input in Configuration model

Browse Source
This commit is contained in:
Sandeep Somavarapu
2017-06-16 12:19:21 +02:00
parent 4e963d7592
commit a4b6dc9532
6 changed files with 55 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -7,6 +7,7 @@
import { mixin } from 'vs/base/common/objects';
import Event, { Emitter } from 'vs/base/common/event';
import { WorkspaceConfiguration } from 'vscode';
import { ExtHostWorkspace } from 'vs/workbench/api/node/extHostWorkspace';
import { ExtHostConfigurationShape, MainThreadConfigurationShape } from './extHost.protocol';
import { IConfigurationData, Configuration } from 'vs/platform/configuration/common/configuration';
import { ConfigurationTarget } from 'vs/workbench/services/configuration/common/configurationEditing';
@@ -29,7 +30,7 @@ export class ExtHostConfiguration extends ExtHostConfigurationShape {
private _data: IConfigurationData<any>;
private _configuration: Configuration<any>;
constructor(proxy: MainThreadConfigurationShape, data: IConfigurationData<any>) {
constructor(proxy: MainThreadConfigurationShape, data: IConfigurationData<any>, private extWorkspace: ExtHostWorkspace) {
super();
this._proxy = proxy;
this._data = data;
@@ -47,7 +48,7 @@ export class ExtHostConfiguration extends ExtHostConfigurationShape {
private get configuration(): Configuration<any> {
if (!this._configuration) {
this._configuration = Configuration.parse(this._data);
this._configuration = Configuration.parse(this._data, this.extWorkspace.workspace);
}
return this._configuration;
}