Fixes microsoft#18252: Misspelled command names: Carret → Caret

alexdima · alexdima · commit 4eef9fabda06 · 2017-01-09T11:58:50.000+01:00
diff --git a/src/vs/editor/browser/editor.all.ts b/src/vs/editor/browser/editor.all.ts
@@ -22,7 +22,7 @@ import 'vs/css!vs/editor/contrib/inPlaceReplace/browser/inPlaceReplace';
 import 'vs/editor/contrib/inPlaceReplace/common/inPlaceReplace';
 import 'vs/editor/contrib/iPadShowKeyboard/browser/iPadShowKeyboard';
 import 'vs/editor/contrib/linesOperations/common/linesOperations';
-import 'vs/editor/contrib/carretOperations/common/carretOperations';
+import 'vs/editor/contrib/caretOperations/common/caretOperations';
 import 'vs/editor/contrib/links/browser/links';
 import 'vs/editor/contrib/multicursor/common/multicursor';
 import 'vs/editor/contrib/multicursor/browser/menuPreventer';
diff --git a/src/vs/editor/contrib/caretOperations/common/caretOperations.ts b/src/vs/editor/contrib/caretOperations/common/caretOperations.ts
@@ -7,9 +7,9 @@
 import * as nls from 'vs/nls';
 import { ICommand, ICommonCodeEditor, EditorContextKeys } from 'vs/editor/common/editorCommon';
 import { IActionOptions, editorAction, EditorAction, ServicesAccessor } from 'vs/editor/common/editorCommonExtensions';
-import { MoveCarretCommand } from './moveCarretCommand';
+import { MoveCaretCommand } from './moveCaretCommand';
 
-class MoveCarretAction extends EditorAction {
+class MoveCaretAction extends EditorAction {
 
 	private left: boolean;
 
@@ -25,32 +25,32 @@ class MoveCarretAction extends EditorAction {
 		var selections = editor.getSelections();
 
 		for (var i = 0; i < selections.length; i++) {
-			commands.push(new MoveCarretCommand(selections[i], this.left));
+			commands.push(new MoveCaretCommand(selections[i], this.left));
 		}
 
 		editor.executeCommands(this.id, commands);
 	}
 }
 
 @editorAction
-class MoveCarretLeftAction extends MoveCarretAction {
+class MoveCaretLeftAction extends MoveCaretAction {
 	constructor() {
 		super(true, {
 			id: 'editor.action.moveCarretLeftAction',
-			label: nls.localize('carret.moveLeft', "Move Carret Left"),
-			alias: 'Move Carret Left',
+			label: nls.localize('caret.moveLeft', "Move Caret Left"),
+			alias: 'Move Caret Left',
 			precondition: EditorContextKeys.Writable
 		});
 	}
 }
 
 @editorAction
-class MoveCarretRightAction extends MoveCarretAction {
+class MoveCaretRightAction extends MoveCaretAction {
 	constructor() {
 		super(false, {
 			id: 'editor.action.moveCarretRightAction',
-			label: nls.localize('carret.moveRight', "Move Carret Right"),
-			alias: 'Move Carret Right',
+			label: nls.localize('caret.moveRight', "Move Caret Right"),
+			alias: 'Move Caret Right',
 			precondition: EditorContextKeys.Writable
 		});
 	}
diff --git a/src/vs/editor/contrib/caretOperations/common/moveCaretCommand.ts b/src/vs/editor/contrib/caretOperations/common/moveCaretCommand.ts
@@ -8,7 +8,7 @@ import { Range } from 'vs/editor/common/core/range';
 import { Selection } from 'vs/editor/common/core/selection';
 import { ICommand, ICursorStateComputerData, IEditOperationBuilder, ITokenizedModel } from 'vs/editor/common/editorCommon';
 
-export class MoveCarretCommand implements ICommand {
+export class MoveCaretCommand implements ICommand {
 
 	private _selection: Selection;
 	private _isMovingLeft: boolean;
diff --git a/src/vs/editor/contrib/caretOperations/test/common/moveCarretCommand.test.ts b/src/vs/editor/contrib/caretOperations/test/common/moveCarretCommand.test.ts
@@ -5,22 +5,22 @@
 'use strict';
 
 import { Selection } from 'vs/editor/common/core/selection';
-import { MoveCarretCommand } from 'vs/editor/contrib/carretOperations/common/moveCarretCommand';
+import { MoveCaretCommand } from 'vs/editor/contrib/caretOperations/common/moveCaretCommand';
 import { testCommand } from 'vs/editor/test/common/commands/commandTestUtils';
 
 
-function testMoveCarretLeftCommand(lines: string[], selection: Selection, expectedLines: string[], expectedSelection: Selection): void {
-	testCommand(lines, null, selection, (sel) => new MoveCarretCommand(sel, true), expectedLines, expectedSelection);
+function testMoveCaretLeftCommand(lines: string[], selection: Selection, expectedLines: string[], expectedSelection: Selection): void {
+	testCommand(lines, null, selection, (sel) => new MoveCaretCommand(sel, true), expectedLines, expectedSelection);
 }
 
-function testMoveCarretRightCommand(lines: string[], selection: Selection, expectedLines: string[], expectedSelection: Selection): void {
-	testCommand(lines, null, selection, (sel) => new MoveCarretCommand(sel, false), expectedLines, expectedSelection);
+function testMoveCaretRightCommand(lines: string[], selection: Selection, expectedLines: string[], expectedSelection: Selection): void {
+	testCommand(lines, null, selection, (sel) => new MoveCaretCommand(sel, false), expectedLines, expectedSelection);
 }
 
-suite('Editor Contrib - Move Carret Command', () => {
+suite('Editor Contrib - Move Caret Command', () => {
 
 	test('move selection to left', function () {
-		testMoveCarretLeftCommand(
+		testMoveCaretLeftCommand(
 			[
 				'012345'
 			],
@@ -32,7 +32,7 @@ suite('Editor Contrib - Move Carret Command', () => {
 		);
 	});
 	test('move selection to right', function () {
-		testMoveCarretRightCommand(
+		testMoveCaretRightCommand(
 			[
 				'012345'
 			],
@@ -44,7 +44,7 @@ suite('Editor Contrib - Move Carret Command', () => {
 		);
 	});
 	test('move selection to left - from first column - no change', function () {
-		testMoveCarretLeftCommand(
+		testMoveCaretLeftCommand(
 			[
 				'012345'
 			],
@@ -56,7 +56,7 @@ suite('Editor Contrib - Move Carret Command', () => {
 		);
 	});
 	test('move selection to right - from last column - no change', function () {
-		testMoveCarretRightCommand(
+		testMoveCaretRightCommand(
 			[
 				'012345'
 			],
