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

@@ -1285,7 +1285,7 @@ export interface CommentThread {
commentThreadHandle: number;
controllerHandle: number;
extensionId?: string;
threadId: string | null;
threadId: string;
resource: string | null;
range: IRange;
label: string;
@@ -1333,8 +1333,7 @@ export enum CommentMode {
* @internal
*/
export interface Comment {
readonly commentId: string;
readonly uniqueIdInThread?: number;
readonly uniqueIdInThread: number;
readonly body: IMarkdownString;
readonly userName: string;
readonly userIconPath?: string;