Skip to content

Fix regression in search results a11y hovers #320268

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

Open
dmitrivMS wants to merge 1 commit into
base: main
Choose a base branch
from
+10 −12
Open

Fix regression in search results a11y hovers #320268

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 10 additions & 12 deletions src/vs/workbench/contrib/search/browser/searchResultsView.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import * as DOM from '../../../../base/browser/dom.js';
import { CountBadge } from '../../../../base/browser/ui/countBadge/countBadge.js';
import { IListVirtualDelegate } from '../../../../base/browser/ui/list/list.js';
import { IListAccessibilityProvider } from '../../../../base/browser/ui/list/listWidget.js';
import { ITreeElementRenderDetails, ITreeNode } from '../../../../base/browser/ui/tree/tree.js';
import { ITreeNode } from '../../../../base/browser/ui/tree/tree.js';
import { Disposable, DisposableStore } from '../../../../base/common/lifecycle.js';
import * as paths from '../../../../base/common/path.js';
import * as nls from '../../../../nls.js';
Expand All @@ -30,6 +30,7 @@ import { ServiceCollection } from '../../../../platform/instantiation/common/ser
import { defaultCountBadgeStyles } from '../../../../platform/theme/browser/defaultStyles.js';
import { SearchContext } from '../common/constants.js';
import { getDefaultHoverDelegate } from '../../../../base/browser/ui/hover/hoverDelegateFactory.js';
import type { IManagedHover } from '../../../../base/browser/ui/hover/hover.js';
import { IHoverService } from '../../../../platform/hover/browser/hover.js';
import { Codicon } from '../../../../base/common/codicons.js';
import { ISearchTreeMatch, isSearchTreeMatch, RenderableMatch, ITextSearchHeading, ISearchTreeFolderMatch, ISearchTreeFileMatch, isSearchTreeFileMatch, isSearchTreeFolderMatch, isTextSearchHeading, ISearchModel, isSearchTreeFolderMatchWorkspaceRoot, isSearchTreeFolderMatchNoRoot, isPlainTextSearchHeading } from './searchTreeModel/searchTreeCommon.js';
Expand Down Expand Up @@ -69,8 +70,9 @@ interface IMatchTemplate {
replace: HTMLElement;
after: HTMLElement;
actions: MenuWorkbenchToolBar;
parentHover: IManagedHover;
lineNumberHover: IManagedHover;
disposables: DisposableStore;
elementDisposables: DisposableStore;
contextKeyService: IContextKeyService;
}

Expand Down Expand Up @@ -430,9 +432,8 @@ export class MatchRenderer extends Disposable implements ICompressibleTreeRender
},
}));

const elementDisposables = new DisposableStore();
disposables.add(elementDisposables);

const parentHover = disposables.add(this.hoverService.setupManagedHover(getDefaultHoverDelegate('mouse'), parent, ''));
const lineNumberHover = disposables.add(this.hoverService.setupManagedHover(getDefaultHoverDelegate('mouse'), lineNumber, ''));

return {
parent,
Expand All @@ -442,8 +443,9 @@ export class MatchRenderer extends Disposable implements ICompressibleTreeRender
after,
lineNumber,
actions,
parentHover,
lineNumberHover,
disposables,
elementDisposables,
contextKeyService: contextKeyServiceMain
};
}
Expand All @@ -462,7 +464,7 @@ export class MatchRenderer extends Disposable implements ICompressibleTreeRender
templateData.after.textContent = preview.after;

const title = (preview.fullBefore + (replace ? match.replaceString : preview.inside) + preview.after).trim().substr(0, 999);
templateData.elementDisposables.add(this.hoverService.setupManagedHover(getDefaultHoverDelegate('mouse'), templateData.parent, title));
templateData.parentHover.update(title);

SearchContext.IsEditableItemKey.bindTo(templateData.contextKeyService).set(!match.isReadonly);

Expand All @@ -474,16 +476,12 @@ export class MatchRenderer extends Disposable implements ICompressibleTreeRender
templateData.lineNumber.classList.toggle('show', (numLines > 0) || showLineNumbers);

templateData.lineNumber.textContent = lineNumberStr + extraLinesStr;
templateData.elementDisposables.add(this.hoverService.setupManagedHover(getDefaultHoverDelegate('mouse'), templateData.lineNumber, this.getMatchTitle(match, showLineNumbers)));
templateData.lineNumberHover.update(this.getMatchTitle(match, showLineNumbers));

templateData.actions.context = { viewer: this.searchView.getControl(), element: match } satisfies ISearchActionContext;

}

disposeElement(element: ITreeNode<ISearchTreeMatch, void>, index: number, templateData: IMatchTemplate, details?: ITreeElementRenderDetails): void {
templateData.elementDisposables.clear();
}

disposeTemplate(templateData: IMatchTemplate): void {
templateData.disposables.dispose();
}
Expand Down
Loading