Merge from vscode aba87f135229c17c4624341b7a2499dcedafcb87 (#6430)

* Merge from vscode aba87f135229c17c4624341b7a2499dcedafcb87

* fix compile errors
This commit is contained in:
Anthony Dresser
2019-07-18 18:32:57 -07:00
committed by GitHub
parent bf4815d364
commit ee3663c1cd
158 changed files with 3101 additions and 2361 deletions

View File

@@ -23,7 +23,7 @@ export class CommentsDataSource implements IDataSource {
return element.id;
}
if (element instanceof CommentNode) {
return `${element.resource.toString()}-${element.comment.commentId}`;
return `${element.resource.toString()}-${element.comment.uniqueIdInThread}`;
}
return '';
}