Bring ICodeEditorService to /browser/ (#37834)

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';

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';

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;

src/vs/editor/common/services/abstractCodeEditorService.ts → 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<ICommonCodeEditor>;
-	private _onCodeEditorRemove: Emitter<ICommonCodeEditor>;
-	private _codeEditors: { [editorId: string]: ICommonCodeEditor; };
+	private _onCodeEditorAdd: Emitter<ICodeEditor>;
+	private _onCodeEditorRemove: Emitter<ICodeEditor>;
+	private _codeEditors: { [editorId: string]: ICodeEditor; };
 
-	private _onDiffEditorAdd: Emitter<ICommonDiffEditor>;
-	private _onDiffEditorRemove: Emitter<ICommonDiffEditor>;
-	private _diffEditors: { [editorId: string]: ICommonDiffEditor; };
+	private _onDiffEditorAdd: Emitter<IDiffEditor>;
+	private _onDiffEditorRemove: Emitter<IDiffEditor>;
+	private _diffEditors: { [editorId: string]: IDiffEditor; };
 
 	constructor() {
 		this._codeEditors = Object.create(null);
 		this._diffEditors = Object.create(null);
-		this._onCodeEditorAdd = new Emitter<ICommonCodeEditor>();
-		this._onCodeEditorRemove = new Emitter<ICommonCodeEditor>();
-		this._onDiffEditorAdd = new Emitter<ICommonDiffEditor>();
-		this._onDiffEditorRemove = new Emitter<ICommonDiffEditor>();
+		this._onCodeEditorAdd = new Emitter<ICodeEditor>();
+		this._onCodeEditorRemove = new Emitter<ICodeEditor>();
+		this._onDiffEditorAdd = new Emitter<IDiffEditor>();
+		this._onDiffEditorRemove = new Emitter<IDiffEditor>();
 	}
 
-	addCodeEditor(editor: ICommonCodeEditor): void {
+	addCodeEditor(editor: ICodeEditor): void {
 		this._codeEditors[editor.getId()] = editor;
 		this._onCodeEditorAdd.fire(editor);
 	}
 
-	get onCodeEditorAdd(): Event<ICommonCodeEditor> {
+	get onCodeEditorAdd(): Event<ICodeEditor> {
 		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<ICommonCodeEditor> {
+	get onCodeEditorRemove(): Event<ICodeEditor> {
 		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<ICommonDiffEditor> {
+	get onDiffEditorAdd(): Event<IDiffEditor> {
 		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<ICommonDiffEditor> {
+	get onDiffEditorRemove(): Event<IDiffEditor> {
 		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++) {

src/vs/editor/common/services/codeEditorService.ts → 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<ICodeEditorService>('codeEditorService');
+export const ICodeEditorService = createDecorator<ICodeEditorService>('codeEditorService');
 
 export interface ICodeEditorService {
 	_serviceBrand: any;
 
-	onCodeEditorAdd: Event<ICommonCodeEditor>;
-	onCodeEditorRemove: Event<ICommonCodeEditor>;
+	onCodeEditorAdd: Event<ICodeEditor>;
+	onCodeEditorRemove: Event<ICodeEditor>;
 
-	onDiffEditorAdd: Event<ICommonDiffEditor>;
-	onDiffEditorRemove: Event<ICommonDiffEditor>;
+	onDiffEditorAdd: Event<IDiffEditor>;
+	onDiffEditorRemove: Event<IDiffEditor>;
 
-	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: <ICodeEditor>control,
 					diffEditor: null
 				};
 			}
 			if (isCommonDiffEditor(control)) {
 				return {
 					codeEditor: null,
-					diffEditor: control
+					diffEditor: <IDiffEditor>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 && <ICodeEditor>r.diffEditor.getModifiedEditor()) || null;
 }

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';
 

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';

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}; }`);
 	}
-});
+});

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;
 

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);
 	}
-}
+}

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';

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';
 

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';

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';

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';

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';

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';

src/vs/editor/test/common/mocks/mockCodeEditorService.ts → 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; }