ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-15 10:58:31 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge from vscode 8ef8aa6b3cb5b96870660fdd3bb8d0755e62fe51 (#5422)

Browse Source
This commit is contained in:
Anthony Dresser
2019-05-09 11:10:57 -07:00
committed by GitHub
parent 1cc3cb5408
commit 2b9a8b9136
15 changed files with 113 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/vs/workbench/api/common/extHostComments.ts
View File

@@ -385,7 +385,11 @@ export class ExtHostCommentThread implements vscode.CommentThread {
}
get resource(): vscode.Uri {
return this._resource;
return this._uri;
}
get uri(): vscode.Uri {
return this._uri;
}
private _onDidUpdateCommentThread = new Emitter<void>();
@@ -476,7 +480,7 @@ export class ExtHostCommentThread implements vscode.CommentThread {
private readonly _commandsConverter: CommandsConverter,
private _commentController: ExtHostCommentController,
private _id: string,
private _resource: vscode.Uri,
private _uri: vscode.Uri,
private _range: vscode.Range,
private _comments: vscode.Comment[]
) {
@@ -484,7 +488,7 @@ export class ExtHostCommentThread implements vscode.CommentThread {
this._commentController.handle,
this.handle,
this._id,
this._resource,
this._uri,
extHostTypeConverter.Range.from(this._range)
);
@@ -513,7 +517,7 @@ export class ExtHostCommentThread implements vscode.CommentThread {
this._commentController.handle,
this.handle,
this._id,
this._resource,
this._uri,
commentThreadRange,
label,
comments,
@@ -717,6 +721,7 @@ function convertFromCommentThread(commentThread: modes.CommentThread): vscode.Co
return {
id: commentThread.threadId!,
threadId: commentThread.threadId!,
uri: URI.parse(commentThread.resource!),
resource: URI.parse(commentThread.resource!),
range: extHostTypeConverter.Range.to(commentThread.range),
comments: commentThread.comments ? commentThread.comments.map(convertFromComment) : [],