@codingame/monaco-vscode-api 5.3.0 → 6.0.0

package/vscode/src/vs/editor/common/cursor/cursorMoveCommands.js

@@ -1,5 +1,5 @@
 import { isObject, isString, isUndefined, isBoolean, isNumber } from '../../../base/common/types.js';
-import { CursorState, SingleCursorState } from '../cursorCommon.js';
+import { CursorState, SingleCursorState, SelectionStartKind } from '../cursorCommon.js';
 import { MoveOperations } from './cursorMoveOperations.js';
 import { WordOperations } from './cursorWordOperations.js';
 import { Position } from '../core/position.js';
@@ -106,7 +106,7 @@ class CursorMoveCommands {
                 endLineNumber++;
                 endColumn = 1;
             }
-            result[i] = CursorState.fromModelState(( new SingleCursorState(( new Range(startLineNumber, 1, startLineNumber, 1)), 0 , 0, ( new Position(endLineNumber, endColumn)), 0)));
+            result[i] = CursorState.fromModelState(( new SingleCursorState(( new Range(startLineNumber, 1, startLineNumber, 1)), SelectionStartKind.Simple, 0, ( new Position(endLineNumber, endColumn)), 0)));
         }
         return result;
     }
@@ -129,7 +129,7 @@ class CursorMoveCommands {
     static selectAll(viewModel, cursor) {
         const lineCount = viewModel.model.getLineCount();
         const maxColumn = viewModel.model.getLineMaxColumn(lineCount);
-        return CursorState.fromModelState(( new SingleCursorState(( new Range(1, 1, 1, 1)), 0 , 0, ( new Position(lineCount, maxColumn)), 0)));
+        return CursorState.fromModelState(( new SingleCursorState(( new Range(1, 1, 1, 1)), SelectionStartKind.Simple, 0, ( new Position(lineCount, maxColumn)), 0)));
     }
     static line(viewModel, cursor, inSelectionMode, _position, _viewPosition) {
         const position = viewModel.model.validatePosition(_position);
@@ -144,7 +144,7 @@ class CursorMoveCommands {
                 selectToLineNumber = lineCount;
                 selectToColumn = viewModel.model.getLineMaxColumn(selectToLineNumber);
             }
-            return CursorState.fromModelState(( new SingleCursorState(( new Range(position.lineNumber, 1, selectToLineNumber, selectToColumn)), 2 , 0, ( new Position(selectToLineNumber, selectToColumn)), 0)));
+            return CursorState.fromModelState(( new SingleCursorState(( new Range(position.lineNumber, 1, selectToLineNumber, selectToColumn)), SelectionStartKind.Line, 0, ( new Position(selectToLineNumber, selectToColumn)), 0)));
         }
         const enteringLineNumber = cursor.modelState.selectionStart.getStartPosition().lineNumber;
         if (position.lineNumber < enteringLineNumber) {
@@ -175,14 +175,14 @@ class CursorMoveCommands {
         }
         const lineNumber = cursor.viewState.position.lineNumber;
         const column = cursor.viewState.position.column;
-        return CursorState.fromViewState(( new SingleCursorState(( new Range(lineNumber, column, lineNumber, column)), 0 , 0, ( new Position(lineNumber, column)), 0)));
+        return CursorState.fromViewState(( new SingleCursorState(( new Range(lineNumber, column, lineNumber, column)), SelectionStartKind.Simple, 0, ( new Position(lineNumber, column)), 0)));
     }
     static moveTo(viewModel, cursor, inSelectionMode, _position, _viewPosition) {
         if (inSelectionMode) {
-            if (cursor.modelState.selectionStartKind === 1 ) {
+            if (cursor.modelState.selectionStartKind === SelectionStartKind.Word) {
                 return this.word(viewModel, cursor, inSelectionMode, _position);
             }
-            if (cursor.modelState.selectionStartKind === 2 ) {
+            if (cursor.modelState.selectionStartKind === SelectionStartKind.Line) {
                 return this.line(viewModel, cursor, inSelectionMode, _position, _viewPosition);
             }
         }
@@ -194,40 +194,40 @@ class CursorMoveCommands {
     }
     static simpleMove(viewModel, cursors, direction, inSelectionMode, value, unit) {
         switch (direction) {
-            case 0 : {
-                if (unit === 4 ) {
+            case CursorMove.Direction.Left: {
+                if (unit === CursorMove.Unit.HalfLine) {
                     return this._moveHalfLineLeft(viewModel, cursors, inSelectionMode);
                 }
                 else {
                     return this._moveLeft(viewModel, cursors, inSelectionMode, value);
                 }
             }
-            case 1 : {
-                if (unit === 4 ) {
+            case CursorMove.Direction.Right: {
+                if (unit === CursorMove.Unit.HalfLine) {
                     return this._moveHalfLineRight(viewModel, cursors, inSelectionMode);
                 }
                 else {
                     return this._moveRight(viewModel, cursors, inSelectionMode, value);
                 }
             }
-            case 2 : {
-                if (unit === 2 ) {
+            case CursorMove.Direction.Up: {
+                if (unit === CursorMove.Unit.WrappedLine) {
                     return this._moveUpByViewLines(viewModel, cursors, inSelectionMode, value);
                 }
                 else {
                     return this._moveUpByModelLines(viewModel, cursors, inSelectionMode, value);
                 }
             }
-            case 3 : {
-                if (unit === 2 ) {
+            case CursorMove.Direction.Down: {
+                if (unit === CursorMove.Unit.WrappedLine) {
                     return this._moveDownByViewLines(viewModel, cursors, inSelectionMode, value);
                 }
                 else {
                     return this._moveDownByModelLines(viewModel, cursors, inSelectionMode, value);
                 }
             }
-            case 4 : {
-                if (unit === 2 ) {
+            case CursorMove.Direction.PrevBlankLine: {
+                if (unit === CursorMove.Unit.WrappedLine) {
                     return ( cursors.map(
                         cursor => CursorState.fromViewState(MoveOperations.moveToPrevBlankLine(viewModel.cursorConfig, viewModel, cursor.viewState, inSelectionMode))
                     ));
@@ -238,8 +238,8 @@ class CursorMoveCommands {
                     ));
                 }
             }
-            case 5 : {
-                if (unit === 2 ) {
+            case CursorMove.Direction.NextBlankLine: {
+                if (unit === CursorMove.Unit.WrappedLine) {
                     return ( cursors.map(
                         cursor => CursorState.fromViewState(MoveOperations.moveToNextBlankLine(viewModel.cursorConfig, viewModel, cursor.viewState, inSelectionMode))
                     ));
@@ -250,19 +250,19 @@ class CursorMoveCommands {
                     ));
                 }
             }
-            case 6 : {
+            case CursorMove.Direction.WrappedLineStart: {
                 return this._moveToViewMinColumn(viewModel, cursors, inSelectionMode);
             }
-            case 7 : {
+            case CursorMove.Direction.WrappedLineFirstNonWhitespaceCharacter: {
                 return this._moveToViewFirstNonWhitespaceColumn(viewModel, cursors, inSelectionMode);
             }
-            case 8 : {
+            case CursorMove.Direction.WrappedLineColumnCenter: {
                 return this._moveToViewCenterColumn(viewModel, cursors, inSelectionMode);
             }
-            case 9 : {
+            case CursorMove.Direction.WrappedLineEnd: {
                 return this._moveToViewMaxColumn(viewModel, cursors, inSelectionMode);
             }
-            case 10 : {
+            case CursorMove.Direction.WrappedLineLastNonWhitespaceCharacter: {
                 return this._moveToViewLastNonWhitespaceColumn(viewModel, cursors, inSelectionMode);
             }
             default:
@@ -273,22 +273,22 @@ class CursorMoveCommands {
         const visibleViewRange = viewModel.getCompletelyVisibleViewRange();
         const visibleModelRange = viewModel.coordinatesConverter.convertViewRangeToModelRange(visibleViewRange);
         switch (direction) {
-            case 11 : {
+            case CursorMove.Direction.ViewPortTop: {
                 const modelLineNumber = this._firstLineNumberInRange(viewModel.model, visibleModelRange, value);
                 const modelColumn = viewModel.model.getLineFirstNonWhitespaceColumn(modelLineNumber);
                 return [this._moveToModelPosition(viewModel, cursors[0], inSelectionMode, modelLineNumber, modelColumn)];
             }
-            case 13 : {
+            case CursorMove.Direction.ViewPortBottom: {
                 const modelLineNumber = this._lastLineNumberInRange(viewModel.model, visibleModelRange, value);
                 const modelColumn = viewModel.model.getLineFirstNonWhitespaceColumn(modelLineNumber);
                 return [this._moveToModelPosition(viewModel, cursors[0], inSelectionMode, modelLineNumber, modelColumn)];
             }
-            case 12 : {
+            case CursorMove.Direction.ViewPortCenter: {
                 const modelLineNumber = Math.round((visibleModelRange.startLineNumber + visibleModelRange.endLineNumber) / 2);
                 const modelColumn = viewModel.model.getLineFirstNonWhitespaceColumn(modelLineNumber);
                 return [this._moveToModelPosition(viewModel, cursors[0], inSelectionMode, modelLineNumber, modelColumn)];
             }
-            case 14 : {
+            case CursorMove.Direction.ViewPortIfOutside: {
                 const result = [];
                 for (let i = 0, len = cursors.length; i < len; i++) {
                     const cursor = cursors[i];
@@ -550,66 +550,66 @@ var CursorMove;
         let direction;
         switch (args.to) {
             case CursorMove.RawDirection.Left:
-                direction = 0 ;
+                direction = Direction.Left;
                 break;
             case CursorMove.RawDirection.Right:
-                direction = 1 ;
+                direction = Direction.Right;
                 break;
             case CursorMove.RawDirection.Up:
-                direction = 2 ;
+                direction = Direction.Up;
                 break;
             case CursorMove.RawDirection.Down:
-                direction = 3 ;
+                direction = Direction.Down;
                 break;
             case CursorMove.RawDirection.PrevBlankLine:
-                direction = 4 ;
+                direction = Direction.PrevBlankLine;
                 break;
             case CursorMove.RawDirection.NextBlankLine:
-                direction = 5 ;
+                direction = Direction.NextBlankLine;
                 break;
             case CursorMove.RawDirection.WrappedLineStart:
-                direction = 6 ;
+                direction = Direction.WrappedLineStart;
                 break;
             case CursorMove.RawDirection.WrappedLineFirstNonWhitespaceCharacter:
-                direction = 7 ;
+                direction = Direction.WrappedLineFirstNonWhitespaceCharacter;
                 break;
             case CursorMove.RawDirection.WrappedLineColumnCenter:
-                direction = 8 ;
+                direction = Direction.WrappedLineColumnCenter;
                 break;
             case CursorMove.RawDirection.WrappedLineEnd:
-                direction = 9 ;
+                direction = Direction.WrappedLineEnd;
                 break;
             case CursorMove.RawDirection.WrappedLineLastNonWhitespaceCharacter:
-                direction = 10 ;
+                direction = Direction.WrappedLineLastNonWhitespaceCharacter;
                 break;
             case CursorMove.RawDirection.ViewPortTop:
-                direction = 11 ;
+                direction = Direction.ViewPortTop;
                 break;
             case CursorMove.RawDirection.ViewPortBottom:
-                direction = 13 ;
+                direction = Direction.ViewPortBottom;
                 break;
             case CursorMove.RawDirection.ViewPortCenter:
-                direction = 12 ;
+                direction = Direction.ViewPortCenter;
                 break;
             case CursorMove.RawDirection.ViewPortIfOutside:
-                direction = 14 ;
+                direction = Direction.ViewPortIfOutside;
                 break;
             default:
                 return null;
         }
-        let unit = 0 ;
+        let unit = Unit.None;
         switch (args.by) {
             case CursorMove.RawUnit.Line:
-                unit = 1 ;
+                unit = Unit.Line;
                 break;
             case CursorMove.RawUnit.WrappedLine:
-                unit = 2 ;
+                unit = Unit.WrappedLine;
                 break;
             case CursorMove.RawUnit.Character:
-                unit = 3 ;
+                unit = Unit.Character;
                 break;
             case CursorMove.RawUnit.HalfLine:
-                unit = 4 ;
+                unit = Unit.HalfLine;
                 break;
         }
         return {
@@ -620,6 +620,7 @@ var CursorMove;
         };
     }
     CursorMove.parse = parse;
+    let Direction;
     ( (function(Direction) {
         Direction[Direction["Left"] = 0] = "Left";
         Direction[Direction["Right"] = 1] = "Right";
@@ -636,13 +637,14 @@ var CursorMove;
         Direction[Direction["ViewPortCenter"] = 12] = "ViewPortCenter";
         Direction[Direction["ViewPortBottom"] = 13] = "ViewPortBottom";
         Direction[Direction["ViewPortIfOutside"] = 14] = "ViewPortIfOutside";
-    })(CursorMove.Direction || (CursorMove.Direction = {})));
+    })(Direction = CursorMove.Direction || (CursorMove.Direction = {})));
+    let Unit;
     ( (function(Unit) {
         Unit[Unit["None"] = 0] = "None";
         Unit[Unit["Line"] = 1] = "Line";
         Unit[Unit["WrappedLine"] = 2] = "WrappedLine";
         Unit[Unit["Character"] = 3] = "Character";
         Unit[Unit["HalfLine"] = 4] = "HalfLine";
-    })(CursorMove.Unit || (CursorMove.Unit = {})));
+    })(Unit = CursorMove.Unit || (CursorMove.Unit = {})));
 })(CursorMove || (CursorMove = {})));
 export { CursorMove, CursorMoveCommands };

package/vscode/src/vs/editor/common/cursor/cursorMoveOperations.js

@@ -1,9 +1,11 @@
 import { prevCharLength, nextCharLength } from '../../../base/common/strings.js';
+import { Constants } from '../../../base/common/uint.js';
 import { CursorColumns } from '../core/cursorColumns.js';
 import { Position } from '../core/position.js';
 import { Range } from '../core/range.js';
-import { AtomicTabMoveOperations } from './cursorAtomicMoveOperations.js';
-import { SingleCursorState } from '../cursorCommon.js';
+import { AtomicTabMoveOperations, Direction } from './cursorAtomicMoveOperations.js';
+import { SingleCursorState, SelectionStartKind } from '../cursorCommon.js';
+import { PositionAffinity } from '../model.js';
 class CursorPosition {
     constructor(lineNumber, column, leftoverVisibleColumns) {
         this._cursorPositionBrand = undefined;
@@ -29,7 +31,7 @@ class MoveOperations {
         if (position.column <= model.getLineIndentColumn(position.lineNumber)) {
             const minColumn = model.getLineMinColumn(position.lineNumber);
             const lineContent = model.getLineContent(position.lineNumber);
-            const newPosition = AtomicTabMoveOperations.atomicPosition(lineContent, position.column - 1, tabSize, 0 );
+            const newPosition = AtomicTabMoveOperations.atomicPosition(lineContent, position.column - 1, tabSize, Direction.Left);
             if (newPosition !== -1 && newPosition + 1 >= minColumn) {
                 return ( new Position(position.lineNumber, newPosition + 1));
             }
@@ -50,7 +52,7 @@ class MoveOperations {
         }
         else {
             const pos = cursor.position.delta(undefined, -(noOfColumns - 1));
-            const normalizedPos = model.normalizePosition(MoveOperations.clipPositionColumn(pos, model), 0 );
+            const normalizedPos = model.normalizePosition(MoveOperations.clipPositionColumn(pos, model), PositionAffinity.Left);
             const p = MoveOperations.left(config, model, normalizedPos);
             lineNumber = p.lineNumber;
             column = p.column;
@@ -85,7 +87,7 @@ class MoveOperations {
     static rightPositionAtomicSoftTabs(model, lineNumber, column, tabSize, indentSize) {
         if (column < model.getLineIndentColumn(lineNumber)) {
             const lineContent = model.getLineContent(lineNumber);
-            const newPosition = AtomicTabMoveOperations.atomicPosition(lineContent, column - 1, tabSize, 1 );
+            const newPosition = AtomicTabMoveOperations.atomicPosition(lineContent, column - 1, tabSize, Direction.Right);
             if (newPosition !== -1) {
                 return ( new Position(lineNumber, newPosition + 1));
             }
@@ -106,7 +108,7 @@ class MoveOperations {
         }
         else {
             const pos = cursor.position.delta(undefined, noOfColumns - 1);
-            const normalizedPos = model.normalizePosition(MoveOperations.clipPositionColumn(pos, model), 1 );
+            const normalizedPos = model.normalizePosition(MoveOperations.clipPositionColumn(pos, model), PositionAffinity.Right);
             const r = MoveOperations.right(config, model, normalizedPos);
             lineNumber = r.lineNumber;
             column = r.column;
@@ -157,7 +159,7 @@ class MoveOperations {
         return ( new CursorPosition(lineNumber, column, leftoverVisibleColumns));
     }
     static down(config, model, lineNumber, column, leftoverVisibleColumns, count, allowMoveOnLastLine) {
-        return this.vertical(config, model, lineNumber, column, leftoverVisibleColumns, lineNumber + count, allowMoveOnLastLine, 4 );
+        return this.vertical(config, model, lineNumber, column, leftoverVisibleColumns, lineNumber + count, allowMoveOnLastLine, PositionAffinity.RightOfInjectedText);
     }
     static moveDown(config, model, cursor, inSelectionMode, linesCount) {
         let lineNumber, column;
@@ -173,7 +175,7 @@ class MoveOperations {
         let r;
         do {
             r = MoveOperations.down(config, model, lineNumber + i, column, cursor.leftoverVisibleColumns, linesCount, true);
-            const np = model.normalizePosition(( new Position(r.lineNumber, r.column)), 2 );
+            const np = model.normalizePosition(( new Position(r.lineNumber, r.column)), PositionAffinity.None);
             if (np.lineNumber > lineNumber) {
                 break;
             }
@@ -189,10 +191,10 @@ class MoveOperations {
             selectionStart.column,
             selectionStart.lineNumber,
             selectionStart.column
-        )), 0 , selectionStart.leftoverVisibleColumns, ( new Position(position.lineNumber, position.column)), position.leftoverVisibleColumns));
+        )), SelectionStartKind.Simple, selectionStart.leftoverVisibleColumns, ( new Position(position.lineNumber, position.column)), position.leftoverVisibleColumns));
     }
     static up(config, model, lineNumber, column, leftoverVisibleColumns, count, allowMoveOnFirstLine) {
-        return this.vertical(config, model, lineNumber, column, leftoverVisibleColumns, lineNumber - count, allowMoveOnFirstLine, 3 );
+        return this.vertical(config, model, lineNumber, column, leftoverVisibleColumns, lineNumber - count, allowMoveOnFirstLine, PositionAffinity.LeftOfInjectedText);
     }
     static moveUp(config, model, cursor, inSelectionMode, linesCount) {
         let lineNumber, column;
@@ -216,7 +218,7 @@ class MoveOperations {
             selectionStart.column,
             selectionStart.lineNumber,
             selectionStart.column
-        )), 0 , selectionStart.leftoverVisibleColumns, ( new Position(position.lineNumber, position.column)), position.leftoverVisibleColumns));
+        )), SelectionStartKind.Simple, selectionStart.leftoverVisibleColumns, ( new Position(position.lineNumber, position.column)), position.leftoverVisibleColumns));
     }
     static _isBlankLine(model, lineNumber) {
         if (model.getLineFirstNonWhitespaceColumn(lineNumber) === 0) {
@@ -262,7 +264,7 @@ class MoveOperations {
     static moveToEndOfLine(config, model, cursor, inSelectionMode, sticky) {
         const lineNumber = cursor.position.lineNumber;
         const maxColumn = model.getLineMaxColumn(lineNumber);
-        return cursor.move(inSelectionMode, lineNumber, maxColumn, sticky ? 1073741824  - maxColumn : 0);
+        return cursor.move(inSelectionMode, lineNumber, maxColumn, sticky ? Constants.MAX_SAFE_SMALL_INTEGER - maxColumn : 0);
     }
     static moveToBeginningOfBuffer(config, model, cursor, inSelectionMode) {
         return cursor.move(inSelectionMode, 1, 1, 0);

package/vscode/src/vs/editor/common/cursor/cursorTypeOperations.js

@@ -1,14 +1,16 @@
+import { CharCode } from '../../../base/common/charCode.js';
 import { onUnexpectedError } from '../../../base/common/errors.js';
 import { splitLines, lastNonWhitespaceIndex, getLeadingWhitespace, firstNonWhitespaceIndex } from '../../../base/common/strings.js';
 import { ReplaceCommand, ReplaceCommandWithOffsetCursorState, ReplaceCommandWithoutChangingPosition, ReplaceCommandThatPreservesSelection } from '../commands/replaceCommand.js';
 import { ShiftCommand } from '../commands/shiftCommand.js';
 import { SurroundSelectionCommand, CompositionSurroundSelectionCommand } from '../commands/surroundSelectionCommand.js';
-import { EditOperationResult, isQuote } from '../cursorCommon.js';
-import { getMapForWordSeparators } from '../core/wordCharacterClassifier.js';
+import { EditOperationResult, EditOperationType, isQuote } from '../cursorCommon.js';
+import { getMapForWordSeparators, WordCharacterClass } from '../core/wordCharacterClassifier.js';
 import { Range } from '../core/range.js';
 import { Position } from '../core/position.js';
 import { IndentAction } from '../languages/languageConfiguration.js';
 import { getIndentationAtPosition } from '../languages/languageConfigurationRegistry.js';
+import { EditorAutoIndentStrategy } from '../config/editorOptions.js';
 import { createScopedLineTokens } from '../languages/supports.js';
 import { getInheritIndentForLine, getIndentForEnter, getIndentActionForType } from '../languages/autoIndent.js';
 import { getEnterAction } from '../languages/enterAction.js';
@@ -57,7 +59,7 @@ class TypeOperations {
         for (let i = 0, len = selections.length; i < len; i++) {
             commands[i] = ( new ReplaceCommand(selections[i], text[i]));
         }
-        return ( new EditOperationResult(0 , commands, {
+        return ( new EditOperationResult(EditOperationType.Other, commands, {
             shouldPushStackElementBefore: true,
             shouldPushStackElementAfter: true
         }));
@@ -81,7 +83,7 @@ class TypeOperations {
                 commands[i] = ( new ReplaceCommand(selection, text));
             }
         }
-        return ( new EditOperationResult(0 , commands, {
+        return ( new EditOperationResult(EditOperationType.Other, commands, {
             shouldPushStackElementBefore: true,
             shouldPushStackElementAfter: true
         }));
@@ -97,10 +99,10 @@ class TypeOperations {
             return multicursorText;
         }
         if (config.multiCursorPaste === 'spread') {
-            if (text.charCodeAt(text.length - 1) === 10 ) {
+            if (text.charCodeAt(text.length - 1) === CharCode.LineFeed) {
                 text = text.substr(0, text.length - 1);
             }
-            if (text.charCodeAt(text.length - 1) === 13 ) {
+            if (text.charCodeAt(text.length - 1) === CharCode.CarriageReturn) {
                 text = text.substr(0, text.length - 1);
             }
             const lines = splitLines(text);
@@ -222,8 +224,8 @@ class TypeOperations {
         const commands = ( selections.map(
             selection => this._compositionType(model, selection, text, replacePrevCharCnt, replaceNextCharCnt, positionDelta)
         ));
-        return ( new EditOperationResult(4 , commands, {
-            shouldPushStackElementBefore: shouldPushStackElementBetween(prevEditOperationType, 4 ),
+        return ( new EditOperationResult(EditOperationType.TypingOther, commands, {
+            shouldPushStackElementBefore: shouldPushStackElementBetween(prevEditOperationType, EditOperationType.TypingOther),
             shouldPushStackElementAfter: false
         }));
     }
@@ -250,10 +252,10 @@ class TypeOperations {
         }
     }
     static _enter(config, model, keepPosition, range) {
-        if (config.autoIndent === 0 ) {
+        if (config.autoIndent === EditorAutoIndentStrategy.None) {
             return TypeOperations._typeCommand(range, '\n', keepPosition);
         }
-        if (!model.tokenization.isCheapToTokenize(range.getStartPosition().lineNumber) || config.autoIndent === 1 ) {
+        if (!model.tokenization.isCheapToTokenize(range.getStartPosition().lineNumber) || config.autoIndent === EditorAutoIndentStrategy.Keep) {
             const lineText = model.getLineContent(range.startLineNumber);
             const indentation = getLeadingWhitespace(lineText).substring(0, range.startColumn - 1);
             return TypeOperations._typeCommand(range, '\n' + config.normalizeIndentation(indentation), keepPosition);
@@ -284,7 +286,7 @@ class TypeOperations {
         }
         const lineText = model.getLineContent(range.startLineNumber);
         const indentation = getLeadingWhitespace(lineText).substring(0, range.startColumn - 1);
-        if (config.autoIndent >= 4 ) {
+        if (config.autoIndent >= EditorAutoIndentStrategy.Full) {
             const ir = getIndentForEnter(config.autoIndent, model, range, {
                 unshiftIndent: (indent) => {
                     return TypeOperations.unshiftIndent(config, indent);
@@ -325,7 +327,7 @@ class TypeOperations {
         return TypeOperations._typeCommand(range, '\n' + config.normalizeIndentation(indentation), keepPosition);
     }
     static _isAutoIndentType(config, model, selections) {
-        if (config.autoIndent < 4 ) {
+        if (config.autoIndent < EditorAutoIndentStrategy.Full) {
             return false;
         }
         for (let i = 0, len = selections.length; i < len; i++) {
@@ -379,8 +381,8 @@ class TypeOperations {
                 return false;
             }
             const chIsQuote = isQuote(ch);
-            const beforeCharacter = position.column > 2 ? lineText.charCodeAt(position.column - 2) : 0 ;
-            if (beforeCharacter === 92  && chIsQuote) {
+            const beforeCharacter = position.column > 2 ? lineText.charCodeAt(position.column - 2) : CharCode.Null;
+            if (beforeCharacter === CharCode.Backslash && chIsQuote) {
                 return false;
             }
             if (config.autoClosingOvertype === 'auto') {
@@ -412,8 +414,8 @@ class TypeOperations {
             ));
             commands[i] = ( new ReplaceCommand(typeSelection, ch));
         }
-        return ( new EditOperationResult(4 , commands, {
-            shouldPushStackElementBefore: shouldPushStackElementBetween(prevEditOperationType, 4 ),
+        return ( new EditOperationResult(EditOperationType.TypingOther, commands, {
+            shouldPushStackElementBefore: shouldPushStackElementBetween(prevEditOperationType, EditOperationType.TypingOther),
             shouldPushStackElementAfter: false
         }));
     }
@@ -531,7 +533,7 @@ class TypeOperations {
                 const wordSeparators = getMapForWordSeparators(config.wordSeparators, []);
                 if (lineBefore.length > 0) {
                     const characterBefore = lineBefore.charCodeAt(lineBefore.length - 1);
-                    if (wordSeparators.get(characterBefore) === 0 ) {
+                    if (wordSeparators.get(characterBefore) === WordCharacterClass.Regular) {
                         return null;
                     }
                 }
@@ -566,7 +568,7 @@ class TypeOperations {
             const selection = selections[i];
             commands[i] = ( new TypeWithAutoClosingCommand(selection, ch, !chIsAlreadyTyped, autoClosingPairClose));
         }
-        return ( new EditOperationResult(4 , commands, {
+        return ( new EditOperationResult(EditOperationType.TypingOther, commands, {
             shouldPushStackElementBefore: true,
             shouldPushStackElementAfter: false
         }));
@@ -618,7 +620,7 @@ class TypeOperations {
             const closeCharacter = config.surroundingPairs[ch];
             commands[i] = ( new SurroundSelectionCommand(selection, ch, closeCharacter));
         }
-        return ( new EditOperationResult(0 , commands, {
+        return ( new EditOperationResult(EditOperationType.Other, commands, {
             shouldPushStackElementBefore: true,
             shouldPushStackElementAfter: true
         }));
@@ -728,7 +730,7 @@ class TypeOperations {
             for (let i = 0, len = positions.length; i < len; i++) {
                 commands.push(( new CompositionSurroundSelectionCommand(positions[i], compositions[i].deletedText, config.surroundingPairs[ch])));
             }
-            return ( new EditOperationResult(4 , commands, {
+            return ( new EditOperationResult(EditOperationType.TypingOther, commands, {
                 shouldPushStackElementBefore: true,
                 shouldPushStackElementAfter: false
             }));
@@ -740,7 +742,7 @@ class TypeOperations {
                 s.positionLineNumber,
                 s.positionColumn + 1
             )), '', false))));
-            return ( new EditOperationResult(4 , commands, {
+            return ( new EditOperationResult(EditOperationType.TypingOther, commands, {
                 shouldPushStackElementBefore: true,
                 shouldPushStackElementAfter: false
             }));
@@ -757,7 +759,7 @@ class TypeOperations {
             for (let i = 0, len = selections.length; i < len; i++) {
                 commands[i] = TypeOperations._enter(config, model, false, selections[i]);
             }
-            return ( new EditOperationResult(4 , commands, {
+            return ( new EditOperationResult(EditOperationType.TypingOther, commands, {
                 shouldPushStackElementBefore: true,
                 shouldPushStackElementAfter: false,
             }));
@@ -773,7 +775,7 @@ class TypeOperations {
                 }
             }
             if (!autoIndentFails) {
-                return ( new EditOperationResult(4 , commands, {
+                return ( new EditOperationResult(EditOperationType.TypingOther, commands, {
                     shouldPushStackElementBefore: true,
                     shouldPushStackElementAfter: false,
                 }));
@@ -894,30 +896,30 @@ class CompositionOutcome {
 }
 function getTypingOperation(typedText, previousTypingOperation) {
     if (typedText === ' ') {
-        return previousTypingOperation === 5
-            || previousTypingOperation === 6
-            ? 6
-            : 5 ;
+        return previousTypingOperation === EditOperationType.TypingFirstSpace
+            || previousTypingOperation === EditOperationType.TypingConsecutiveSpace
+            ? EditOperationType.TypingConsecutiveSpace
+            : EditOperationType.TypingFirstSpace;
     }
-    return 4 ;
+    return EditOperationType.TypingOther;
 }
 function shouldPushStackElementBetween(previousTypingOperation, typingOperation) {
     if (isTypingOperation(previousTypingOperation) && !isTypingOperation(typingOperation)) {
         return true;
     }
-    if (previousTypingOperation === 5 ) {
+    if (previousTypingOperation === EditOperationType.TypingFirstSpace) {
         return false;
     }
     return normalizeOperationType(previousTypingOperation) !== normalizeOperationType(typingOperation);
 }
 function normalizeOperationType(type) {
-    return ((type === 6  || type === 5) )
+    return (type === EditOperationType.TypingConsecutiveSpace || type === EditOperationType.TypingFirstSpace)
         ? 'space'
         : type;
 }
 function isTypingOperation(type) {
-    return type === 4
-        || type === 5
-        || type === 6 ;
+    return type === EditOperationType.TypingOther
+        || type === EditOperationType.TypingFirstSpace
+        || type === EditOperationType.TypingConsecutiveSpace;
 }
 export { CompositionOutcome, TypeOperations, TypeWithAutoClosingCommand };