mirror of
https://github.com/Microsoft/vscode
synced 2024-08-26 12:29:37 +00:00
Fix #118134
This commit is contained in:
parent
e8111f76b5
commit
5064fae294
|
@ -354,6 +354,8 @@ export class UserSettings extends Disposable {
|
|||
super();
|
||||
this.parser = new ConfigurationModelParser(this.userSettingsResource.toString(), this.scopes);
|
||||
this._register(this.fileService.watch(extUri.dirname(this.userSettingsResource)));
|
||||
// Also listen to the resource incase the resource is a symlink - https://github.com/microsoft/vscode/issues/118134
|
||||
this._register(this.fileService.watch(this.userSettingsResource));
|
||||
this._register(Event.filter(this.fileService.onDidFilesChange, e => e.contains(this.userSettingsResource))(() => this._onDidChange.fire()));
|
||||
}
|
||||
|
||||
|
|
|
@ -96,7 +96,12 @@ class FileServiceBasedConfiguration extends Disposable {
|
|||
) {
|
||||
super();
|
||||
this.allResources = [this.settingsResource, ...this.standAloneConfigurationResources.map(([, resource]) => resource)];
|
||||
this._register(combinedDisposable(...this.allResources.map(resource => this.fileService.watch(uriIdentityService.extUri.dirname(resource)))));
|
||||
this._register(combinedDisposable(...this.allResources.map(resource => combinedDisposable(
|
||||
this.fileService.watch(uriIdentityService.extUri.dirname(resource)),
|
||||
// Also listen to the resource incase the resource is a symlink - https://github.com/microsoft/vscode/issues/118134
|
||||
this.fileService.watch(resource)
|
||||
))));
|
||||
|
||||
this._folderSettingsModelParser = new ConfigurationModelParser(name, this.scopes);
|
||||
this._standAloneConfigurations = [];
|
||||
this._cache = new ConfigurationModel();
|
||||
|
|
|
@ -677,6 +677,8 @@ class UserKeybindings extends Disposable {
|
|||
super();
|
||||
|
||||
this._register(fileService.watch(dirname(keybindingsResource)));
|
||||
// Also listen to the resource incase the resource is a symlink - https://github.com/microsoft/vscode/issues/118134
|
||||
this._register(this.fileService.watch(this.keybindingsResource));
|
||||
this.reloadConfigurationScheduler = this._register(new RunOnceScheduler(() => this.reload().then(changed => {
|
||||
if (changed) {
|
||||
this._onDidChange.fire();
|
||||
|
|
Loading…
Reference in a new issue