Skip to content

Commit

Permalink
Avoid <MyType>Object.create(null); (#172912)
Browse files Browse the repository at this point in the history
Part of #172317

Co-authored-by: Matt Bierner <matb@microsoft.com>
  • Loading branch information
alexr00 and mjbvz committed Feb 1, 2023
1 parent 7dff9e9 commit 4bee92b
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 15 deletions.
20 changes: 9 additions & 11 deletions src/vs/workbench/contrib/comments/browser/commentsTreeViewer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -92,11 +92,10 @@ export class ResourceWithCommentsRenderer implements IListRenderer<ITreeNode<Res
}

renderTemplate(container: HTMLElement) {
const data = <IResourceTemplateData>Object.create(null);
const labelContainer = dom.append(container, dom.$('.resource-container'));
data.resourceLabel = this.labels.create(labelContainer);
const resourceLabel = this.labels.create(labelContainer);

return data;
return { resourceLabel };
}

renderElement(node: ITreeNode<ResourceWithCommentThreads>, index: number, templateData: IResourceTemplateData, height: number | undefined): void {
Expand All @@ -118,34 +117,33 @@ export class CommentNodeRenderer implements IListRenderer<ITreeNode<CommentNode>
) { }

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

const threadContainer = dom.append(container, dom.$('.comment-thread-container'));
const metadataContainer = dom.append(threadContainer, dom.$('.comment-metadata-container'));
data.threadMetadata = {
const threadMetadata = {
icon: dom.append(metadataContainer, dom.$('.icon')),
userNames: dom.append(metadataContainer, dom.$('.user')),
timestamp: new TimestampWidget(this.configurationService, dom.append(metadataContainer, dom.$('.timestamp-container'))),
separator: dom.append(metadataContainer, dom.$('.separator')),
commentPreview: dom.append(metadataContainer, dom.$('.text')),
range: dom.append(metadataContainer, dom.$('.range'))
};
data.threadMetadata.separator.innerText = '\u00b7';
threadMetadata.separator.innerText = '\u00b7';

const snippetContainer = dom.append(threadContainer, dom.$('.comment-snippet-container'));
data.repliesMetadata = {
const repliesMetadata = {
container: snippetContainer,
icon: dom.append(snippetContainer, dom.$('.icon')),
count: dom.append(snippetContainer, dom.$('.count')),
lastReplyDetail: dom.append(snippetContainer, dom.$('.reply-detail')),
separator: dom.append(snippetContainer, dom.$('.separator')),
timestamp: new TimestampWidget(this.configurationService, dom.append(snippetContainer, dom.$('.timestamp-container'))),
};
data.repliesMetadata.separator.innerText = '\u00b7';
data.repliesMetadata.icon.classList.add(...ThemeIcon.asClassNameArray(Codicon.indent));
data.disposables = [data.threadMetadata.timestamp, data.repliesMetadata.timestamp];
repliesMetadata.separator.innerText = '\u00b7';
repliesMetadata.icon.classList.add(...ThemeIcon.asClassNameArray(Codicon.indent));
const disposables = [threadMetadata.timestamp, repliesMetadata.timestamp];

return data;
return { threadMetadata, repliesMetadata, disposables };
}

private getCountString(commentCount: number): string {
Expand Down
6 changes: 2 additions & 4 deletions src/vs/workbench/contrib/remote/browser/remote.ts
Original file line number Diff line number Diff line change
Expand Up @@ -117,10 +117,8 @@ class HelpTreeRenderer implements ITreeRenderer<HelpModel | IHelpItem, IHelpItem
renderTemplate(container: HTMLElement): IHelpItemTemplateData {
container.classList.add('remote-help-tree-node-item');
const icon = dom.append(container, dom.$('.remote-help-tree-node-item-icon'));
const data = <IHelpItemTemplateData>Object.create(null);
data.parent = container;
data.icon = icon;
return data;
const parent = container;
return { parent, icon };
}

renderElement(element: ITreeNode<IHelpItem, IHelpItem>, index: number, templateData: IHelpItemTemplateData, height: number | undefined): void {
Expand Down

0 comments on commit 4bee92b

Please sign in to comment.