@codingame/monaco-vscode-api 5.3.0 → 6.0.0

package/vscode/src/vs/editor/browser/widget/diffEditor/diffEditorWidget.js

@@ -17,16 +17,18 @@ import { StableEditorScrollState } from '../../stableEditorScroll.js';
 import { CodeEditorWidget } from '../codeEditor/codeEditorWidget.js';
 import { AccessibleDiffViewerModelFromEditors, AccessibleDiffViewer } from './components/accessibleDiffViewer.js';
 import { DiffEditorDecorations } from './components/diffEditorDecorations.js';
-import { DiffEditorSash } from './components/diffEditorSash.js';
+import { SashLayout, DiffEditorSash } from './components/diffEditorSash.js';
 import { DiffEditorViewZones } from './components/diffEditorViewZones/diffEditorViewZones.js';
 import { DiffEditorGutter } from './features/gutterFeature.js';
 import { HideUnchangedRegionsFeature } from './features/hideUnchangedRegionsFeature.js';
 import { MovedBlocksLinesFeature } from './features/movedBlocksLinesFeature.js';
 import { OverviewRulerFeature } from './features/overviewRulerFeature.js';
 import { RevertButtonsFeature } from './features/revertButtonsFeature.js';
-import { ObservableElementSizeObserver, bindContextKey, applyViewZones, applyStyle, translatePosition, readHotReloadableExport } from './utils.js';
+import { ObservableElementSizeObserver, applyViewZones, applyStyle, translatePosition, readHotReloadableExport } from './utils.js';
+import { bindContextKey } from '../../../../platform/observable/common/platformObservableUtils.js';
 import { Position } from '../../../common/core/position.js';
 import { Range } from '../../../common/core/range.js';
+import { CursorChangeReason } from '../../../common/cursorEvents.js';
 import { EditorType } from '../../../common/editorCommon.js';
 import { EditorContextKeys } from '../../../common/editorContextKeys.js';
 import { AccessibilitySignal } from '../../../../platform/accessibilitySignal/browser/accessibilitySignalService.js';
@@ -59,7 +61,7 @@ let DiffEditorWidget = class DiffEditorWidget extends DelegatingEditor {
         this._shouldDisposeDiffModel = false;
         this.onDidChangeModel = Event.fromObservableLight(this._diffModel);
         this._contextKeyService = this._register(this._parentContextKeyService.createScoped(this._domElement));
-        this._instantiationService = this._parentInstantiationService.createChild(( new ServiceCollection([IContextKeyService, this._contextKeyService])));
+        this._instantiationService = this._register(this._parentInstantiationService.createChild(( new ServiceCollection([IContextKeyService, this._contextKeyService]))));
         this._boundarySashes = observableValue(this, undefined);
         this._accessibleDiffViewerShouldBeVisible = observableValue(this, false);
         this._accessibleDiffViewerVisible = derived(this, reader => this._options.onlyShowAccessibleDiffViewer.read(reader)
@@ -69,6 +71,12 @@ let DiffEditorWidget = class DiffEditorWidget extends DelegatingEditor {
         this._layoutInfo = derived(this, reader => {
             const fullWidth = this._rootSizeObserver.width.read(reader);
             const fullHeight = this._rootSizeObserver.height.read(reader);
+            if (this._rootSizeObserver.automaticLayout) {
+                this.elements.root.style.height = '100%';
+            }
+            else {
+                this.elements.root.style.height = fullHeight + 'px';
+            }
             const sash = this._sash.read(reader);
             const gutter = this._gutter.read(reader);
             const gutterWidth = gutter?.width.read(reader) ?? 0;
@@ -130,13 +138,22 @@ let DiffEditorWidget = class DiffEditorWidget extends DelegatingEditor {
         this._overviewRulerPart = derivedDisposable(this, reader => !this._options.renderOverviewRuler.read(reader)
             ? undefined
             : this._instantiationService.createInstance(readHotReloadableExport(OverviewRulerFeature, reader), this._editors, this.elements.root, this._diffModel, this._rootSizeObserver.width, this._rootSizeObserver.height, ( this._layoutInfo.map(i => i.modifiedEditor)))).recomputeInitiallyAndOnChange(this._store);
+        const dimensions = {
+            height: this._rootSizeObserver.height,
+            width: ( this._rootSizeObserver.width.map((w, reader) => w - (this._overviewRulerPart.read(reader)?.width ?? 0))),
+        };
+        this._sashLayout = ( new SashLayout(this._options, dimensions));
         this._sash = derivedDisposable(this, reader => {
             const showSash = this._options.renderSideBySide.read(reader);
             this.elements.root.classList.toggle('side-by-side', showSash);
-            return !showSash ? undefined : ( new DiffEditorSash(this._options, this.elements.root, {
-                height: this._rootSizeObserver.height,
-                width: ( this._rootSizeObserver.width.map((w, reader) => w - (this._overviewRulerPart.read(reader)?.width ?? 0))),
-            }, this._boundarySashes));
+            return !showSash ? undefined : ( new DiffEditorSash(
+                this.elements.root,
+                dimensions,
+                this._options.enableSplitViewResizing,
+                this._boundarySashes,
+                this._sashLayout.sashLeft,
+                () => this._sashLayout.resetSash()
+            ));
         }).recomputeInitiallyAndOnChange(this._store);
         const unchangedRangesFeature = derivedDisposable(this, reader =>  this._instantiationService.createInstance(readHotReloadableExport(HideUnchangedRegionsFeature, reader), this._editors, this._diffModel, this._options)).recomputeInitiallyAndOnChange(this._store);
         derivedDisposable(this, reader =>  this._instantiationService.createInstance(readHotReloadableExport(DiffEditorDecorations, reader), this._editors, this._diffModel, this._options, this)).recomputeInitiallyAndOnChange(this._store);
@@ -176,7 +193,7 @@ let DiffEditorWidget = class DiffEditorWidget extends DelegatingEditor {
         codeEditorService.addDiffEditor(this);
         this._gutter = derivedDisposable(this, reader => {
             return this._options.shouldRenderGutterMenu.read(reader)
-                ? this._instantiationService.createInstance(readHotReloadableExport(DiffEditorGutter, reader), this.elements.root, this._diffModel, this._editors)
+                ? this._instantiationService.createInstance(readHotReloadableExport(DiffEditorGutter, reader), this.elements.root, this._diffModel, this._editors, this._options, this._sashLayout, this._boundarySashes)
                 : undefined;
         });
         this._register(recomputeInitiallyAndOnChange(this._layoutInfo));
@@ -446,7 +463,7 @@ let DiffEditorWidget = class DiffEditorWidget extends DelegatingEditor {
         });
     }
     _handleCursorPositionChange(e, isModifiedEditor) {
-        if (e?.reason === 3 ) {
+        if (e?.reason === CursorChangeReason.Explicit) {
             const diff = this._diffModel.get()?.diff.get()?.mappings.find(m => isModifiedEditor ? m.lineRangeMapping.modified.contains(e.position.lineNumber) : m.lineRangeMapping.original.contains(e.position.lineNumber));
             if (diff?.lineRangeMapping.modified.isEmpty) {
                 this._accessibilitySignalService.playSignal(AccessibilitySignal.diffLineDeleted, { source: 'diffEditor.cursorPositionChanged' });

package/vscode/src/vs/editor/browser/widget/diffEditor/diffProviderFactoryService.js

@@ -1,5 +1,5 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import { registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { registerSingleton, InstantiationType } from '../../../../platform/instantiation/common/extensions.js';
 import { createDecorator, IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 import { Emitter } from '../../../../base/common/event.js';
 import { StopWatch } from '../../../../base/common/stopwatch.js';
@@ -20,7 +20,7 @@ let WorkerBasedDiffProviderFactoryService = class WorkerBasedDiffProviderFactory
 WorkerBasedDiffProviderFactoryService = ( __decorate([
     ( __param(0, IInstantiationService))
 ], WorkerBasedDiffProviderFactoryService));
-registerSingleton(IDiffProviderFactoryService, WorkerBasedDiffProviderFactoryService, 1 );
+registerSingleton(IDiffProviderFactoryService, WorkerBasedDiffProviderFactoryService, InstantiationType.Delayed);
 let WorkerBasedDocumentDiffProvider = class WorkerBasedDocumentDiffProvider {
     static { WorkerBasedDocumentDiffProvider_1 = this; }
     static { this.diffCache = ( new Map()); }

package/vscode/src/vs/editor/browser/widget/diffEditor/features/gutterFeature.js

@@ -1,22 +1,26 @@
 import { __decorate, __param } from '../../../../../../../../external/tslib/tslib.es6.js';
 import { h, addDisposableListener, EventType } from '../../../../../base/browser/dom.js';
+import { ActionsOrientation } from '../../../../../base/browser/ui/actionbar/actionbar.js';
+import { HoverPosition } from '../../../../../base/browser/ui/hover/hoverWidget.js';
 import { Disposable } from '../../../../../base/common/lifecycle.js';
 import { observableValue } from '../../../../../base/common/observableInternal/base.js';
-import { derived } from '../../../../../base/common/observableInternal/derived.js';
+import { derived, derivedDisposable, derivedWithSetter } from '../../../../../base/common/observableInternal/derived.js';
 import { autorun, autorunWithStore } from '../../../../../base/common/observableInternal/autorun.js';
 import { observableFromEvent } from '../../../../../base/common/observableInternal/utils.js';
 import '../../../../../base/common/cancellation.js';
 import '../../../../../base/common/arrays.js';
+import { DiffEditorSash } from '../components/diffEditorSash.js';
 import { prependRemoveOnDispose, applyStyle, appendRemoveOnDispose } from '../utils.js';
 import { EditorGutter } from '../utils/editorGutter.js';
 import { ActionRunnerWithContext } from '../../multiDiffEditor/utils.js';
+import { EditorOption } from '../../../../common/config/editorOptions.js';
 import { LineRangeSet, LineRange } from '../../../../common/core/lineRange.js';
 import { OffsetRange } from '../../../../common/core/offsetRange.js';
 import { Range } from '../../../../common/core/range.js';
 import { TextEdit } from '../../../../common/core/textEdit.js';
 import { DetailedLineRangeMapping } from '../../../../common/diff/rangeMapping.js';
 import { TextModelText } from '../../../../common/model/textModelText.js';
-import { MenuWorkbenchToolBar } from '../../../../../platform/actions/browser/toolbar.js';
+import { MenuWorkbenchToolBar, HiddenItemStrategy } from '../../../../../platform/actions/browser/toolbar.js';
 import { MenuId } from '../../../../../platform/actions/common/actions.js';
 import { IMenuService } from '../../../../../platform/actions/common/actions.service.js';
 import { IContextKeyService } from '../../../../../platform/contextkey/common/contextkey.service.js';
@@ -25,16 +29,20 @@ import { IInstantiationService } from '../../../../../platform/instantiation/com
 const emptyArr = [];
 const width = 35;
 let DiffEditorGutter = class DiffEditorGutter extends Disposable {
-    constructor(diffEditorRoot, _diffModel, _editors, _instantiationService, _contextKeyService, _menuService) {
+    constructor(diffEditorRoot, _diffModel, _editors, _options, _sashLayout, _boundarySashes, _instantiationService, _contextKeyService, _menuService) {
         super();
         this._diffModel = _diffModel;
         this._editors = _editors;
+        this._options = _options;
+        this._sashLayout = _sashLayout;
+        this._boundarySashes = _boundarySashes;
         this._instantiationService = _instantiationService;
         this._contextKeyService = _contextKeyService;
         this._menuService = _menuService;
         this._menu = this._register(this._menuService.createMenu(MenuId.DiffEditorHunkToolbar, this._contextKeyService));
         this._actions = observableFromEvent(this._menu.onDidChange, () => this._menu.getActions());
         this._hasActions = ( this._actions.map(a => a.length > 0));
+        this._showSash = derived(this, reader => this._options.renderSideBySide.read(reader) && this._hasActions.read(reader));
         this.width = derived(this, reader => this._hasActions.read(reader) ? width : 0);
         this.elements = h('div.gutter@gutter', { style: { position: 'absolute', height: '100%', width: width + 'px' } }, []);
         this._currentDiff = derived(this, (reader) => {
@@ -75,6 +83,17 @@ let DiffEditorGutter = class DiffEditorGutter extends Disposable {
             this._editors.modified.focus();
         }));
         this._register(applyStyle(this.elements.root, { display: ( this._hasActions.map(a => a ? 'block' : 'none')) }));
+        derivedDisposable(this, reader => {
+            const showSash = this._showSash.read(reader);
+            return !showSash ? undefined : ( new DiffEditorSash(
+                diffEditorRoot,
+                this._sashLayout.dimensions,
+                this._options.enableSplitViewResizing,
+                this._boundarySashes,
+                derivedWithSetter(this, reader => this._sashLayout.sashLeft.read(reader) - width, (v, tx) => this._sashLayout.sashLeft.set(v + width, tx)),
+                () => this._sashLayout.resetSash()
+            ));
+        }).recomputeInitiallyAndOnChange(this._store);
         this._register(( new EditorGutter(this._editors.modified, this.elements.root, {
             getIntersectingGutterItems: (range, reader) => {
                 const model = this._diffModel.read(reader);
@@ -114,7 +133,7 @@ let DiffEditorGutter = class DiffEditorGutter extends Disposable {
             },
         })));
         this._register(addDisposableListener(this.elements.gutter, EventType.MOUSE_WHEEL, (e) => {
-            if (this._editors.modified.getOption(103 ).handleMouseWheel) {
+            if (this._editors.modified.getOption(EditorOption.scrollbar).handleMouseWheel) {
                 this._editors.modified.delegateScrollFromMouseWheelEvent(e);
             }
         }, { passive: false }));
@@ -132,9 +151,9 @@ let DiffEditorGutter = class DiffEditorGutter extends Disposable {
     }
 };
 DiffEditorGutter = ( __decorate([
-    ( __param(3, IInstantiationService)),
-    ( __param(4, IContextKeyService)),
-    ( __param(5, IMenuService))
+    ( __param(6, IInstantiationService)),
+    ( __param(7, IContextKeyService)),
+    ( __param(8, IMenuService))
 ], DiffEditorGutter));
 class DiffGutterItem {
     constructor(mapping, showAlways, menuId, rangeOverride, originalUri, modifiedUri) {
@@ -161,7 +180,7 @@ let DiffToolBar = class DiffToolBar extends Disposable {
         this._isSmall = observableValue(this, false);
         this._lastItemRange = undefined;
         this._lastViewRange = undefined;
-        const hoverDelegate = this._register(instantiationService.createInstance(WorkbenchHoverDelegate, 'element', true, { position: { hoverPosition: 1  } }));
+        const hoverDelegate = this._register(instantiationService.createInstance(WorkbenchHoverDelegate, 'element', true, { position: { hoverPosition: HoverPosition.RIGHT } }));
         this._register(appendRemoveOnDispose(target, this._elements.root));
         this._register(autorun(reader => {
             const showAlways = this._showAlways.read(reader);
@@ -174,13 +193,13 @@ let DiffToolBar = class DiffToolBar extends Disposable {
         this._register(autorunWithStore((reader, store) => {
             this._elements.buttons.replaceChildren();
             const i = store.add(instantiationService.createInstance(MenuWorkbenchToolBar, this._elements.buttons, this._menuId.read(reader), {
-                orientation: 1 ,
+                orientation: ActionsOrientation.VERTICAL,
                 hoverDelegate,
                 toolbarOptions: {
                     primaryGroup: g => g.startsWith('primary'),
                 },
                 overflowBehavior: { maxItems: this._isSmall.read(reader) ? 1 : 3 },
-                hiddenItemStrategy: 0 ,
+                hiddenItemStrategy: HiddenItemStrategy.Ignore,
                 actionRunner: ( new ActionRunnerWithContext(() => {
                     const item = this._item.get();
                     const mapping = item.mapping;
@@ -208,8 +227,6 @@ let DiffToolBar = class DiffToolBar extends Disposable {
         let itemHeight = this._elements.buttons.clientHeight;
         this._isSmall.set(this._item.get().mapping.original.startLineNumber === 1 && itemRange.length < 30, undefined);
         itemHeight = this._elements.buttons.clientHeight;
-        this._elements.root.style.top = itemRange.start + 'px';
-        this._elements.root.style.height = itemRange.length + 'px';
         const middleHeight = itemRange.length / 2 - itemHeight / 2;
         const margin = itemHeight;
         let effectiveCheckboxTop = itemRange.start + middleHeight;

package/vscode/src/vs/editor/browser/widget/diffEditor/features/hideUnchangedRegionsFeature.js

@@ -12,10 +12,13 @@ import '../../../../../base/common/cancellation.js';
 import '../../../../../base/common/arrays.js';
 import { ThemeIcon } from '../../../../../base/common/themables.js';
 import { isDefined } from '../../../../../base/common/types.js';
+import { RevealPreference } from '../diffEditorViewModel.js';
 import { applyObservableDecorations, ViewZoneOverlayWidget, applyStyle, PlaceholderViewZone } from '../utils.js';
+import { EditorOption } from '../../../../common/config/editorOptions.js';
 import { LineRange } from '../../../../common/core/lineRange.js';
 import { Position } from '../../../../common/core/position.js';
 import { Range } from '../../../../common/core/range.js';
+import { CursorChangeReason } from '../../../../common/cursorEvents.js';
 import { SymbolKinds } from '../../../../common/languages.js';
 import { localizeWithPath } from '../../../../../nls.js';
 import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
@@ -41,26 +44,26 @@ let HideUnchangedRegionsFeature = class HideUnchangedRegionsFeature extends Disp
         });
         this._isUpdatingHiddenAreas = false;
         this._register(this._editors.original.onDidChangeCursorPosition(e => {
-            if (e.reason === 1 ) {
+            if (e.reason === CursorChangeReason.ContentFlush) {
                 return;
             }
             const m = this._diffModel.get();
             transaction(tx => {
                 for (const s of this._editors.original.getSelections() || []) {
-                    m?.ensureOriginalLineIsVisible(s.getStartPosition().lineNumber, 0 , tx);
-                    m?.ensureOriginalLineIsVisible(s.getEndPosition().lineNumber, 0 , tx);
+                    m?.ensureOriginalLineIsVisible(s.getStartPosition().lineNumber, RevealPreference.FromCloserSide, tx);
+                    m?.ensureOriginalLineIsVisible(s.getEndPosition().lineNumber, RevealPreference.FromCloserSide, tx);
                 }
             });
         }));
         this._register(this._editors.modified.onDidChangeCursorPosition(e => {
-            if (e.reason === 1 ) {
+            if (e.reason === CursorChangeReason.ContentFlush) {
                 return;
             }
             const m = this._diffModel.get();
             transaction(tx => {
                 for (const s of this._editors.modified.getSelections() || []) {
-                    m?.ensureModifiedLineIsVisible(s.getStartPosition().lineNumber, 0 , tx);
-                    m?.ensureModifiedLineIsVisible(s.getEndPosition().lineNumber, 0 , tx);
+                    m?.ensureModifiedLineIsVisible(s.getStartPosition().lineNumber, RevealPreference.FromCloserSide, tx);
+                    m?.ensureModifiedLineIsVisible(s.getEndPosition().lineNumber, RevealPreference.FromCloserSide, tx);
                 }
             });
         }));
@@ -95,7 +98,7 @@ let HideUnchangedRegionsFeature = class HideUnchangedRegionsFeature extends Disp
                         r.originalUnchangedRange,
                         !sideBySide,
                         modifiedOutlineSource,
-                        l => this._diffModel.get().ensureModifiedLineIsVisible(l, 2 , undefined),
+                        l => this._diffModel.get().ensureModifiedLineIsVisible(l, RevealPreference.FromBottom, undefined),
                         this._options
                     ))));
                 }
@@ -110,7 +113,7 @@ let HideUnchangedRegionsFeature = class HideUnchangedRegionsFeature extends Disp
                         r.modifiedUnchangedRange,
                         false,
                         modifiedOutlineSource,
-                        l => this._diffModel.get().ensureModifiedLineIsVisible(l, 2 , undefined),
+                        l => this._diffModel.get().ensureModifiedLineIsVisible(l, RevealPreference.FromBottom, undefined),
                         this._options
                     ))));
                 }
@@ -277,7 +280,7 @@ class CollapsedCodeOverlayWidget extends ViewZoneOverlayWidget {
                 const currentTop = e.clientY;
                 const delta = currentTop - startTop;
                 didMove = didMove || Math.abs(delta) > 2;
-                const lineDelta = Math.round(delta / editor.getOption(67 ));
+                const lineDelta = Math.round(delta / editor.getOption(EditorOption.lineHeight));
                 const newVal = Math.max(0, Math.min(cur + lineDelta, this._unchangedRegion.getMaxVisibleLineCountTop()));
                 this._unchangedRegion.visibleLineCountTop.set(newVal, undefined);
             });
@@ -308,7 +311,7 @@ class CollapsedCodeOverlayWidget extends ViewZoneOverlayWidget {
                 const currentTop = e.clientY;
                 const delta = currentTop - startTop;
                 didMove = didMove || Math.abs(delta) > 2;
-                const lineDelta = Math.round(delta / editor.getOption(67 ));
+                const lineDelta = Math.round(delta / editor.getOption(EditorOption.lineHeight));
                 const newVal = Math.max(0, Math.min(cur - lineDelta, this._unchangedRegion.getMaxVisibleLineCountBottom()));
                 const top = this._unchangedRegionRange.endLineNumberExclusive > editor.getModel().getLineCount()
                     ? editor.getContentHeight()

package/vscode/src/vs/editor/browser/widget/diffEditor/features/overviewRulerFeature.js

@@ -9,6 +9,7 @@ import { autorunWithStore, autorun } from '../../../../../base/common/observable
 import { observableFromEvent, observableSignalFromEvent } from '../../../../../base/common/observableInternal/utils.js';
 import '../../../../../base/common/cancellation.js';
 import { appendRemoveOnDispose } from '../utils.js';
+import { EditorOption } from '../../../../common/config/editorOptions.js';
 import { Position } from '../../../../common/core/position.js';
 import { OverviewRulerZone } from '../../../../common/viewModel/overviewZoneManager.js';
 import '../../../../../platform/theme/common/colorUtils.js';
@@ -124,7 +125,7 @@ let OverviewRulerFeature = class OverviewRulerFeature extends Disposable {
                     });
                     const scrollTop = this._editors.modifiedScrollTop.read(reader);
                     const scrollHeight = this._editors.modifiedScrollHeight.read(reader);
-                    const scrollBarOptions = this._editors.modified.getOption(103 );
+                    const scrollBarOptions = this._editors.modified.getOption(EditorOption.scrollbar);
                     const state = ( new ScrollbarState(
                         scrollBarOptions.verticalHasArrows ? scrollBarOptions.arrowSize : 0,
                         scrollBarOptions.verticalScrollbarSize,

package/vscode/src/vs/editor/browser/widget/diffEditor/style.css.js

@@ -1,4 +1,4 @@
 import n from '../../../../../../../external/rollup-plugin-styles/dist/runtime/inject-css.js';
-var css = ".monaco-editor .diff-hidden-lines-widget{width:100%}.monaco-editor .diff-hidden-lines{font-size:13px;height:0;line-height:14px;transform:translateY(-10px)}.monaco-editor .diff-hidden-lines .bottom.dragging,.monaco-editor .diff-hidden-lines .top.dragging,.monaco-editor .diff-hidden-lines:not(.dragging) .bottom:hover,.monaco-editor .diff-hidden-lines:not(.dragging) .top:hover{background-color:var(--vscode-focusBorder)}.monaco-editor .diff-hidden-lines .bottom,.monaco-editor .diff-hidden-lines .top{background-clip:padding-box;background-color:transparent;border-bottom:2px solid transparent;border-top:4px solid transparent;height:4px;transition:background-color .1s ease-out}.monaco-editor .diff-hidden-lines .bottom.canMoveTop:not(.canMoveBottom),.monaco-editor .diff-hidden-lines .top.canMoveTop:not(.canMoveBottom),.monaco-editor.draggingUnchangedRegion.canMoveTop:not(.canMoveBottom) *{cursor:n-resize!important}.monaco-editor .diff-hidden-lines .bottom:not(.canMoveTop).canMoveBottom,.monaco-editor .diff-hidden-lines .top:not(.canMoveTop).canMoveBottom,.monaco-editor.draggingUnchangedRegion:not(.canMoveTop).canMoveBottom *{cursor:s-resize!important}.monaco-editor .diff-hidden-lines .bottom.canMoveTop.canMoveBottom,.monaco-editor .diff-hidden-lines .top.canMoveTop.canMoveBottom,.monaco-editor.draggingUnchangedRegion.canMoveTop.canMoveBottom *{cursor:ns-resize!important}.monaco-editor .diff-hidden-lines .top{transform:translateY(4px)}.monaco-editor .diff-hidden-lines .bottom{transform:translateY(-6px)}.monaco-editor .diff-unchanged-lines{background:var(--vscode-diffEditor-unchangedCodeBackground)}.monaco-editor .noModificationsOverlay{align-items:center;background:var(--vscode-editor-background);display:flex;justify-content:center;z-index:1}.monaco-editor .diff-hidden-lines .center{background:var(--vscode-diffEditor-unchangedRegionBackground);box-shadow:inset 0 -5px 5px -7px var(--vscode-diffEditor-unchangedRegionShadow),inset 0 5px 5px -7px var(--vscode-diffEditor-unchangedRegionShadow);color:var(--vscode-diffEditor-unchangedRegionForeground);display:block;height:24px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.monaco-editor .diff-hidden-lines .center span.codicon{vertical-align:middle}.monaco-editor .diff-hidden-lines .center a:hover .codicon{color:var(--vscode-editorLink-activeForeground)!important;cursor:pointer}.monaco-editor .diff-hidden-lines div.breadcrumb-item{cursor:pointer}.monaco-editor .diff-hidden-lines div.breadcrumb-item:hover{color:var(--vscode-editorLink-activeForeground)}.monaco-editor .movedModified,.monaco-editor .movedOriginal{border:2px solid var(--vscode-diffEditor-move-border)}.monaco-editor .movedModified.currentMove,.monaco-editor .movedOriginal.currentMove{border:2px solid var(--vscode-diffEditor-moveActive-border)}.monaco-diff-editor .moved-blocks-lines path.currentMove{stroke:var(--vscode-diffEditor-moveActive-border)}.monaco-diff-editor .moved-blocks-lines path{pointer-events:visiblestroke}.monaco-diff-editor .moved-blocks-lines .arrow{fill:var(--vscode-diffEditor-move-border)}.monaco-diff-editor .moved-blocks-lines .arrow.currentMove{fill:var(--vscode-diffEditor-moveActive-border)}.monaco-diff-editor .moved-blocks-lines .arrow-rectangle{fill:var(--vscode-editor-background)}.monaco-diff-editor .moved-blocks-lines{pointer-events:none;position:absolute}.monaco-diff-editor .moved-blocks-lines path{fill:none;stroke:var(--vscode-diffEditor-move-border);stroke-width:2}.monaco-editor .char-delete.diff-range-empty{border-left:3px solid var(--vscode-diffEditor-removedTextBackground);margin-left:-1px}.monaco-editor .char-insert.diff-range-empty{border-left:3px solid var(--vscode-diffEditor-insertedTextBackground)}.monaco-editor .fold-unchanged{cursor:pointer}.monaco-diff-editor .diff-moved-code-block{display:flex;justify-content:flex-end;margin-top:-4px}.monaco-diff-editor .diff-moved-code-block .action-bar .action-label.codicon{font-size:12px;height:12px;width:12px}.monaco-diff-editor .diffOverview{z-index:9}.monaco-diff-editor .diffOverview .diffViewport{z-index:10}.monaco-diff-editor.vs\t\t\t.diffOverview{background:rgba(0,0,0,.03)}.monaco-diff-editor.vs-dark\t\t.diffOverview{background:hsla(0,0%,100%,.01)}.monaco-scrollable-element.modified-in-monaco-diff-editor.vs\t\t.scrollbar,.monaco-scrollable-element.modified-in-monaco-diff-editor.vs-dark\t.scrollbar{background:transparent}.monaco-scrollable-element.modified-in-monaco-diff-editor.hc-black\t.scrollbar,.monaco-scrollable-element.modified-in-monaco-diff-editor.hc-light\t.scrollbar{background:none}.monaco-scrollable-element.modified-in-monaco-diff-editor .slider{z-index:10}.modified-in-monaco-diff-editor\t\t\t\t.slider.active{background:hsla(0,0%,67%,.4)}.modified-in-monaco-diff-editor.hc-black\t.slider.active,.modified-in-monaco-diff-editor.hc-light\t.slider.active{background:none}.monaco-diff-editor .delete-sign,.monaco-diff-editor .insert-sign,.monaco-editor .delete-sign,.monaco-editor .insert-sign{align-items:center;display:flex!important;font-size:11px!important;opacity:.7!important}.monaco-diff-editor.hc-black .delete-sign,.monaco-diff-editor.hc-black .insert-sign,.monaco-diff-editor.hc-light .delete-sign,.monaco-diff-editor.hc-light .insert-sign,.monaco-editor.hc-black .delete-sign,.monaco-editor.hc-black .insert-sign,.monaco-editor.hc-light .delete-sign,.monaco-editor.hc-light .insert-sign{opacity:1}.monaco-editor .inline-added-margin-view-zone,.monaco-editor .inline-deleted-margin-view-zone{text-align:right}.monaco-editor .arrow-revert-change{position:absolute;z-index:10}.monaco-editor .arrow-revert-change:hover{cursor:pointer}.monaco-editor .view-zones .view-lines .view-line span{display:inline-block}.monaco-editor .margin-view-zones .lightbulb-glyph:hover{cursor:pointer}.monaco-diff-editor .char-insert,.monaco-editor .char-insert{background-color:var(--vscode-diffEditor-insertedTextBackground)}.monaco-diff-editor .line-insert,.monaco-editor .line-insert{background-color:var(--vscode-diffEditor-insertedLineBackground,var(--vscode-diffEditor-insertedTextBackground))}.monaco-editor .char-insert,.monaco-editor .line-insert{border:1px solid var(--vscode-diffEditor-insertedTextBorder);box-sizing:border-box}.monaco-editor.hc-black .char-insert,.monaco-editor.hc-black .line-insert,.monaco-editor.hc-light .char-insert,.monaco-editor.hc-light .line-insert{border-style:dashed}.monaco-editor .char-delete,.monaco-editor .line-delete{border:1px solid var(--vscode-diffEditor-removedTextBorder);box-sizing:border-box}.monaco-editor.hc-black .char-delete,.monaco-editor.hc-black .line-delete,.monaco-editor.hc-light .char-delete,.monaco-editor.hc-light .line-delete{border-style:dashed}.monaco-diff-editor .gutter-insert,.monaco-editor .gutter-insert,.monaco-editor .inline-added-margin-view-zone{background-color:var(--vscode-diffEditorGutter-insertedLineBackground,var(--vscode-diffEditor-insertedLineBackground),var(--vscode-diffEditor-insertedTextBackground))}.monaco-diff-editor .char-delete,.monaco-editor .char-delete{background-color:var(--vscode-diffEditor-removedTextBackground)}.monaco-diff-editor .line-delete,.monaco-editor .line-delete{background-color:var(--vscode-diffEditor-removedLineBackground,var(--vscode-diffEditor-removedTextBackground))}.monaco-diff-editor .gutter-delete,.monaco-editor .gutter-delete,.monaco-editor .inline-deleted-margin-view-zone{background-color:var(--vscode-diffEditorGutter-removedLineBackground,var(--vscode-diffEditor-removedLineBackground),var(--vscode-diffEditor-removedTextBackground))}.monaco-diff-editor.side-by-side .editor.modified{border-left:1px solid var(--vscode-diffEditor-border);box-shadow:-6px 0 5px -5px var(--vscode-scrollbar-shadow)}.monaco-diff-editor.side-by-side .editor.original{border-right:1px solid var(--vscode-diffEditor-border);box-shadow:6px 0 5px -5px var(--vscode-scrollbar-shadow)}.monaco-diff-editor .diffViewport{background:var(--vscode-scrollbarSlider-background)}.monaco-diff-editor .diffViewport:hover{background:var(--vscode-scrollbarSlider-hoverBackground)}.monaco-diff-editor .diffViewport:active{background:var(--vscode-scrollbarSlider-activeBackground)}.monaco-editor .diagonal-fill{background-image:linear-gradient(-45deg,var(--vscode-diffEditor-diagonalFill) 12.5%,#0000 12.5%,#0000 50%,var(--vscode-diffEditor-diagonalFill) 50%,var(--vscode-diffEditor-diagonalFill) 62.5%,#0000 62.5%,#0000 100%);background-size:8px 8px}.monaco-diff-editor .gutter{flex-grow:0;flex-shrink:0;overflow:hidden;position:relative;.gutterItem{opacity:0;transition:opacity .7s;&.showAlways{opacity:1}&.noTransition,&.showAlways{transition:none}}&:hover .gutterItem{opacity:1;transition:opacity .1s ease-in-out}.gutterItem{.background{border-left:2px solid var(--vscode-menu-border);height:100%;left:50%;position:absolute;width:1px}.buttons{align-items:center;display:flex;justify-content:center;position:absolute;width:100%;.monaco-toolbar{height:fit-content;.monaco-action-bar{line-height:1;.actions-container{background:var(--vscode-editor-background);border:1px solid var(--vscode-menu-border);border-radius:4px;width:fit-content;.action-item{&:hover{background:var(--vscode-toolbar-hoverBackground)}.action-label{padding:.5px 1px}}}}}}}}";
+var css = ".monaco-editor .diff-hidden-lines-widget{width:100%}.monaco-editor .diff-hidden-lines{font-size:13px;height:0;line-height:14px;transform:translateY(-10px)}.monaco-editor .diff-hidden-lines .bottom.dragging,.monaco-editor .diff-hidden-lines .top.dragging,.monaco-editor .diff-hidden-lines:not(.dragging) .bottom:hover,.monaco-editor .diff-hidden-lines:not(.dragging) .top:hover{background-color:var(--vscode-focusBorder)}.monaco-editor .diff-hidden-lines .bottom,.monaco-editor .diff-hidden-lines .top{background-clip:padding-box;background-color:transparent;border-bottom:2px solid transparent;border-top:4px solid transparent;height:4px;transition:background-color .1s ease-out}.monaco-editor .diff-hidden-lines .bottom.canMoveTop:not(.canMoveBottom),.monaco-editor .diff-hidden-lines .top.canMoveTop:not(.canMoveBottom),.monaco-editor.draggingUnchangedRegion.canMoveTop:not(.canMoveBottom) *{cursor:n-resize!important}.monaco-editor .diff-hidden-lines .bottom:not(.canMoveTop).canMoveBottom,.monaco-editor .diff-hidden-lines .top:not(.canMoveTop).canMoveBottom,.monaco-editor.draggingUnchangedRegion:not(.canMoveTop).canMoveBottom *{cursor:s-resize!important}.monaco-editor .diff-hidden-lines .bottom.canMoveTop.canMoveBottom,.monaco-editor .diff-hidden-lines .top.canMoveTop.canMoveBottom,.monaco-editor.draggingUnchangedRegion.canMoveTop.canMoveBottom *{cursor:ns-resize!important}.monaco-editor .diff-hidden-lines .top{transform:translateY(4px)}.monaco-editor .diff-hidden-lines .bottom{transform:translateY(-6px)}.monaco-editor .diff-unchanged-lines{background:var(--vscode-diffEditor-unchangedCodeBackground)}.monaco-editor .noModificationsOverlay{align-items:center;background:var(--vscode-editor-background);display:flex;justify-content:center;z-index:1}.monaco-editor .diff-hidden-lines .center{background:var(--vscode-diffEditor-unchangedRegionBackground);box-shadow:inset 0 -5px 5px -7px var(--vscode-diffEditor-unchangedRegionShadow),inset 0 5px 5px -7px var(--vscode-diffEditor-unchangedRegionShadow);color:var(--vscode-diffEditor-unchangedRegionForeground);display:block;height:24px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.monaco-editor .diff-hidden-lines .center span.codicon{vertical-align:middle}.monaco-editor .diff-hidden-lines .center a:hover .codicon{color:var(--vscode-editorLink-activeForeground)!important;cursor:pointer}.monaco-editor .diff-hidden-lines div.breadcrumb-item{cursor:pointer}.monaco-editor .diff-hidden-lines div.breadcrumb-item:hover{color:var(--vscode-editorLink-activeForeground)}.monaco-editor .movedModified,.monaco-editor .movedOriginal{border:2px solid var(--vscode-diffEditor-move-border)}.monaco-editor .movedModified.currentMove,.monaco-editor .movedOriginal.currentMove{border:2px solid var(--vscode-diffEditor-moveActive-border)}.monaco-diff-editor .moved-blocks-lines path.currentMove{stroke:var(--vscode-diffEditor-moveActive-border)}.monaco-diff-editor .moved-blocks-lines path{pointer-events:visiblestroke}.monaco-diff-editor .moved-blocks-lines .arrow{fill:var(--vscode-diffEditor-move-border)}.monaco-diff-editor .moved-blocks-lines .arrow.currentMove{fill:var(--vscode-diffEditor-moveActive-border)}.monaco-diff-editor .moved-blocks-lines .arrow-rectangle{fill:var(--vscode-editor-background)}.monaco-diff-editor .moved-blocks-lines{pointer-events:none;position:absolute}.monaco-diff-editor .moved-blocks-lines path{fill:none;stroke:var(--vscode-diffEditor-move-border);stroke-width:2}.monaco-editor .char-delete.diff-range-empty{border-left:3px solid var(--vscode-diffEditor-removedTextBackground);margin-left:-1px}.monaco-editor .char-insert.diff-range-empty{border-left:3px solid var(--vscode-diffEditor-insertedTextBackground)}.monaco-editor .fold-unchanged{cursor:pointer}.monaco-diff-editor .diff-moved-code-block{display:flex;justify-content:flex-end;margin-top:-4px}.monaco-diff-editor .diff-moved-code-block .action-bar .action-label.codicon{font-size:12px;height:12px;width:12px}.monaco-diff-editor .diffOverview{z-index:9}.monaco-diff-editor .diffOverview .diffViewport{z-index:10}.monaco-diff-editor.vs\t\t\t.diffOverview{background:rgba(0,0,0,.03)}.monaco-diff-editor.vs-dark\t\t.diffOverview{background:hsla(0,0%,100%,.01)}.monaco-scrollable-element.modified-in-monaco-diff-editor.vs\t\t.scrollbar,.monaco-scrollable-element.modified-in-monaco-diff-editor.vs-dark\t.scrollbar{background:transparent}.monaco-scrollable-element.modified-in-monaco-diff-editor.hc-black\t.scrollbar,.monaco-scrollable-element.modified-in-monaco-diff-editor.hc-light\t.scrollbar{background:none}.monaco-scrollable-element.modified-in-monaco-diff-editor .slider{z-index:10}.modified-in-monaco-diff-editor\t\t\t\t.slider.active{background:hsla(0,0%,67%,.4)}.modified-in-monaco-diff-editor.hc-black\t.slider.active,.modified-in-monaco-diff-editor.hc-light\t.slider.active{background:none}.monaco-diff-editor .delete-sign,.monaco-diff-editor .insert-sign,.monaco-editor .delete-sign,.monaco-editor .insert-sign{align-items:center;display:flex!important;font-size:11px!important;opacity:.7!important}.monaco-diff-editor.hc-black .delete-sign,.monaco-diff-editor.hc-black .insert-sign,.monaco-diff-editor.hc-light .delete-sign,.monaco-diff-editor.hc-light .insert-sign,.monaco-editor.hc-black .delete-sign,.monaco-editor.hc-black .insert-sign,.monaco-editor.hc-light .delete-sign,.monaco-editor.hc-light .insert-sign{opacity:1}.monaco-editor .inline-added-margin-view-zone,.monaco-editor .inline-deleted-margin-view-zone{text-align:right}.monaco-editor .arrow-revert-change{position:absolute;z-index:10}.monaco-editor .arrow-revert-change:hover{cursor:pointer}.monaco-editor .view-zones .view-lines .view-line span{display:inline-block}.monaco-editor .margin-view-zones .lightbulb-glyph:hover{cursor:pointer}.monaco-diff-editor .char-insert,.monaco-editor .char-insert{background-color:var(--vscode-diffEditor-insertedTextBackground)}.monaco-diff-editor .line-insert,.monaco-editor .line-insert{background-color:var(--vscode-diffEditor-insertedLineBackground,var(--vscode-diffEditor-insertedTextBackground))}.monaco-editor .char-insert,.monaco-editor .line-insert{border:1px solid var(--vscode-diffEditor-insertedTextBorder);box-sizing:border-box}.monaco-editor.hc-black .char-insert,.monaco-editor.hc-black .line-insert,.monaco-editor.hc-light .char-insert,.monaco-editor.hc-light .line-insert{border-style:dashed}.monaco-editor .char-delete,.monaco-editor .line-delete{border:1px solid var(--vscode-diffEditor-removedTextBorder);box-sizing:border-box}.monaco-editor.hc-black .char-delete,.monaco-editor.hc-black .line-delete,.monaco-editor.hc-light .char-delete,.monaco-editor.hc-light .line-delete{border-style:dashed}.monaco-diff-editor .gutter-insert,.monaco-editor .gutter-insert,.monaco-editor .inline-added-margin-view-zone{background-color:var(--vscode-diffEditorGutter-insertedLineBackground,var(--vscode-diffEditor-insertedLineBackground),var(--vscode-diffEditor-insertedTextBackground))}.monaco-diff-editor .char-delete,.monaco-editor .char-delete{background-color:var(--vscode-diffEditor-removedTextBackground)}.monaco-diff-editor .line-delete,.monaco-editor .line-delete{background-color:var(--vscode-diffEditor-removedLineBackground,var(--vscode-diffEditor-removedTextBackground))}.monaco-diff-editor .gutter-delete,.monaco-editor .gutter-delete,.monaco-editor .inline-deleted-margin-view-zone{background-color:var(--vscode-diffEditorGutter-removedLineBackground,var(--vscode-diffEditor-removedLineBackground),var(--vscode-diffEditor-removedTextBackground))}.monaco-diff-editor.side-by-side .editor.modified{border-left:1px solid var(--vscode-diffEditor-border);box-shadow:-6px 0 5px -5px var(--vscode-scrollbar-shadow)}.monaco-diff-editor.side-by-side .editor.original{border-right:1px solid var(--vscode-diffEditor-border);box-shadow:6px 0 5px -5px var(--vscode-scrollbar-shadow)}.monaco-diff-editor .diffViewport{background:var(--vscode-scrollbarSlider-background)}.monaco-diff-editor .diffViewport:hover{background:var(--vscode-scrollbarSlider-hoverBackground)}.monaco-diff-editor .diffViewport:active{background:var(--vscode-scrollbarSlider-activeBackground)}.monaco-editor .diagonal-fill{background-image:linear-gradient(-45deg,var(--vscode-diffEditor-diagonalFill) 12.5%,#0000 12.5%,#0000 50%,var(--vscode-diffEditor-diagonalFill) 50%,var(--vscode-diffEditor-diagonalFill) 62.5%,#0000 62.5%,#0000 100%);background-size:8px 8px}.monaco-diff-editor .gutter{flex-grow:0;flex-shrink:0;overflow:hidden;position:relative;&>div{position:absolute}.gutterItem{opacity:0;transition:opacity .7s;&.showAlways{opacity:1}&.noTransition,&.showAlways{transition:none}}&:hover .gutterItem{opacity:1;transition:opacity .1s ease-in-out}.gutterItem{.background{border-left:2px solid var(--vscode-menu-border);height:100%;left:50%;position:absolute;width:1px}.buttons{align-items:center;display:flex;justify-content:center;position:absolute;width:100%;.monaco-toolbar{height:fit-content;.monaco-action-bar{line-height:1;.actions-container{background:var(--vscode-editorGutter-commentRangeForeground);border-radius:4px;width:fit-content;.action-item{&:hover{background:var(--vscode-toolbar-hoverBackground)}.action-label{padding:1px 2px}}}}}}}}";
 n(css,{});
 export { css, css as default };

package/vscode/src/vs/editor/browser/widget/diffEditor/utils.js

@@ -79,8 +79,10 @@ function prependRemoveOnDispose(parent, child) {
 class ObservableElementSizeObserver extends Disposable {
     get width() { return this._width; }
     get height() { return this._height; }
+    get automaticLayout() { return this._automaticLayout; }
     constructor(element, dimension) {
         super();
+        this._automaticLayout = false;
         this.elementSizeObserver = this._register(( new ElementSizeObserver(element, dimension)));
         this._width = observableValue(this, this.elementSizeObserver.getWidth());
         this._height = observableValue(this, this.elementSizeObserver.getHeight());
@@ -93,6 +95,7 @@ class ObservableElementSizeObserver extends Disposable {
         this.elementSizeObserver.observe(dimension);
     }
     setAutomaticLayout(automaticLayout) {
+        this._automaticLayout = automaticLayout;
         if (automaticLayout) {
             this.elementSizeObserver.startObserving();
         }
@@ -334,12 +337,6 @@ function lengthBetweenPositions(position1, position2) {
         return ( new TextLength(position2.lineNumber - position1.lineNumber, position2.column - 1));
     }
 }
-function bindContextKey(key, service, computeValue) {
-    const boundKey = key.bindTo(service);
-    return autorunOpts({ debugName: () => `Set Context Key "${key.key}"` }, reader => {
-        boundKey.set(computeValue(reader));
-    });
-}
 function filterWithPrevious(arr, filter) {
     let prev;
     return arr.filter(cur => {
@@ -348,4 +345,4 @@ function filterWithPrevious(arr, filter) {
         return result;
     });
 }
-export { DisposableCancellationTokenSource, ManagedOverlayWidget, ObservableElementSizeObserver, PlaceholderViewZone, ViewZoneOverlayWidget, animatedObservable, appendRemoveOnDispose, applyObservableDecorations, applyStyle, applyViewZones, bindContextKey, filterWithPrevious, joinCombine, observeHotReloadableExports, prependRemoveOnDispose, readHotReloadableExport, translatePosition };
+export { DisposableCancellationTokenSource, ManagedOverlayWidget, ObservableElementSizeObserver, PlaceholderViewZone, ViewZoneOverlayWidget, animatedObservable, appendRemoveOnDispose, applyObservableDecorations, applyStyle, applyViewZones, filterWithPrevious, joinCombine, observeHotReloadableExports, prependRemoveOnDispose, readHotReloadableExport, translatePosition };

package/vscode/src/vs/editor/browser/widget/markdownRenderer/browser/markdownRenderer.js

@@ -6,6 +6,7 @@ import { Emitter } from '../../../../../base/common/event.js';
 import { DisposableStore } from '../../../../../base/common/lifecycle.js';
 import './renderedMarkdown.css.js';
 import { applyFontInfo } from '../../../config/domFontInfo.js';
+import { EditorOption } from '../../../../common/config/editorOptions.js';
 import { ILanguageService } from '../../../../common/languages/language.js';
 import { PLAINTEXT_LANGUAGE_ID } from '../../../../common/languages/modesRegistry.js';
 import { tokenizeToString } from '../../../../common/languages/textToHtmlTokenizer.js';
@@ -58,7 +59,7 @@ let MarkdownRenderer = class MarkdownRenderer {
                 const element = document.createElement('span');
                 element.innerHTML = (MarkdownRenderer_1._ttpTokenizer?.createHTML(html) ?? html);
                 if (this._options.editor) {
-                    const fontInfo = this._options.editor.getOption(50 );
+                    const fontInfo = this._options.editor.getOption(EditorOption.fontInfo);
                     applyFontInfo(element, fontInfo);
                 }
                 else if (this._options.codeBlockFontFamily) {