Skip to content

Commit 40c4d29

Browse files
authored
SCM - 💄 adopt Event.runAndSubscribe (microsoft#205194)
1 parent 1673082 commit 40c4d29

File tree

1 file changed

+4
-10
lines changed

1 file changed

+4
-10
lines changed

src/vs/workbench/contrib/scm/browser/scmViewPane.ts

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3119,7 +3119,7 @@ export class SCMViewPane extends ViewPane {
31193119
repositoryDisposables.add(repository.input.onDidChangeVisibility(() => this.updateChildren(repository)));
31203120
repositoryDisposables.add(repository.provider.onDidChangeResourceGroups(() => this.updateChildren(repository)));
31213121

3122-
const onDidChangeHistoryProvider = () => {
3122+
repositoryDisposables.add(Event.runAndSubscribe(repository.provider.onDidChangeHistoryProvider, () => {
31233123
if (!repository.provider.historyProvider) {
31243124
this.logService.debug('SCMViewPane:onDidChangeVisibleRepositories - no history provider present');
31253125
return;
@@ -3131,10 +3131,7 @@ export class SCMViewPane extends ViewPane {
31313131
}));
31323132

31333133
this.logService.debug('SCMViewPane:onDidChangeVisibleRepositories - onDidChangeCurrentHistoryItemGroup listener added');
3134-
};
3135-
3136-
repositoryDisposables.add(repository.provider.onDidChangeHistoryProvider(onDidChangeHistoryProvider));
3137-
onDidChangeHistoryProvider();
3134+
}));
31383135

31393136
const resourceGroupDisposables = repositoryDisposables.add(new DisposableMap<ISCMResourceGroup, IDisposable>());
31403137

@@ -3783,7 +3780,7 @@ class SCMTreeDataSource implements IAsyncDataSource<ISCMViewService, TreeElement
37833780
for (const repository of added) {
37843781
const repositoryDisposables = new DisposableStore();
37853782

3786-
const onDidChangeHistoryProvider = () => {
3783+
repositoryDisposables.add(Event.runAndSubscribe(repository.provider.onDidChangeHistoryProvider, () => {
37873784
if (!repository.provider.historyProvider) {
37883785
this.logService.debug('SCMTreeDataSource:onDidChangeVisibleRepositories - no history provider present');
37893786
return;
@@ -3795,10 +3792,7 @@ class SCMTreeDataSource implements IAsyncDataSource<ISCMViewService, TreeElement
37953792
}));
37963793

37973794
this.logService.debug('SCMTreeDataSource:onDidChangeVisibleRepositories - onDidChangeCurrentHistoryItemGroup listener added');
3798-
};
3799-
3800-
repositoryDisposables.add(repository.provider.onDidChangeHistoryProvider(onDidChangeHistoryProvider));
3801-
onDidChangeHistoryProvider();
3795+
}));
38023796

38033797
this.repositoryDisposables.set(repository, repositoryDisposables);
38043798
}

0 commit comments

Comments
 (0)