@codingame/monaco-vscode-api 9.0.3 → 10.0.0

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

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

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

@@ -1,16 +1,14 @@
-import { CharCode } from '../../../base/common/charCode.js';
 import { onUnexpectedError } from '../../../base/common/errors.js';
 import { getLeadingWhitespace, firstNonWhitespaceIndex, splitLines, lastNonWhitespaceIndex } from '../../../base/common/strings.js';
 import { ReplaceCommandWithoutChangingPosition, ReplaceCommandWithOffsetCursorState, ReplaceCommand, ReplaceCommandThatPreservesSelection } from '../commands/replaceCommand.js';
 import { ShiftCommand } from '../commands/shiftCommand.js';
 import { SurroundSelectionCommand } from '../commands/surroundSelectionCommand.js';
-import { EditOperationResult, EditOperationType, isQuote } from '../cursorCommon.js';
-import { getMapForWordSeparators, WordCharacterClass } from '../core/wordCharacterClassifier.js';
+import { EditOperationResult, isQuote } from '../cursorCommon.js';
+import { getMapForWordSeparators } 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 { getIndentActionForType, getIndentForEnter, getInheritIndentForLine } from '../languages/autoIndent.js';
 import { getEnterAction } from '../languages/enterAction.js';
@@ -31,7 +29,7 @@ class AutoIndentOperation {
         return;
     }
     static _isAutoIndentType(config, model, selections) {
-        if (config.autoIndent < EditorAutoIndentStrategy.Full) {
+        if (config.autoIndent < 4 ) {
             return false;
         }
         for (let i = 0, len = selections.length; i < len; i++) {
@@ -71,7 +69,7 @@ class AutoIndentOperation {
             }
         }));
         const editOptions = { shouldPushStackElementBefore: true, shouldPushStackElementAfter: false };
-        return ( new EditOperationResult(EditOperationType.TypingOther, commands, editOptions));
+        return ( new EditOperationResult(4 , commands, editOptions));
     }
     static _getEditFromIndentationAndSelection(config, model, indentation, selection, ch, includeChInEdit = true) {
         const startLineNumber = selection.startLineNumber;
@@ -106,8 +104,8 @@ class AutoClosingOvertypeOperation {
             ));
             commands[i] = ( new ReplaceCommand(typeSelection, ch));
         }
-        return ( new EditOperationResult(EditOperationType.TypingOther, commands, {
-            shouldPushStackElementBefore: shouldPushStackElementBetween(prevEditOperationType, EditOperationType.TypingOther),
+        return ( new EditOperationResult(4 , commands, {
+            shouldPushStackElementBefore: shouldPushStackElementBetween(prevEditOperationType, 4 ),
             shouldPushStackElementAfter: false
         }));
     }
@@ -121,7 +119,7 @@ class AutoClosingOvertypeWithInterceptorsOperation {
                 s.positionLineNumber,
                 s.positionColumn + 1
             )), '', false))));
-            return ( new EditOperationResult(EditOperationType.TypingOther, commands, {
+            return ( new EditOperationResult(4 , commands, {
                 shouldPushStackElementBefore: true,
                 shouldPushStackElementAfter: false
             }));
@@ -145,7 +143,7 @@ class AutoClosingOpenCharTypeOperation {
             const selection = selections[i];
             commands[i] = ( new TypeWithAutoClosingCommand(selection, ch, !chIsAlreadyTyped, autoClosingPairClose));
         }
-        return ( new EditOperationResult(EditOperationType.TypingOther, commands, {
+        return ( new EditOperationResult(4 , commands, {
             shouldPushStackElementBefore: true,
             shouldPushStackElementAfter: false
         }));
@@ -212,7 +210,7 @@ class AutoClosingOpenCharTypeOperation {
                 const wordSeparators = getMapForWordSeparators(config.wordSeparators, []);
                 if (lineBefore.length > 0) {
                     const characterBefore = lineBefore.charCodeAt(lineBefore.length - 1);
-                    if (wordSeparators.get(characterBefore) === WordCharacterClass.Regular) {
+                    if (wordSeparators.get(characterBefore) === 0 ) {
                         return null;
                     }
                 }
@@ -308,7 +306,7 @@ class SurroundSelectionOperation {
             const closeCharacter = config.surroundingPairs[ch];
             commands[i] = ( new SurroundSelectionCommand(selection, ch, closeCharacter));
         }
-        return ( new EditOperationResult(EditOperationType.Other, commands, {
+        return ( new EditOperationResult(0 , commands, {
             shouldPushStackElementBefore: true,
             shouldPushStackElementAfter: true
         }));
@@ -428,7 +426,7 @@ class EnterOperation {
             for (let i = 0, len = selections.length; i < len; i++) {
                 commands[i] = this._enter(config, model, false, selections[i]);
             }
-            return ( new EditOperationResult(EditOperationType.TypingOther, commands, {
+            return ( new EditOperationResult(4 , commands, {
                 shouldPushStackElementBefore: true,
                 shouldPushStackElementAfter: false,
             }));
@@ -436,10 +434,10 @@ class EnterOperation {
         return;
     }
     static _enter(config, model, keepPosition, range) {
-        if (config.autoIndent === EditorAutoIndentStrategy.None) {
+        if (config.autoIndent === 0 ) {
             return typeCommand(range, '\n', keepPosition);
         }
-        if (!model.tokenization.isCheapToTokenize(range.getStartPosition().lineNumber) || config.autoIndent === EditorAutoIndentStrategy.Keep) {
+        if (!model.tokenization.isCheapToTokenize(range.getStartPosition().lineNumber) || config.autoIndent === 1 ) {
             const lineText = model.getLineContent(range.startLineNumber);
             const indentation = getLeadingWhitespace(lineText).substring(0, range.startColumn - 1);
             return typeCommand(range, '\n' + config.normalizeIndentation(indentation), keepPosition);
@@ -470,7 +468,7 @@ class EnterOperation {
         }
         const lineText = model.getLineContent(range.startLineNumber);
         const indentation = getLeadingWhitespace(lineText).substring(0, range.startColumn - 1);
-        if (config.autoIndent >= EditorAutoIndentStrategy.Full) {
+        if (config.autoIndent >= 4 ) {
             const ir = getIndentForEnter(config.autoIndent, model, range, {
                 unshiftIndent: (indent) => {
                     return unshiftIndent(config, indent);
@@ -570,10 +568,10 @@ class PasteOperation {
             return multicursorText;
         }
         if (config.multiCursorPaste === 'spread') {
-            if (text.charCodeAt(text.length - 1) === CharCode.LineFeed) {
+            if (text.charCodeAt(text.length - 1) === 10 ) {
                 text = text.substring(0, text.length - 1);
             }
-            if (text.charCodeAt(text.length - 1) === CharCode.CarriageReturn) {
+            if (text.charCodeAt(text.length - 1) === 13 ) {
                 text = text.substring(0, text.length - 1);
             }
             const lines = splitLines(text);
@@ -588,7 +586,7 @@ class PasteOperation {
         for (let i = 0, len = selections.length; i < len; i++) {
             commands[i] = ( new ReplaceCommand(selections[i], text[i]));
         }
-        return ( new EditOperationResult(EditOperationType.Other, commands, {
+        return ( new EditOperationResult(0 , commands, {
             shouldPushStackElementBefore: true,
             shouldPushStackElementAfter: true
         }));
@@ -612,7 +610,7 @@ class PasteOperation {
                 commands[i] = ( new ReplaceCommand(selection, text));
             }
         }
-        return ( new EditOperationResult(EditOperationType.Other, commands, {
+        return ( new EditOperationResult(0 , commands, {
             shouldPushStackElementBefore: true,
             shouldPushStackElementAfter: true
         }));
@@ -623,8 +621,8 @@ class CompositionOperation {
         const commands = ( selections.map(
             selection => this._compositionType(model, selection, text, replacePrevCharCnt, replaceNextCharCnt, positionDelta)
         ));
-        return ( new EditOperationResult(EditOperationType.TypingOther, commands, {
-            shouldPushStackElementBefore: shouldPushStackElementBetween(prevEditOperationType, EditOperationType.TypingOther),
+        return ( new EditOperationResult(4 , commands, {
+            shouldPushStackElementBefore: shouldPushStackElementBetween(prevEditOperationType, 4 ),
             shouldPushStackElementAfter: false
         }));
     }
@@ -819,31 +817,31 @@ class TypeWithIndentationAndAutoClosingCommand extends BaseTypeWithAutoClosingCo
 }
 function getTypingOperation(typedText, previousTypingOperation) {
     if (typedText === ' ') {
-        return previousTypingOperation === EditOperationType.TypingFirstSpace
-            || previousTypingOperation === EditOperationType.TypingConsecutiveSpace
-            ? EditOperationType.TypingConsecutiveSpace
-            : EditOperationType.TypingFirstSpace;
+        return previousTypingOperation === 5
+            || previousTypingOperation === 6
+            ? 6
+            : 5 ;
     }
-    return EditOperationType.TypingOther;
+    return 4 ;
 }
 function shouldPushStackElementBetween(previousTypingOperation, typingOperation) {
     if (isTypingOperation(previousTypingOperation) && !isTypingOperation(typingOperation)) {
         return true;
     }
-    if (previousTypingOperation === EditOperationType.TypingFirstSpace) {
+    if (previousTypingOperation === 5 ) {
         return false;
     }
     return normalizeOperationType(previousTypingOperation) !== normalizeOperationType(typingOperation);
 }
 function normalizeOperationType(type) {
-    return (type === EditOperationType.TypingConsecutiveSpace || type === EditOperationType.TypingFirstSpace)
+    return ((type === 6  || type === 5) )
         ? 'space'
         : type;
 }
 function isTypingOperation(type) {
-    return type === EditOperationType.TypingOther
-        || type === EditOperationType.TypingFirstSpace
-        || type === EditOperationType.TypingConsecutiveSpace;
+    return type === 4
+        || type === 5
+        || type === 6 ;
 }
 function isAutoClosingOvertype(config, model, selections, autoClosedCharacters, ch) {
     if (config.autoClosingOvertype === 'never') {
@@ -864,8 +862,8 @@ function isAutoClosingOvertype(config, model, selections, autoClosedCharacters,
             return false;
         }
         const chIsQuote = isQuote(ch);
-        const beforeCharacter = position.column > 2 ? lineText.charCodeAt(position.column - 2) : CharCode.Null;
-        if (beforeCharacter === CharCode.Backslash && chIsQuote) {
+        const beforeCharacter = position.column > 2 ? lineText.charCodeAt(position.column - 2) : 0 ;
+        if (beforeCharacter === 92  && chIsQuote) {
             return false;
         }
         if (config.autoClosingOvertype === 'auto') {

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

@@ -1,6 +1,6 @@
 import { ShiftCommand } from '../commands/shiftCommand.js';
 import { CompositionSurroundSelectionCommand } from '../commands/surroundSelectionCommand.js';
-import { isQuote, EditOperationResult, EditOperationType } from '../cursorCommon.js';
+import { isQuote, EditOperationResult } from '../cursorCommon.js';
 import { shiftIndent, unshiftIndent, PasteOperation, TabOperation, CompositionOperation, shouldSurroundChar, AutoClosingOvertypeWithInterceptorsOperation, AutoClosingOpenCharTypeOperation, EnterOperation, AutoIndentOperation, AutoClosingOvertypeOperation, SurroundSelectionOperation, InterceptorElectricCharOperation, SimpleCharacterTypeOperation, TypeWithoutInterceptorsOperation } from './cursorTypeEditOperations.js';
 class TypeOperations {
     static indent(config, model, selections) {
@@ -103,7 +103,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(EditOperationType.TypingOther, commands, {
+            return ( new EditOperationResult(4 , commands, {
                 shouldPushStackElementBefore: true,
                 shouldPushStackElementAfter: false
             }));