From 8107cbff1c1c6fce8b4753698bc3343053c2210f Mon Sep 17 00:00:00 2001 From: Peng Lyu Date: Mon, 16 Apr 2018 14:45:34 -0700 Subject: [PATCH] move comment widget out of editor --- build/lib/i18n.resources.json | 4 ++++ src/vs/editor/editor.all.ts | 1 - src/vs/workbench/api/electron-browser/mainThreadComments.ts | 2 +- .../parts/comments/common}/reviewModel.ts | 0 .../comments/electron-browser/comments.contribution.ts | 1 + .../electron-browser/commentsEditorContribution.ts} | 6 +++--- .../parts/comments/electron-browser/commentsPanel.ts | 2 +- .../parts/comments/electron-browser/media}/close.svg | 0 .../parts/comments/electron-browser/media}/comment.svg | 0 .../parts/comments/electron-browser/media}/review.css | 0 10 files changed, 10 insertions(+), 6 deletions(-) rename src/vs/{editor/contrib/review => workbench/parts/comments/common}/reviewModel.ts (100%) rename src/vs/{editor/contrib/review/review.ts => workbench/parts/comments/electron-browser/commentsEditorContribution.ts} (99%) rename src/vs/{editor/contrib/review => workbench/parts/comments/electron-browser/media}/close.svg (100%) rename src/vs/{editor/contrib/review => workbench/parts/comments/electron-browser/media}/comment.svg (100%) rename src/vs/{editor/contrib/review => workbench/parts/comments/electron-browser/media}/review.css (100%) diff --git a/build/lib/i18n.resources.json b/build/lib/i18n.resources.json index 18567d3f995..559f831ab63 100644 --- a/build/lib/i18n.resources.json +++ b/build/lib/i18n.resources.json @@ -34,6 +34,10 @@ "name": "vs/workbench/parts/codeEditor", "project": "vscode-workbench" }, + { + "name": "vs/workbench/parts/comments", + "project": "vscode-workbench" + }, { "name": "vs/workbench/parts/debug", "project": "vscode-workbench" diff --git a/src/vs/editor/editor.all.ts b/src/vs/editor/editor.all.ts index 4ea80a1d81b..d4f93d0a876 100644 --- a/src/vs/editor/editor.all.ts +++ b/src/vs/editor/editor.all.ts @@ -22,7 +22,6 @@ import 'vs/editor/contrib/cursorUndo/cursorUndo'; import 'vs/editor/contrib/dnd/dnd'; import 'vs/editor/contrib/find/findController'; import 'vs/editor/contrib/folding/folding'; -import 'vs/editor/contrib/review/review'; import 'vs/editor/contrib/format/formatActions'; import 'vs/editor/contrib/goToDeclaration/goToDeclarationCommands'; import 'vs/editor/contrib/goToDeclaration/goToDeclarationMouse'; diff --git a/src/vs/workbench/api/electron-browser/mainThreadComments.ts b/src/vs/workbench/api/electron-browser/mainThreadComments.ts index 7bac9b689f4..a8254786648 100644 --- a/src/vs/workbench/api/electron-browser/mainThreadComments.ts +++ b/src/vs/workbench/api/electron-browser/mainThreadComments.ts @@ -8,7 +8,6 @@ import { Disposable, IDisposable } from 'vs/base/common/lifecycle'; import { ICodeEditor } from 'vs/editor/browser/editorBrowser'; import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService'; import * as modes from 'vs/editor/common/modes'; -import { ReviewController } from 'vs/editor/contrib/review/review'; import { extHostNamedCustomer } from 'vs/workbench/api/electron-browser/extHostCustomers'; import { IEditorGroupService } from 'vs/workbench/services/group/common/groupService'; import { keys } from '../../../base/common/map'; @@ -20,6 +19,7 @@ import { COMMENTS_PANEL_ID } from 'vs/workbench/parts/comments/electron-browser/ import { IPanelService } from 'vs/workbench/services/panel/common/panelService'; import URI from 'vs/base/common/uri'; import { ITextModel } from 'vs/editor/common/model'; +import { ReviewController } from 'vs/workbench/parts/comments/electron-browser/commentsEditorContribution'; @extHostNamedCustomer(MainContext.MainThreadComments) export class MainThreadComments extends Disposable implements MainThreadCommentsShape { diff --git a/src/vs/editor/contrib/review/reviewModel.ts b/src/vs/workbench/parts/comments/common/reviewModel.ts similarity index 100% rename from src/vs/editor/contrib/review/reviewModel.ts rename to src/vs/workbench/parts/comments/common/reviewModel.ts diff --git a/src/vs/workbench/parts/comments/electron-browser/comments.contribution.ts b/src/vs/workbench/parts/comments/electron-browser/comments.contribution.ts index 311c0b3be09..a5d1defd45e 100644 --- a/src/vs/workbench/parts/comments/electron-browser/comments.contribution.ts +++ b/src/vs/workbench/parts/comments/electron-browser/comments.contribution.ts @@ -9,6 +9,7 @@ import { Extensions as PanelExtensions, PanelDescriptor, PanelRegistry } from 'v import { Extensions as WorkbenchExtensions, IWorkbenchContribution, IWorkbenchContributionsRegistry } from 'vs/workbench/common/contributions'; import { IPanelService } from 'vs/workbench/services/panel/common/panelService'; import { COMMENTS_PANEL_ID, COMMENTS_PANEL_TITLE, CommentsPanel } from './commentsPanel'; +import 'vs/workbench/parts/comments/electron-browser/commentsEditorContribution'; export class CommentPanelVisibilityUpdater implements IWorkbenchContribution { diff --git a/src/vs/editor/contrib/review/review.ts b/src/vs/workbench/parts/comments/electron-browser/commentsEditorContribution.ts similarity index 99% rename from src/vs/editor/contrib/review/review.ts rename to src/vs/workbench/parts/comments/electron-browser/commentsEditorContribution.ts index 4fbe81ce667..3437e3fec05 100644 --- a/src/vs/editor/contrib/review/review.ts +++ b/src/vs/workbench/parts/comments/electron-browser/commentsEditorContribution.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; -import 'vs/css!./review'; +import 'vs/css!./media/review'; import * as nls from 'vs/nls'; import * as arrays from 'vs/base/common/arrays'; import * as modes from 'vs/editor/common/modes'; @@ -15,7 +15,6 @@ import { IDisposable, dispose } from 'vs/base/common/lifecycle'; import { registerEditorContribution } from 'vs/editor/browser/editorExtensions'; import { ModelDecorationOptions } from 'vs/editor/common/model/textModel'; import { TrackedRangeStickiness, IModelDeltaDecoration } from 'vs/editor/common/model'; -import { ZoneWidget, IOptions } from '../zoneWidget/zoneWidget'; import { renderMarkdown } from 'vs/base/browser/htmlContentRenderer'; import { RawContextKey, IContextKeyService, IContextKey } from 'vs/platform/contextkey/common/contextkey'; import { KeybindingsRegistry } from 'vs/platform/keybinding/common/keybindingsRegistry'; @@ -31,8 +30,9 @@ import { Color } from 'vs/base/common/color'; import { IMarginData } from 'vs/editor/browser/controller/mouseTarget'; import { ICommandService } from 'vs/platform/commands/common/commands'; import { Emitter, Event } from 'vs/base/common/event'; -import { ReviewModel, ReviewStyle } from 'vs/editor/contrib/review/reviewModel'; import { editorBackground, editorForeground } from 'vs/platform/theme/common/colorRegistry'; +import { ZoneWidget, IOptions } from 'vs/editor/contrib/zoneWidget/zoneWidget'; +import { ReviewModel, ReviewStyle } from 'vs/workbench/parts/comments/common/reviewModel'; export const ctxReviewPanelVisible = new RawContextKey('reviewPanelVisible', false); export const ID = 'editor.contrib.review'; diff --git a/src/vs/workbench/parts/comments/electron-browser/commentsPanel.ts b/src/vs/workbench/parts/comments/electron-browser/commentsPanel.ts index c5b010a01fd..cdc9d969075 100644 --- a/src/vs/workbench/parts/comments/electron-browser/commentsPanel.ts +++ b/src/vs/workbench/parts/comments/electron-browser/commentsPanel.ts @@ -9,7 +9,6 @@ import { Promise, TPromise } from 'vs/base/common/winjs.base'; import { IDataSource, IFilter, IRenderer, ITree } from 'vs/base/parts/tree/browser/tree'; import { DefaultAccessibilityProvider, DefaultController, DefaultDragAndDrop } from 'vs/base/parts/tree/browser/treeDefaults'; import { isCodeEditor } from 'vs/editor/browser/editorBrowser'; -import { ReviewController } from 'vs/editor/contrib/review/review'; import { IEditorService } from 'vs/platform/editor/common/editor'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; import { TreeResourceNavigator, WorkbenchTree } from 'vs/platform/list/browser/listService'; @@ -18,6 +17,7 @@ import { IThemeService } from 'vs/platform/theme/common/themeService'; import { ResourceLabel } from 'vs/workbench/browser/labels'; import { Panel } from 'vs/workbench/browser/panel'; import { CommentNode, CommentsModel, ICommentService, ResourceCommentThreads } from 'vs/workbench/services/comments/electron-browser/commentService'; +import { ReviewController } from 'vs/workbench/parts/comments/electron-browser/commentsEditorContribution'; export const COMMENTS_PANEL_ID = 'workbench.panel.comments'; export const COMMENTS_PANEL_TITLE = 'Comments'; diff --git a/src/vs/editor/contrib/review/close.svg b/src/vs/workbench/parts/comments/electron-browser/media/close.svg similarity index 100% rename from src/vs/editor/contrib/review/close.svg rename to src/vs/workbench/parts/comments/electron-browser/media/close.svg diff --git a/src/vs/editor/contrib/review/comment.svg b/src/vs/workbench/parts/comments/electron-browser/media/comment.svg similarity index 100% rename from src/vs/editor/contrib/review/comment.svg rename to src/vs/workbench/parts/comments/electron-browser/media/comment.svg diff --git a/src/vs/editor/contrib/review/review.css b/src/vs/workbench/parts/comments/electron-browser/media/review.css similarity index 100% rename from src/vs/editor/contrib/review/review.css rename to src/vs/workbench/parts/comments/electron-browser/media/review.css