Skip to content

Commit b7e92f1

Browse files
authored
SCM - remove diffIdentityProvider (microsoft#199750)
* SCM - fix input box action button regression (microsoft#199739) * SCM - remove diffIdentityProvider (microsoft#199745)
1 parent 604f370 commit b7e92f1

File tree

1 file changed

+3
-12
lines changed

1 file changed

+3
-12
lines changed

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

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2515,7 +2515,6 @@ export class SCMViewPane extends ViewPane {
25152515
private treeScrollTop: number | undefined;
25162516
private treeContainer!: HTMLElement;
25172517
private tree!: WorkbenchCompressibleAsyncDataTree<ISCMViewService, TreeElement, FuzzyScore>;
2518-
private treeIdentityProvider!: IIdentityProvider<TreeElement>;
25192518

25202519
private listLabels!: ResourceLabels;
25212520
private inputRenderer!: InputRenderer;
@@ -2759,8 +2758,6 @@ export class SCMViewPane extends ViewPane {
27592758
const treeDataSource = this.instantiationService.createInstance(SCMTreeDataSource, () => this.viewMode, () => this.alwaysShowRepositories, () => this.showActionButton, () => this.showIncomingChanges, () => this.showOutgoingChanges);
27602759
this.disposables.add(treeDataSource);
27612760

2762-
this.treeIdentityProvider = new SCMResourceIdentityProvider();
2763-
27642761
this.tree = this.instantiationService.createInstance(
27652762
WorkbenchCompressibleAsyncDataTree,
27662763
'SCM Tree Repo',
@@ -2785,7 +2782,7 @@ export class SCMViewPane extends ViewPane {
27852782
transformOptimization: false,
27862783
filter: new SCMTreeFilter(),
27872784
dnd: new SCMTreeDragAndDrop(this.instantiationService),
2788-
identityProvider: this.treeIdentityProvider,
2785+
identityProvider: new SCMResourceIdentityProvider(),
27892786
sorter: new SCMTreeSorter(() => this.viewMode, () => this.viewSortKey),
27902787
keyboardNavigationLabelProvider: this.instantiationService.createInstance(SCMTreeKeyboardNavigationLabelProvider, () => this.viewMode),
27912788
overrideStyles: {
@@ -3113,16 +3110,10 @@ export class SCMViewPane extends ViewPane {
31133110

31143111
if (element && this.tree.hasNode(element)) {
31153112
// Refresh specific repository
3116-
await this.tree.updateChildren(element, true, false, {
3117-
diffDepth: Infinity,
3118-
diffIdentityProvider: this.treeIdentityProvider
3119-
});
3113+
await this.tree.updateChildren(element);
31203114
} else {
31213115
// Refresh the entire tree
3122-
await this.tree.updateChildren(undefined, true, false, {
3123-
diffDepth: Infinity,
3124-
diffIdentityProvider: this.treeIdentityProvider
3125-
});
3116+
await this.tree.updateChildren(undefined);
31263117
}
31273118

31283119
if (focusedInput) {

0 commit comments

Comments
 (0)