Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Deduce parent element from compressed node instead of stored info #173078

Merged
merged 1 commit into from Feb 1, 2023
Merged

Deduce parent element from compressed node instead of stored info #173078

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 6 additions & 2 deletions src/vs/workbench/contrib/search/browser/searchActionsTopBar.ts
View file
Open in desktop
Expand Up @@ -290,7 +290,9 @@ function collapseDeepestExpandedLevel(accessor: ServicesAccessor) {
let nodeToTest = node;

if (node instanceof FolderMatch) {
nodeToTest = node.compressionStartParent ?? node;
const compressionStartNode = viewer.getCompressedTreeNode(node).element?.elements[0];
// Match elements should never be compressed, so !(compressionStartNode instanceof Match) should always be true here
nodeToTest = (compressionStartNode && !(compressionStartNode instanceof Match)) ? compressionStartNode : node;
}

const immediateParent = nodeToTest.parent();
Expand All @@ -317,7 +319,9 @@ function collapseDeepestExpandedLevel(accessor: ServicesAccessor) {
let nodeToTest = node;

if (node instanceof FolderMatch) {
nodeToTest = node.compressionStartParent ?? node;
const compressionStartNode = viewer.getCompressedTreeNode(node).element?.elements[0];
// Match elements should never be compressed, so !(compressionStartNode instanceof Match) should always be true here
nodeToTest = (compressionStartNode && !(compressionStartNode instanceof Match)) ? compressionStartNode : node;
}
const immediateParent = nodeToTest.parent();

Expand Down
2 changes: 0 additions & 2 deletions src/vs/workbench/contrib/search/browser/searchResultsView.ts
View file
Open in desktop
Expand Up @@ -98,7 +98,6 @@ export class FolderMatchRenderer extends Disposable implements ICompressibleTree
renderCompressedElements(node: ITreeNode<ICompressedTreeNode<FolderMatch>, any>, index: number, templateData: IFolderMatchTemplate, height: number | undefined): void {
const compressed = node.element;
const folder = compressed.elements[compressed.elements.length - 1];
folder.compressionStartParent = compressed.elements[0];
const label = compressed.elements.map(e => e.name());

if (folder.resource) {
Expand Down Expand Up @@ -149,7 +148,6 @@ export class FolderMatchRenderer extends Disposable implements ICompressibleTree

renderElement(node: ITreeNode<FolderMatch, any>, index: number, templateData: IFolderMatchTemplate): void {
const folderMatch = node.element;
folderMatch.compressionStartParent = undefined;
if (folderMatch.resource) {
const workspaceFolder = this.contextService.getWorkspaceFolder(folderMatch.resource);
if (workspaceFolder && isEqual(workspaceFolder.uri, folderMatch.resource)) {
Expand Down
3 changes: 0 additions & 3 deletions src/vs/workbench/contrib/search/common/searchModel.ts
View file
Open in desktop
Expand Up @@ -511,9 +511,6 @@ export class FolderMatch extends Disposable {
private _replacingAll: boolean = false;
private _name: Lazy<string>;

// if this is compressed in a node with other FolderMatches, then this is set to the parent where compression starts
public compressionStartParent: FolderMatch | undefined;

constructor(
protected _resource: URI | null,
private _id: string,
Expand Down