Fixes source control remember tree collapsed state#89313
Fixes source control remember tree collapsed state#89313joaomoreno merged 7 commits intomicrosoft:masterfrom
Conversation
| element = children[0]; | ||
|
|
||
| if (element.incompressible) { | ||
| let childElement: ICompressedTreeElement<T> = children[0]; | ||
| if (childElement.incompressible) { | ||
| break; | ||
| } | ||
| element = childElement; |
There was a problem hiding this comment.
I was getting an incorrect behavior when an ISCMResourceGroup contained just one element.
The issue was that if a child was incompressible, the returned compressed element was using the collapsible and collapsed attribute from said child. This changes fix that.
|
This has been rotting for more than 8 months. |
joaomoreno
left a comment
joaomoreno
left a comment
There was a problem hiding this comment.
@jeanp413 Once again, fantastic work. Thanks a lot of keeping the changes up to date and for your patience! 🙏
Apart from the inline comments I found other issues:
- When using the tree view mode, new folders appeared as collapsed by default. For that reason I've changed the state to store collapsed folders, instead of expanded ones.
I've addressed my own feedback.
| const storageMode = this.storageService.get(`scm.viewMode`, StorageScope.WORKSPACE) as ViewModelMode; | ||
| let treeViewState: ITreeViewState | undefined; | ||
|
|
||
| const raw = this.storageService.get(`scm.viewState`, StorageScope.WORKSPACE); |
There was a problem hiding this comment.
This breaks the scm.viewMode key. Let's keep each state in its separate key.
| element = children[0]; | ||
|
|
||
| if (element.incompressible) { | ||
| let childElement: ICompressedTreeElement<T> = children[0]; | ||
| if (childElement.incompressible) { | ||
| break; | ||
| } | ||
| element = childElement; |
| configurationService.onDidChangeConfiguration(this.onDidChangeConfiguration, this, this.disposables); | ||
| this.onDidChangeConfiguration(); | ||
|
|
||
| this.disposables.add(this.tree.onDidChangeCollapseState(() => this.updateViewState())); |
There was a problem hiding this comment.
This might be too expensive. We really only need to snapshot the view state whenever the view goes invisible or when the workbench shuts down.
3 participants
This PR fixes #89145