Skip to content

Commit 77afd22

Browse files
authored
Comments panel: Line numbers too far to the right (microsoft#239241)
Fixes microsoft#239221
1 parent 0c1ff56 commit 77afd22

File tree

2 files changed

+21
-9
lines changed

2 files changed

+21
-9
lines changed

src/vs/workbench/contrib/comments/browser/commentsTreeViewer.ts

Lines changed: 19 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ interface ICommentThreadTemplateData {
6262
timestamp: TimestampWidget;
6363
separator: HTMLElement;
6464
commentPreview: HTMLSpanElement;
65-
range: HTMLSpanElement;
65+
range: HTMLElement;
6666
};
6767
repliesMetadata: {
6868
container: HTMLElement;
@@ -193,14 +193,25 @@ export class CommentNodeRenderer implements IListRenderer<ITreeNode<CommentNode>
193193
const threadContainer = dom.append(container, dom.$('.comment-thread-container'));
194194
const metadataContainer = dom.append(threadContainer, dom.$('.comment-metadata-container'));
195195
const metadata = dom.append(metadataContainer, dom.$('.comment-metadata'));
196+
197+
const icon = dom.append(metadata, dom.$('.icon'));
198+
const userNames = dom.append(metadata, dom.$('.user'));
199+
const timestamp = new TimestampWidget(this.configurationService, this.hoverService, dom.append(metadata, dom.$('.timestamp-container')));
200+
const relevance = dom.append(metadata, dom.$('.relevance'));
201+
const separator = dom.append(metadata, dom.$('.separator'));
202+
const commentPreview = dom.append(metadata, dom.$('.text'));
203+
const rangeContainer = dom.append(metadata, dom.$('.range'));
204+
const range = dom.$('p');
205+
rangeContainer.appendChild(range);
206+
196207
const threadMetadata = {
197-
icon: dom.append(metadata, dom.$('.icon')),
198-
userNames: dom.append(metadata, dom.$('.user')),
199-
timestamp: new TimestampWidget(this.configurationService, this.hoverService, dom.append(metadata, dom.$('.timestamp-container'))),
200-
relevance: dom.append(metadata, dom.$('.relevance')),
201-
separator: dom.append(metadata, dom.$('.separator')),
202-
commentPreview: dom.append(metadata, dom.$('.text')),
203-
range: dom.append(metadata, dom.$('.range'))
208+
icon,
209+
userNames,
210+
timestamp,
211+
relevance,
212+
separator,
213+
commentPreview,
214+
range
204215
};
205216
threadMetadata.separator.innerText = '\u00b7';
206217

src/vs/workbench/contrib/comments/browser/media/panel.css

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,8 @@
8787
opacity: 0.8;
8888
}
8989

90-
.comments-panel .comments-panel-container .tree-container .comment-thread-container .text * {
90+
.comments-panel .comments-panel-container .tree-container .comment-thread-container .text *,
91+
.comments-panel .comments-panel-container .tree-container .comment-thread-container .range * {
9192
margin: 0;
9293
text-overflow: ellipsis;
9394
overflow: hidden;

0 commit comments

Comments
 (0)