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

add meaningful defaults to paths, product and package to survive test runs

Browse Source
This commit is contained in:
Benjamin Pasero
2016-08-17 08:20:19 +02:00
parent d2a413ee9a
commit 84c4c8d492
8 changed files with 68 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/vs/workbench/services/configuration/node/configurationService.ts
View File

@@ -15,6 +15,7 @@ import {IConfigFile} from 'vs/platform/configuration/common/model';
import objects = require('vs/base/common/objects');
import {IStat, IContent, ConfigurationService as CommonConfigurationService} from 'vs/platform/configuration/common/configurationService';
import {IWorkspaceContextService} from 'vs/workbench/services/workspace/common/contextService';
import {IEnvironmentService} from 'vs/platform/environment/common/environment';
import {OptionsChangeEvent, EventType} from 'vs/workbench/common/events';
import {IEventService} from 'vs/platform/event/common/event';
import {IDisposable} from 'vs/base/common/lifecycle';
@@ -31,7 +32,8 @@ export class ConfigurationService extends CommonConfigurationService {
constructor(
contextService: IWorkspaceContextService,
eventService: IEventService
eventService: IEventService,
private environmentService: IEnvironmentService
) {
super(contextService, eventService);
@@ -120,8 +122,8 @@ export class ConfigurationService extends CommonConfigurationService {
}
public setUserConfiguration(key: any, value: any) : Thenable<void> {
const appSettingsPath = this.contextService.getConfiguration().env.appSettingsPath;
const appSettingsPath = this.environmentService.appSettingsPath;
return readFile(appSettingsPath, 'utf8').then(content => {
const {tabSize, insertSpaces} = this.getConfiguration<{ tabSize: number; insertSpaces: boolean }>('editor');
const path: JSONPath = typeof key === 'string' ? (<string> key).split('.') : <JSONPath> key;