From cd6e7e683bd50a12a0853e06a7254db39d8676f8 Mon Sep 17 00:00:00 2001
From: Rachel Macfarlane <ramacfar@microsoft.com>
Date: Wed, 10 Jul 2019 17:29:01 -0700
Subject: [PATCH] Replace SimpleCommentService with actual comment service

---
 .../workbench/browser/web.simpleservices.ts   | 51 -------------------
 src/vs/workbench/workbench.web.main.ts        |  2 +-
 2 files changed, 1 insertion(+), 52 deletions(-)

diff --git a/src/vs/workbench/browser/web.simpleservices.ts b/src/vs/workbench/browser/web.simpleservices.ts
index 34905fba1a2..36fdab58002 100644
--- a/src/vs/workbench/browser/web.simpleservices.ts
+++ b/src/vs/workbench/browser/web.simpleservices.ts
@@ -32,12 +32,6 @@ import { IRemoteConsoleLog } from 'vs/base/common/console';
 // tslint:disable-next-line: import-patterns
 // tslint:disable-next-line: import-patterns
 import { IExtensionsWorkbenchService, IExtension as IExtension2 } from 'vs/workbench/contrib/extensions/common/extensions';
-// tslint:disable-next-line: import-patterns
-import { ICommentService, IResourceCommentThreadEvent, IWorkspaceCommentThreadsEvent } from 'vs/workbench/contrib/comments/browser/commentService';
-// tslint:disable-next-line: import-patterns
-import { ICommentThreadChangedEvent } from 'vs/workbench/contrib/comments/common/commentModel';
-import { CommentingRanges } from 'vs/editor/common/modes';
-import { Range } from 'vs/editor/common/core/range';
 import { IWorkspaceContextService, WorkbenchState } from 'vs/platform/workspace/common/workspace';
 import { addDisposableListener, EventType } from 'vs/base/browser/dom';
 import { IEditorService, IResourceEditor } from 'vs/workbench/services/editor/common/editorService';
@@ -194,51 +188,6 @@ export class SimpleExtensionsWorkbenchService implements IExtensionsWorkbenchSer
 registerSingleton(IExtensionsWorkbenchService, SimpleExtensionsWorkbenchService, true);
 //#endregion
 
-//#region ICommentService
-export class SimpleCommentService implements ICommentService {
-	_serviceBrand: any;
-	onDidSetResourceCommentInfos: Event<IResourceCommentThreadEvent> = Event.None;
-	onDidSetAllCommentThreads: Event<IWorkspaceCommentThreadsEvent> = Event.None;
-	onDidUpdateCommentThreads: Event<ICommentThreadChangedEvent> = Event.None;
-	onDidChangeActiveCommentingRange: Event<{ range: Range; commentingRangesInfo: CommentingRanges; }> = Event.None;
-	onDidChangeActiveCommentThread: Event<any> = Event.None;
-	onDidSetDataProvider: Event<void> = Event.None;
-	onDidDeleteDataProvider: Event<string> = Event.None;
-	setDocumentComments: any;
-	setWorkspaceComments: any;
-	removeWorkspaceComments: any;
-	registerCommentController: any;
-	unregisterCommentController: any;
-	getCommentController: any;
-	createCommentThreadTemplate: any;
-	updateCommentThreadTemplate: any;
-	getCommentMenus: any;
-	registerDataProvider: any;
-	unregisterDataProvider: any;
-	updateComments: any;
-	disposeCommentThread: any;
-	createNewCommentThread: any;
-	replyToCommentThread: any;
-	editComment: any;
-	deleteComment: any;
-	getComments() { return Promise.resolve([]); }
-	getCommentingRanges: any;
-	startDraft: any;
-	deleteDraft: any;
-	finishDraft: any;
-	getStartDraftLabel: any;
-	getDeleteDraftLabel: any;
-	getFinishDraftLabel: any;
-	addReaction: any;
-	deleteReaction: any;
-	getReactionGroup: any;
-	hasReactionHandler: any;
-	toggleReaction: any;
-	setActiveCommentThread: any;
-}
-registerSingleton(ICommentService, SimpleCommentService, true);
-//#endregion
-
 //#region Extension Management
 
 //#region Extension Enablement
diff --git a/src/vs/workbench/workbench.web.main.ts b/src/vs/workbench/workbench.web.main.ts
index dd20ec8105b..f417d5c967d 100644
--- a/src/vs/workbench/workbench.web.main.ts
+++ b/src/vs/workbench/workbench.web.main.ts
@@ -250,7 +250,7 @@ import 'vs/workbench/contrib/debug/browser/debugHelperService';
 import 'vs/workbench/contrib/markers/browser/markers.contribution';
 
 // Comments
-// import 'vs/workbench/contrib/comments/browser/comments.contribution';
+import 'vs/workbench/contrib/comments/browser/comments.contribution';
 
 // URL Support
 import 'vs/workbench/contrib/url/common/url.contribution';
-- 
GitLab