@codingame/monaco-vscode-api 9.0.2 → 10.0.0

package/vscode/src/vs/editor/browser/controller/{textAreaHandler.js → editContext/textArea/textAreaEditContext.js}

@@ -1,32 +1,30 @@
-import { __decorate, __param } from '../../../../../../external/tslib/tslib.es6.js';
-import './textAreaHandler.css.js';
-import { localize } from '../../../nls.js';
-import { isAndroid, isChrome, isFirefox, isSafari } from '../../../base/browser/browser.js';
-import { createFastDomNode } from '../../../base/browser/fastDomNode.js';
-import { OS, isMacintosh, isWindows } from '../../../base/common/platform.js';
-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, PartFingerprint } from '../view/viewPart.js';
-import { LineNumbersOverlay } from '../viewParts/lineNumbers/lineNumbers.js';
-import { Margin } from '../viewParts/margin/margin.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';
-import { IInstantiationService } from '../../../platform/instantiation/common/instantiation.js';
+import { __decorate, __param } from '../../../../../../../../external/tslib/tslib.es6.js';
+import './textAreaEditContext.css.js';
+import { localize } from '../../../../../nls.js';
+import { isAndroid, isChrome, isFirefox, isSafari } from '../../../../../base/browser/browser.js';
+import { createFastDomNode } from '../../../../../base/browser/fastDomNode.js';
+import { OS, isMacintosh } from '../../../../../base/common/platform.js';
+import { isHighSurrogate } from '../../../../../base/common/strings.js';
+import { applyFontInfo } from '../../../config/domFontInfo.js';
+import { PartFingerprints } 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 { Position } from '../../../../common/core/position.js';
+import { Range } from '../../../../common/core/range.js';
+import { Selection } from '../../../../common/core/selection.js';
+import { MOUSE_CURSOR_TEXT_CSS_CLASS_NAME } from '../../../../../base/browser/ui/mouseCursor/mouseCursor.js';
+import { TokenizationRegistry } from '../../../../common/languages.js';
+import { Color } from '../../../../../base/common/color.js';
+import { IME } from '../../../../../base/common/ime.js';
+import { IKeybindingService } from '../../../../../platform/keybinding/common/keybinding.service.js';
+import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
+import { AbstractEditContext } from '../editContextUtils.js';
+import { TextAreaWrapper, TextAreaInput } from './textAreaEditContextInput.js';
+import { ariaLabelForScreenReaderContent, newlinecount, PagedScreenReaderStrategy } from '../screenReaderUtils.js';
+import { getDataToCopy } from '../clipboardUtils.js';
+import { TextAreaState } from './textAreaEditContextState.js';
+import { getMapForWordSeparators } from '../../../../common/core/wordCharacterClassifier.js';
 class VisibleTextAreaData {
     constructor(_context, modelLineNumber, distanceToModelLineStart, widthOfHiddenLineTextBefore, distanceToModelLineEnd) {
         this._context = _context;
@@ -65,7 +63,7 @@ class VisibleTextAreaData {
             }
             else {
                 this._previousPresentation = {
-                    foreground: ColorId.DefaultForeground,
+                    foreground: 1 ,
                     italic: false,
                     bold: false,
                     underline: false,
@@ -77,7 +75,7 @@ class VisibleTextAreaData {
     }
 }
 const canUseZeroSizeTextarea = (isFirefox);
-let TextAreaHandler = class TextAreaHandler extends ViewPart {
+let TextAreaEditContext = class TextAreaEditContext extends AbstractEditContext {
     constructor(context, viewController, visibleRangeProvider, _keybindingService, _instantiationService) {
         super(context);
         this._keybindingService = _keybindingService;
@@ -89,21 +87,21 @@ let TextAreaHandler = class TextAreaHandler extends ViewPart {
         this._scrollLeft = 0;
         this._scrollTop = 0;
         const options = this._context.configuration.options;
-        const layoutInfo = options.get(EditorOption.layoutInfo);
+        const layoutInfo = options.get(148 );
         this._setAccessibilityOptions(options);
         this._contentLeft = layoutInfo.contentLeft;
         this._contentWidth = layoutInfo.contentWidth;
         this._contentHeight = layoutInfo.height;
-        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._fontInfo = options.get(52 );
+        this._lineHeight = options.get(69 );
+        this._emptySelectionClipboard = options.get(38 );
+        this._copyWithSyntaxHighlighting = options.get(25 );
         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, PartFingerprint.TextArea);
+        PartFingerprints.write(this.textArea, 7 );
         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();
@@ -112,13 +110,13 @@ let TextAreaHandler = class TextAreaHandler extends ViewPart {
         this.textArea.setAttribute('autocapitalize', 'off');
         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(EditorOption.ariaRequired) ? 'true' : 'false');
-        this.textArea.setAttribute('tabindex', String(options.get(EditorOption.tabIndex)));
+        this.textArea.setAttribute('aria-label', ariaLabelForScreenReaderContent(options, this._keybindingService));
+        this.textArea.setAttribute('aria-required', options.get(5 ) ? 'true' : 'false');
+        this.textArea.setAttribute('tabindex', String(options.get(127 )));
         this.textArea.setAttribute('role', 'textbox');
-        this.textArea.setAttribute('aria-roledescription', ( localize(9870, "editor")));
+        this.textArea.setAttribute('aria-roledescription', ( localize(9967, "editor")));
         this.textArea.setAttribute('aria-multiline', 'true');
-        this.textArea.setAttribute('aria-autocomplete', options.get(EditorOption.readOnly) ? 'none' : 'both');
+        this.textArea.setAttribute('aria-autocomplete', options.get(94 ) ? 'none' : 'both');
         this._ensureReadOnlyAttribute();
         this.textAreaCover = createFastDomNode(document.createElement('div'));
         this.textAreaCover.setPosition('absolute');
@@ -141,30 +139,10 @@ let TextAreaHandler = class TextAreaHandler extends ViewPart {
         };
         const textAreaInputHost = {
             getDataToCopy: () => {
-                const rawTextToCopy = this._context.viewModel.getPlainTextToCopy(this._modelSelections, this._emptySelectionClipboard, isWindows);
-                const newLineCharacter = this._context.viewModel.model.getEOL();
-                const isFromEmptySelection = (this._emptySelectionClipboard && this._modelSelections.length === 1 && this._modelSelections[0].isEmpty());
-                const multicursorText = (Array.isArray(rawTextToCopy) ? rawTextToCopy : null);
-                const text = (Array.isArray(rawTextToCopy) ? rawTextToCopy.join(newLineCharacter) : rawTextToCopy);
-                let html = undefined;
-                let mode = null;
-                if (CopyOptions.forceCopyWithSyntaxHighlighting || (this._copyWithSyntaxHighlighting && text.length < 65536)) {
-                    const richText = this._context.viewModel.getRichTextToCopy(this._modelSelections, this._emptySelectionClipboard);
-                    if (richText) {
-                        html = richText.html;
-                        mode = richText.mode;
-                    }
-                }
-                return {
-                    isFromEmptySelection,
-                    multicursorText,
-                    text,
-                    html,
-                    mode
-                };
+                return getDataToCopy(this._context.viewModel, this._modelSelections, this._emptySelectionClipboard, this._copyWithSyntaxHighlighting);
             },
             getScreenReaderContent: () => {
-                if (this._accessibilitySupport === AccessibilitySupport.Disabled) {
+                if (this._accessibilitySupport === 1 ) {
                     const selection = this._selections[0];
                     if (isMacintosh && selection.isEmpty()) {
                         const position = selection.getStartPosition();
@@ -185,8 +163,8 @@ let TextAreaHandler = class TextAreaHandler extends ViewPart {
                         }
                     }
                     const LIMIT_CHARS = 500;
-                    if (isMacintosh && !selection.isEmpty() && simpleModel.getValueLengthInRange(selection, EndOfLinePreference.TextDefined) < LIMIT_CHARS) {
-                        const text = simpleModel.getValueInRange(selection, EndOfLinePreference.TextDefined);
+                    if (isMacintosh && !selection.isEmpty() && simpleModel.getValueLengthInRange(selection, 0 ) < LIMIT_CHARS) {
+                        const text = simpleModel.getValueInRange(selection, 0 );
                         return (
                              (new TextAreaState(text, 0, text.length, selection, 0))
                         );
@@ -218,7 +196,8 @@ let TextAreaHandler = class TextAreaHandler extends ViewPart {
                     }
                     return TextAreaState.EMPTY;
                 }
-                return PagedScreenReaderStrategy.fromEditorSelection(simpleModel, this._selections[0], this._accessibilityPageSize, this._accessibilitySupport === AccessibilitySupport.Unknown);
+                const screenReaderContentState = PagedScreenReaderStrategy.fromEditorSelection(simpleModel, this._selections[0], this._accessibilityPageSize, this._accessibilitySupport === 0 );
+                return TextAreaState.fromScreenReaderContentState(screenReaderContentState);
             },
             deduceModelPosition: (viewAnchorPosition, deltaOffset, lineFeedCnt) => {
                 return this._context.viewModel.deduceModelPositionRelativeToViewPosition(viewAnchorPosition, deltaOffset, lineFeedCnt);
@@ -290,7 +269,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()), VerticalRevealType.Simple, ScrollType.Immediate);
+            this._context.viewModel.revealRange('keyboard', true, Range.fromPositions(this._selections[0].getStartPosition()), 0 , 1 );
             this._visibleTextArea = ( (new VisibleTextAreaData(
                 this._context,
                 modelSelection.startLineNumber,
@@ -330,11 +309,20 @@ let TextAreaHandler = class TextAreaHandler extends ViewPart {
             this._ensureReadOnlyAttribute();
         }));
     }
+    get domNode() {
+        return this.textArea;
+    }
+    appendTo(overflowGuardContainer) {
+        overflowGuardContainer.appendChild(this.textArea);
+        overflowGuardContainer.appendChild(this.textAreaCover);
+    }
     writeScreenReaderContent(reason) {
         this._textAreaInput.writeNativeTextAreaContent(reason);
     }
     dispose() {
         super.dispose();
+        this.textArea.domNode.remove();
+        this.textAreaCover.domNode.remove();
     }
     _getAndroidWordAtPosition(position) {
         const ANDROID_WORD_SEPARATORS = '`~!@#$%^&*()-=+[{]}\\|;:",.<>/?';
@@ -352,7 +340,7 @@ let TextAreaHandler = class TextAreaHandler extends ViewPart {
             if (goingLeft) {
                 const charCode = lineContent.charCodeAt(startColumn - 2);
                 const charClass = wordSeparators.get(charCode);
-                if (charClass !== WordCharacterClass.Regular) {
+                if (charClass !== 0 ) {
                     goingLeft = false;
                 }
                 else {
@@ -365,7 +353,7 @@ let TextAreaHandler = class TextAreaHandler extends ViewPart {
             if (goingRight) {
                 const charCode = lineContent.charCodeAt(endColumn - 1);
                 const charClass = wordSeparators.get(charCode);
-                if (charClass !== WordCharacterClass.Regular) {
+                if (charClass !== 0 ) {
                     goingRight = false;
                 }
                 else {
@@ -378,13 +366,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(EditorOption.wordSeparators), []);
+        const wordSeparators = getMapForWordSeparators(this._context.configuration.options.get(134 ), []);
         let column = position.column;
         let distance = 0;
         while (column > 1) {
             const charCode = lineContent.charCodeAt(column - 2);
             const charClass = wordSeparators.get(charCode);
-            if (charClass !== WordCharacterClass.Regular || distance > 50) {
+            if (charClass !== 0  || distance > 50) {
                 return lineContent.substring(column - 1, position.column - 1);
             }
             distance++;
@@ -402,56 +390,19 @@ let TextAreaHandler = class TextAreaHandler extends ViewPart {
         }
         return '';
     }
-    _getAriaLabel(options) {
-        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();
-            const editorNotAccessibleMessage = ( localize(9871, "The editor is not accessible at this time."));
-            if (toggleKeybindingLabel) {
-                return ( localize(
-                    9872,
-                    "{0} To enable screen reader optimized mode, use {1}",
-                    editorNotAccessibleMessage,
-                    toggleKeybindingLabel
-                ));
-            }
-            else if (runCommandKeybindingLabel) {
-                return ( localize(
-                    9873,
-                    "{0} To enable screen reader optimized mode, open the quick pick with {1} and run the command Toggle Screen Reader Accessibility Mode, which is currently not triggerable via keyboard.",
-                    editorNotAccessibleMessage,
-                    runCommandKeybindingLabel
-                ));
-            }
-            else if (keybindingEditorKeybindingLabel) {
-                return ( localize(
-                    9874,
-                    "{0} Please assign a keybinding for the command Toggle Screen Reader Accessibility Mode by accessing the keybindings editor with {1} and run it.",
-                    editorNotAccessibleMessage,
-                    keybindingEditorKeybindingLabel
-                ));
-            }
-            else {
-                return editorNotAccessibleMessage;
-            }
-        }
-        return options.get(EditorOption.ariaLabel);
-    }
     _setAccessibilityOptions(options) {
-        this._accessibilitySupport = options.get(EditorOption.accessibilitySupport);
-        const accessibilityPageSize = options.get(EditorOption.accessibilityPageSize);
-        if (this._accessibilitySupport === AccessibilitySupport.Enabled && accessibilityPageSize === EditorOptions.accessibilityPageSize.defaultValue) {
+        this._accessibilitySupport = options.get(2 );
+        const accessibilityPageSize = options.get(3 );
+        if (this._accessibilitySupport === 2  && accessibilityPageSize === EditorOptions.accessibilityPageSize.defaultValue) {
             this._accessibilityPageSize = 500;
         }
         else {
             this._accessibilityPageSize = accessibilityPageSize;
         }
-        const layoutInfo = options.get(EditorOption.layoutInfo);
+        const layoutInfo = options.get(148 );
         const wrappingColumn = layoutInfo.wrappingColumn;
-        if (wrappingColumn !== -1 && this._accessibilitySupport !== AccessibilitySupport.Disabled) {
-            const fontInfo = options.get(EditorOption.fontInfo);
+        if (wrappingColumn !== -1 && this._accessibilitySupport !== 1 ) {
+            const fontInfo = options.get(52 );
             this._textAreaWrapping = true;
             this._textAreaWidth = Math.round(wrappingColumn * fontInfo.typicalHalfwidthCharacterWidth);
         }
@@ -462,25 +413,25 @@ let TextAreaHandler = class TextAreaHandler extends ViewPart {
     }
     onConfigurationChanged(e) {
         const options = this._context.configuration.options;
-        const layoutInfo = options.get(EditorOption.layoutInfo);
+        const layoutInfo = options.get(148 );
         this._setAccessibilityOptions(options);
         this._contentLeft = layoutInfo.contentLeft;
         this._contentWidth = layoutInfo.contentWidth;
         this._contentHeight = layoutInfo.height;
-        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._fontInfo = options.get(52 );
+        this._lineHeight = options.get(69 );
+        this._emptySelectionClipboard = options.get(38 );
+        this._copyWithSyntaxHighlighting = options.get(25 );
         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(EditorOption.ariaRequired) ? 'true' : 'false');
-        this.textArea.setAttribute('tabindex', String(options.get(EditorOption.tabIndex)));
-        if (e.hasChanged(EditorOption.domReadOnly) || e.hasChanged(EditorOption.readOnly)) {
+        this.textArea.setAttribute('aria-label', ariaLabelForScreenReaderContent(options, this._keybindingService));
+        this.textArea.setAttribute('aria-required', options.get(5 ) ? 'true' : 'false');
+        this.textArea.setAttribute('tabindex', String(options.get(127 )));
+        if (e.hasChanged(34 ) || e.hasChanged(94 )) {
             this._ensureReadOnlyAttribute();
         }
-        if (e.hasChanged(EditorOption.accessibilitySupport)) {
+        if (e.hasChanged(2 )) {
             this._textAreaInput.writeNativeTextAreaContent('strategy changed');
         }
         return true;
@@ -517,7 +468,7 @@ let TextAreaHandler = class TextAreaHandler extends ViewPart {
     isFocused() {
         return this._textAreaInput.isFocused();
     }
-    focusTextArea() {
+    focus() {
         this._textAreaInput.focusTextArea();
     }
     refreshFocusState() {
@@ -543,7 +494,7 @@ let TextAreaHandler = class TextAreaHandler extends ViewPart {
     }
     _ensureReadOnlyAttribute() {
         const options = this._context.configuration.options;
-        const useReadOnly = !IME.enabled || (options.get(EditorOption.domReadOnly) && options.get(EditorOption.readOnly));
+        const useReadOnly = !IME.enabled || (options.get(34 ) && options.get(94 ));
         if (useReadOnly) {
             this.textArea.setAttribute('readonly', 'true');
         }
@@ -568,7 +519,7 @@ let TextAreaHandler = class TextAreaHandler extends ViewPart {
             const endPosition = this._visibleTextArea.endPosition;
             if (startPosition && endPosition && visibleStart && visibleEnd && visibleEnd.left >= this._scrollLeft && visibleStart.left <= this._scrollLeft + this._contentWidth) {
                 const top = (this._context.viewLayout.getVerticalOffsetForLineNumber(this._primaryCursorPosition.lineNumber) - this._scrollTop);
-                const lineCount = this._newlinecount(this.textArea.domNode.value.substr(0, this.textArea.domNode.selectionStart));
+                const lineCount = newlinecount(this.textArea.domNode.value.substr(0, this.textArea.domNode.selectionStart));
                 let scrollLeft = this._visibleTextArea.widthOfHiddenLineTextBefore;
                 let left = (this._contentLeft + visibleStart.left - this._scrollLeft);
                 let width = visibleEnd.left - visibleStart.left + 1;
@@ -618,7 +569,7 @@ let TextAreaHandler = class TextAreaHandler extends ViewPart {
             this._renderAtTopLeft();
             return;
         }
-        if (isMacintosh || this._accessibilitySupport === AccessibilitySupport.Enabled) {
+        if (isMacintosh || this._accessibilitySupport === 2 ) {
             this._doRender({
                 lastRenderPosition: this._primaryCursorPosition,
                 top,
@@ -628,7 +579,7 @@ let TextAreaHandler = class TextAreaHandler extends ViewPart {
                 useCover: false
             });
             this.textArea.domNode.scrollLeft = this._primaryCursorVisibleRange.left;
-            const lineCount = this._textAreaInput.textAreaState.newlineCountBeforeSelection ?? this._newlinecount(this.textArea.domNode.value.substr(0, this.textArea.domNode.selectionStart));
+            const lineCount = this._textAreaInput.textAreaState.newlineCountBeforeSelection ?? newlinecount(this.textArea.domNode.value.substring(0, this.textArea.domNode.selectionStart));
             this.textArea.domNode.scrollTop = lineCount * this._lineHeight;
             return;
         }
@@ -641,18 +592,6 @@ let TextAreaHandler = class TextAreaHandler extends ViewPart {
             useCover: false
         });
     }
-    _newlinecount(text) {
-        let result = 0;
-        let startIndex = -1;
-        do {
-            startIndex = text.indexOf('\n', startIndex + 1);
-            if (startIndex === -1) {
-                break;
-            }
-            result++;
-        } while (true);
-        return result;
-    }
     _renderAtTopLeft() {
         this._doRender({
             lastRenderPosition: null,
@@ -683,11 +622,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(EditorOption.glyphMargin)) {
+        if (options.get(59 )) {
             tac.setClassName('monaco-editor-background textAreaCover ' + Margin.OUTER_CLASS_NAME);
         }
         else {
-            if (options.get(EditorOption.lineNumbers).renderType !== RenderLineNumbersType.Off) {
+            if (options.get(70 ).renderType !== 0 ) {
                 tac.setClassName('monaco-editor-background textAreaCover ' + LineNumbersOverlay.CLASS_NAME);
             }
             else {
@@ -696,10 +635,10 @@ let TextAreaHandler = class TextAreaHandler extends ViewPart {
         }
     }
 };
-TextAreaHandler = ( (__decorate([
+TextAreaEditContext = ( (__decorate([
     ( (__param(3, IKeybindingService))),
     ( (__param(4, IInstantiationService)))
-], TextAreaHandler)));
+], TextAreaEditContext)));
 function measureText(targetDocument, text, fontInfo, tabSize) {
     if (text.length === 0) {
         return 0;
@@ -719,4 +658,4 @@ function measureText(targetDocument, text, fontInfo, tabSize) {
     container.remove();
     return res;
 }
-export { TextAreaHandler };
+export { TextAreaEditContext };

package/vscode/src/vs/editor/browser/controller/{textAreaInput.js → editContext/textArea/textAreaEditContextInput.js}

@@ -1,43 +1,23 @@
-import { __decorate, __param } from '../../../../../../external/tslib/tslib.es6.js';
-import { isFirefox } from '../../../base/browser/browser.js';
-import { addDisposableListener, getShadowRoot, getActiveElement, getWindow, saveParentsScrollTop, restoreParentsScrollTop } from '../../../base/browser/dom.js';
-import { DomEmitter } from '../../../base/browser/event.js';
-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';
-import { IAccessibilityService } from '../../../platform/accessibility/common/accessibility.service.js';
-import { ILogService } from '../../../platform/log/common/log.service.js';
+import { __decorate, __param } from '../../../../../../../../external/tslib/tslib.es6.js';
+import { isFirefox } from '../../../../../base/browser/browser.js';
+import { addDisposableListener, getShadowRoot, getActiveElement, getWindow, saveParentsScrollTop, restoreParentsScrollTop } from '../../../../../base/browser/dom.js';
+import { DomEmitter } from '../../../../../base/browser/event.js';
+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 { Disposable, MutableDisposable } from '../../../../../base/common/lifecycle.js';
+import { Mimes } from '../../../../../base/common/mime.js';
+import { isHighSurrogate } from '../../../../../base/common/strings.js';
+import { Selection } from '../../../../common/core/selection.js';
+import { IAccessibilityService } from '../../../../../platform/accessibility/common/accessibility.service.js';
+import { ILogService } from '../../../../../platform/log/common/log.service.js';
+import { InMemoryClipboardMetadataManager } from '../clipboardUtils.js';
+import { TextAreaState } from './textAreaEditContextState.js';
 var TextAreaSyntethicEvents;
 ( (function(TextAreaSyntethicEvents) {
     TextAreaSyntethicEvents.Tap = '-monaco-textarea-synthetic-tap';
 })(TextAreaSyntethicEvents || (TextAreaSyntethicEvents = {})));
-const CopyOptions = {
-    forceCopyWithSyntaxHighlighting: false
-};
-class InMemoryClipboardMetadataManager {
-    static { this.INSTANCE = ( new InMemoryClipboardMetadataManager()); }
-    constructor() {
-        this._lastState = null;
-    }
-    set(lastCopiedValue, data) {
-        this._lastState = { lastCopiedValue, data };
-    }
-    get(pastedText) {
-        if (this._lastState && this._lastState.lastCopiedValue === pastedText) {
-            return this._lastState.data;
-        }
-        this._lastState = null;
-        return null;
-    }
-}
 class CompositionContext {
     constructor() {
         this._lastTypeTextLength = 0;
@@ -108,11 +88,11 @@ let TextAreaInput = class TextAreaInput extends Disposable {
         let lastKeyDown = null;
         this._register(this._textArea.onKeyDown((_e) => {
             const e = ( new StandardKeyboardEvent(_e));
-            if (e.keyCode === KeyCode.KEY_IN_COMPOSITION
-                || (this._currentComposition && e.keyCode === KeyCode.Backspace)) {
+            if (e.keyCode === 114
+                || ((this._currentComposition && e.keyCode === 1) )) {
                 e.stopPropagation();
             }
-            if (e.equals(KeyCode.Escape)) {
+            if (e.equals(9 )) {
                 e.preventDefault();
             }
             lastKeyDown = e;
@@ -129,9 +109,9 @@ let TextAreaInput = class TextAreaInput extends Disposable {
                 return;
             }
             this._currentComposition = currentComposition;
-            if (this._OS === OperatingSystem.Macintosh
+            if (this._OS === 2
                 && lastKeyDown
-                && lastKeyDown.equals(KeyCode.KEY_IN_COMPOSITION)
+                && lastKeyDown.equals(114 )
                 && this._textAreaState.selectionStart === this._textAreaState.selectionEnd
                 && this._textAreaState.selectionStart > 0
                 && this._textAreaState.value.substr(this._textAreaState.selectionStart - 1, 1) === e.data
@@ -189,7 +169,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 === OperatingSystem.Macintosh);
+            const typeInput = TextAreaState.deduceInput(this._textAreaState, newState,  this._OS === 2 );
             if (typeInput.replacePrevCharCnt === 0 && typeInput.text.length === 1) {
                 if (isHighSurrogate(typeInput.text.charCodeAt(0))
                     || typeInput.text.charCodeAt(0) === 0x7f ) {
@@ -515,4 +495,4 @@ class TextAreaWrapper extends Disposable {
         }
     }
 }
-export { ClipboardEventUtils, CopyOptions, InMemoryClipboardMetadataManager, TextAreaInput, TextAreaSyntethicEvents, TextAreaWrapper };
+export { ClipboardEventUtils, TextAreaInput, TextAreaSyntethicEvents, TextAreaWrapper };

package/vscode/src/vs/editor/browser/controller/{textAreaState.js → editContext/textArea/textAreaEditContextState.js}

@@ -1,6 +1,4 @@
-import { commonPrefixLength, commonSuffixLength } from '../../../base/common/strings.js';
-import { Range } from '../../common/core/range.js';
-import { EndOfLinePreference } from '../../common/model.js';
+import { commonPrefixLength, commonSuffixLength } from '../../../../../base/common/strings.js';
 class TextAreaState {
     static { this.EMPTY = ( new TextAreaState('', 0, 0, null, undefined)); }
     constructor(value,
@@ -131,58 +129,14 @@ class TextAreaState {
             positionDelta: currentSelectionEnd - currentValue.length
         };
     }
-}
-class PagedScreenReaderStrategy {
-    static _getPageOfLine(lineNumber, linesPerPage) {
-        return Math.floor((lineNumber - 1) / linesPerPage);
-    }
-    static _getRangeForPage(page, linesPerPage) {
-        const offset = page * linesPerPage;
-        const startLineNumber = offset + 1;
-        const endLineNumber = offset + linesPerPage;
-        return ( new Range(startLineNumber, 1, endLineNumber + 1, 1));
-    }
-    static fromEditorSelection(model, selection, linesPerPage, trimLongText) {
-        const LIMIT_CHARS = 500;
-        const selectionStartPage = PagedScreenReaderStrategy._getPageOfLine(selection.startLineNumber, linesPerPage);
-        const selectionStartPageRange = PagedScreenReaderStrategy._getRangeForPage(selectionStartPage, linesPerPage);
-        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, EndOfLinePreference.LF) > LIMIT_CHARS) {
-            const pretextStart = model.modifyPosition(pretextRange.getEndPosition(), -LIMIT_CHARS);
-            pretextRange = Range.fromPositions(pretextStart, pretextRange.getEndPosition());
-        }
-        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, EndOfLinePreference.LF) > LIMIT_CHARS) {
-            const posttextEnd = model.modifyPosition(posttextRange.getStartPosition(), LIMIT_CHARS);
-            posttextRange = Range.fromPositions(posttextRange.getStartPosition(), posttextEnd);
-        }
-        const posttext = model.getValueInRange(posttextRange, EndOfLinePreference.LF);
-        let text;
-        if (selectionStartPage === selectionEndPage || selectionStartPage + 1 === selectionEndPage) {
-            text = model.getValueInRange(selection, EndOfLinePreference.LF);
-        }
-        else {
-            const selectionRange1 = selectionStartPageRange.intersectRanges(selection);
-            const selectionRange2 = selectionEndPageRange.intersectRanges(selection);
-            text = (model.getValueInRange(selectionRange1, EndOfLinePreference.LF)
-                + String.fromCharCode(8230)
-                + 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);
-        }
+    static fromScreenReaderContentState(screenReaderContentState) {
         return ( new TextAreaState(
-            pretext + text + posttext,
-            pretext.length,
-            pretext.length + text.length,
-            selection,
-            pretextRange.endLineNumber - pretextRange.startLineNumber
+            screenReaderContentState.value,
+            screenReaderContentState.selectionStart,
+            screenReaderContentState.selectionEnd,
+            screenReaderContentState.selection,
+            screenReaderContentState.newlineCountBeforeSelection
         ));
     }
 }
-export { PagedScreenReaderStrategy, TextAreaState };
+export { TextAreaState };