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.

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

Fix switching problems view mode #172315

Merged
merged 1 commit into from Jan 24, 2023
Merged
Changes from all commits
Commits
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
14 changes: 5 additions & 9 deletions src/vs/workbench/contrib/markers/browser/markersTreeViewer.ts
Expand Up @@ -52,9 +52,8 @@ import { unsupportedSchemas } from 'vs/platform/markers/common/markerService';
import { defaultCountBadgeStyles } from 'vs/platform/theme/browser/defaultStyles';

interface IResourceMarkersTemplateData {
resourceLabel: IResourceLabel;
count: CountBadge;
styler: IDisposable;
readonly resourceLabel: IResourceLabel;
readonly count: CountBadge;
}

interface IMarkerTemplateData {
Expand Down Expand Up @@ -165,15 +164,13 @@ export class ResourceMarkersRenderer implements ITreeRenderer<ResourceMarkers, R
templateId = TemplateId.ResourceMarkers;

renderTemplate(container: HTMLElement): IResourceMarkersTemplateData {
const data = <IResourceMarkersTemplateData>Object.create(null);

const resourceLabelContainer = dom.append(container, dom.$('.resource-label-container'));
data.resourceLabel = this.labels.create(resourceLabelContainer, { supportHighlights: true });
const resourceLabel = this.labels.create(resourceLabelContainer, { supportHighlights: true });

const badgeWrapper = dom.append(container, dom.$('.count-badge-wrapper'));
data.count = new CountBadge(badgeWrapper, {}, defaultCountBadgeStyles);
const count = new CountBadge(badgeWrapper, {}, defaultCountBadgeStyles);

return data;
return { count, resourceLabel };
}

renderElement(node: ITreeNode<ResourceMarkers, ResourceMarkersFilterData>, _: number, templateData: IResourceMarkersTemplateData): void {
Expand All @@ -196,7 +193,6 @@ export class ResourceMarkersRenderer implements ITreeRenderer<ResourceMarkers, R

disposeTemplate(templateData: IResourceMarkersTemplateData): void {
templateData.resourceLabel.dispose();
templateData.styler.dispose();
}

private onDidChangeRenderNodeCount(node: ITreeNode<ResourceMarkers, ResourceMarkersFilterData>): void {
Expand Down