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

loadConfiguration => reloadConfiguration

Browse Source
This commit is contained in:
Benjamin Pasero
2016-08-23 09:16:23 +02:00
parent 8d3b632ced
commit cfc6c77fcc
14 changed files with 25 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -116,7 +116,7 @@ export class ConfigurationService implements IWorkbenchConfigurationService, IDi
return result;
}
public loadConfiguration(section?: string): TPromise<any> {
public reloadConfiguration(section?: string): TPromise<any> {
// Reset caches to ensure we are hitting the disk
this.bulkFetchFromWorkspacePromise = null;

12
src/vs/workbench/services/themes/electron-browser/themeService.ts
View File

@@ -19,6 +19,7 @@ import {ITelemetryService} from 'vs/platform/telemetry/common/telemetry';
import {IConfigurationService} from 'vs/platform/configuration/common/configuration';
import {Registry} from 'vs/platform/platform';
import {IConfigurationRegistry, Extensions} from 'vs/platform/configuration/common/configurationRegistry';
import {IFilesConfiguration} from 'vs/platform/files/common/files';
import {$} from 'vs/base/browser/builder';
import Event, {Emitter} from 'vs/base/common/event';
@@ -190,12 +191,11 @@ export class ThemeService implements IThemeService {
}
});
configurationService.loadConfiguration('files').then((settings: any) => {
let iconTheme = settings && settings.iconTheme;
if (iconTheme) {
this.setFileIcons(iconTheme);
}
});
const settings = configurationService.getConfiguration<IFilesConfiguration>();
let iconTheme = settings && settings.files && settings.files.iconTheme;
if (iconTheme) {
this.setFileIcons(iconTheme);
}
configurationService.onDidUpdateConfiguration(e => {
let filesConfig = e.config.files;