From aa14fc5914833c789bd2d80a23bb552abe255fe0 Mon Sep 17 00:00:00 2001 From: Alex Dima Date: Thu, 9 Nov 2017 12:18:35 +0100 Subject: [PATCH] Bring ICodeEditorService to /browser/ (#37834) --- src/vs/editor/browser/codeEditor.ts | 2 +- .../editor/browser/controller/coreCommands.ts | 2 +- src/vs/editor/browser/editorExtensions.ts | 2 +- .../services/abstractCodeEditorService.ts | 53 ++++++++++--------- .../services/codeEditorService.ts | 41 +++++++------- .../browser/services/codeEditorServiceImpl.ts | 2 +- .../editor/browser/widget/codeEditorWidget.ts | 2 +- .../editor/browser/widget/diffEditorWidget.ts | 4 +- src/vs/editor/browser/widget/diffReview.ts | 2 +- .../widget/embeddedCodeEditorWidget.ts | 4 +- src/vs/editor/contrib/clipboard/clipboard.ts | 2 +- .../contrib/colorPicker/colorDetector.ts | 2 +- src/vs/editor/contrib/format/formatActions.ts | 2 +- .../contrib/referenceSearch/peekViewWidget.ts | 2 +- .../browser/standaloneCodeEditor.ts | 2 +- .../standalone/browser/standaloneEditor.ts | 2 +- .../standalone/browser/standaloneServices.ts | 2 +- .../testCodeEditorService.ts} | 4 +- .../mainThreadDocumentContentProviders.ts | 2 +- .../mainThreadDocumentsAndEditors.ts | 2 +- .../api/electron-browser/mainThreadEditors.ts | 2 +- .../mainThreadSaveParticipant.ts | 2 +- .../browser/parts/editor/editorActions.ts | 2 +- .../parts/editor/editorGroupsControl.ts | 2 +- .../browser/parts/editor/editorPart.ts | 4 +- .../browser/parts/editor/editorStatus.ts | 2 +- .../browser/parts/editor/textEditor.ts | 2 +- .../browser/parts/statusbar/statusbarPart.ts | 2 +- src/vs/workbench/electron-browser/shell.ts | 2 +- .../electron-browser/toggleWordWrap.ts | 2 +- .../debugEditorContribution.ts | 2 +- .../debug/electron-browser/replEditor.ts | 2 +- .../parts/files/browser/fileActions.ts | 2 +- .../preferences/browser/preferencesEditor.ts | 2 +- .../preferences/browser/preferencesService.ts | 2 +- .../quickopen/browser/gotoLineHandler.ts | 2 +- .../quickopen/browser/gotoSymbolHandler.ts | 2 +- .../electron-browser/dirtydiffDecorator.ts | 2 +- .../search/browser/search.contribution.ts | 2 +- .../electron-browser/terminalActions.ts | 4 +- .../electron-browser/walkThroughPart.ts | 4 +- .../services/history/browser/history.ts | 2 +- .../api/mainThreadDocumentsAndEditors.test.ts | 6 +-- .../api/mainThreadEditors.test.ts | 4 +- 44 files changed, 99 insertions(+), 97 deletions(-) rename src/vs/editor/{common => browser}/services/abstractCodeEditorService.ts (67%) rename src/vs/editor/{common => browser}/services/codeEditorService.ts (60%) rename src/vs/editor/test/{common/mocks/mockCodeEditorService.ts => browser/testCodeEditorService.ts} (82%) diff --git a/src/vs/editor/browser/codeEditor.ts b/src/vs/editor/browser/codeEditor.ts index add88178dc0..ba4ced1885d 100644 --- a/src/vs/editor/browser/codeEditor.ts +++ b/src/vs/editor/browser/codeEditor.ts @@ -7,7 +7,7 @@ import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; import { ICommandService } from 'vs/platform/commands/common/commands'; import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey'; -import { ICodeEditorService } from 'vs/editor/common/services/codeEditorService'; +import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService'; import { CodeEditorWidget } from 'vs/editor/browser/widget/codeEditorWidget'; import { EditorAction, EditorExtensionsRegistry, IEditorContributionCtor } from 'vs/editor/browser/editorExtensions'; import { IEditorOptions } from 'vs/editor/common/config/editorOptions'; diff --git a/src/vs/editor/browser/controller/coreCommands.ts b/src/vs/editor/browser/controller/coreCommands.ts index b873bad3c0d..01819763181 100644 --- a/src/vs/editor/browser/controller/coreCommands.ts +++ b/src/vs/editor/browser/controller/coreCommands.ts @@ -18,7 +18,7 @@ import { EditorContextKeys } from 'vs/editor/common/editorContextKeys'; import { KeyMod, KeyCode } from 'vs/base/common/keyCodes'; import { KeybindingsRegistry } from 'vs/platform/keybinding/common/keybindingsRegistry'; import H = editorCommon.Handler; -import { ICodeEditorService, getCodeEditor } from 'vs/editor/common/services/codeEditorService'; +import { ICodeEditorService, getCodeEditor } from 'vs/editor/browser/services/codeEditorService'; import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey'; import * as types from 'vs/base/common/types'; import { ICommandHandlerDescription } from 'vs/platform/commands/common/commands'; diff --git a/src/vs/editor/browser/editorExtensions.ts b/src/vs/editor/browser/editorExtensions.ts index c04a592d4ff..c5ff66a4ff5 100644 --- a/src/vs/editor/browser/editorExtensions.ts +++ b/src/vs/editor/browser/editorExtensions.ts @@ -18,7 +18,7 @@ import { IModelService } from 'vs/editor/common/services/modelService'; import { MenuId, MenuRegistry, IMenuItem } from 'vs/platform/actions/common/actions'; import { IEditorService } from 'vs/platform/editor/common/editor'; import { IContextKeyService, ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey'; -import { ICodeEditorService, getCodeEditor } from 'vs/editor/common/services/codeEditorService'; +import { ICodeEditorService, getCodeEditor } from 'vs/editor/browser/services/codeEditorService'; import { ICodeEditor } from 'vs/editor/browser/editorBrowser'; export type ServicesAccessor = ServicesAccessor; diff --git a/src/vs/editor/common/services/abstractCodeEditorService.ts b/src/vs/editor/browser/services/abstractCodeEditorService.ts similarity index 67% rename from src/vs/editor/common/services/abstractCodeEditorService.ts rename to src/vs/editor/browser/services/abstractCodeEditorService.ts index d735688a692..f5b8609b382 100644 --- a/src/vs/editor/common/services/abstractCodeEditorService.ts +++ b/src/vs/editor/browser/services/abstractCodeEditorService.ts @@ -5,86 +5,87 @@ 'use strict'; import Event, { Emitter } from 'vs/base/common/event'; -import { ICommonCodeEditor, ICommonDiffEditor, IDecorationRenderOptions, IModelDecorationOptions, IModel } from 'vs/editor/common/editorCommon'; -import { ICodeEditorService } from 'vs/editor/common/services/codeEditorService'; +import { IDecorationRenderOptions, IModelDecorationOptions, IModel } from 'vs/editor/common/editorCommon'; +import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService'; +import { ICodeEditor, IDiffEditor } from 'vs/editor/browser/editorBrowser'; export abstract class AbstractCodeEditorService implements ICodeEditorService { _serviceBrand: any; - private _onCodeEditorAdd: Emitter; - private _onCodeEditorRemove: Emitter; - private _codeEditors: { [editorId: string]: ICommonCodeEditor; }; + private _onCodeEditorAdd: Emitter; + private _onCodeEditorRemove: Emitter; + private _codeEditors: { [editorId: string]: ICodeEditor; }; - private _onDiffEditorAdd: Emitter; - private _onDiffEditorRemove: Emitter; - private _diffEditors: { [editorId: string]: ICommonDiffEditor; }; + private _onDiffEditorAdd: Emitter; + private _onDiffEditorRemove: Emitter; + private _diffEditors: { [editorId: string]: IDiffEditor; }; constructor() { this._codeEditors = Object.create(null); this._diffEditors = Object.create(null); - this._onCodeEditorAdd = new Emitter(); - this._onCodeEditorRemove = new Emitter(); - this._onDiffEditorAdd = new Emitter(); - this._onDiffEditorRemove = new Emitter(); + this._onCodeEditorAdd = new Emitter(); + this._onCodeEditorRemove = new Emitter(); + this._onDiffEditorAdd = new Emitter(); + this._onDiffEditorRemove = new Emitter(); } - addCodeEditor(editor: ICommonCodeEditor): void { + addCodeEditor(editor: ICodeEditor): void { this._codeEditors[editor.getId()] = editor; this._onCodeEditorAdd.fire(editor); } - get onCodeEditorAdd(): Event { + get onCodeEditorAdd(): Event { return this._onCodeEditorAdd.event; } - removeCodeEditor(editor: ICommonCodeEditor): void { + removeCodeEditor(editor: ICodeEditor): void { if (delete this._codeEditors[editor.getId()]) { this._onCodeEditorRemove.fire(editor); } } - get onCodeEditorRemove(): Event { + get onCodeEditorRemove(): Event { return this._onCodeEditorRemove.event; } - getCodeEditor(editorId: string): ICommonCodeEditor { + getCodeEditor(editorId: string): ICodeEditor { return this._codeEditors[editorId] || null; } - listCodeEditors(): ICommonCodeEditor[] { + listCodeEditors(): ICodeEditor[] { return Object.keys(this._codeEditors).map(id => this._codeEditors[id]); } - addDiffEditor(editor: ICommonDiffEditor): void { + addDiffEditor(editor: IDiffEditor): void { this._diffEditors[editor.getId()] = editor; this._onDiffEditorAdd.fire(editor); } - get onDiffEditorAdd(): Event { + get onDiffEditorAdd(): Event { return this._onDiffEditorAdd.event; } - removeDiffEditor(editor: ICommonDiffEditor): void { + removeDiffEditor(editor: IDiffEditor): void { if (delete this._diffEditors[editor.getId()]) { this._onDiffEditorRemove.fire(editor); } } - get onDiffEditorRemove(): Event { + get onDiffEditorRemove(): Event { return this._onDiffEditorRemove.event; } - getDiffEditor(editorId: string): ICommonDiffEditor { + getDiffEditor(editorId: string): IDiffEditor { return this._diffEditors[editorId] || null; } - listDiffEditors(): ICommonDiffEditor[] { + listDiffEditors(): IDiffEditor[] { return Object.keys(this._diffEditors).map(id => this._diffEditors[id]); } - getFocusedCodeEditor(): ICommonCodeEditor { - let editorWithWidgetFocus: ICommonCodeEditor = null; + getFocusedCodeEditor(): ICodeEditor { + let editorWithWidgetFocus: ICodeEditor = null; let editors = this.listCodeEditors(); for (let i = 0; i < editors.length; i++) { diff --git a/src/vs/editor/common/services/codeEditorService.ts b/src/vs/editor/browser/services/codeEditorService.ts similarity index 60% rename from src/vs/editor/common/services/codeEditorService.ts rename to src/vs/editor/browser/services/codeEditorService.ts index e6c6b2f6bec..bf83455501e 100644 --- a/src/vs/editor/common/services/codeEditorService.ts +++ b/src/vs/editor/browser/services/codeEditorService.ts @@ -6,34 +6,35 @@ import Event from 'vs/base/common/event'; import { createDecorator } from 'vs/platform/instantiation/common/instantiation'; -import { ICommonCodeEditor, ICommonDiffEditor, isCommonCodeEditor, isCommonDiffEditor, IDecorationRenderOptions, IModelDecorationOptions, IModel } from 'vs/editor/common/editorCommon'; +import { isCommonCodeEditor, isCommonDiffEditor, IDecorationRenderOptions, IModelDecorationOptions, IModel } from 'vs/editor/common/editorCommon'; import { IEditor } from 'vs/platform/editor/common/editor'; +import { ICodeEditor, IDiffEditor } from 'vs/editor/browser/editorBrowser'; -export var ICodeEditorService = createDecorator('codeEditorService'); +export const ICodeEditorService = createDecorator('codeEditorService'); export interface ICodeEditorService { _serviceBrand: any; - onCodeEditorAdd: Event; - onCodeEditorRemove: Event; + onCodeEditorAdd: Event; + onCodeEditorRemove: Event; - onDiffEditorAdd: Event; - onDiffEditorRemove: Event; + onDiffEditorAdd: Event; + onDiffEditorRemove: Event; - addCodeEditor(editor: ICommonCodeEditor): void; - removeCodeEditor(editor: ICommonCodeEditor): void; - getCodeEditor(editorId: string): ICommonCodeEditor; - listCodeEditors(): ICommonCodeEditor[]; + addCodeEditor(editor: ICodeEditor): void; + removeCodeEditor(editor: ICodeEditor): void; + getCodeEditor(editorId: string): ICodeEditor; + listCodeEditors(): ICodeEditor[]; - addDiffEditor(editor: ICommonDiffEditor): void; - removeDiffEditor(editor: ICommonDiffEditor): void; - getDiffEditor(editorId: string): ICommonDiffEditor; - listDiffEditors(): ICommonDiffEditor[]; + addDiffEditor(editor: IDiffEditor): void; + removeDiffEditor(editor: IDiffEditor): void; + getDiffEditor(editorId: string): IDiffEditor; + listDiffEditors(): IDiffEditor[]; /** * Returns the current focused code editor (if the focus is in the editor or in an editor widget) or null. */ - getFocusedCodeEditor(): ICommonCodeEditor; + getFocusedCodeEditor(): ICodeEditor; registerDecorationType(key: string, options: IDecorationRenderOptions, parentTypeKey?: string): void; removeDecorationType(key: string): void; @@ -46,20 +47,20 @@ export interface ICodeEditorService { /** * Uses `editor.getControl()` and returns either a `codeEditor` or a `diffEditor` or nothing. */ -export function getCodeOrDiffEditor(editor: IEditor): { codeEditor: ICommonCodeEditor; diffEditor: ICommonDiffEditor } { +export function getCodeOrDiffEditor(editor: IEditor): { codeEditor: ICodeEditor; diffEditor: IDiffEditor } { if (editor) { let control = editor.getControl(); if (control) { if (isCommonCodeEditor(control)) { return { - codeEditor: control, + codeEditor: control, diffEditor: null }; } if (isCommonDiffEditor(control)) { return { codeEditor: null, - diffEditor: control + diffEditor: control }; } } @@ -74,7 +75,7 @@ export function getCodeOrDiffEditor(editor: IEditor): { codeEditor: ICommonCodeE /** * Uses `editor.getControl()` and returns either the code editor, or the modified editor of a diff editor or nothing. */ -export function getCodeEditor(editor: IEditor): ICommonCodeEditor { +export function getCodeEditor(editor: IEditor): ICodeEditor { let r = getCodeOrDiffEditor(editor); - return r.codeEditor || (r.diffEditor && r.diffEditor.getModifiedEditor()) || null; + return r.codeEditor || (r.diffEditor && r.diffEditor.getModifiedEditor()) || null; } diff --git a/src/vs/editor/browser/services/codeEditorServiceImpl.ts b/src/vs/editor/browser/services/codeEditorServiceImpl.ts index 35f14e0b0e4..952ae5139fa 100644 --- a/src/vs/editor/browser/services/codeEditorServiceImpl.ts +++ b/src/vs/editor/browser/services/codeEditorServiceImpl.ts @@ -11,7 +11,7 @@ import { IDecorationRenderOptions, IModelDecorationOptions, IModelDecorationOverviewRulerOptions, IThemeDecorationRenderOptions, IContentDecorationRenderOptions, OverviewRulerLane, TrackedRangeStickiness, isThemeColor } from 'vs/editor/common/editorCommon'; -import { AbstractCodeEditorService } from 'vs/editor/common/services/abstractCodeEditorService'; +import { AbstractCodeEditorService } from 'vs/editor/browser/services/abstractCodeEditorService'; import { IDisposable, dispose as disposeAll } from 'vs/base/common/lifecycle'; import { IThemeService, ITheme, ThemeColor } from 'vs/platform/theme/common/themeService'; diff --git a/src/vs/editor/browser/widget/codeEditorWidget.ts b/src/vs/editor/browser/widget/codeEditorWidget.ts index 40495dc3b35..07475cad86a 100644 --- a/src/vs/editor/browser/widget/codeEditorWidget.ts +++ b/src/vs/editor/browser/widget/codeEditorWidget.ts @@ -17,7 +17,7 @@ import { CommonEditorConfiguration } from 'vs/editor/common/config/commonEditorC import { Range } from 'vs/editor/common/core/range'; import * as editorCommon from 'vs/editor/common/editorCommon'; import { EditorAction, EditorExtensionsRegistry, IEditorContributionCtor } from 'vs/editor/browser/editorExtensions'; -import { ICodeEditorService } from 'vs/editor/common/services/codeEditorService'; +import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService'; import { Configuration } from 'vs/editor/browser/config/configuration'; import * as editorBrowser from 'vs/editor/browser/editorBrowser'; import { View, IOverlayWidgetData, IContentWidgetData } from 'vs/editor/browser/view/viewImpl'; diff --git a/src/vs/editor/browser/widget/diffEditorWidget.ts b/src/vs/editor/browser/widget/diffEditorWidget.ts index 8cfbae34535..c40c6e1eab7 100644 --- a/src/vs/editor/browser/widget/diffEditorWidget.ts +++ b/src/vs/editor/browser/widget/diffEditorWidget.ts @@ -16,7 +16,7 @@ import { FastDomNode, createFastDomNode } from 'vs/base/browser/fastDomNode'; import { ISashEvent, IVerticalSashLayoutProvider, Sash } from 'vs/base/browser/ui/sash/sash'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey'; -import { ICodeEditorService } from 'vs/editor/common/services/codeEditorService'; +import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService'; import { Range, IRange } from 'vs/editor/common/core/range'; import * as editorCommon from 'vs/editor/common/editorCommon'; import { IEditorWorkerService } from 'vs/editor/common/services/editorWorkerService'; @@ -2056,4 +2056,4 @@ registerThemingParticipant((theme, collector) => { if (shadow) { collector.addRule(`.monaco-diff-editor.side-by-side .editor.modified { box-shadow: -6px 0 5px -5px ${shadow}; }`); } -}); \ No newline at end of file +}); diff --git a/src/vs/editor/browser/widget/diffReview.ts b/src/vs/editor/browser/widget/diffReview.ts index 9bd5ce5a6ef..b8c99ab4568 100644 --- a/src/vs/editor/browser/widget/diffReview.ts +++ b/src/vs/editor/browser/widget/diffReview.ts @@ -26,7 +26,7 @@ import { ActionBar } from 'vs/base/browser/ui/actionbar/actionbar'; import { Action } from 'vs/base/common/actions'; import { registerEditorAction, EditorAction, ServicesAccessor } from 'vs/editor/browser/editorExtensions'; import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey'; -import { ICodeEditorService } from 'vs/editor/common/services/codeEditorService'; +import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService'; const DIFF_LINES_PADDING = 3; diff --git a/src/vs/editor/browser/widget/embeddedCodeEditorWidget.ts b/src/vs/editor/browser/widget/embeddedCodeEditorWidget.ts index 050937ddb51..e1761f3b3e6 100644 --- a/src/vs/editor/browser/widget/embeddedCodeEditorWidget.ts +++ b/src/vs/editor/browser/widget/embeddedCodeEditorWidget.ts @@ -8,7 +8,7 @@ import * as objects from 'vs/base/common/objects'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; import { ICommandService } from 'vs/platform/commands/common/commands'; import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey'; -import { ICodeEditorService } from 'vs/editor/common/services/codeEditorService'; +import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService'; import { ICodeEditor } from 'vs/editor/browser/editorBrowser'; import { CodeEditor } from 'vs/editor/browser/codeEditor'; import { IConfigurationChangedEvent, IEditorOptions, IDiffEditorOptions } from 'vs/editor/common/config/editorOptions'; @@ -98,4 +98,4 @@ export class EmbeddedDiffEditorWidget extends DiffEditorWidget { objects.mixin(this._overwriteOptions, newOptions, true); super.updateOptions(this._overwriteOptions); } -} \ No newline at end of file +} diff --git a/src/vs/editor/contrib/clipboard/clipboard.ts b/src/vs/editor/contrib/clipboard/clipboard.ts index d909ea54ee0..a0bd765318a 100644 --- a/src/vs/editor/contrib/clipboard/clipboard.ts +++ b/src/vs/editor/contrib/clipboard/clipboard.ts @@ -11,7 +11,7 @@ import { KeyCode, KeyMod } from 'vs/base/common/keyCodes'; import * as browser from 'vs/base/browser/browser'; import * as platform from 'vs/base/common/platform'; import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation'; -import { ICodeEditorService } from 'vs/editor/common/services/codeEditorService'; +import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService'; import * as editorCommon from 'vs/editor/common/editorCommon'; import { registerEditorAction, IActionOptions, EditorAction, ICommandKeybindingsOptions } from 'vs/editor/browser/editorExtensions'; import { CopyOptions } from 'vs/editor/browser/controller/textAreaInput'; diff --git a/src/vs/editor/contrib/colorPicker/colorDetector.ts b/src/vs/editor/contrib/colorPicker/colorDetector.ts index 81c2f2428c2..b8033f8c051 100644 --- a/src/vs/editor/contrib/colorPicker/colorDetector.ts +++ b/src/vs/editor/contrib/colorPicker/colorDetector.ts @@ -13,7 +13,7 @@ import { ICodeEditor } from 'vs/editor/browser/editorBrowser'; import { Range } from 'vs/editor/common/core/range'; import { Position } from 'vs/editor/common/core/position'; import { ColorProviderRegistry } from 'vs/editor/common/modes'; -import { ICodeEditorService } from 'vs/editor/common/services/codeEditorService'; +import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService'; import { getColors, IColorData } from 'vs/editor/contrib/colorPicker/color'; import { IConfigurationService } from 'vs/platform/configuration/common/configuration'; diff --git a/src/vs/editor/contrib/format/formatActions.ts b/src/vs/editor/contrib/format/formatActions.ts index d98f454c802..d49581b655f 100644 --- a/src/vs/editor/contrib/format/formatActions.ts +++ b/src/vs/editor/contrib/format/formatActions.ts @@ -16,7 +16,7 @@ import { OnTypeFormattingEditProviderRegistry, DocumentRangeFormattingEditProvid import { getOnTypeFormattingEdits, getDocumentFormattingEdits, getDocumentRangeFormattingEdits, NoProviderError } from 'vs/editor/contrib/format/format'; import { EditOperationsCommand } from 'vs/editor/contrib/format/formatCommand'; import { CommandsRegistry } from 'vs/platform/commands/common/commands'; -import { ICodeEditorService } from 'vs/editor/common/services/codeEditorService'; +import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService'; import { IEditorWorkerService } from 'vs/editor/common/services/editorWorkerService'; import { CharacterSet } from 'vs/editor/common/core/characterClassifier'; import { Range } from 'vs/editor/common/core/range'; diff --git a/src/vs/editor/contrib/referenceSearch/peekViewWidget.ts b/src/vs/editor/contrib/referenceSearch/peekViewWidget.ts index 09fa772ec81..ff0bac4b83b 100644 --- a/src/vs/editor/contrib/referenceSearch/peekViewWidget.ts +++ b/src/vs/editor/contrib/referenceSearch/peekViewWidget.ts @@ -16,7 +16,7 @@ import * as dom from 'vs/base/browser/dom'; import { ActionBar, IActionBarOptions } from 'vs/base/browser/ui/actionbar/actionbar'; import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation'; import { ICommonCodeEditor } from 'vs/editor/common/editorCommon'; -import { ICodeEditorService } from 'vs/editor/common/services/codeEditorService'; +import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService'; import { ICodeEditor } from 'vs/editor/browser/editorBrowser'; import { IOptions, ZoneWidget, IStyles } from 'vs/editor/contrib/zoneWidget/zoneWidget'; import { EmbeddedCodeEditorWidget } from 'vs/editor/browser/widget/embeddedCodeEditorWidget'; diff --git a/src/vs/editor/standalone/browser/standaloneCodeEditor.ts b/src/vs/editor/standalone/browser/standaloneCodeEditor.ts index bb23be19f3c..aa4b7ca7a9a 100644 --- a/src/vs/editor/standalone/browser/standaloneCodeEditor.ts +++ b/src/vs/editor/standalone/browser/standaloneCodeEditor.ts @@ -13,7 +13,7 @@ import { CommandsRegistry, ICommandService, ICommandHandler } from 'vs/platform/ import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding'; import { ContextKeyExpr, IContextKey, IContextKeyService } from 'vs/platform/contextkey/common/contextkey'; import { IActionDescriptor, IModel, IModelChangedEvent } from 'vs/editor/common/editorCommon'; -import { ICodeEditorService } from 'vs/editor/common/services/codeEditorService'; +import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService'; import { IEditorWorkerService } from 'vs/editor/common/services/editorWorkerService'; import { StandaloneKeybindingService } from 'vs/editor/standalone/browser/simpleServices'; import { IEditorContextViewService } from 'vs/editor/standalone/browser/standaloneServices'; diff --git a/src/vs/editor/standalone/browser/standaloneEditor.ts b/src/vs/editor/standalone/browser/standaloneEditor.ts index 7d9f5184fdc..f09e6397d9a 100644 --- a/src/vs/editor/standalone/browser/standaloneEditor.ts +++ b/src/vs/editor/standalone/browser/standaloneEditor.ts @@ -27,7 +27,7 @@ import { IContextViewService } from 'vs/platform/contextview/browser/contextView import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding'; import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey'; -import { ICodeEditorService } from 'vs/editor/common/services/codeEditorService'; +import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService'; import { IEditorWorkerService } from 'vs/editor/common/services/editorWorkerService'; import { ITextModelService } from 'vs/editor/common/services/resolverService'; import { NULL_STATE, nullTokenize } from 'vs/editor/common/modes/nullMode'; diff --git a/src/vs/editor/standalone/browser/standaloneServices.ts b/src/vs/editor/standalone/browser/standaloneServices.ts index c219b2f8e22..8071e7863ea 100644 --- a/src/vs/editor/standalone/browser/standaloneServices.ts +++ b/src/vs/editor/standalone/browser/standaloneServices.ts @@ -22,7 +22,7 @@ import { IProgressService } from 'vs/platform/progress/common/progress'; import { IStorageService, NullStorageService } from 'vs/platform/storage/common/storage'; import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry'; import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace'; -import { ICodeEditorService } from 'vs/editor/common/services/codeEditorService'; +import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService'; import { IEditorWorkerService } from 'vs/editor/common/services/editorWorkerService'; import { EditorWorkerServiceImpl } from 'vs/editor/common/services/editorWorkerServiceImpl'; import { ITextResourceConfigurationService } from 'vs/editor/common/services/resourceConfiguration'; diff --git a/src/vs/editor/test/common/mocks/mockCodeEditorService.ts b/src/vs/editor/test/browser/testCodeEditorService.ts similarity index 82% rename from src/vs/editor/test/common/mocks/mockCodeEditorService.ts rename to src/vs/editor/test/browser/testCodeEditorService.ts index 867c0855794..09e4216e2ad 100644 --- a/src/vs/editor/test/common/mocks/mockCodeEditorService.ts +++ b/src/vs/editor/test/browser/testCodeEditorService.ts @@ -5,9 +5,9 @@ 'use strict'; import { IDecorationRenderOptions, IModelDecorationOptions } from 'vs/editor/common/editorCommon'; -import { AbstractCodeEditorService } from 'vs/editor/common/services/abstractCodeEditorService'; +import { AbstractCodeEditorService } from 'vs/editor/browser/services/abstractCodeEditorService'; -export class MockCodeEditorService extends AbstractCodeEditorService { +export class TestCodeEditorService extends AbstractCodeEditorService { public registerDecorationType(key: string, options: IDecorationRenderOptions, parentTypeKey?: string): void { } public removeDecorationType(key: string): void { } public resolveDecorationOptions(decorationTypeKey: string, writable: boolean): IModelDecorationOptions { return null; } diff --git a/src/vs/workbench/api/electron-browser/mainThreadDocumentContentProviders.ts b/src/vs/workbench/api/electron-browser/mainThreadDocumentContentProviders.ts index 2cbcc834311..ffc9644d266 100644 --- a/src/vs/workbench/api/electron-browser/mainThreadDocumentContentProviders.ts +++ b/src/vs/workbench/api/electron-browser/mainThreadDocumentContentProviders.ts @@ -8,7 +8,7 @@ import URI from 'vs/base/common/uri'; import { IDisposable } from 'vs/base/common/lifecycle'; import { TPromise } from 'vs/base/common/winjs.base'; import { IModel } from 'vs/editor/common/editorCommon'; -import { ICodeEditorService } from 'vs/editor/common/services/codeEditorService'; +import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService'; import { IEditorGroupService } from 'vs/workbench/services/group/common/groupService'; import { MainThreadDocumentContentProvidersShape, ExtHostContext, ExtHostDocumentContentProvidersShape, MainContext, IExtHostContext } from '../node/extHost.protocol'; import { ITextSource } from 'vs/editor/common/model/textSource'; diff --git a/src/vs/workbench/api/electron-browser/mainThreadDocumentsAndEditors.ts b/src/vs/workbench/api/electron-browser/mainThreadDocumentsAndEditors.ts index be7ea0e06c6..90a5d6315ec 100644 --- a/src/vs/workbench/api/electron-browser/mainThreadDocumentsAndEditors.ts +++ b/src/vs/workbench/api/electron-browser/mainThreadDocumentsAndEditors.ts @@ -7,7 +7,7 @@ import { IModelService } from 'vs/editor/common/services/modelService'; import { IModel, ICommonCodeEditor, isCommonCodeEditor, isCommonDiffEditor } from 'vs/editor/common/editorCommon'; import { IDisposable, dispose } from 'vs/base/common/lifecycle'; -import { ICodeEditorService } from 'vs/editor/common/services/codeEditorService'; +import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService'; import Event, { Emitter } from 'vs/base/common/event'; import { ExtHostContext, ExtHostDocumentsAndEditorsShape, IModelAddedData, ITextEditorAddData, IDocumentsAndEditorsDelta, IExtHostContext, MainContext } from '../node/extHost.protocol'; import { MainThreadTextEditor } from './mainThreadEditor'; diff --git a/src/vs/workbench/api/electron-browser/mainThreadEditors.ts b/src/vs/workbench/api/electron-browser/mainThreadEditors.ts index eb1b487da37..115bbc42c56 100644 --- a/src/vs/workbench/api/electron-browser/mainThreadEditors.ts +++ b/src/vs/workbench/api/electron-browser/mainThreadEditors.ts @@ -9,7 +9,7 @@ import { IDisposable, dispose } from 'vs/base/common/lifecycle'; import { disposed } from 'vs/base/common/errors'; import { TPromise } from 'vs/base/common/winjs.base'; import { ISingleEditOperation, IDecorationRenderOptions, IDecorationOptions, ILineChange, ICommonCodeEditor, isCommonCodeEditor } from 'vs/editor/common/editorCommon'; -import { ICodeEditorService } from 'vs/editor/common/services/codeEditorService'; +import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService'; import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/editorService'; import { IEditorGroupService } from 'vs/workbench/services/group/common/groupService'; import { Position as EditorPosition, ITextEditorOptions } from 'vs/platform/editor/common/editor'; diff --git a/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.ts b/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.ts index 82e964f6a87..a5944a95afa 100644 --- a/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.ts +++ b/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.ts @@ -8,7 +8,7 @@ import { TPromise } from 'vs/base/common/winjs.base'; import { sequence } from 'vs/base/common/async'; import * as strings from 'vs/base/common/strings'; -import { ICodeEditorService } from 'vs/editor/common/services/codeEditorService'; +import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService'; import { ISaveParticipant, ITextFileEditorModel, SaveReason } from 'vs/workbench/services/textfile/common/textfiles'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry'; diff --git a/src/vs/workbench/browser/parts/editor/editorActions.ts b/src/vs/workbench/browser/parts/editor/editorActions.ts index 7dce52b6198..678406a897a 100644 --- a/src/vs/workbench/browser/parts/editor/editorActions.ts +++ b/src/vs/workbench/browser/parts/editor/editorActions.ts @@ -8,7 +8,7 @@ import { TPromise } from 'vs/base/common/winjs.base'; import nls = require('vs/nls'); import { Action } from 'vs/base/common/actions'; import { mixin } from 'vs/base/common/objects'; -import { getCodeEditor } from 'vs/editor/common/services/codeEditorService'; +import { getCodeEditor } from 'vs/editor/browser/services/codeEditorService'; import { EditorInput, TextEditorOptions, EditorOptions, IEditorIdentifier, IEditorContext, ActiveEditorMoveArguments, ActiveEditorMovePositioning, EditorCommands, ConfirmResult } from 'vs/workbench/common/editor'; import { QuickOpenEntryGroup } from 'vs/base/parts/quickopen/browser/quickOpenModel'; import { EditorQuickOpenEntry, EditorQuickOpenEntryGroup, IEditorQuickOpenEntry, QuickOpenAction } from 'vs/workbench/browser/quickopen'; diff --git a/src/vs/workbench/browser/parts/editor/editorGroupsControl.ts b/src/vs/workbench/browser/parts/editor/editorGroupsControl.ts index 7dd9f702394..a9ed3813069 100644 --- a/src/vs/workbench/browser/parts/editor/editorGroupsControl.ts +++ b/src/vs/workbench/browser/parts/editor/editorGroupsControl.ts @@ -32,7 +32,7 @@ import { NoTabsTitleControl } from 'vs/workbench/browser/parts/editor/noTabsTitl import { IEditorStacksModel, IStacksModelChangeEvent, IEditorGroup, EditorOptions, TextEditorOptions, IEditorIdentifier } from 'vs/workbench/common/editor'; import { extractResources } from 'vs/workbench/browser/editor'; import { IWindowService, IWindowsService } from 'vs/platform/windows/common/windows'; -import { getCodeEditor } from 'vs/editor/common/services/codeEditorService'; +import { getCodeEditor } from 'vs/editor/browser/services/codeEditorService'; import { IThemeService } from 'vs/platform/theme/common/themeService'; import { editorBackground, contrastBorder, activeContrastBorder } from 'vs/platform/theme/common/colorRegistry'; import { Themable, EDITOR_GROUP_HEADER_TABS_BACKGROUND, EDITOR_GROUP_HEADER_NO_TABS_BACKGROUND, EDITOR_GROUP_BORDER, EDITOR_DRAG_AND_DROP_BACKGROUND, EDITOR_GROUP_BACKGROUND, EDITOR_GROUP_HEADER_TABS_BORDER } from 'vs/workbench/common/theme'; diff --git a/src/vs/workbench/browser/parts/editor/editorPart.ts b/src/vs/workbench/browser/parts/editor/editorPart.ts index 14575627faa..b95e873d4bd 100644 --- a/src/vs/workbench/browser/parts/editor/editorPart.ts +++ b/src/vs/workbench/browser/parts/editor/editorPart.ts @@ -16,7 +16,7 @@ import arrays = require('vs/base/common/arrays'); import types = require('vs/base/common/types'); import errors = require('vs/base/common/errors'); import * as objects from 'vs/base/common/objects'; -import { getCodeEditor } from 'vs/editor/common/services/codeEditorService'; +import { getCodeEditor } from 'vs/editor/browser/services/codeEditorService'; import { toErrorMessage } from 'vs/base/common/errorMessage'; import { Scope as MementoScope } from 'vs/workbench/common/memento'; import { Part } from 'vs/workbench/browser/part'; @@ -1610,4 +1610,4 @@ export class EditorPart extends Part implements IEditorPart, IEditorGroupService private hasGroup(position: Position): boolean { return !!this.stacks.groupAt(position); } -} \ No newline at end of file +} diff --git a/src/vs/workbench/browser/parts/editor/editorStatus.ts b/src/vs/workbench/browser/parts/editor/editorStatus.ts index 0cd0f0cac28..ba0eca9f0c0 100644 --- a/src/vs/workbench/browser/parts/editor/editorStatus.ts +++ b/src/vs/workbench/browser/parts/editor/editorStatus.ts @@ -43,7 +43,7 @@ import { TabFocus } from 'vs/editor/common/config/commonEditorConfig'; import { ICommandService } from 'vs/platform/commands/common/commands'; import { IExtensionGalleryService } from 'vs/platform/extensionManagement/common/extensionManagement'; import { ITextFileService } from 'vs/workbench/services/textfile/common/textfiles'; -import { getCodeEditor as getEditorWidget, getCodeOrDiffEditor } from 'vs/editor/common/services/codeEditorService'; +import { getCodeEditor as getEditorWidget, getCodeOrDiffEditor } from 'vs/editor/browser/services/codeEditorService'; import { ICursorPositionChangedEvent } from 'vs/editor/common/controller/cursorEvents'; import { IConfigurationChangedEvent, IEditorOptions } from 'vs/editor/common/config/editorOptions'; import { ITextResourceConfigurationService } from 'vs/editor/common/services/resourceConfiguration'; diff --git a/src/vs/workbench/browser/parts/editor/textEditor.ts b/src/vs/workbench/browser/parts/editor/textEditor.ts index dc250322285..622f690d6da 100644 --- a/src/vs/workbench/browser/parts/editor/textEditor.ts +++ b/src/vs/workbench/browser/parts/editor/textEditor.ts @@ -23,7 +23,7 @@ import { IInstantiationService } from 'vs/platform/instantiation/common/instanti import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry'; import { IThemeService } from 'vs/platform/theme/common/themeService'; import { Scope } from 'vs/workbench/common/memento'; -import { getCodeEditor } from 'vs/editor/common/services/codeEditorService'; +import { getCodeEditor } from 'vs/editor/browser/services/codeEditorService'; import { ITextFileService, SaveReason, AutoSaveMode } from 'vs/workbench/services/textfile/common/textfiles'; import { ITextResourceConfigurationService } from 'vs/editor/common/services/resourceConfiguration'; import { IEditorGroupService } from 'vs/workbench/services/group/common/groupService'; diff --git a/src/vs/workbench/browser/parts/statusbar/statusbarPart.ts b/src/vs/workbench/browser/parts/statusbar/statusbarPart.ts index 011fb2a1548..3b34b1cb77b 100644 --- a/src/vs/workbench/browser/parts/statusbar/statusbarPart.ts +++ b/src/vs/workbench/browser/parts/statusbar/statusbarPart.ts @@ -22,7 +22,7 @@ import { IInstantiationService } from 'vs/platform/instantiation/common/instanti import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry'; import { IMessageService, Severity } from 'vs/platform/message/common/message'; import { IStatusbarService, IStatusbarEntry } from 'vs/platform/statusbar/common/statusbar'; -import { getCodeEditor } from 'vs/editor/common/services/codeEditorService'; +import { getCodeEditor } from 'vs/editor/browser/services/codeEditorService'; import { IContextMenuService } from 'vs/platform/contextview/browser/contextView'; import { Action } from 'vs/base/common/actions'; import { IThemeService, registerThemingParticipant, ITheme, ICssStyleCollector } from 'vs/platform/theme/common/themeService'; diff --git a/src/vs/workbench/electron-browser/shell.ts b/src/vs/workbench/electron-browser/shell.ts index 6e281cbc3b5..60cc8295f4a 100644 --- a/src/vs/workbench/electron-browser/shell.ts +++ b/src/vs/workbench/electron-browser/shell.ts @@ -43,7 +43,7 @@ import { MarkerService } from 'vs/platform/markers/common/markerService'; import { IModelService } from 'vs/editor/common/services/modelService'; import { ModelServiceImpl } from 'vs/editor/common/services/modelServiceImpl'; import { CodeEditorServiceImpl } from 'vs/editor/browser/services/codeEditorServiceImpl'; -import { ICodeEditorService } from 'vs/editor/common/services/codeEditorService'; +import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService'; import { IntegrityServiceImpl } from 'vs/platform/integrity/node/integrityServiceImpl'; import { IIntegrityService } from 'vs/platform/integrity/common/integrity'; import { EditorWorkerServiceImpl } from 'vs/editor/common/services/editorWorkerServiceImpl'; diff --git a/src/vs/workbench/parts/codeEditor/electron-browser/toggleWordWrap.ts b/src/vs/workbench/parts/codeEditor/electron-browser/toggleWordWrap.ts index cb31d345adc..95b8853988f 100644 --- a/src/vs/workbench/parts/codeEditor/electron-browser/toggleWordWrap.ts +++ b/src/vs/workbench/parts/codeEditor/electron-browser/toggleWordWrap.ts @@ -9,7 +9,7 @@ import * as nls from 'vs/nls'; import { KeyCode, KeyMod } from 'vs/base/common/keyCodes'; import { ICommonCodeEditor, IEditorContribution, IModel } from 'vs/editor/common/editorCommon'; import { registerEditorAction, ServicesAccessor, EditorAction, registerEditorContribution } from 'vs/editor/browser/editorExtensions'; -import { ICodeEditorService } from 'vs/editor/common/services/codeEditorService'; +import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService'; import { MenuRegistry, MenuId } from 'vs/platform/actions/common/actions'; import { ContextKeyExpr, IContextKeyService } from 'vs/platform/contextkey/common/contextkey'; import { Disposable } from 'vs/base/common/lifecycle'; diff --git a/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.ts b/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.ts index aa19d6e828a..33e09d2ace5 100644 --- a/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.ts +++ b/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.ts @@ -20,7 +20,7 @@ import { DEFAULT_WORD_REGEXP } from 'vs/editor/common/model/wordHelper'; import { ICodeEditor, IEditorMouseEvent, MouseTargetType } from 'vs/editor/browser/editorBrowser'; import { registerEditorContribution } from 'vs/editor/browser/editorExtensions'; import { IDecorationOptions, IModelDecorationOptions, IModelDeltaDecoration, TrackedRangeStickiness } from 'vs/editor/common/editorCommon'; -import { ICodeEditorService } from 'vs/editor/common/services/codeEditorService'; +import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService'; import { Range } from 'vs/editor/common/core/range'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry'; diff --git a/src/vs/workbench/parts/debug/electron-browser/replEditor.ts b/src/vs/workbench/parts/debug/electron-browser/replEditor.ts index a7d1ebe8338..e73098c24ad 100644 --- a/src/vs/workbench/parts/debug/electron-browser/replEditor.ts +++ b/src/vs/workbench/parts/debug/electron-browser/replEditor.ts @@ -5,7 +5,7 @@ import { IEditorOptions } from 'vs/editor/common/config/editorOptions'; import { EditorAction, EditorExtensionsRegistry, IEditorContributionCtor } from 'vs/editor/browser/editorExtensions'; -import { ICodeEditorService } from 'vs/editor/common/services/codeEditorService'; +import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService'; import { CodeEditorWidget } from 'vs/editor/browser/widget/codeEditorWidget'; import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; diff --git a/src/vs/workbench/parts/files/browser/fileActions.ts b/src/vs/workbench/parts/files/browser/fileActions.ts index 2efaf66b2ef..e3b93228d13 100644 --- a/src/vs/workbench/parts/files/browser/fileActions.ts +++ b/src/vs/workbench/parts/files/browser/fileActions.ts @@ -41,7 +41,7 @@ import { Position, IResourceInput, IUntitledResourceInput } from 'vs/platform/ed import { IInstantiationService, IConstructorSignature2, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation'; import { IMessageService, IMessageWithAction, IConfirmation, Severity, CancelAction, IConfirmationResult } from 'vs/platform/message/common/message'; import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace'; -import { getCodeEditor } from 'vs/editor/common/services/codeEditorService'; +import { getCodeEditor } from 'vs/editor/browser/services/codeEditorService'; import { IEditorViewState } from 'vs/editor/common/editorCommon'; import { IBackupFileService } from 'vs/workbench/services/backup/common/backup'; import { IWindowsService } from 'vs/platform/windows/common/windows'; diff --git a/src/vs/workbench/parts/preferences/browser/preferencesEditor.ts b/src/vs/workbench/parts/preferences/browser/preferencesEditor.ts index 61cd5d3e9c0..7525e3122ec 100644 --- a/src/vs/workbench/parts/preferences/browser/preferencesEditor.ts +++ b/src/vs/workbench/parts/preferences/browser/preferencesEditor.ts @@ -45,7 +45,7 @@ import { Widget } from 'vs/base/browser/ui/widget'; import { IPreferencesRenderer, DefaultSettingsRenderer, UserSettingsRenderer, WorkspaceSettingsRenderer, FolderSettingsRenderer } from 'vs/workbench/parts/preferences/browser/preferencesRenderers'; import { ITextFileService } from 'vs/workbench/services/textfile/common/textfiles'; import { IEditorGroupService } from 'vs/workbench/services/group/common/groupService'; -import { getCodeEditor } from 'vs/editor/common/services/codeEditorService'; +import { getCodeEditor } from 'vs/editor/browser/services/codeEditorService'; import { IEditorRegistry, Extensions as EditorExtensions } from 'vs/workbench/browser/editor'; import { FoldingController } from 'vs/editor/contrib/folding/folding'; import { FindController } from 'vs/editor/contrib/find/findController'; diff --git a/src/vs/workbench/parts/preferences/browser/preferencesService.ts b/src/vs/workbench/parts/preferences/browser/preferencesService.ts index c9f691030ed..d5f032a82d5 100644 --- a/src/vs/workbench/parts/preferences/browser/preferencesService.ts +++ b/src/vs/workbench/parts/preferences/browser/preferencesService.ts @@ -31,7 +31,7 @@ import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry'; import { DefaultPreferencesEditorInput, PreferencesEditorInput } from 'vs/workbench/parts/preferences/browser/preferencesEditor'; import { KeybindingsEditorInput } from 'vs/workbench/parts/preferences/browser/keybindingsEditor'; import { ITextModelService } from 'vs/editor/common/services/resolverService'; -import { getCodeEditor } from 'vs/editor/common/services/codeEditorService'; +import { getCodeEditor } from 'vs/editor/browser/services/codeEditorService'; import { EditOperation } from 'vs/editor/common/core/editOperation'; import { Position, IPosition } from 'vs/editor/common/core/position'; import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding'; diff --git a/src/vs/workbench/parts/quickopen/browser/gotoLineHandler.ts b/src/vs/workbench/parts/quickopen/browser/gotoLineHandler.ts index 520766ae206..ddde848d692 100644 --- a/src/vs/workbench/parts/quickopen/browser/gotoLineHandler.ts +++ b/src/vs/workbench/parts/quickopen/browser/gotoLineHandler.ts @@ -16,7 +16,7 @@ import { IEditor, IModelDecorationsChangeAccessor, OverviewRulerLane, IModelDelt import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/editorService'; import { Position, IEditorInput, ITextEditorOptions } from 'vs/platform/editor/common/editor'; import { IQuickOpenService } from 'vs/platform/quickOpen/common/quickOpen'; -import { getCodeEditor } from 'vs/editor/common/services/codeEditorService'; +import { getCodeEditor } from 'vs/editor/browser/services/codeEditorService'; import { IRange } from 'vs/editor/common/core/range'; import { overviewRulerRangeHighlight } from 'vs/editor/common/view/editorColorRegistry'; import { themeColorFromId } from 'vs/platform/theme/common/themeService'; diff --git a/src/vs/workbench/parts/quickopen/browser/gotoSymbolHandler.ts b/src/vs/workbench/parts/quickopen/browser/gotoSymbolHandler.ts index dd215266269..8a750cf3cae 100644 --- a/src/vs/workbench/parts/quickopen/browser/gotoSymbolHandler.ts +++ b/src/vs/workbench/parts/quickopen/browser/gotoSymbolHandler.ts @@ -22,7 +22,7 @@ import { IQuickOpenService } from 'vs/platform/quickOpen/common/quickOpen'; import { Position, IEditorInput, ITextEditorOptions } from 'vs/platform/editor/common/editor'; import { getDocumentSymbols } from 'vs/editor/contrib/quickOpen/quickOpen'; import { DocumentSymbolProviderRegistry, SymbolInformation, symbolKindToCssClass } from 'vs/editor/common/modes'; -import { getCodeEditor } from 'vs/editor/common/services/codeEditorService'; +import { getCodeEditor } from 'vs/editor/browser/services/codeEditorService'; import { IRange } from 'vs/editor/common/core/range'; import { themeColorFromId } from 'vs/platform/theme/common/themeService'; import { overviewRulerRangeHighlight } from 'vs/editor/common/view/editorColorRegistry'; diff --git a/src/vs/workbench/parts/scm/electron-browser/dirtydiffDecorator.ts b/src/vs/workbench/parts/scm/electron-browser/dirtydiffDecorator.ts index 750e6caba99..bfa13c15a28 100644 --- a/src/vs/workbench/parts/scm/electron-browser/dirtydiffDecorator.ts +++ b/src/vs/workbench/parts/scm/electron-browser/dirtydiffDecorator.ts @@ -48,7 +48,7 @@ import { fillInActions, MenuItemActionItem } from 'vs/platform/actions/browser/m import { IChange, ICommonCodeEditor, IEditorModel, ScrollType, IEditorContribution, OverviewRulerLane, IModel } from 'vs/editor/common/editorCommon'; import { sortedDiff, Splice, firstIndex } from 'vs/base/common/arrays'; import { IMarginData } from 'vs/editor/browser/controller/mouseTarget'; -import { ICodeEditorService } from 'vs/editor/common/services/codeEditorService'; +import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService'; // TODO@Joao // Need to subclass MenuItemActionItem in order to respect diff --git a/src/vs/workbench/parts/search/browser/search.contribution.ts b/src/vs/workbench/parts/search/browser/search.contribution.ts index 90bd760ef88..3ae65459b2b 100644 --- a/src/vs/workbench/parts/search/browser/search.contribution.ts +++ b/src/vs/workbench/parts/search/browser/search.contribution.ts @@ -25,7 +25,7 @@ import { KeybindingsRegistry } from 'vs/platform/keybinding/common/keybindingsRe import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace'; import { IQuickOpenService } from 'vs/platform/quickOpen/common/quickOpen'; -import { ICodeEditorService } from 'vs/editor/common/services/codeEditorService'; +import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService'; import { getSelectionSearchString } from 'vs/editor/contrib/find/findController'; import { IViewletService } from 'vs/workbench/services/viewlet/browser/viewlet'; import { KeyMod, KeyCode } from 'vs/base/common/keyCodes'; diff --git a/src/vs/workbench/parts/terminal/electron-browser/terminalActions.ts b/src/vs/workbench/parts/terminal/electron-browser/terminalActions.ts index 3db89bc5d53..e1d7e318805 100644 --- a/src/vs/workbench/parts/terminal/electron-browser/terminalActions.ts +++ b/src/vs/workbench/parts/terminal/electron-browser/terminalActions.ts @@ -7,7 +7,7 @@ import * as nls from 'vs/nls'; import * as os from 'os'; import { Action, IAction } from 'vs/base/common/actions'; import { EndOfLinePreference } from 'vs/editor/common/editorCommon'; -import { ICodeEditorService } from 'vs/editor/common/services/codeEditorService'; +import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService'; import { ITerminalService, TERMINAL_PANEL_ID, ITerminalInstance } from 'vs/workbench/parts/terminal/common/terminal'; import { SelectActionItem } from 'vs/base/browser/ui/actionbar/actionbar'; import { TPromise } from 'vs/base/common/winjs.base'; @@ -785,4 +785,4 @@ export class RenameTerminalQuickOpenAction extends RenameTerminalAction { .then(result => this.quickOpenService.show(TERMINAL_PICKER_PREFIX, null)); return TPromise.as(null); } -} \ No newline at end of file +} diff --git a/src/vs/workbench/parts/welcome/walkThrough/electron-browser/walkThroughPart.ts b/src/vs/workbench/parts/welcome/walkThrough/electron-browser/walkThroughPart.ts index 2eb59c0b93d..c71f25381d4 100644 --- a/src/vs/workbench/parts/welcome/walkThrough/electron-browser/walkThroughPart.ts +++ b/src/vs/workbench/parts/welcome/walkThrough/electron-browser/walkThroughPart.ts @@ -31,7 +31,7 @@ import { IConfigurationService } from 'vs/platform/configuration/common/configur import { once } from 'vs/base/common/event'; import { isObject } from 'vs/base/common/types'; import { ICommandService, CommandsRegistry } from 'vs/platform/commands/common/commands'; -import { ICodeEditorService } from 'vs/editor/common/services/codeEditorService'; +import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService'; import { IEditorOptions } from 'vs/editor/common/config/editorOptions'; import { IMessageService, Severity } from 'vs/platform/message/common/message'; import { IThemeService, registerThemingParticipant } from 'vs/platform/theme/common/themeService'; @@ -622,4 +622,4 @@ registerThemingParticipant((theme, collector) => { if (quoteBorder) { collector.addRule(`.monaco-workbench > .part.editor > .content .walkThroughContent blockquote { border-color: ${quoteBorder}; }`); } -}); \ No newline at end of file +}); diff --git a/src/vs/workbench/services/history/browser/history.ts b/src/vs/workbench/services/history/browser/history.ts index adcd70dbd18..680e22f777b 100644 --- a/src/vs/workbench/services/history/browser/history.ts +++ b/src/vs/workbench/services/history/browser/history.ts @@ -24,7 +24,7 @@ import { once, debounceEvent } from 'vs/base/common/event'; import { IConfigurationService, IConfigurationChangeEvent } from 'vs/platform/configuration/common/configuration'; import { IEditorGroupService } from 'vs/workbench/services/group/common/groupService'; import { IWindowsService } from 'vs/platform/windows/common/windows'; -import { getCodeEditor } from 'vs/editor/common/services/codeEditorService'; +import { getCodeEditor } from 'vs/editor/browser/services/codeEditorService'; import { getExcludes, ISearchConfiguration } from 'vs/platform/search/common/search'; import { IExpression } from 'vs/base/common/glob'; import { ICursorPositionChangedEvent } from 'vs/editor/common/controller/cursorEvents'; diff --git a/src/vs/workbench/test/electron-browser/api/mainThreadDocumentsAndEditors.test.ts b/src/vs/workbench/test/electron-browser/api/mainThreadDocumentsAndEditors.test.ts index 520fd6faaa1..af278c6d952 100644 --- a/src/vs/workbench/test/electron-browser/api/mainThreadDocumentsAndEditors.test.ts +++ b/src/vs/workbench/test/electron-browser/api/mainThreadDocumentsAndEditors.test.ts @@ -10,7 +10,7 @@ import { MainThreadDocumentsAndEditors } from 'vs/workbench/api/electron-browser import { OneGetThreadService } from './testThreadService'; import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService'; import { ModelServiceImpl } from 'vs/editor/common/services/modelServiceImpl'; -import { MockCodeEditorService } from 'vs/editor/test/common/mocks/mockCodeEditorService'; +import { TestCodeEditorService } from 'vs/editor/test/browser/testCodeEditorService'; import { ITextFileService } from 'vs/workbench/services/textfile/common/textfiles'; import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/editorService'; import { ExtHostDocumentsAndEditorsShape, IDocumentsAndEditorsDelta } from 'vs/workbench/api/node/extHost.protocol'; @@ -22,7 +22,7 @@ import Event from 'vs/base/common/event'; suite('MainThreadDocumentsAndEditors', () => { let modelService: ModelServiceImpl; - let codeEditorService: MockCodeEditorService; + let codeEditorService: TestCodeEditorService; let textFileService: ITextFileService; let workbenchEditorService: IWorkbenchEditorService; let deltas: IDocumentsAndEditorsDelta[] = []; @@ -33,7 +33,7 @@ suite('MainThreadDocumentsAndEditors', () => { const configService = new TestConfigurationService(); configService.setUserConfiguration('editor', { 'detectIndentation': false }); modelService = new ModelServiceImpl(null, configService); - codeEditorService = new MockCodeEditorService(); + codeEditorService = new TestCodeEditorService(); textFileService = new class extends mock() { isDirty() { return false; } models = { diff --git a/src/vs/workbench/test/electron-browser/api/mainThreadEditors.test.ts b/src/vs/workbench/test/electron-browser/api/mainThreadEditors.test.ts index ab9454d1177..a9e24acbef3 100644 --- a/src/vs/workbench/test/electron-browser/api/mainThreadEditors.test.ts +++ b/src/vs/workbench/test/electron-browser/api/mainThreadEditors.test.ts @@ -10,7 +10,7 @@ import { MainThreadDocumentsAndEditors } from 'vs/workbench/api/electron-browser import { OneGetThreadService, TestThreadService } from './testThreadService'; import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService'; import { ModelServiceImpl } from 'vs/editor/common/services/modelServiceImpl'; -import { MockCodeEditorService } from 'vs/editor/test/common/mocks/mockCodeEditorService'; +import { TestCodeEditorService } from 'vs/editor/test/browser/testCodeEditorService'; import { ITextFileService } from 'vs/workbench/services/textfile/common/textfiles'; import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/editorService'; import { ExtHostDocumentsAndEditorsShape, IWorkspaceResourceEdit, ExtHostContext, ExtHostDocumentsShape } from 'vs/workbench/api/node/extHost.protocol'; @@ -34,7 +34,7 @@ suite('MainThreadEditors', () => { setup(() => { const configService = new TestConfigurationService(); modelService = new ModelServiceImpl(null, configService); - const codeEditorService = new MockCodeEditorService(); + const codeEditorService = new TestCodeEditorService(); const textFileService = new class extends mock() { isDirty() { return false; } models = {