Merge from vscode c873727e8bac95e7cbf5b154a9e6ae0986f2ce18 (#6446)

This commit is contained in:
Anthony Dresser
2019-07-19 19:21:54 -07:00
committed by GitHub
parent 5c63f7bdb5
commit b21435743d
63 changed files with 2049 additions and 1000 deletions

View File

@@ -20,10 +20,10 @@ export class CommentsDataSource implements IDataSource {
return 'root';
}
if (element instanceof ResourceWithCommentThreads) {
return element.id;
return `${element.owner}-${element.id}`;
}
if (element instanceof CommentNode) {
return `${element.resource.toString()}-${element.comment.uniqueIdInThread}`;
return `${element.owner}-${element.resource.toString()}-${element.threadId}-${element.comment.uniqueIdInThread}`;
}
return '';
}