Fixes microsoft#59348, Error in editComment/deleteComment not indicated in UI

Author: Rachel Macfarlane

src/vs/workbench/parts/comments/electron-browser/commentNode.ts

@@ -28,6 +28,7 @@ import { isMacintosh } from 'vs/base/common/platform';
 import { Selection } from 'vs/editor/common/core/selection';
 import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
 import { Emitter, Event } from 'vs/base/common/event';
+import { INotificationService } from 'vs/platform/notification/common/notification';
 
 const UPDATE_COMMENT_LABEL = nls.localize('label.updateComment', "Update comment");
 const UPDATE_IN_PROGRESS_LABEL = nls.localize('label.updatingComment', "Updating comment...");
@@ -62,7 +63,8 @@ export class CommentNode extends Disposable {
 		private commentService: ICommentService,
 		private modelService: IModelService,
 		private modeService: IModeService,
-		private dialogService: IDialogService
+		private dialogService: IDialogService,
+		private notificationService: INotificationService
 	) {
 		super();
 
@@ -150,18 +152,17 @@ export class CommentNode extends Disposable {
 		this._commentEditContainer.remove();
 	}
 
-	private editComment(): void {
+	private async editComment(): Promise<void> {
 		this._updateCommentButton.enabled = false;
 		this._updateCommentButton.label = UPDATE_IN_PROGRESS_LABEL;
 
 		try {
-			this.commentService.editComment(this.owner, this.resource, this.comment, this._commentEditor.getValue()).then(editedComment => {
-				this._updateCommentButton.enabled = true;
-				this._updateCommentButton.label = UPDATE_COMMENT_LABEL;
-				this._commentEditor.getDomNode().style.outline = '';
-				this.removeCommentEditor();
-				this.update(editedComment);
-			});
+			const editedComment = await this.commentService.editComment(this.owner, this.resource, this.comment, this._commentEditor.getValue());
+			this._updateCommentButton.enabled = true;
+			this._updateCommentButton.label = UPDATE_COMMENT_LABEL;
+			this._commentEditor.getDomNode().style.outline = '';
+			this.removeCommentEditor();
+			this.update(editedComment);
 		} catch (e) {
 			this._updateCommentButton.enabled = true;
 			this._updateCommentButton.label = UPDATE_COMMENT_LABEL;
@@ -180,13 +181,16 @@ export class CommentNode extends Disposable {
 				message: nls.localize('confirmDelete', "Delete comment?"),
 				type: 'question',
 				primaryButton: nls.localize('label.delete', "Delete")
-			}).then(result => {
+			}).then(async result => {
 				if (result.confirmed) {
-					this.commentService.deleteComment(this.owner, this.resource, this.comment).then((didDelete) => {
+					try {
+						const didDelete = await this.commentService.deleteComment(this.owner, this.resource, this.comment);
 						if (didDelete) {
 							this._onDidDelete.fire(this);
 						}
-					});
+					} catch (e) {
+						this.notificationService.error(nls.localize('commentDeletionError', "Deleting the comment failed: {0}.", e.message));
+					}
 				}
 			});
 		});

src/vs/workbench/parts/comments/electron-browser/commentService.ts

@@ -5,7 +5,6 @@
 
 'use strict';
 
-import * as nls from 'vs/nls';
 import { CommentThread, DocumentCommentProvider, CommentThreadChangedEvent, CommentInfo, Comment } from 'vs/editor/common/modes';
 import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
 import { Event, Emitter } from 'vs/base/common/event';
@@ -14,7 +13,6 @@ import { URI } from 'vs/base/common/uri';
 import { Range } from 'vs/editor/common/core/range';
 import { keys } from 'vs/base/common/map';
 import { CancellationToken } from 'vs/base/common/cancellation';
-import { INotificationService } from 'vs/platform/notification/common/notification';
 
 export const ICommentService = createDecorator<ICommentService>('commentService');
 
@@ -68,7 +66,7 @@ export class CommentService extends Disposable implements ICommentService {
 
 	private _commentProviders = new Map<number, DocumentCommentProvider>();
 
-	constructor(@INotificationService private notificationService: INotificationService) {
+	constructor() {
 		super();
 	}
 
@@ -132,12 +130,7 @@ export class CommentService extends Disposable implements ICommentService {
 		const commentProvider = this._commentProviders.get(owner);
 
 		if (commentProvider) {
-			try {
-				return commentProvider.deleteComment(resource, comment, CancellationToken.None).then(() => true);
-			} catch (e) {
-				this.notificationService.error(nls.localize('commentDeletionError', "Deleting the comment failed: {0}.", e.message));
-				return Promise.resolve(false);
-			}
+			return commentProvider.deleteComment(resource, comment, CancellationToken.None).then(() => true);
 		}
 
 		return Promise.resolve(false);

src/vs/workbench/parts/comments/electron-browser/commentThreadWidget.ts

@@ -39,6 +39,7 @@ import { IMarginData } from 'vs/editor/browser/controller/mouseTarget';
 import { ModelDecorationOptions } from 'vs/editor/common/model/textModel';
 import { CommentNode } from 'vs/workbench/parts/comments/electron-browser/commentNode';
 import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
+import { INotificationService } from 'vs/platform/notification/common/notification';
 
 export const COMMENTEDITOR_DECORATION_KEY = 'commenteditordecoration';
 const COLLAPSE_ACTION_CLASS = 'expand-review-action octicon octicon-x';
@@ -85,6 +86,7 @@ export class ReviewZoneWidget extends ZoneWidget {
 		private commentService: ICommentService,
 		private openerService: IOpenerService,
 		private dialogService: IDialogService,
+		private notificationService: INotificationService,
 		editor: ICodeEditor,
 		owner: number,
 		commentThread: modes.CommentThread,
@@ -352,7 +354,8 @@ export class ReviewZoneWidget extends ZoneWidget {
 			this.commentService,
 			this.modelService,
 			this.modeService,
-			this.dialogService);
+			this.dialogService,
+			this.notificationService);
 
 		this._disposables.push(newCommentNode);
 		this._disposables.push(newCommentNode.onDidDelete(deletedNode => {

src/vs/workbench/parts/comments/electron-browser/commentsEditorContribution.ts

@@ -358,7 +358,7 @@ export class ReviewController implements IEditorContribution {
 				}
 			});
 			added.forEach(thread => {
-				let zoneWidget = new ReviewZoneWidget(this.instantiationService, this.modeService, this.modelService, this.themeService, this.commentService, this.openerService, this.dialogService, this.editor, e.owner, thread, {});
+				let zoneWidget = new ReviewZoneWidget(this.instantiationService, this.modeService, this.modelService, this.themeService, this.commentService, this.openerService, this.dialogService, this.notificationService, this.editor, e.owner, thread, {});
 				zoneWidget.display(thread.range.startLineNumber, this._commentingRangeDecorator.commentsOptions);
 				this._commentWidgets.push(zoneWidget);
 				this._commentInfos.filter(info => info.owner === e.owner)[0].threads.push(thread);
@@ -380,7 +380,7 @@ export class ReviewController implements IEditorContribution {
 		// add new comment
 		this._reviewPanelVisible.set(true);
 		const { replyCommand, ownerId } = newCommentInfo;
-		this._newCommentWidget = new ReviewZoneWidget(this.instantiationService, this.modeService, this.modelService, this.themeService, this.commentService, this.openerService, this.dialogService, this.editor, ownerId, {
+		this._newCommentWidget = new ReviewZoneWidget(this.instantiationService, this.modeService, this.modelService, this.themeService, this.commentService, this.openerService, this.dialogService, this.notificationService, this.editor, ownerId, {
 			threadId: null,
 			resource: null,
 			comments: [],
@@ -507,7 +507,7 @@ export class ReviewController implements IEditorContribution {
 
 		this._commentInfos.forEach(info => {
 			info.threads.forEach(thread => {
-				let zoneWidget = new ReviewZoneWidget(this.instantiationService, this.modeService, this.modelService, this.themeService, this.commentService, this.openerService, this.dialogService, this.editor, info.owner, thread, {});
+				let zoneWidget = new ReviewZoneWidget(this.instantiationService, this.modeService, this.modelService, this.themeService, this.commentService, this.openerService, this.dialogService, this.notificationService, this.editor, info.owner, thread, {});
 				zoneWidget.display(thread.range.startLineNumber, this._commentingRangeDecorator.commentsOptions);
 				this._commentWidgets.push(zoneWidget);
 			});