@codingame/monaco-vscode-api 2.2.1 → 3.0.0

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;
     }

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

@@ -7,10 +7,10 @@ class EditorScrollbar extends ViewPart {
     constructor(context, linesContent, viewDomNode, overflowGuardDomNode) {
         super(context);
         const options = this._context.configuration.options;
-        const scrollbar = options.get(102 );
-        const mouseWheelScrollSensitivity = options.get(74 );
+        const scrollbar = options.get(103 );
+        const mouseWheelScrollSensitivity = options.get(75 );
         const fastScrollSensitivity = options.get(40 );
-        const scrollPredominantAxis = options.get(105 );
+        const scrollPredominantAxis = options.get(106 );
         const scrollbarOptions = {
             listenOnDomNode: viewDomNode.domNode,
             className: 'editor-scrollable' + ' ' + getThemeTypeSelector(context.theme.type),
@@ -69,9 +69,9 @@ class EditorScrollbar extends ViewPart {
     }
     _setLayout() {
         const options = this._context.configuration.options;
-        const layoutInfo = options.get(143 );
+        const layoutInfo = options.get(144 );
         this.scrollbarDomNode.setLeft(layoutInfo.contentLeft);
-        const minimap = options.get(72 );
+        const minimap = options.get(73 );
         const side = minimap.side;
         if (side === 'right') {
             this.scrollbarDomNode.setWidth(layoutInfo.contentWidth + layoutInfo.minimap.minimapWidth);
@@ -94,14 +94,14 @@ class EditorScrollbar extends ViewPart {
         this.scrollbar.delegateScrollFromMouseWheelEvent(browserEvent);
     }
     onConfigurationChanged(e) {
-        if (e.hasChanged(102 )
-            || e.hasChanged(74 )
+        if (e.hasChanged(103 )
+            || e.hasChanged(75 )
             || e.hasChanged(40 )) {
             const options = this._context.configuration.options;
-            const scrollbar = options.get(102 );
-            const mouseWheelScrollSensitivity = options.get(74 );
+            const scrollbar = options.get(103 );
+            const mouseWheelScrollSensitivity = options.get(75 );
             const fastScrollSensitivity = options.get(40 );
-            const scrollPredominantAxis = options.get(105 );
+            const scrollPredominantAxis = options.get(106 );
             const newOpts = {
                 vertical: scrollbar.vertical,
                 horizontal: scrollbar.horizontal,
@@ -115,7 +115,7 @@ class EditorScrollbar extends ViewPart {
             };
             this.scrollbar.updateOptions(newOpts);
         }
-        if (e.hasChanged(143 )) {
+        if (e.hasChanged(144 )) {
             this._setLayout();
         }
         return true;

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

@@ -82,12 +82,12 @@ class GlyphMarginWidgets extends ViewPart {
         this._widgets = {};
         this._context = context;
         const options = this._context.configuration.options;
-        const layoutInfo = options.get(143 );
+        const layoutInfo = options.get(144 );
         this.domNode = createFastDomNode(document.createElement('div'));
         this.domNode.setClassName('glyph-margin-widgets');
         this.domNode.setPosition('absolute');
         this.domNode.setTop(0);
-        this._lineHeight = options.get(66 );
+        this._lineHeight = options.get(67 );
         this._glyphMargin = options.get(57 );
         this._glyphMarginLeft = layoutInfo.glyphMarginLeft;
         this._glyphMarginWidth = layoutInfo.glyphMarginWidth;
@@ -106,8 +106,8 @@ class GlyphMarginWidgets extends ViewPart {
     }
     onConfigurationChanged(e) {
         const options = this._context.configuration.options;
-        const layoutInfo = options.get(143 );
-        this._lineHeight = options.get(66 );
+        const layoutInfo = options.get(144 );
+        this._lineHeight = options.get(67 );
         this._glyphMargin = options.get(57 );
         this._glyphMarginLeft = layoutInfo.glyphMarginLeft;
         this._glyphMarginWidth = layoutInfo.glyphMarginWidth;

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

@@ -13,9 +13,9 @@ class IndentGuidesOverlay extends DynamicViewOverlay {
         this._context = context;
         this._primaryPosition = null;
         const options = this._context.configuration.options;
-        const wrappingInfo = options.get(144 );
+        const wrappingInfo = options.get(145 );
         const fontInfo = options.get(50 );
-        this._lineHeight = options.get(66 );
+        this._lineHeight = options.get(67 );
         this._spaceWidth = fontInfo.spaceWidth;
         this._maxIndentLeft = wrappingInfo.wrappingColumn === -1 ? -1 : (wrappingInfo.wrappingColumn * fontInfo.typicalHalfwidthCharacterWidth);
         this._bracketPairGuideOptions = options.get(16 );
@@ -29,9 +29,9 @@ class IndentGuidesOverlay extends DynamicViewOverlay {
     }
     onConfigurationChanged(e) {
         const options = this._context.configuration.options;
-        const wrappingInfo = options.get(144 );
+        const wrappingInfo = options.get(145 );
         const fontInfo = options.get(50 );
-        this._lineHeight = options.get(66 );
+        this._lineHeight = options.get(67 );
         this._spaceWidth = fontInfo.spaceWidth;
         this._maxIndentLeft = wrappingInfo.wrappingColumn === -1 ? -1 : (wrappingInfo.wrappingColumn * fontInfo.typicalHalfwidthCharacterWidth);
         this._bracketPairGuideOptions = options.get(16 );

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

@@ -18,12 +18,12 @@ class LineNumbersOverlay extends DynamicViewOverlay {
     }
     _readConfig() {
         const options = this._context.configuration.options;
-        this._lineHeight = options.get(66 );
-        const lineNumbers = options.get(67 );
+        this._lineHeight = options.get(67 );
+        const lineNumbers = options.get(68 );
         this._renderLineNumbers = lineNumbers.renderType;
         this._renderCustomLineNumbers = lineNumbers.renderFn;
-        this._renderFinalNewline = options.get(94 );
-        const layoutInfo = options.get(143 );
+        this._renderFinalNewline = options.get(95 );
+        const layoutInfo = options.get(144 );
         this._lineNumbersLeft = layoutInfo.lineNumbersLeft;
         this._lineNumbersWidth = layoutInfo.lineNumbersWidth;
     }

package/vscode/src/vs/editor/browser/viewParts/lines/viewLine.js

@@ -24,20 +24,20 @@ class ViewLineOptions {
         const fontInfo = options.get(50 );
         const experimentalWhitespaceRendering = options.get(38 );
         if (experimentalWhitespaceRendering === 'off') {
-            this.renderWhitespace = options.get(98 );
+            this.renderWhitespace = options.get(99 );
         }
         else {
             this.renderWhitespace = 'none';
         }
-        this.renderControlCharacters = options.get(93 );
+        this.renderControlCharacters = options.get(94 );
         this.spaceWidth = fontInfo.spaceWidth;
         this.middotWidth = fontInfo.middotWidth;
         this.wsmiddotWidth = fontInfo.wsmiddotWidth;
         this.useMonospaceOptimizations = (fontInfo.isMonospace
             && !options.get(33 ));
         this.canUseHalfwidthRightwardsArrow = fontInfo.canUseHalfwidthRightwardsArrow;
-        this.lineHeight = options.get(66 );
-        this.stopRenderingLineAfter = options.get(116 );
+        this.lineHeight = options.get(67 );
+        this.stopRenderingLineAfter = options.get(117 );
         this.fontLigatures = options.get(51 );
     }
     equals(other) {

package/vscode/src/vs/editor/browser/viewParts/lines/viewLines.js

@@ -65,11 +65,11 @@ class ViewLines extends ViewPart {
         const conf = this._context.configuration;
         const options = this._context.configuration.options;
         const fontInfo = options.get(50 );
-        const wrappingInfo = options.get(144 );
-        this._lineHeight = options.get(66 );
+        const wrappingInfo = options.get(145 );
+        this._lineHeight = options.get(67 );
         this._typicalHalfwidthCharacterWidth = fontInfo.typicalHalfwidthCharacterWidth;
         this._isViewportWrapping = wrappingInfo.isViewportWrapping;
-        this._revealHorizontalRightPadding = options.get(99 );
+        this._revealHorizontalRightPadding = options.get(100 );
         this._cursorSurroundingLines = options.get(29 );
         this._cursorSurroundingLinesStyle = options.get(30 );
         this._canUseLayerHinting = !options.get(32 );
@@ -86,8 +86,8 @@ class ViewLines extends ViewPart {
         }, 2000));
         this._lastRenderedData = ( new LastRenderedData());
         this._horizontalRevealRequest = null;
-        this._stickyScrollEnabled = options.get(114 ).enabled;
-        this._maxNumberStickyLines = options.get(114 ).maxLineCount;
+        this._stickyScrollEnabled = options.get(115 ).enabled;
+        this._maxNumberStickyLines = options.get(115 ).maxLineCount;
     }
     dispose() {
         this._asyncUpdateLineWidths.dispose();
@@ -102,24 +102,24 @@ class ViewLines extends ViewPart {
     }
     onConfigurationChanged(e) {
         this._visibleLines.onConfigurationChanged(e);
-        if (e.hasChanged(144 )) {
+        if (e.hasChanged(145 )) {
             this._maxLineWidth = 0;
         }
         const options = this._context.configuration.options;
         const fontInfo = options.get(50 );
-        const wrappingInfo = options.get(144 );
-        this._lineHeight = options.get(66 );
+        const wrappingInfo = options.get(145 );
+        this._lineHeight = options.get(67 );
         this._typicalHalfwidthCharacterWidth = fontInfo.typicalHalfwidthCharacterWidth;
         this._isViewportWrapping = wrappingInfo.isViewportWrapping;
-        this._revealHorizontalRightPadding = options.get(99 );
+        this._revealHorizontalRightPadding = options.get(100 );
         this._cursorSurroundingLines = options.get(29 );
         this._cursorSurroundingLinesStyle = options.get(30 );
         this._canUseLayerHinting = !options.get(32 );
-        this._stickyScrollEnabled = options.get(114 ).enabled;
-        this._maxNumberStickyLines = options.get(114 ).maxLineCount;
+        this._stickyScrollEnabled = options.get(115 ).enabled;
+        this._maxNumberStickyLines = options.get(115 ).maxLineCount;
         applyFontInfo(this.domNode, fontInfo);
         this._onOptionsMaybeChanged();
-        if (e.hasChanged(143 )) {
+        if (e.hasChanged(144 )) {
             this._maxLineWidth = 0;
         }
         return true;
@@ -570,7 +570,7 @@ class ViewLines extends ViewPart {
     }
     _computeScrollLeftToReveal(horizontalRevealRequest) {
         const viewport = this._context.viewLayout.getCurrentViewport();
-        const layoutInfo = this._context.configuration.options.get(143 );
+        const layoutInfo = this._context.configuration.options.get(144 );
         const viewportStartX = viewport.left;
         const viewportEndX = viewportStartX + viewport.width - layoutInfo.verticalScrollbarWidth;
         let boxStartX = 1073741824 ;

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

@@ -5,7 +5,7 @@ class LinesDecorationsOverlay extends DedupOverlay {
         super();
         this._context = context;
         const options = this._context.configuration.options;
-        const layoutInfo = options.get(143 );
+        const layoutInfo = options.get(144 );
         this._decorationsLeft = layoutInfo.decorationsLeft;
         this._decorationsWidth = layoutInfo.decorationsWidth;
         this._renderResult = null;
@@ -18,7 +18,7 @@ class LinesDecorationsOverlay extends DedupOverlay {
     }
     onConfigurationChanged(e) {
         const options = this._context.configuration.options;
-        const layoutInfo = options.get(143 );
+        const layoutInfo = options.get(144 );
         this._decorationsLeft = layoutInfo.decorationsLeft;
         this._decorationsWidth = layoutInfo.decorationsWidth;
         return true;