@codingame/monaco-vscode-api 5.2.0 → 6.0.0

package/vscode/src/vs/editor/browser/controller/textAreaHandler.js

@@ -8,16 +8,21 @@ import { isHighSurrogate } from '../../../base/common/strings.js';
 import { applyFontInfo } from '../config/domFontInfo.js';
 import { TextAreaWrapper, TextAreaInput, CopyOptions } from './textAreaInput.js';
 import { TextAreaState, PagedScreenReaderStrategy } from './textAreaState.js';
-import { ViewPart, PartFingerprints } from '../view/viewPart.js';
+import { ViewPart, PartFingerprints, PartFingerprint } from '../view/viewPart.js';
 import { LineNumbersOverlay } from '../viewParts/lineNumbers/lineNumbers.js';
 import { Margin } from '../viewParts/margin/margin.js';
-import { EditorOptions } from '../../common/config/editorOptions.js';
-import { getMapForWordSeparators } from '../../common/core/wordCharacterClassifier.js';
+import { EditorOption, EditorOptions, RenderLineNumbersType } from '../../common/config/editorOptions.js';
+import { getMapForWordSeparators, WordCharacterClass } from '../../common/core/wordCharacterClassifier.js';
 import { Position } from '../../common/core/position.js';
 import { Range } from '../../common/core/range.js';
 import { Selection } from '../../common/core/selection.js';
+import { ScrollType } from '../../common/editorCommon.js';
+import { EndOfLinePreference } from '../../common/model.js';
+import { VerticalRevealType } from '../../common/viewEvents.js';
+import { AccessibilitySupport } from '../../../platform/accessibility/common/accessibility.js';
 import { MOUSE_CURSOR_TEXT_CSS_CLASS_NAME } from '../../../base/browser/ui/mouseCursor/mouseCursor.js';
 import { TokenizationRegistry } from '../../common/languages.js';
+import { ColorId } from '../../common/encodedTokenAttributes.js';
 import { Color } from '../../../base/common/color.js';
 import { IME } from '../../../base/common/ime.js';
 import { IKeybindingService } from '../../../platform/keybinding/common/keybinding.service.js';
@@ -61,7 +66,7 @@ class VisibleTextAreaData {
             }
             else {
                 this._previousPresentation = {
-                    foreground: 1 ,
+                    foreground: ColorId.DefaultForeground,
                     italic: false,
                     bold: false,
                     underline: false,
@@ -85,21 +90,21 @@ let TextAreaHandler = class TextAreaHandler extends ViewPart {
         this._scrollLeft = 0;
         this._scrollTop = 0;
         const options = this._context.configuration.options;
-        const layoutInfo = options.get(145 );
+        const layoutInfo = options.get(EditorOption.layoutInfo);
         this._setAccessibilityOptions(options);
         this._contentLeft = layoutInfo.contentLeft;
         this._contentWidth = layoutInfo.contentWidth;
         this._contentHeight = layoutInfo.height;
-        this._fontInfo = options.get(50 );
-        this._lineHeight = options.get(67 );
-        this._emptySelectionClipboard = options.get(37 );
-        this._copyWithSyntaxHighlighting = options.get(25 );
+        this._fontInfo = options.get(EditorOption.fontInfo);
+        this._lineHeight = options.get(EditorOption.lineHeight);
+        this._emptySelectionClipboard = options.get(EditorOption.emptySelectionClipboard);
+        this._copyWithSyntaxHighlighting = options.get(EditorOption.copyWithSyntaxHighlighting);
         this._visibleTextArea = null;
         this._selections = [( (new Selection(1, 1, 1, 1)))];
         this._modelSelections = [( (new Selection(1, 1, 1, 1)))];
         this._lastRenderPosition = null;
         this.textArea = createFastDomNode(document.createElement('textarea'));
-        PartFingerprints.write(this.textArea, 7 );
+        PartFingerprints.write(this.textArea, PartFingerprint.TextArea);
         this.textArea.setClassName(`inputarea ${MOUSE_CURSOR_TEXT_CSS_CLASS_NAME}`);
         this.textArea.setAttribute('wrap', this._textAreaWrapping && !this._visibleTextArea ? 'on' : 'off');
         const { tabSize } = this._context.viewModel.model.getOptions();
@@ -109,12 +114,12 @@ let TextAreaHandler = class TextAreaHandler extends ViewPart {
         this.textArea.setAttribute('autocomplete', 'off');
         this.textArea.setAttribute('spellcheck', 'false');
         this.textArea.setAttribute('aria-label', this._getAriaLabel(options));
-        this.textArea.setAttribute('aria-required', options.get(5 ) ? 'true' : 'false');
-        this.textArea.setAttribute('tabindex', String(options.get(124 )));
+        this.textArea.setAttribute('aria-required', options.get(EditorOption.ariaRequired) ? 'true' : 'false');
+        this.textArea.setAttribute('tabindex', String(options.get(EditorOption.tabIndex)));
         this.textArea.setAttribute('role', 'textbox');
         this.textArea.setAttribute('aria-roledescription', ( localizeWithPath(_moduleId, 0, "editor")));
         this.textArea.setAttribute('aria-multiline', 'true');
-        this.textArea.setAttribute('aria-autocomplete', options.get(91 ) ? 'none' : 'both');
+        this.textArea.setAttribute('aria-autocomplete', options.get(EditorOption.readOnly) ? 'none' : 'both');
         this._ensureReadOnlyAttribute();
         this.textAreaCover = createFastDomNode(document.createElement('div'));
         this.textAreaCover.setPosition('absolute');
@@ -160,7 +165,7 @@ let TextAreaHandler = class TextAreaHandler extends ViewPart {
                 };
             },
             getScreenReaderContent: () => {
-                if (this._accessibilitySupport === 1 ) {
+                if (this._accessibilitySupport === AccessibilitySupport.Disabled) {
                     const selection = this._selections[0];
                     if (isMacintosh && selection.isEmpty()) {
                         const position = selection.getStartPosition();
@@ -181,8 +186,8 @@ let TextAreaHandler = class TextAreaHandler extends ViewPart {
                         }
                     }
                     const LIMIT_CHARS = 500;
-                    if (isMacintosh && !selection.isEmpty() && simpleModel.getValueLengthInRange(selection, 0 ) < LIMIT_CHARS) {
-                        const text = simpleModel.getValueInRange(selection, 0 );
+                    if (isMacintosh && !selection.isEmpty() && simpleModel.getValueLengthInRange(selection, EndOfLinePreference.TextDefined) < LIMIT_CHARS) {
+                        const text = simpleModel.getValueInRange(selection, EndOfLinePreference.TextDefined);
                         return (
                              (new TextAreaState(text, 0, text.length, selection, 0))
                         );
@@ -214,7 +219,7 @@ let TextAreaHandler = class TextAreaHandler extends ViewPart {
                     }
                     return TextAreaState.EMPTY;
                 }
-                return PagedScreenReaderStrategy.fromEditorSelection(simpleModel, this._selections[0], this._accessibilityPageSize, this._accessibilitySupport === 0 );
+                return PagedScreenReaderStrategy.fromEditorSelection(simpleModel, this._selections[0], this._accessibilityPageSize, this._accessibilitySupport === AccessibilitySupport.Unknown);
             },
             deduceModelPosition: (viewAnchorPosition, deltaOffset, lineFeedCnt) => {
                 return this._context.viewModel.deduceModelPositionRelativeToViewPosition(viewAnchorPosition, deltaOffset, lineFeedCnt);
@@ -286,7 +291,7 @@ let TextAreaHandler = class TextAreaHandler extends ViewPart {
                 const distanceToModelLineEnd = this._context.viewModel.model.getLineMaxColumn(endModelPosition.lineNumber) - endModelPosition.column - visibleAfterCharCount;
                 return { distanceToModelLineEnd };
             })();
-            this._context.viewModel.revealRange('keyboard', true, Range.fromPositions(this._selections[0].getStartPosition()), 0 , 1 );
+            this._context.viewModel.revealRange('keyboard', true, Range.fromPositions(this._selections[0].getStartPosition()), VerticalRevealType.Simple, ScrollType.Immediate);
             this._visibleTextArea = ( (new VisibleTextAreaData(
                 this._context,
                 modelSelection.startLineNumber,
@@ -348,7 +353,7 @@ let TextAreaHandler = class TextAreaHandler extends ViewPart {
             if (goingLeft) {
                 const charCode = lineContent.charCodeAt(startColumn - 2);
                 const charClass = wordSeparators.get(charCode);
-                if (charClass !== 0 ) {
+                if (charClass !== WordCharacterClass.Regular) {
                     goingLeft = false;
                 }
                 else {
@@ -361,7 +366,7 @@ let TextAreaHandler = class TextAreaHandler extends ViewPart {
             if (goingRight) {
                 const charCode = lineContent.charCodeAt(endColumn - 1);
                 const charClass = wordSeparators.get(charCode);
-                if (charClass !== 0 ) {
+                if (charClass !== WordCharacterClass.Regular) {
                     goingRight = false;
                 }
                 else {
@@ -374,13 +379,13 @@ let TextAreaHandler = class TextAreaHandler extends ViewPart {
     }
     _getWordBeforePosition(position) {
         const lineContent = this._context.viewModel.getLineContent(position.lineNumber);
-        const wordSeparators = getMapForWordSeparators(this._context.configuration.options.get(131 ), []);
+        const wordSeparators = getMapForWordSeparators(this._context.configuration.options.get(EditorOption.wordSeparators), []);
         let column = position.column;
         let distance = 0;
         while (column > 1) {
             const charCode = lineContent.charCodeAt(column - 2);
             const charClass = wordSeparators.get(charCode);
-            if (charClass !== 0  || distance > 50) {
+            if (charClass !== WordCharacterClass.Regular || distance > 50) {
                 return lineContent.substring(column - 1, position.column - 1);
             }
             distance++;
@@ -399,8 +404,8 @@ let TextAreaHandler = class TextAreaHandler extends ViewPart {
         return '';
     }
     _getAriaLabel(options) {
-        const accessibilitySupport = options.get(2 );
-        if (accessibilitySupport === 1 ) {
+        const accessibilitySupport = options.get(EditorOption.accessibilitySupport);
+        if (accessibilitySupport === AccessibilitySupport.Disabled) {
             const toggleKeybindingLabel = this._keybindingService.lookupKeybinding('editor.action.toggleScreenReaderAccessibilityMode')?.getAriaLabel();
             const runCommandKeybindingLabel = this._keybindingService.lookupKeybinding('workbench.action.showCommands')?.getAriaLabel();
             const keybindingEditorKeybindingLabel = this._keybindingService.lookupKeybinding('workbench.action.openGlobalKeybindings')?.getAriaLabel();
@@ -436,21 +441,21 @@ let TextAreaHandler = class TextAreaHandler extends ViewPart {
                 return editorNotAccessibleMessage;
             }
         }
-        return options.get(4 );
+        return options.get(EditorOption.ariaLabel);
     }
     _setAccessibilityOptions(options) {
-        this._accessibilitySupport = options.get(2 );
-        const accessibilityPageSize = options.get(3 );
-        if (this._accessibilitySupport === 2  && accessibilityPageSize === EditorOptions.accessibilityPageSize.defaultValue) {
+        this._accessibilitySupport = options.get(EditorOption.accessibilitySupport);
+        const accessibilityPageSize = options.get(EditorOption.accessibilityPageSize);
+        if (this._accessibilitySupport === AccessibilitySupport.Enabled && accessibilityPageSize === EditorOptions.accessibilityPageSize.defaultValue) {
             this._accessibilityPageSize = 500;
         }
         else {
             this._accessibilityPageSize = accessibilityPageSize;
         }
-        const layoutInfo = options.get(145 );
+        const layoutInfo = options.get(EditorOption.layoutInfo);
         const wrappingColumn = layoutInfo.wrappingColumn;
-        if (wrappingColumn !== -1 && this._accessibilitySupport !== 1 ) {
-            const fontInfo = options.get(50 );
+        if (wrappingColumn !== -1 && this._accessibilitySupport !== AccessibilitySupport.Disabled) {
+            const fontInfo = options.get(EditorOption.fontInfo);
             this._textAreaWrapping = true;
             this._textAreaWidth = Math.round(wrappingColumn * fontInfo.typicalHalfwidthCharacterWidth);
         }
@@ -461,25 +466,25 @@ let TextAreaHandler = class TextAreaHandler extends ViewPart {
     }
     onConfigurationChanged(e) {
         const options = this._context.configuration.options;
-        const layoutInfo = options.get(145 );
+        const layoutInfo = options.get(EditorOption.layoutInfo);
         this._setAccessibilityOptions(options);
         this._contentLeft = layoutInfo.contentLeft;
         this._contentWidth = layoutInfo.contentWidth;
         this._contentHeight = layoutInfo.height;
-        this._fontInfo = options.get(50 );
-        this._lineHeight = options.get(67 );
-        this._emptySelectionClipboard = options.get(37 );
-        this._copyWithSyntaxHighlighting = options.get(25 );
+        this._fontInfo = options.get(EditorOption.fontInfo);
+        this._lineHeight = options.get(EditorOption.lineHeight);
+        this._emptySelectionClipboard = options.get(EditorOption.emptySelectionClipboard);
+        this._copyWithSyntaxHighlighting = options.get(EditorOption.copyWithSyntaxHighlighting);
         this.textArea.setAttribute('wrap', this._textAreaWrapping && !this._visibleTextArea ? 'on' : 'off');
         const { tabSize } = this._context.viewModel.model.getOptions();
         this.textArea.domNode.style.tabSize = `${tabSize * this._fontInfo.spaceWidth}px`;
         this.textArea.setAttribute('aria-label', this._getAriaLabel(options));
-        this.textArea.setAttribute('aria-required', options.get(5 ) ? 'true' : 'false');
-        this.textArea.setAttribute('tabindex', String(options.get(124 )));
-        if (e.hasChanged(34 ) || e.hasChanged(91 )) {
+        this.textArea.setAttribute('aria-required', options.get(EditorOption.ariaRequired) ? 'true' : 'false');
+        this.textArea.setAttribute('tabindex', String(options.get(EditorOption.tabIndex)));
+        if (e.hasChanged(EditorOption.domReadOnly) || e.hasChanged(EditorOption.readOnly)) {
             this._ensureReadOnlyAttribute();
         }
-        if (e.hasChanged(2 )) {
+        if (e.hasChanged(EditorOption.accessibilitySupport)) {
             this._textAreaInput.writeNativeTextAreaContent('strategy changed');
         }
         return true;
@@ -542,7 +547,7 @@ let TextAreaHandler = class TextAreaHandler extends ViewPart {
     }
     _ensureReadOnlyAttribute() {
         const options = this._context.configuration.options;
-        const useReadOnly = !IME.enabled || (options.get(34 ) && options.get(91 ));
+        const useReadOnly = !IME.enabled || (options.get(EditorOption.domReadOnly) && options.get(EditorOption.readOnly));
         if (useReadOnly) {
             this.textArea.setAttribute('readonly', 'true');
         }
@@ -617,7 +622,7 @@ let TextAreaHandler = class TextAreaHandler extends ViewPart {
             this._renderAtTopLeft();
             return;
         }
-        if (isMacintosh || this._accessibilitySupport === 2 ) {
+        if (isMacintosh || this._accessibilitySupport === AccessibilitySupport.Enabled) {
             this._doRender({
                 lastRenderPosition: this._primaryCursorPosition,
                 top,
@@ -682,11 +687,11 @@ let TextAreaHandler = class TextAreaHandler extends ViewPart {
         tac.setWidth(renderData.useCover ? renderData.width : 0);
         tac.setHeight(renderData.useCover ? renderData.height : 0);
         const options = this._context.configuration.options;
-        if (options.get(57 )) {
+        if (options.get(EditorOption.glyphMargin)) {
             tac.setClassName('monaco-editor-background textAreaCover ' + Margin.OUTER_CLASS_NAME);
         }
         else {
-            if (options.get(68 ).renderType !== 0 ) {
+            if (options.get(EditorOption.lineNumbers).renderType !== RenderLineNumbersType.Off) {
                 tac.setClassName('monaco-editor-background textAreaCover ' + LineNumbersOverlay.CLASS_NAME);
             }
             else {

package/vscode/src/vs/editor/browser/controller/textAreaInput.js

@@ -6,8 +6,10 @@ import { StandardKeyboardEvent } from '../../../base/browser/keyboardEvent.js';
 import { inputLatency } from '../../../base/browser/performance.js';
 import { RunOnceScheduler } from '../../../base/common/async.js';
 import { Emitter, Event } from '../../../base/common/event.js';
+import { KeyCode } from '../../../base/common/keyCodes.js';
 import { Disposable, MutableDisposable } from '../../../base/common/lifecycle.js';
 import { Mimes } from '../../../base/common/mime.js';
+import { OperatingSystem } from '../../../base/common/platform.js';
 import { isHighSurrogate } from '../../../base/common/strings.js';
 import { TextAreaState } from './textAreaState.js';
 import { Selection } from '../../common/core/selection.js';
@@ -106,11 +108,11 @@ let TextAreaInput = class TextAreaInput extends Disposable {
         let lastKeyDown = null;
         this._register(this._textArea.onKeyDown((_e) => {
             const e = ( new StandardKeyboardEvent(_e));
-            if (e.keyCode === 114
-                || ((this._currentComposition && e.keyCode === 1) )) {
+            if (e.keyCode === KeyCode.KEY_IN_COMPOSITION
+                || (this._currentComposition && e.keyCode === KeyCode.Backspace)) {
                 e.stopPropagation();
             }
-            if (e.equals(9 )) {
+            if (e.equals(KeyCode.Escape)) {
                 e.preventDefault();
             }
             lastKeyDown = e;
@@ -127,9 +129,9 @@ let TextAreaInput = class TextAreaInput extends Disposable {
                 return;
             }
             this._currentComposition = currentComposition;
-            if (this._OS === 2
+            if (this._OS === OperatingSystem.Macintosh
                 && lastKeyDown
-                && lastKeyDown.equals(114 )
+                && lastKeyDown.equals(KeyCode.KEY_IN_COMPOSITION)
                 && this._textAreaState.selectionStart === this._textAreaState.selectionEnd
                 && this._textAreaState.selectionStart > 0
                 && this._textAreaState.value.substr(this._textAreaState.selectionStart - 1, 1) === e.data
@@ -187,7 +189,7 @@ let TextAreaInput = class TextAreaInput extends Disposable {
                 return;
             }
             const newState = TextAreaState.readFromTextArea(this._textArea, this._textAreaState);
-            const typeInput = TextAreaState.deduceInput(this._textAreaState, newState,  this._OS === 2 );
+            const typeInput = TextAreaState.deduceInput(this._textAreaState, newState,  this._OS === OperatingSystem.Macintosh);
             if (typeInput.replacePrevCharCnt === 0 && typeInput.text.length === 1) {
                 if (isHighSurrogate(typeInput.text.charCodeAt(0))
                     || typeInput.text.charCodeAt(0) === 0x7f ) {

package/vscode/src/vs/editor/browser/controller/textAreaState.js

@@ -1,5 +1,6 @@
 import { commonPrefixLength, commonSuffixLength } from '../../../base/common/strings.js';
 import { Range } from '../../common/core/range.js';
+import { EndOfLinePreference } from '../../common/model.js';
 class TextAreaState {
     static { this.EMPTY = ( new TextAreaState('', 0, 0, null, undefined)); }
     constructor(value,
@@ -148,29 +149,29 @@ class PagedScreenReaderStrategy {
         const selectionEndPage = PagedScreenReaderStrategy._getPageOfLine(selection.endLineNumber, linesPerPage);
         const selectionEndPageRange = PagedScreenReaderStrategy._getRangeForPage(selectionEndPage, linesPerPage);
         let pretextRange = selectionStartPageRange.intersectRanges(( new Range(1, 1, selection.startLineNumber, selection.startColumn)));
-        if (trimLongText && model.getValueLengthInRange(pretextRange, 1 ) > LIMIT_CHARS) {
+        if (trimLongText && model.getValueLengthInRange(pretextRange, EndOfLinePreference.LF) > LIMIT_CHARS) {
             const pretextStart = model.modifyPosition(pretextRange.getEndPosition(), -LIMIT_CHARS);
             pretextRange = Range.fromPositions(pretextStart, pretextRange.getEndPosition());
         }
-        const pretext = model.getValueInRange(pretextRange, 1 );
+        const pretext = model.getValueInRange(pretextRange, EndOfLinePreference.LF);
         const lastLine = model.getLineCount();
         const lastLineMaxColumn = model.getLineMaxColumn(lastLine);
         let posttextRange = selectionEndPageRange.intersectRanges(( new Range(selection.endLineNumber, selection.endColumn, lastLine, lastLineMaxColumn)));
-        if (trimLongText && model.getValueLengthInRange(posttextRange, 1 ) > LIMIT_CHARS) {
+        if (trimLongText && model.getValueLengthInRange(posttextRange, EndOfLinePreference.LF) > LIMIT_CHARS) {
             const posttextEnd = model.modifyPosition(posttextRange.getStartPosition(), LIMIT_CHARS);
             posttextRange = Range.fromPositions(posttextRange.getStartPosition(), posttextEnd);
         }
-        const posttext = model.getValueInRange(posttextRange, 1 );
+        const posttext = model.getValueInRange(posttextRange, EndOfLinePreference.LF);
         let text;
         if (selectionStartPage === selectionEndPage || selectionStartPage + 1 === selectionEndPage) {
-            text = model.getValueInRange(selection, 1 );
+            text = model.getValueInRange(selection, EndOfLinePreference.LF);
         }
         else {
             const selectionRange1 = selectionStartPageRange.intersectRanges(selection);
             const selectionRange2 = selectionEndPageRange.intersectRanges(selection);
-            text = (model.getValueInRange(selectionRange1, 1 )
+            text = (model.getValueInRange(selectionRange1, EndOfLinePreference.LF)
                 + String.fromCharCode(8230)
-                + model.getValueInRange(selectionRange2, 1 ));
+                + model.getValueInRange(selectionRange2, EndOfLinePreference.LF));
         }
         if (trimLongText && text.length > 2 * LIMIT_CHARS) {
             text = text.substring(0, LIMIT_CHARS) + String.fromCharCode(8230) + text.substring(text.length - LIMIT_CHARS, text.length);