Move mockCodeEditor to /browser/ (#37834)

src/vs/editor/contrib/bracketMatching/test/bracketMatching.test.ts

@@ -5,7 +5,7 @@
 'use strict';
 
 import * as assert from 'assert';
-import { withMockCodeEditor } from 'vs/editor/test/common/mocks/mockCodeEditor';
+import { withMockCodeEditor } from 'vs/editor/test/browser/testCodeEditor';
 import { Position } from 'vs/editor/common/core/position';
 import { Model } from 'vs/editor/common/model/model';
 import { LanguageConfigurationRegistry } from 'vs/editor/common/modes/languageConfigurationRegistry';

src/vs/editor/contrib/caretOperations/test/moveCarretCommand.test.ts

@@ -6,7 +6,7 @@
 
 import { Selection } from 'vs/editor/common/core/selection';
 import { MoveCaretCommand } from 'vs/editor/contrib/caretOperations/common/moveCaretCommand';
-import { testCommand } from 'vs/editor/test/common/commands/commandTestUtils';
+import { testCommand } from 'vs/editor/test/browser/testCommand';
 
 
 function testMoveCaretLeftCommand(lines: string[], selection: Selection, expectedLines: string[], expectedSelection: Selection): void {
@@ -67,4 +67,4 @@ suite('Editor Contrib - Move Caret Command', () => {
 			new Selection(1, 5, 1, 7)
 		);
 	});
-});
+});

src/vs/editor/contrib/comment/test/blockCommentCommand.test.ts

@@ -6,7 +6,7 @@
 
 import { Selection } from 'vs/editor/common/core/selection';
 import { BlockCommentCommand } from 'vs/editor/contrib/comment/common/blockCommentCommand';
-import { testCommand } from 'vs/editor/test/common/commands/commandTestUtils';
+import { testCommand } from 'vs/editor/test/browser/testCommand';
 import { CommentMode } from 'vs/editor/test/common/commentMode';
 
 function testBlockCommentCommand(lines: string[], selection: Selection, expectedLines: string[], expectedSelection: Selection): void {

src/vs/editor/contrib/comment/test/lineCommentCommand.test.ts

@@ -7,7 +7,7 @@
 import * as assert from 'assert';
 import { Selection } from 'vs/editor/common/core/selection';
 import { ILinePreflightData, IPreflightData, ISimpleModel, LineCommentCommand, Type } from 'vs/editor/contrib/comment/common/lineCommentCommand';
-import { testCommand } from 'vs/editor/test/common/commands/commandTestUtils';
+import { testCommand } from 'vs/editor/test/browser/testCommand';
 import { CommentMode } from 'vs/editor/test/common/commentMode';
 import * as modes from 'vs/editor/common/modes';
 import { NULL_STATE } from 'vs/editor/common/modes/nullMode';

src/vs/editor/contrib/find/test/find.test.ts

@@ -8,7 +8,7 @@ import * as assert from 'assert';
 import { Position } from 'vs/editor/common/core/position';
 import { Range } from 'vs/editor/common/core/range';
 import { getSelectionSearchString } from 'vs/editor/contrib/find/common/find';
-import { withMockCodeEditor } from 'vs/editor/test/common/mocks/mockCodeEditor';
+import { withMockCodeEditor } from 'vs/editor/test/browser/testCodeEditor';
 
 
 suite('Find', () => {

src/vs/editor/contrib/find/test/findController.test.ts

@@ -13,7 +13,7 @@ import { Selection } from 'vs/editor/common/core/selection';
 import { Range } from 'vs/editor/common/core/range';
 import { ICommonCodeEditor } from 'vs/editor/common/editorCommon';
 import { CommonFindController, FindStartFocusAction, IFindStartOptions, NextMatchFindAction, StartFindAction } from 'vs/editor/contrib/find/common/findController';
-import { withMockCodeEditor } from 'vs/editor/test/common/mocks/mockCodeEditor';
+import { withMockCodeEditor } from 'vs/editor/test/browser/testCodeEditor';
 import { HistoryNavigator } from 'vs/base/common/history';
 import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
 import { IStorageService } from 'vs/platform/storage/common/storage';
@@ -466,4 +466,4 @@ suite('FindController query options persistence', () => {
 			findController.dispose();
 		});
 	});
-});
+});

src/vs/editor/contrib/find/test/findModel.test.ts

@@ -12,7 +12,7 @@ import { Range } from 'vs/editor/common/core/range';
 import { ICommonCodeEditor } from 'vs/editor/common/editorCommon';
 import { FindModelBoundToEditorModel } from 'vs/editor/contrib/find/common/findModel';
 import { FindReplaceState } from 'vs/editor/contrib/find/common/findState';
-import { withMockCodeEditor } from 'vs/editor/test/common/mocks/mockCodeEditor';
+import { withMockCodeEditor } from 'vs/editor/test/browser/testCodeEditor';
 import { CoreNavigationCommands } from 'vs/editor/common/controller/coreCommands';
 
 suite('FindModel', () => {

src/vs/editor/contrib/format/test/formatCommand.test.ts

@@ -10,7 +10,7 @@ import { Selection } from 'vs/editor/common/core/selection';
 import { ISingleEditOperation } from 'vs/editor/common/editorCommon';
 import { Model } from 'vs/editor/common/model/model';
 import { EditOperationsCommand } from 'vs/editor/contrib/format/common/formatCommand';
-import { testCommand } from 'vs/editor/test/common/commands/commandTestUtils';
+import { testCommand } from 'vs/editor/test/browser/testCommand';
 
 function editOp(startLineNumber: number, startColumn: number, endLineNumber: number, endColumn: number, text: string[]): ISingleEditOperation {
 	return {
@@ -310,4 +310,4 @@ suite('FormatCommand', () => {
 		);
 	});
 
-});
+});

src/vs/editor/contrib/indentation/test/indentation.test.ts

@@ -5,7 +5,7 @@
 
 import { Selection } from 'vs/editor/common/core/selection';
 import { IndentationToSpacesCommand, IndentationToTabsCommand } from 'vs/editor/contrib/indentation/common/indentation';
-import { testCommand } from 'vs/editor/test/common/commands/commandTestUtils';
+import { testCommand } from 'vs/editor/test/browser/testCommand';
 
 function testIndentationToSpacesCommand(lines: string[], selection: Selection, tabSize: number, expectedLines: string[], expectedSelection: Selection): void {
 	testCommand(lines, null, selection, (sel) => new IndentationToSpacesCommand(sel, tabSize), expectedLines, expectedSelection);

src/vs/editor/contrib/linesOperations/test/copyLinesCommand.test.ts

@@ -6,7 +6,7 @@
 
 import { Selection } from 'vs/editor/common/core/selection';
 import { CopyLinesCommand } from 'vs/editor/contrib/linesOperations/common/copyLinesCommand';
-import { testCommand } from 'vs/editor/test/common/commands/commandTestUtils';
+import { testCommand } from 'vs/editor/test/browser/testCommand';
 
 function testCopyLinesDownCommand(lines: string[], selection: Selection, expectedLines: string[], expectedSelection: Selection): void {
 	testCommand(lines, null, selection, (sel) => new CopyLinesCommand(sel, true), expectedLines, expectedSelection);
@@ -196,5 +196,3 @@ suite('Editor Contrib - Copy Lines Command', () => {
 		);
 	});
 });
-
-

src/vs/editor/contrib/linesOperations/test/deleteLinesCommand.test.ts

@@ -6,7 +6,7 @@
 
 import { Selection } from 'vs/editor/common/core/selection';
 import { DeleteLinesCommand } from 'vs/editor/contrib/linesOperations/common/deleteLinesCommand';
-import { testCommand } from 'vs/editor/test/common/commands/commandTestUtils';
+import { testCommand } from 'vs/editor/test/browser/testCommand';
 
 function testDeleteLinesCommand(lines: string[], selection: Selection, expectedLines: string[], expectedSelection: Selection): void {
 	testCommand(lines, null, selection, (sel) => DeleteLinesCommand.createFromSelection(sel), expectedLines, expectedSelection);
@@ -191,4 +191,3 @@ suite('Editor Contrib - Delete Lines Command', () => {
 		);
 	});
 });
-

src/vs/editor/contrib/linesOperations/test/linesOperations.test.ts

@@ -8,7 +8,7 @@ import * as assert from 'assert';
 import { Selection } from 'vs/editor/common/core/selection';
 import { Position } from 'vs/editor/common/core/position';
 import { Handler, IModel, DefaultEndOfLine } from 'vs/editor/common/editorCommon';
-import { withMockCodeEditor } from 'vs/editor/test/common/mocks/mockCodeEditor';
+import { withMockCodeEditor } from 'vs/editor/test/browser/testCodeEditor';
 import { DeleteAllLeftAction, JoinLinesAction, TransposeAction, UpperCaseAction, LowerCaseAction, DeleteAllRightAction, InsertLineBeforeAction, InsertLineAfterAction, IndentLinesAction } from 'vs/editor/contrib/linesOperations/common/linesOperations';
 import { Cursor } from 'vs/editor/common/controller/cursor';
 import { Model } from 'vs/editor/common/model/model';

src/vs/editor/contrib/linesOperations/test/moveLinesCommand.test.ts

@@ -5,7 +5,7 @@
 'use strict';
 import { Selection } from 'vs/editor/common/core/selection';
 import { MoveLinesCommand } from 'vs/editor/contrib/linesOperations/common/moveLinesCommand';
-import { testCommand } from 'vs/editor/test/common/commands/commandTestUtils';
+import { testCommand } from 'vs/editor/test/browser/testCommand';
 import { MockMode } from 'vs/editor/test/common/mocks/mockMode';
 import { LanguageIdentifier } from 'vs/editor/common/modes';
 import { IndentationRule } from 'vs/editor/common/modes/languageConfiguration';
@@ -350,4 +350,4 @@ suite('Editor contrib - Move Lines Command honors Indentation Rules', () => {
 			new Selection(2, 1, 2, 1)
 		);
 	});
-});
+});

src/vs/editor/contrib/linesOperations/test/sortLinesCommand.test.ts

@@ -6,7 +6,7 @@
 
 import { Selection } from 'vs/editor/common/core/selection';
 import { SortLinesCommand } from 'vs/editor/contrib/linesOperations/common/sortLinesCommand';
-import { testCommand } from 'vs/editor/test/common/commands/commandTestUtils';
+import { testCommand } from 'vs/editor/test/browser/testCommand';
 
 function testSortLinesAscendingCommand(lines: string[], selection: Selection, expectedLines: string[], expectedSelection: Selection): void {
 	testCommand(lines, null, selection, (sel) => new SortLinesCommand(sel, false), expectedLines, expectedSelection);

src/vs/editor/contrib/multicursor/test/multicursor.test.ts

@@ -5,7 +5,7 @@
 'use strict';
 
 import * as assert from 'assert';
-import { withMockCodeEditor, MockCodeEditor } from 'vs/editor/test/common/mocks/mockCodeEditor';
+import { withMockCodeEditor, MockCodeEditor } from 'vs/editor/test/browser/testCodeEditor';
 import { Selection } from 'vs/editor/common/core/selection';
 import { Range } from 'vs/editor/common/core/range';
 import { InsertCursorAbove, InsertCursorBelow, MultiCursorSelectionController, SelectHighlightsAction, AddSelectionToNextFindMatchAction } from 'vs/editor/contrib/multicursor/common/multicursor';

src/vs/editor/contrib/quickFix/test/quickFixModel.test.ts

@@ -9,7 +9,7 @@ import { ICommonCodeEditor } from 'vs/editor/common/editorCommon';
 import URI from 'vs/base/common/uri';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { Model } from 'vs/editor/common/model/model';
-import { mockCodeEditor } from 'vs/editor/test/common/mocks/mockCodeEditor';
+import { mockCodeEditor } from 'vs/editor/test/browser/testCodeEditor';
 import { MarkerService } from 'vs/platform/markers/common/markerService';
 import { QuickFixOracle } from 'vs/editor/contrib/quickFix/browser/quickFixModel';
 import { CodeActionProviderRegistry, LanguageIdentifier } from 'vs/editor/common/modes';

src/vs/editor/contrib/snippet/test/snippetController2.old.test.ts

@@ -8,7 +8,7 @@ import * as assert from 'assert';
 import { Position } from 'vs/editor/common/core/position';
 import { Selection } from 'vs/editor/common/core/selection';
 import { SnippetController2 } from 'vs/editor/contrib/snippet/browser/snippetController2';
-import { MockCodeEditor, withMockCodeEditor } from 'vs/editor/test/common/mocks/mockCodeEditor';
+import { MockCodeEditor, withMockCodeEditor } from 'vs/editor/test/browser/testCodeEditor';
 import { Cursor } from 'vs/editor/common/controller/cursor';
 import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
 import { ICommonCodeEditor } from 'vs/editor/common/editorCommon';

src/vs/editor/contrib/snippet/test/snippetController2.test.ts

@@ -8,7 +8,7 @@ import * as assert from 'assert';
 import { Selection } from 'vs/editor/common/core/selection';
 import { SnippetController2 } from 'vs/editor/contrib/snippet/browser/snippetController2';
 import { ICommonCodeEditor } from 'vs/editor/common/editorCommon';
-import { mockCodeEditor } from 'vs/editor/test/common/mocks/mockCodeEditor';
+import { mockCodeEditor } from 'vs/editor/test/browser/testCodeEditor';
 import { Model } from 'vs/editor/common/model/model';
 import { MockContextKeyService } from 'vs/platform/keybinding/test/common/mockKeybindingService';
 

src/vs/editor/contrib/snippet/test/snippetSession.test.ts

@@ -10,7 +10,7 @@ import { Range } from 'vs/editor/common/core/range';
 import { IPosition, Position } from 'vs/editor/common/core/position';
 import { SnippetSession } from 'vs/editor/contrib/snippet/browser/snippetSession';
 import { ICommonCodeEditor } from 'vs/editor/common/editorCommon';
-import { mockCodeEditor } from 'vs/editor/test/common/mocks/mockCodeEditor';
+import { mockCodeEditor } from 'vs/editor/test/browser/testCodeEditor';
 import { Model } from 'vs/editor/common/model/model';
 
 suite('SnippetSession', function () {
@@ -526,4 +526,3 @@ suite('SnippetSession', function () {
 		assert.equal(model.getValue(), 'console.far');
 	});
 });
-

src/vs/editor/contrib/suggest/test/suggestModel.test.ts

@@ -13,7 +13,7 @@ import { Model } from 'vs/editor/common/model/model';
 import { ICommonCodeEditor, Handler } from 'vs/editor/common/editorCommon';
 import { ISuggestSupport, ISuggestResult, SuggestRegistry, SuggestTriggerKind } from 'vs/editor/common/modes';
 import { SuggestModel, LineContext } from 'vs/editor/contrib/suggest/browser/suggestModel';
-import { MockCodeEditor, MockScopeLocation } from 'vs/editor/test/common/mocks/mockCodeEditor';
+import { MockCodeEditor, MockScopeLocation } from 'vs/editor/test/browser/testCodeEditor';
 import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
 import { InstantiationService } from 'vs/platform/instantiation/common/instantiationService';
 import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';

src/vs/editor/contrib/wordOperations/test/wordOperations.test.ts

@@ -8,7 +8,7 @@ import * as assert from 'assert';
 import { Position } from 'vs/editor/common/core/position';
 import { Selection } from 'vs/editor/common/core/selection';
 import { ICommonCodeEditor } from 'vs/editor/common/editorCommon';
-import { withMockCodeEditor } from 'vs/editor/test/common/mocks/mockCodeEditor';
+import { withMockCodeEditor } from 'vs/editor/test/browser/testCodeEditor';
 import {
 	CursorWordLeft, CursorWordLeftSelect, CursorWordStartLeft,
 	CursorWordEndLeft, CursorWordStartLeftSelect, CursorWordEndLeftSelect,

src/vs/editor/test/common/commands/shiftCommand.test.ts → src/vs/editor/test/browser/commands/shiftCommand.test.ts

@@ -7,14 +7,27 @@
 import * as assert from 'assert';
 import { ShiftCommand } from 'vs/editor/common/commands/shiftCommand';
 import { Selection } from 'vs/editor/common/core/selection';
+import { Range } from 'vs/editor/common/core/range';
 import { IIdentifiedSingleEditOperation } from 'vs/editor/common/editorCommon';
 import { IndentAction } from 'vs/editor/common/modes/languageConfiguration';
 import { LanguageConfigurationRegistry } from 'vs/editor/common/modes/languageConfigurationRegistry';
-import { createSingleEditOp, getEditOperation, testCommand } from 'vs/editor/test/common/commands/commandTestUtils';
+import { getEditOperation, testCommand } from 'vs/editor/test/browser/testCommand';
 import { withEditorModel } from 'vs/editor/test/common/editorTestUtils';
 import { MockMode } from 'vs/editor/test/common/mocks/mockMode';
 import { LanguageIdentifier } from 'vs/editor/common/modes';
 
+/**
+ * Create single edit operation
+ */
+export function createSingleEditOp(text: string, positionLineNumber: number, positionColumn: number, selectionLineNumber: number = positionLineNumber, selectionColumn: number = positionColumn): IIdentifiedSingleEditOperation {
+	return {
+		identifier: null,
+		range: new Range(selectionLineNumber, selectionColumn, positionLineNumber, positionColumn),
+		text: text,
+		forceMoveMarkers: false
+	};
+}
+
 class DocBlockCommentMode extends MockMode {
 
 	private static _id = new LanguageIdentifier('commentMode', 3);

src/vs/editor/test/common/commands/sideEditing.test.ts → src/vs/editor/test/browser/commands/sideEditing.test.ts

@@ -10,7 +10,7 @@ import { Position } from 'vs/editor/common/core/position';
 import { Range } from 'vs/editor/common/core/range';
 import { Selection } from 'vs/editor/common/core/selection';
 import { IIdentifiedSingleEditOperation } from 'vs/editor/common/editorCommon';
-import { withMockCodeEditor } from 'vs/editor/test/common/mocks/mockCodeEditor';
+import { withMockCodeEditor } from 'vs/editor/test/browser/testCodeEditor';
 import { Model } from 'vs/editor/common/model/model';
 import { TestConfiguration } from 'vs/editor/test/common/mocks/testConfiguration';
 import { ViewModel } from 'vs/editor/common/viewModel/viewModelImpl';
@@ -883,4 +883,4 @@ suite('SideEditing', () => {
 			});
 		});
 	});
-});
+});

src/vs/editor/test/common/commands/trimTrailingWhitespaceCommand.test.ts → src/vs/editor/test/browser/commands/trimTrailingWhitespaceCommand.test.ts

@@ -8,10 +8,35 @@ import * as assert from 'assert';
 import { TrimTrailingWhitespaceCommand, trimTrailingWhitespace } from 'vs/editor/common/commands/trimTrailingWhitespaceCommand';
 import { Selection } from 'vs/editor/common/core/selection';
 import { Position } from 'vs/editor/common/core/position';
+import { Range } from 'vs/editor/common/core/range';
 import { IIdentifiedSingleEditOperation } from 'vs/editor/common/editorCommon';
-import { createInsertDeleteSingleEditOp, createSingleEditOp, getEditOperation } from 'vs/editor/test/common/commands/commandTestUtils';
+import { getEditOperation } from 'vs/editor/test/browser/testCommand';
 import { withEditorModel } from 'vs/editor/test/common/editorTestUtils';
 
+/**
+ * Create single edit operation
+ */
+function createInsertDeleteSingleEditOp(text: string, positionLineNumber: number, positionColumn: number, selectionLineNumber: number = positionLineNumber, selectionColumn: number = positionColumn): IIdentifiedSingleEditOperation {
+	return {
+		identifier: null,
+		range: new Range(selectionLineNumber, selectionColumn, positionLineNumber, positionColumn),
+		text: text,
+		forceMoveMarkers: true
+	};
+}
+
+/**
+ * Create single edit operation
+ */
+export function createSingleEditOp(text: string, positionLineNumber: number, positionColumn: number, selectionLineNumber: number = positionLineNumber, selectionColumn: number = positionColumn): IIdentifiedSingleEditOperation {
+	return {
+		identifier: null,
+		range: new Range(selectionLineNumber, selectionColumn, positionLineNumber, positionColumn),
+		text: text,
+		forceMoveMarkers: false
+	};
+}
+
 function assertTrimTrailingWhitespaceCommand(text: string[], expected: IIdentifiedSingleEditOperation[]): void {
 	return withEditorModel(text, (model) => {
 		var op = new TrimTrailingWhitespaceCommand(new Selection(1, 1, 1, 1), []);
@@ -79,4 +104,3 @@ suite('Editor Commands - Trim Trailing Whitespace Command', () => {
 	});
 
 });
-

src/vs/editor/test/common/controller/cursor.test.ts → src/vs/editor/test/browser/controller/cursor.test.ts

@@ -23,7 +23,7 @@ import { MockMode } from 'vs/editor/test/common/mocks/mockMode';
 import { LanguageIdentifier } from 'vs/editor/common/modes';
 import { IEditorOptions } from 'vs/editor/common/config/editorOptions';
 import { CoreNavigationCommands, CoreEditingCommands } from 'vs/editor/common/controller/coreCommands';
-import { withMockCodeEditor } from 'vs/editor/test/common/mocks/mockCodeEditor';
+import { withMockCodeEditor } from 'vs/editor/test/browser/testCodeEditor';
 import { TextModel } from 'vs/editor/common/model/textModel';
 import { ViewModel } from 'vs/editor/common/viewModel/viewModelImpl';
 let H = Handler;

src/vs/editor/test/common/commands/commandTestUtils.ts → src/vs/editor/test/browser/testCommand.ts

@@ -10,7 +10,7 @@ import { Selection } from 'vs/editor/common/core/selection';
 import * as editorCommon from 'vs/editor/common/editorCommon';
 import { Model } from 'vs/editor/common/model/model';
 import { LanguageIdentifier } from 'vs/editor/common/modes';
-import { withMockCodeEditor } from 'vs/editor/test/common/mocks/mockCodeEditor';
+import { withMockCodeEditor } from 'vs/editor/test/browser/testCodeEditor';
 
 export function testCommand(
 	lines: string[],
@@ -68,27 +68,3 @@ export function getEditOperation(model: editorCommon.IModel, command: editorComm
 	command.getEditOperations(model, editOperationBuilder);
 	return operations;
 }
-
-/**
- * Create single edit operation
- */
-export function createSingleEditOp(text: string, positionLineNumber: number, positionColumn: number, selectionLineNumber: number = positionLineNumber, selectionColumn: number = positionColumn): editorCommon.IIdentifiedSingleEditOperation {
-	return {
-		identifier: null,
-		range: new Range(selectionLineNumber, selectionColumn, positionLineNumber, positionColumn),
-		text: text,
-		forceMoveMarkers: false
-	};
-}
-
-/**
- * Create single edit operation
- */
-export function createInsertDeleteSingleEditOp(text: string, positionLineNumber: number, positionColumn: number, selectionLineNumber: number = positionLineNumber, selectionColumn: number = positionColumn): editorCommon.IIdentifiedSingleEditOperation {
-	return {
-		identifier: null,
-		range: new Range(selectionLineNumber, selectionColumn, positionLineNumber, positionColumn),
-		text: text,
-		forceMoveMarkers: true
-	};
-}