@codingame/monaco-vscode-api 2.2.2 → 3.0.0

package/vscode/src/vs/base/common/strings.js

@@ -159,6 +159,14 @@ function regExpLeadsToEndlessLoop(regexp) {
 function splitLines(str) {
     return str.split(/\r\n|\r|\n/);
 }
+function splitLinesIncludeSeparators(str) {
+    const linesWithSeparators = [];
+    const splitLinesAndSeparators = str.split(/(\r\n|\r|\n)/);
+    for (let i = 0; i < Math.ceil(splitLinesAndSeparators.length / 2); i++) {
+        linesWithSeparators.push(splitLinesAndSeparators[2 * i] + (splitLinesAndSeparators[2 * i + 1] ?? ''));
+    }
+    return linesWithSeparators;
+}
 function firstNonWhitespaceIndex(str) {
     for (let i = 0, len = str.length; i < len; i++) {
         const chCode = str.charCodeAt(i);
@@ -752,4 +760,4 @@ class InvisibleCharacters {
         return InvisibleCharacters.getData();
     }
 }
-export { AmbiguousCharacters, CodePointIterator, GraphemeIterator, InvisibleCharacters, UNUSUAL_LINE_TERMINATORS, UTF8_BOM_CHARACTER, commonPrefixLength, commonSuffixLength, compare, compareIgnoreCase, compareSubstring, compareSubstringIgnoreCase, computeCodePoint, containsRTL, containsUnusualLineTerminators, containsUppercaseCharacter, convertSimple2RegExpPattern, count, createRegExp, equalsIgnoreCase, escape, escapeRegExpCharacters, firstNonWhitespaceIndex, format, format2, fuzzyContains, getCharContainingOffset, getLeadingWhitespace, getLeftDeleteOffset, getNLines, getNextCodePoint, htmlAttributeEncodeValue, isAsciiDigit, isBasicASCII, isEmojiImprecise, isFalsyOrWhitespace, isFullWidthCharacter, isHighSurrogate, isLowSurrogate, isLowerAsciiLetter, isUpperAsciiLetter, lastNonWhitespaceIndex, lcut, ltrim, nextCharLength, noBreakWhitespace, prevCharLength, regExpLeadsToEndlessLoop, removeAnsiEscapeCodes, replaceAsync, rtrim, singleLetterHash, splitLines, startsWithIgnoreCase, startsWithUTF8BOM, stripWildcards, trim, truncate, truncateMiddle, uppercaseFirstLetter };
+export { AmbiguousCharacters, CodePointIterator, GraphemeIterator, InvisibleCharacters, UNUSUAL_LINE_TERMINATORS, UTF8_BOM_CHARACTER, commonPrefixLength, commonSuffixLength, compare, compareIgnoreCase, compareSubstring, compareSubstringIgnoreCase, computeCodePoint, containsRTL, containsUnusualLineTerminators, containsUppercaseCharacter, convertSimple2RegExpPattern, count, createRegExp, equalsIgnoreCase, escape, escapeRegExpCharacters, firstNonWhitespaceIndex, format, format2, fuzzyContains, getCharContainingOffset, getLeadingWhitespace, getLeftDeleteOffset, getNLines, getNextCodePoint, htmlAttributeEncodeValue, isAsciiDigit, isBasicASCII, isEmojiImprecise, isFalsyOrWhitespace, isFullWidthCharacter, isHighSurrogate, isLowSurrogate, isLowerAsciiLetter, isUpperAsciiLetter, lastNonWhitespaceIndex, lcut, ltrim, nextCharLength, noBreakWhitespace, prevCharLength, regExpLeadsToEndlessLoop, removeAnsiEscapeCodes, replaceAsync, rtrim, singleLetterHash, splitLines, splitLinesIncludeSeparators, startsWithIgnoreCase, startsWithUTF8BOM, stripWildcards, trim, truncate, truncateMiddle, uppercaseFirstLetter };

package/vscode/src/vs/editor/browser/config/charWidthReader.js

@@ -1,4 +1,3 @@
-import { $window } from '../../../base/browser/window.js';
 import { applyFontInfo } from './domFontInfo.js';
 class CharWidthRequest {
     constructor(chr, type) {
@@ -17,11 +16,11 @@ class DomCharWidthReader {
         this._container = null;
         this._testElements = null;
     }
-    read() {
+    read(targetWindow) {
         this._createDomElements();
-        $window.document.body.appendChild(this._container);
+        targetWindow.document.body.appendChild(this._container);
         this._readFromDomElements();
-        $window.document.body.removeChild(this._container);
+        targetWindow.document.body.removeChild(this._container);
         this._container = null;
         this._testElements = null;
     }
@@ -86,8 +85,8 @@ class DomCharWidthReader {
         }
     }
 }
-function readCharWidths(bareFontInfo, requests) {
+function readCharWidths(targetWindow, bareFontInfo, requests) {
     const reader = ( new DomCharWidthReader(bareFontInfo, requests));
-    reader.read();
+    reader.read(targetWindow);
 }
 export { CharWidthRequest, readCharWidths };

package/vscode/src/vs/editor/browser/config/editorConfiguration.js

@@ -1,5 +1,5 @@
 import { __decorate, __param } from '../../../../../../external/tslib/tslib.es6.js';
-import { PixelRatio, isWebKit, isFirefox, isSafari, isWebkitWebView } from '../../../base/browser/browser.js';
+import { isWebKit, isFirefox, isSafari, isWebkitWebView } from '../../../base/browser/browser.js';
 import { equals } from '../../../base/common/arrays.js';
 import { Emitter } from '../../../base/common/event.js';
 import { Disposable } from '../../../base/common/lifecycle.js';
@@ -13,6 +13,8 @@ import { ComputeOptionsMemory, editorOptionsRegistry, ConfigurationChangedEvent
 import { EditorZoom } from '../../common/config/editorZoom.js';
 import { BareFontInfo } from '../../common/config/fontInfo.js';
 import { IAccessibilityService } from '../../../platform/accessibility/common/accessibility.js';
+import { getWindow, getWindowById } from '../../../base/browser/dom.js';
+import { PixelRatio } from '../../../base/browser/pixelRatio.js';
 let EditorConfiguration = class EditorConfiguration extends Disposable {
     constructor(isSimpleWidget, isStandaloneEditor, options, container, _accessibilityService) {
         super();
@@ -30,6 +32,7 @@ let EditorConfiguration = class EditorConfiguration extends Disposable {
         this.isSimpleWidget = isSimpleWidget;
         this.isStandaloneEditor = isStandaloneEditor;
         this._containerObserver = this._register(( new ElementSizeObserver(container, options.dimension)));
+        this._targetWindowId = getWindow(container).vscodeWindowId;
         this._rawOptions = deepCloneAndMigrateOptions(options);
         this._validatedOptions = EditorOptionsUtil.validateOptions(this._rawOptions);
         this.options = this._computeOptions();
@@ -40,7 +43,7 @@ let EditorConfiguration = class EditorConfiguration extends Disposable {
         this._register(TabFocus.onDidChangeTabFocus(() => this._recomputeOptions()));
         this._register(this._containerObserver.onDidChange(() => this._recomputeOptions()));
         this._register(FontMeasurements.onDidChange(() => this._recomputeOptions()));
-        this._register(PixelRatio.onDidChange(() => this._recomputeOptions()));
+        this._register(PixelRatio.getInstance(getWindow(container)).onDidChange(() => this._recomputeOptions()));
         this._register(this._accessibilityService.onDidChangeScreenReaderOptimized(() => this._recomputeOptions()));
     }
     _recomputeOptions() {
@@ -80,14 +83,14 @@ let EditorConfiguration = class EditorConfiguration extends Disposable {
             outerWidth: this._containerObserver.getWidth(),
             outerHeight: this._containerObserver.getHeight(),
             emptySelectionClipboard: isWebKit || isFirefox,
-            pixelRatio: PixelRatio.value,
+            pixelRatio: PixelRatio.getInstance(getWindowById(this._targetWindowId, true).window).value,
             accessibilitySupport: (this._accessibilityService.isScreenReaderOptimized()
                 ? 2
                 : this._accessibilityService.getAccessibilitySupport())
         };
     }
     _readFontInfo(bareFontInfo) {
-        return FontMeasurements.readFontInfo(bareFontInfo);
+        return FontMeasurements.readFontInfo(getWindowById(this._targetWindowId, true).window, bareFontInfo);
     }
     getRawOptions() {
         return this._rawOptions;

package/vscode/src/vs/editor/browser/config/fontMeasurements.js

@@ -1,5 +1,5 @@
-import { PixelRatio } from '../../../base/browser/browser.js';
-import { mainWindow } from '../../../base/browser/window.js';
+import { getWindowId } from '../../../base/browser/dom.js';
+import { PixelRatio } from '../../../base/browser/pixelRatio.js';
 import { Emitter } from '../../../base/common/event.js';
 import { Disposable } from '../../../base/common/lifecycle.js';
 import { readCharWidths, CharWidthRequest } from './charWidthReader.js';
@@ -7,11 +7,11 @@ import { EditorFontLigatures } from '../../common/config/editorOptions.js';
 import { SERIALIZED_FONT_INFO_VERSION, FontInfo } from '../../common/config/fontInfo.js';
 class FontMeasurementsImpl extends Disposable {
     constructor() {
-        super();
+        super(...arguments);
+        this._cache = ( new Map());
+        this._evictUntrustedReadingsTimeout = -1;
         this._onDidChange = this._register(( new Emitter()));
         this.onDidChange = this._onDidChange.event;
-        this._cache = ( new FontMeasurementsCache());
-        this._evictUntrustedReadingsTimeout = -1;
     }
     dispose() {
         if (this._evictUntrustedReadingsTimeout !== -1) {
@@ -21,49 +21,62 @@ class FontMeasurementsImpl extends Disposable {
         super.dispose();
     }
     clearAllFontInfos() {
-        this._cache = ( new FontMeasurementsCache());
+        this._cache.clear();
         this._onDidChange.fire();
     }
-    _writeToCache(item, value) {
-        this._cache.put(item, value);
+    _ensureCache(targetWindow) {
+        const windowId = getWindowId(targetWindow);
+        let cache = this._cache.get(windowId);
+        if (!cache) {
+            cache = ( new FontMeasurementsCache());
+            this._cache.set(windowId, cache);
+        }
+        return cache;
+    }
+    _writeToCache(targetWindow, item, value) {
+        const cache = this._ensureCache(targetWindow);
+        cache.put(item, value);
         if (!value.isTrusted && this._evictUntrustedReadingsTimeout === -1) {
-            this._evictUntrustedReadingsTimeout = mainWindow.setTimeout(() => {
+            this._evictUntrustedReadingsTimeout = targetWindow.setTimeout(() => {
                 this._evictUntrustedReadingsTimeout = -1;
-                this._evictUntrustedReadings();
+                this._evictUntrustedReadings(targetWindow);
             }, 5000);
         }
     }
-    _evictUntrustedReadings() {
-        const values = this._cache.getValues();
+    _evictUntrustedReadings(targetWindow) {
+        const cache = this._ensureCache(targetWindow);
+        const values = cache.getValues();
         let somethingRemoved = false;
         for (const item of values) {
             if (!item.isTrusted) {
                 somethingRemoved = true;
-                this._cache.remove(item);
+                cache.remove(item);
             }
         }
         if (somethingRemoved) {
             this._onDidChange.fire();
         }
     }
-    serializeFontInfo() {
-        return this._cache.getValues().filter(item => item.isTrusted);
+    serializeFontInfo(targetWindow) {
+        const cache = this._ensureCache(targetWindow);
+        return cache.getValues().filter(item => item.isTrusted);
     }
-    restoreFontInfo(savedFontInfos) {
+    restoreFontInfo(targetWindow, savedFontInfos) {
         for (const savedFontInfo of savedFontInfos) {
             if (savedFontInfo.version !== SERIALIZED_FONT_INFO_VERSION) {
                 continue;
             }
             const fontInfo = ( new FontInfo(savedFontInfo, false));
-            this._writeToCache(fontInfo, fontInfo);
+            this._writeToCache(targetWindow, fontInfo, fontInfo);
         }
     }
-    readFontInfo(bareFontInfo) {
-        if (!( this._cache.has(bareFontInfo))) {
-            let readConfig = this._actualReadFontInfo(bareFontInfo);
+    readFontInfo(targetWindow, bareFontInfo) {
+        const cache = this._ensureCache(targetWindow);
+        if (!( cache.has(bareFontInfo))) {
+            let readConfig = this._actualReadFontInfo(targetWindow, bareFontInfo);
             if (readConfig.typicalHalfwidthCharacterWidth <= 2 || readConfig.typicalFullwidthCharacterWidth <= 2 || readConfig.spaceWidth <= 2 || readConfig.maxDigitWidth <= 2) {
                 readConfig = ( new FontInfo({
-                    pixelRatio: PixelRatio.value,
+                    pixelRatio: PixelRatio.getInstance(targetWindow).value,
                     fontFamily: readConfig.fontFamily,
                     fontWeight: readConfig.fontWeight,
                     fontSize: readConfig.fontSize,
@@ -81,9 +94,9 @@ class FontMeasurementsImpl extends Disposable {
                     maxDigitWidth: Math.max(readConfig.maxDigitWidth, 5),
                 }, false));
             }
-            this._writeToCache(bareFontInfo, readConfig);
+            this._writeToCache(targetWindow, bareFontInfo, readConfig);
         }
-        return this._cache.get(bareFontInfo);
+        return cache.get(bareFontInfo);
     }
     _createRequest(chr, type, all, monospace) {
         const result = ( new CharWidthRequest(chr, type));
@@ -91,7 +104,7 @@ class FontMeasurementsImpl extends Disposable {
         monospace?.push(result);
         return result;
     }
-    _actualReadFontInfo(bareFontInfo) {
+    _actualReadFontInfo(targetWindow, bareFontInfo) {
         const all = [];
         const monospace = [];
         const typicalHalfwidthCharacter = this._createRequest('n', 0 , all, monospace);
@@ -117,7 +130,7 @@ class FontMeasurementsImpl extends Disposable {
             this._createRequest(monospaceTestChars.charAt(i), 1 , all, monospace);
             this._createRequest(monospaceTestChars.charAt(i), 2 , all, monospace);
         }
-        readCharWidths(bareFontInfo, all);
+        readCharWidths(targetWindow, bareFontInfo, all);
         const maxDigitWidth = Math.max(digit0.width, digit1.width, digit2.width, digit3.width, digit4.width, digit5.width, digit6.width, digit7.width, digit8.width, digit9.width);
         let isMonospace = (bareFontInfo.fontFeatureSettings === EditorFontLigatures.OFF);
         const referenceWidth = monospace[0].width;
@@ -136,7 +149,7 @@ class FontMeasurementsImpl extends Disposable {
             canUseHalfwidthRightwardsArrow = false;
         }
         return ( new FontInfo({
-            pixelRatio: PixelRatio.value,
+            pixelRatio: PixelRatio.getInstance(targetWindow).value,
             fontFamily: bareFontInfo.fontFamily,
             fontWeight: bareFontInfo.fontWeight,
             fontSize: bareFontInfo.fontSize,

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

@@ -26,7 +26,7 @@ class MouseHandler extends ViewEventHandler {
             (e) => this._getMouseColumn(e)
         )));
         this.lastMouseLeaveTime = -1;
-        this._height = this._context.configuration.options.get(143 ).height;
+        this._height = this._context.configuration.options.get(144 ).height;
         const mouseEvents = ( new EditorMouseEventFactory(this.viewHelper.viewDomNode));
         this._register(mouseEvents.onContextMenu(this.viewHelper.viewDomNode, (e) => this._onContextMenu(e, true)));
         this._register(mouseEvents.onMouseMove(this.viewHelper.viewDomNode, (e) => {
@@ -60,7 +60,7 @@ class MouseHandler extends ViewEventHandler {
         let gestureAccumulatedDelta = 0;
         const onMouseWheel = (browserEvent) => {
             this.viewController.emitMouseWheel(browserEvent);
-            if (!this._context.configuration.options.get(75 )) {
+            if (!this._context.configuration.options.get(76 )) {
                 return;
             }
             const e = ( new StandardWheelEvent(browserEvent));
@@ -105,8 +105,8 @@ class MouseHandler extends ViewEventHandler {
         super.dispose();
     }
     onConfigurationChanged(e) {
-        if (e.hasChanged(143 )) {
-            const height = this._context.configuration.options.get(143 ).height;
+        if (e.hasChanged(144 )) {
+            const height = this._context.configuration.options.get(144 ).height;
             if (this._height !== height) {
                 this._height = height;
                 this._mouseDownOperation.onHeightChanged();
@@ -189,7 +189,7 @@ class MouseHandler extends ViewEventHandler {
         const targetIsContent = ((t.type === 6  || t.type === 7) );
         const targetIsGutter = ((t.type === 2  || t.type === 3  || t.type === 4) );
         const targetIsLineNumbers = ((t.type === 3) );
-        const selectOnLineNumbers = this._context.configuration.options.get(108 );
+        const selectOnLineNumbers = this._context.configuration.options.get(109 );
         const targetIsViewZone = ((t.type === 8  || t.type === 5) );
         const targetIsWidget = ((t.type === 9) );
         let shouldHandle = e.leftButton || e.middleButton;
@@ -290,7 +290,7 @@ class MouseDownOperation extends Disposable {
         this._mouseState.trySetCount(e.detail, position.position);
         e.detail = this._mouseState.count;
         const options = this._context.configuration.options;
-        if (!options.get(90 )
+        if (!options.get(91 )
             && options.get(35 )
             && !options.get(22 )
             && !this._mouseState.altKey
@@ -497,8 +497,8 @@ class TopBottomDragScrollingOperation extends Disposable {
         return elapsed;
     }
     _getScrollSpeed() {
-        const lineHeight = this._context.configuration.options.get(66 );
-        const viewportInLines = this._context.configuration.options.get(143 ).height / lineHeight;
+        const lineHeight = this._context.configuration.options.get(67 );
+        const viewportInLines = this._context.configuration.options.get(144 ).height / lineHeight;
         const outsideDistanceInLines = this._position.outsideDistance / lineHeight;
         if (outsideDistanceInLines <= 1.5) {
             return Math.max(30, viewportInLines * (1 + outsideDistanceInLines));
@@ -509,7 +509,7 @@ class TopBottomDragScrollingOperation extends Disposable {
         return Math.max(200, viewportInLines * (7 + outsideDistanceInLines));
     }
     _execute() {
-        const lineHeight = this._context.configuration.options.get(66 );
+        const lineHeight = this._context.configuration.options.get(67 );
         const scrollSpeedInLines = this._getScrollSpeed();
         const elapsed = this._tick();
         const scrollInPixels = scrollSpeedInLines * (elapsed / 1000) * lineHeight;
@@ -521,7 +521,7 @@ class TopBottomDragScrollingOperation extends Disposable {
         let mouseTarget;
         {
             const editorPos = createEditorPagePosition(this._viewHelper.viewDomNode);
-            const horizontalScrollbarHeight = this._context.configuration.options.get(143 ).horizontalScrollbarHeight;
+            const horizontalScrollbarHeight = this._context.configuration.options.get(144 ).horizontalScrollbarHeight;
             const pos = ( new PageCoordinates(
                 this._mouseEvent.pos.x,
                 editorPos.y + editorPos.height - horizontalScrollbarHeight - 0.1

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

@@ -160,10 +160,10 @@ class HitTestContext {
     constructor(context, viewHelper, lastRenderData) {
         this.viewModel = context.viewModel;
         const options = context.configuration.options;
-        this.layoutInfo = options.get(143 );
+        this.layoutInfo = options.get(144 );
         this.viewDomNode = viewHelper.viewDomNode;
-        this.lineHeight = options.get(66 );
-        this.stickyTabStops = options.get(115 );
+        this.lineHeight = options.get(67 );
+        this.stickyTabStops = options.get(116 );
         this.typicalHalfwidthCharacterWidth = options.get(50 ).typicalHalfwidthCharacterWidth;
         this.lastRenderData = lastRenderData;
         this._context = context;
@@ -571,7 +571,7 @@ class MouseTargetFactory {
     }
     getMouseColumn(relativePos) {
         const options = this._context.configuration.options;
-        const layoutInfo = options.get(143 );
+        const layoutInfo = options.get(144 );
         const mouseContentHorizontalOffset = this._context.viewLayout.getCurrentScrollLeft() + relativePos.x - layoutInfo.contentLeft;
         return MouseTargetFactory._getMouseColumn(mouseContentHorizontalOffset, options.get(50 ).typicalHalfwidthCharacterWidth);
     }

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

@@ -84,13 +84,13 @@ let TextAreaHandler = class TextAreaHandler extends ViewPart {
         this._scrollLeft = 0;
         this._scrollTop = 0;
         const options = this._context.configuration.options;
-        const layoutInfo = options.get(143 );
+        const layoutInfo = options.get(144 );
         this._setAccessibilityOptions(options);
         this._contentLeft = layoutInfo.contentLeft;
         this._contentWidth = layoutInfo.contentWidth;
         this._contentHeight = layoutInfo.height;
         this._fontInfo = options.get(50 );
-        this._lineHeight = options.get(66 );
+        this._lineHeight = options.get(67 );
         this._emptySelectionClipboard = options.get(37 );
         this._copyWithSyntaxHighlighting = options.get(25 );
         this._visibleTextArea = null;
@@ -109,11 +109,11 @@ let TextAreaHandler = class TextAreaHandler extends ViewPart {
         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(123 )));
+        this.textArea.setAttribute('tabindex', String(options.get(124 )));
         this.textArea.setAttribute('role', 'textbox');
         this.textArea.setAttribute('aria-roledescription', ( localizeWithPath('vs/editor/browser/controller/textAreaHandler', 'editor', "editor")));
         this.textArea.setAttribute('aria-multiline', 'true');
-        this.textArea.setAttribute('aria-autocomplete', options.get(90 ) ? 'none' : 'both');
+        this.textArea.setAttribute('aria-autocomplete', options.get(91 ) ? 'none' : 'both');
         this._ensureReadOnlyAttribute();
         this.textAreaCover = createFastDomNode(document.createElement('div'));
         this.textAreaCover.setPosition('absolute');
@@ -365,7 +365,7 @@ let TextAreaHandler = class TextAreaHandler extends ViewPart {
     }
     _getWordBeforePosition(position) {
         const lineContent = this._context.viewModel.getLineContent(position.lineNumber);
-        const wordSeparators = getMapForWordSeparators(this._context.configuration.options.get(129 ));
+        const wordSeparators = getMapForWordSeparators(this._context.configuration.options.get(130 ));
         let column = position.column;
         let distance = 0;
         while (column > 1) {
@@ -442,7 +442,7 @@ let TextAreaHandler = class TextAreaHandler extends ViewPart {
         else {
             this._accessibilityPageSize = accessibilityPageSize;
         }
-        const layoutInfo = options.get(143 );
+        const layoutInfo = options.get(144 );
         const wrappingColumn = layoutInfo.wrappingColumn;
         if (wrappingColumn !== -1 && this._accessibilitySupport !== 1 ) {
             const fontInfo = options.get(50 );
@@ -456,13 +456,13 @@ let TextAreaHandler = class TextAreaHandler extends ViewPart {
     }
     onConfigurationChanged(e) {
         const options = this._context.configuration.options;
-        const layoutInfo = options.get(143 );
+        const layoutInfo = options.get(144 );
         this._setAccessibilityOptions(options);
         this._contentLeft = layoutInfo.contentLeft;
         this._contentWidth = layoutInfo.contentWidth;
         this._contentHeight = layoutInfo.height;
         this._fontInfo = options.get(50 );
-        this._lineHeight = options.get(66 );
+        this._lineHeight = options.get(67 );
         this._emptySelectionClipboard = options.get(37 );
         this._copyWithSyntaxHighlighting = options.get(25 );
         this.textArea.setAttribute('wrap', this._textAreaWrapping && !this._visibleTextArea ? 'on' : 'off');
@@ -470,8 +470,8 @@ let TextAreaHandler = class TextAreaHandler extends ViewPart {
         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(123 )));
-        if (e.hasChanged(34 ) || e.hasChanged(90 )) {
+        this.textArea.setAttribute('tabindex', String(options.get(124 )));
+        if (e.hasChanged(34 ) || e.hasChanged(91 )) {
             this._ensureReadOnlyAttribute();
         }
         if (e.hasChanged(2 )) {
@@ -537,7 +537,7 @@ let TextAreaHandler = class TextAreaHandler extends ViewPart {
     }
     _ensureReadOnlyAttribute() {
         const options = this._context.configuration.options;
-        const useReadOnly = !IME.enabled || (options.get(34 ) && options.get(90 ));
+        const useReadOnly = !IME.enabled || (options.get(34 ) && options.get(91 ));
         if (useReadOnly) {
             this.textArea.setAttribute('readonly', 'true');
         }
@@ -681,7 +681,7 @@ let TextAreaHandler = class TextAreaHandler extends ViewPart {
             tac.setClassName('monaco-editor-background textAreaCover ' + Margin.OUTER_CLASS_NAME);
         }
         else {
-            if (options.get(67 ).renderType !== 0 ) {
+            if (options.get(68 ).renderType !== 0 ) {
                 tac.setClassName('monaco-editor-background textAreaCover ' + LineNumbersOverlay.CLASS_NAME);
             }
             else {

package/vscode/src/vs/editor/browser/coreCommands.js

@@ -1647,7 +1647,7 @@ var CoreEditingCommands;
             activeElement.ownerDocument.execCommand('undo');
         }
         runEditorCommand(accessor, editor, args) {
-            if (!editor.hasModel() || editor.getOption(90 ) === true) {
+            if (!editor.hasModel() || editor.getOption(91 ) === true) {
                 return;
             }
             return editor.getModel().undo();
@@ -1661,7 +1661,7 @@ var CoreEditingCommands;
             activeElement.ownerDocument.execCommand('redo');
         }
         runEditorCommand(accessor, editor, args) {
-            if (!editor.hasModel() || editor.getOption(90 ) === true) {
+            if (!editor.hasModel() || editor.getOption(91 ) === true) {
                 return;
             }
             return editor.getModel().redo();

package/vscode/src/vs/editor/browser/view/viewController.js

@@ -40,7 +40,7 @@ class ViewController {
         return viewPosition;
     }
     _hasMulticursorModifier(data) {
-        switch (this.configuration.options.get(77 )) {
+        switch (this.configuration.options.get(78 )) {
             case 'altKey':
                 return data.altKey;
             case 'ctrlKey':
@@ -52,7 +52,7 @@ class ViewController {
         }
     }
     _hasNonMulticursorModifier(data) {
-        switch (this.configuration.options.get(77 )) {
+        switch (this.configuration.options.get(78 )) {
             case 'altKey':
                 return data.ctrlKey || data.metaKey;
             case 'ctrlKey':
@@ -65,7 +65,7 @@ class ViewController {
     }
     dispatchMouse(data) {
         const options = this.configuration.options;
-        const selectionClipboardIsOn = (isLinux && options.get(106 ));
+        const selectionClipboardIsOn = (isLinux && options.get(107 ));
         const columnSelection = options.get(22 );
         if (data.middleButton && !selectionClipboardIsOn) {
             this._columnSelect(data.position, data.mouseColumn, data.inSelectionMode);

package/vscode/src/vs/editor/browser/view/viewLayer.js

@@ -160,7 +160,7 @@ class VisibleLinesCollection {
         return domNode;
     }
     onConfigurationChanged(e) {
-        if (e.hasChanged(143 )) {
+        if (e.hasChanged(144 )) {
             return true;
         }
         return false;

package/vscode/src/vs/editor/browser/view/viewOverlays.js

@@ -100,7 +100,7 @@ class ViewOverlays extends ViewPart {
 class ViewOverlayLine {
     constructor(configuration, dynamicOverlays) {
         this._configuration = configuration;
-        this._lineHeight = this._configuration.options.get(66 );
+        this._lineHeight = this._configuration.options.get(67 );
         this._dynamicOverlays = dynamicOverlays;
         this._domNode = null;
         this._renderedContent = null;
@@ -119,7 +119,7 @@ class ViewOverlayLine {
     onTokensChanged() {
     }
     onConfigurationChanged(e) {
-        this._lineHeight = this._configuration.options.get(66 );
+        this._lineHeight = this._configuration.options.get(67 );
     }
     renderLine(lineNumber, deltaTop, viewportData, sb) {
         let result = '';
@@ -151,13 +151,13 @@ class ContentViewOverlays extends ViewOverlays {
     constructor(context) {
         super(context);
         const options = this._context.configuration.options;
-        const layoutInfo = options.get(143 );
+        const layoutInfo = options.get(144 );
         this._contentWidth = layoutInfo.contentWidth;
         this.domNode.setHeight(0);
     }
     onConfigurationChanged(e) {
         const options = this._context.configuration.options;
-        const layoutInfo = options.get(143 );
+        const layoutInfo = options.get(144 );
         this._contentWidth = layoutInfo.contentWidth;
         return super.onConfigurationChanged(e) || true;
     }
@@ -173,7 +173,7 @@ class MarginViewOverlays extends ViewOverlays {
     constructor(context) {
         super(context);
         const options = this._context.configuration.options;
-        const layoutInfo = options.get(143 );
+        const layoutInfo = options.get(144 );
         this._contentLeft = layoutInfo.contentLeft;
         this.domNode.setClassName('margin-view-overlays');
         this.domNode.setWidth(1);
@@ -182,7 +182,7 @@ class MarginViewOverlays extends ViewOverlays {
     onConfigurationChanged(e) {
         const options = this._context.configuration.options;
         applyFontInfo(this.domNode, options.get(50 ));
-        const layoutInfo = options.get(143 );
+        const layoutInfo = options.get(144 );
         this._contentLeft = layoutInfo.contentLeft;
         return super.onConfigurationChanged(e) || true;
     }

package/vscode/src/vs/editor/browser/view.js

@@ -211,7 +211,7 @@ let View = class View extends ViewEventHandler {
     }
     _applyLayout() {
         const options = this._context.configuration.options;
-        const layoutInfo = options.get(143 );
+        const layoutInfo = options.get(144 );
         this.domNode.setWidth(layoutInfo.width);
         this.domNode.setHeight(layoutInfo.height);
         this._overflowGuardContainer.setWidth(layoutInfo.width);
@@ -221,7 +221,7 @@ let View = class View extends ViewEventHandler {
     }
     _getEditorClassName() {
         const focused = this._textAreaHandler.isFocused() ? ' focused' : '';
-        return this._context.configuration.options.get(140 ) + ' ' + getThemeTypeSelector(this._context.theme.type) + focused;
+        return this._context.configuration.options.get(141 ) + ' ' + getThemeTypeSelector(this._context.theme.type) + focused;
     }
     handleEvents(events) {
         super.handleEvents(events);

package/vscode/src/vs/editor/browser/viewParts/blockDecorations/blockDecorations.js

@@ -16,7 +16,7 @@ class BlockDecorations extends ViewPart {
     update() {
         let didChange = false;
         const options = this._context.configuration.options;
-        const layoutInfo = options.get(143 );
+        const layoutInfo = options.get(144 );
         const newContentWidth = layoutInfo.contentWidth - layoutInfo.verticalScrollbarWidth;
         if (this.contentWidth !== newContentWidth) {
             this.contentWidth = newContentWidth;

package/vscode/src/vs/editor/browser/viewParts/contentWidgets/contentWidgets.js

@@ -124,11 +124,11 @@ class Widget {
         this.allowEditorOverflow = this._actual.allowEditorOverflow || false;
         this.suppressMouseDown = this._actual.suppressMouseDown || false;
         const options = this._context.configuration.options;
-        const layoutInfo = options.get(143 );
+        const layoutInfo = options.get(144 );
         this._fixedOverflowWidgets = options.get(42 );
         this._contentWidth = layoutInfo.contentWidth;
         this._contentLeft = layoutInfo.contentLeft;
-        this._lineHeight = options.get(66 );
+        this._lineHeight = options.get(67 );
         this._affinity = null;
         this._preference = [];
         this._cachedDomNodeOffsetWidth = -1;
@@ -144,9 +144,9 @@ class Widget {
     }
     onConfigurationChanged(e) {
         const options = this._context.configuration.options;
-        this._lineHeight = options.get(66 );
-        if (e.hasChanged(143 )) {
-            const layoutInfo = options.get(143 );
+        this._lineHeight = options.get(67 );
+        if (e.hasChanged(144 )) {
+            const layoutInfo = options.get(144 );
             this._contentLeft = layoutInfo.contentLeft;
             this._contentWidth = layoutInfo.contentWidth;
             this._maxWidth = this._getMaxWidth();

package/vscode/src/vs/editor/browser/viewParts/currentLineHighlight/currentLineHighlight.js

@@ -11,10 +11,10 @@ class AbstractLineHighlightOverlay extends DynamicViewOverlay {
         super();
         this._context = context;
         const options = this._context.configuration.options;
-        const layoutInfo = options.get(143 );
-        this._lineHeight = options.get(66 );
-        this._renderLineHighlight = options.get(95 );
-        this._renderLineHighlightOnlyWhenFocus = options.get(96 );
+        const layoutInfo = options.get(144 );
+        this._lineHeight = options.get(67 );
+        this._renderLineHighlight = options.get(96 );
+        this._renderLineHighlightOnlyWhenFocus = options.get(97 );
         this._wordWrap = layoutInfo.isViewportWrapping;
         this._contentLeft = layoutInfo.contentLeft;
         this._contentWidth = layoutInfo.contentWidth;
@@ -53,10 +53,10 @@ class AbstractLineHighlightOverlay extends DynamicViewOverlay {
     }
     onConfigurationChanged(e) {
         const options = this._context.configuration.options;
-        const layoutInfo = options.get(143 );
-        this._lineHeight = options.get(66 );
-        this._renderLineHighlight = options.get(95 );
-        this._renderLineHighlightOnlyWhenFocus = options.get(96 );
+        const layoutInfo = options.get(144 );
+        this._lineHeight = options.get(67 );
+        this._renderLineHighlight = options.get(96 );
+        this._renderLineHighlightOnlyWhenFocus = options.get(97 );
         this._wordWrap = layoutInfo.isViewportWrapping;
         this._contentLeft = layoutInfo.contentLeft;
         this._contentWidth = layoutInfo.contentWidth;

package/vscode/src/vs/editor/browser/viewParts/decorations/decorations.js

@@ -7,7 +7,7 @@ class DecorationsOverlay extends DynamicViewOverlay {
         super();
         this._context = context;
         const options = this._context.configuration.options;
-        this._lineHeight = options.get(66 );
+        this._lineHeight = options.get(67 );
         this._typicalHalfwidthCharacterWidth = options.get(50 ).typicalHalfwidthCharacterWidth;
         this._renderResult = null;
         this._context.addEventHandler(this);
@@ -19,7 +19,7 @@ class DecorationsOverlay extends DynamicViewOverlay {
     }
     onConfigurationChanged(e) {
         const options = this._context.configuration.options;
-        this._lineHeight = options.get(66 );
+        this._lineHeight = options.get(67 );
         this._typicalHalfwidthCharacterWidth = options.get(50 ).typicalHalfwidthCharacterWidth;
         return true;
     }