Convert Handler to a const enum

alexdima · alexdima · commit d41a00102292 · 2020-05-14T22:21:48.000+02:00
diff --git a/src/vs/editor/common/controller/cursor.ts b/src/vs/editor/common/controller/cursor.ts
@@ -663,15 +663,13 @@ export class Cursor extends viewEvents.ViewEventEmitter implements ICursors {
 	}
 
 	public trigger(source: string | null | undefined, handlerId: string, payload: any): void {
-		const H = editorCommon.Handler;
-
-		if (handlerId === H.CompositionStart) {
+		if (handlerId === editorCommon.Handler.CompositionStart) {
 			this._isDoingComposition = true;
 			this._selectionsWhenCompositionStarted = this.getSelections().slice(0);
 			return;
 		}
 
-		if (handlerId === H.CompositionEnd) {
+		if (handlerId === editorCommon.Handler.CompositionEnd) {
 			this._isDoingComposition = false;
 		}
 
@@ -694,32 +692,32 @@ export class Cursor extends viewEvents.ViewEventEmitter implements ICursors {
 
 		try {
 			switch (handlerId) {
-				case H.Type:
+				case editorCommon.Handler.Type:
 					this._type(source, <string>payload.text);
 					break;
 
-				case H.ReplacePreviousChar:
+				case editorCommon.Handler.ReplacePreviousChar:
 					this._replacePreviousChar(<string>payload.text, <number>payload.replaceCharCnt);
 					break;
 
-				case H.Paste:
+				case editorCommon.Handler.Paste:
 					cursorChangeReason = CursorChangeReason.Paste;
 					this._paste(<string>payload.text, <boolean>payload.pasteOnNewLine, <string[]>payload.multicursorText || []);
 					break;
 
-				case H.Cut:
+				case editorCommon.Handler.Cut:
 					this._cut();
 					break;
 
-				case H.ExecuteCommand:
+				case editorCommon.Handler.ExecuteCommand:
 					this._externalExecuteCommand(<editorCommon.ICommand>payload);
 					break;
 
-				case H.ExecuteCommands:
+				case editorCommon.Handler.ExecuteCommands:
 					this._externalExecuteCommands(<editorCommon.ICommand[]>payload);
 					break;
 
-				case H.CompositionEnd:
+				case editorCommon.Handler.CompositionEnd:
 					this._interpretCompositionEnd(source);
 					break;
 			}
diff --git a/src/vs/editor/common/editorCommon.ts b/src/vs/editor/common/editorCommon.ts
@@ -688,14 +688,13 @@ export const EditorType = {
  * Built-in commands.
  * @internal
  */
-export const Handler = {
-	ExecuteCommand: 'executeCommand',
-	ExecuteCommands: 'executeCommands',
-
-	Type: 'type',
-	ReplacePreviousChar: 'replacePreviousChar',
-	CompositionStart: 'compositionStart',
-	CompositionEnd: 'compositionEnd',
-	Paste: 'paste',
-	Cut: 'cut',
-};
+export const enum Handler {
+	ExecuteCommand = 'executeCommand',
+	ExecuteCommands = 'executeCommands',
+	Type = 'type',
+	ReplacePreviousChar = 'replacePreviousChar',
+	CompositionStart = 'compositionStart',
+	CompositionEnd = 'compositionEnd',
+	Paste = 'paste',
+	Cut = 'cut',
+}
diff --git a/src/vs/editor/test/browser/controller/cursor.test.ts b/src/vs/editor/test/browser/controller/cursor.test.ts
@@ -12,7 +12,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 { TokenizationResult2 } from 'vs/editor/common/core/token';
-import { Handler, ICommand, ICursorStateComputerData, IEditOperationBuilder } from 'vs/editor/common/editorCommon';
+import { Handler as H, ICommand, ICursorStateComputerData, IEditOperationBuilder } from 'vs/editor/common/editorCommon';
 import { EndOfLinePreference, EndOfLineSequence, ITextModel } from 'vs/editor/common/model';
 import { TextModel } from 'vs/editor/common/model/textModel';
 import { IState, ITokenizationSupport, LanguageIdentifier, TokenizationRegistry } from 'vs/editor/common/modes';
@@ -24,8 +24,6 @@ import { IRelaxedTextModelCreationOptions, createTextModel } from 'vs/editor/tes
 import { MockMode } from 'vs/editor/test/common/mocks/mockMode';
 import { javascriptOnEnterRules } from 'vs/editor/test/common/modes/supports/javascriptOnEnterRules';
 
-const H = Handler;
-
 // --------- utils
 
 function cursorCommand(cursor: Cursor, command: string, extraData?: any, overwriteSource?: string) {
@@ -2686,7 +2684,7 @@ suite('Editor Controller - Cursor Configuration', () => {
 
 			}
 
-			cursor.trigger('autoFormat', Handler.ExecuteCommand, new TestCommand());
+			cursor.trigger('autoFormat', H.ExecuteCommand, new TestCommand());
 			assert.equal(model.getLineContent(1), 'function foo(params: string) {');
 			assert.equal(model.getLineContent(2), '    ');
 			assert.equal(model.getLineContent(3), '}');
