@codingame/monaco-vscode-api 6.0.3 → 7.0.1

package/vscode/src/vs/editor/browser/services/hoverService/hoverService.js

@@ -25,7 +25,7 @@ import { IAccessibilityService } from '../../../../platform/accessibility/common
 import { ILayoutService } from '../../../../platform/layout/browser/layoutService.service.js';
 import { mainWindow } from '../../../../base/browser/window.js';
 import { ContextViewHandler } from '../../../../platform/contextview/browser/contextViewService.js';
-import { UpdatableHoverWidget } from './updatableHoverWidget.js';
+import { ManagedHoverWidget } from './updatableHoverWidget.js';
 import { TimeoutTimer } from '../../../../base/common/async.js';
 let HoverService = class HoverService extends Disposable {
     constructor(_instantiationService, contextMenuService, _keybindingService, _layoutService, _accessibilityService) {
@@ -34,7 +34,7 @@ let HoverService = class HoverService extends Disposable {
         this._keybindingService = _keybindingService;
         this._layoutService = _layoutService;
         this._accessibilityService = _accessibilityService;
-        this._existingHovers = ( new Map());
+        this._managedHovers = ( new Map());
         contextMenuService.onDidShowContextMenu(() => this.hideHover());
         this._contextViewHandler = this._register(( new ContextViewHandler(this._layoutService)));
     }
@@ -161,12 +161,12 @@ let HoverService = class HoverService extends Disposable {
             }
         }
     }
-    setupUpdatableHover(hoverDelegate, htmlElement, content, options) {
-        htmlElement.setAttribute('custom-hover', 'true');
-        if (htmlElement.title !== '') {
+    setupManagedHover(hoverDelegate, targetElement, content, options) {
+        targetElement.setAttribute('custom-hover', 'true');
+        if (targetElement.title !== '') {
             console.warn('HTML element already has a title attribute, which will conflict with the custom hover. Please remove the title attribute.');
-            console.trace('Stack trace:', htmlElement.title);
-            htmlElement.title = '';
+            console.trace('Stack trace:', targetElement.title);
+            targetElement.title = '';
         }
         let hoverPreparation;
         let hoverWidget;
@@ -188,22 +188,22 @@ let HoverService = class HoverService extends Disposable {
         const triggerShowHover = (delay, focus, target, trapFocus) => {
             return ( new TimeoutTimer(async () => {
                 if (!hoverWidget || hoverWidget.isDisposed) {
-                    hoverWidget = ( new UpdatableHoverWidget(hoverDelegate, target || htmlElement, delay > 0));
+                    hoverWidget = ( new ManagedHoverWidget(hoverDelegate, target || targetElement, delay > 0));
                     await hoverWidget.update(typeof content === 'function' ? content() : content, focus, { ...options, trapFocus });
                 }
             }, delay));
         };
         let isMouseDown = false;
-        const mouseDownEmitter = addDisposableListener(htmlElement, EventType.MOUSE_DOWN, () => {
+        const mouseDownEmitter = addDisposableListener(targetElement, EventType.MOUSE_DOWN, () => {
             isMouseDown = true;
             hideHover(true, true);
         }, true);
-        const mouseUpEmitter = addDisposableListener(htmlElement, EventType.MOUSE_UP, () => {
+        const mouseUpEmitter = addDisposableListener(targetElement, EventType.MOUSE_UP, () => {
             isMouseDown = false;
         }, true);
-        const mouseLeaveEmitter = addDisposableListener(htmlElement, EventType.MOUSE_LEAVE, (e) => {
+        const mouseLeaveEmitter = addDisposableListener(targetElement, EventType.MOUSE_LEAVE, (e) => {
             isMouseDown = false;
-            hideHover(false, e.fromElement === htmlElement);
+            hideHover(false, e.fromElement === targetElement);
         }, true);
         const onMouseOver = (e) => {
             if (hoverPreparation) {
@@ -211,43 +211,43 @@ let HoverService = class HoverService extends Disposable {
             }
             const toDispose = ( new DisposableStore());
             const target = {
-                targetElements: [htmlElement],
+                targetElements: [targetElement],
                 dispose: () => { }
             };
             if (hoverDelegate.placement === undefined || hoverDelegate.placement === 'mouse') {
                 const onMouseMove = (e) => {
                     target.x = e.x + 10;
-                    if ((isHTMLElement(e.target)) && getHoverTargetElement(e.target, htmlElement) !== htmlElement) {
+                    if ((isHTMLElement(e.target)) && getHoverTargetElement(e.target, targetElement) !== targetElement) {
                         hideHover(true, true);
                     }
                 };
-                toDispose.add(addDisposableListener(htmlElement, EventType.MOUSE_MOVE, onMouseMove, true));
+                toDispose.add(addDisposableListener(targetElement, EventType.MOUSE_MOVE, onMouseMove, true));
             }
             hoverPreparation = toDispose;
-            if ((isHTMLElement(e.target)) && getHoverTargetElement(e.target, htmlElement) !== htmlElement) {
+            if ((isHTMLElement(e.target)) && getHoverTargetElement(e.target, targetElement) !== targetElement) {
                 return;
             }
             toDispose.add(triggerShowHover(hoverDelegate.delay, false, target));
         };
-        const mouseOverDomEmitter = addDisposableListener(htmlElement, EventType.MOUSE_OVER, onMouseOver, true);
+        const mouseOverDomEmitter = addDisposableListener(targetElement, EventType.MOUSE_OVER, onMouseOver, true);
         const onFocus = () => {
             if (isMouseDown || hoverPreparation) {
                 return;
             }
             const target = {
-                targetElements: [htmlElement],
+                targetElements: [targetElement],
                 dispose: () => { }
             };
             const toDispose = ( new DisposableStore());
             const onBlur = () => hideHover(true, true);
-            toDispose.add(addDisposableListener(htmlElement, EventType.BLUR, onBlur, true));
+            toDispose.add(addDisposableListener(targetElement, EventType.BLUR, onBlur, true));
             toDispose.add(triggerShowHover(hoverDelegate.delay, false, target));
             hoverPreparation = toDispose;
         };
         let focusDomEmitter;
-        const tagName = htmlElement.tagName.toLowerCase();
+        const tagName = targetElement.tagName.toLowerCase();
         if (tagName !== 'input' && tagName !== 'textarea') {
-            focusDomEmitter = addDisposableListener(htmlElement, EventType.FOCUS, onFocus, true);
+            focusDomEmitter = addDisposableListener(targetElement, EventType.FOCUS, onFocus, true);
         }
         const hover = {
             show: focus => {
@@ -261,7 +261,7 @@ let HoverService = class HoverService extends Disposable {
                 await hoverWidget?.update(content, undefined, hoverOptions);
             },
             dispose: () => {
-                this._existingHovers.delete(htmlElement);
+                this._managedHovers.delete(targetElement);
                 mouseOverDomEmitter.dispose();
                 mouseLeaveEmitter.dispose();
                 mouseDownEmitter.dispose();
@@ -270,17 +270,17 @@ let HoverService = class HoverService extends Disposable {
                 hideHover(true, true);
             }
         };
-        this._existingHovers.set(htmlElement, hover);
+        this._managedHovers.set(targetElement, hover);
         return hover;
     }
-    triggerUpdatableHover(target) {
-        const hover = this._existingHovers.get(target);
+    showManagedHover(target) {
+        const hover = this._managedHovers.get(target);
         if (hover) {
             hover.show(true);
         }
     }
     dispose() {
-        this._existingHovers.forEach(hover => hover.dispose());
+        this._managedHovers.forEach(hover => hover.dispose());
         super.dispose();
     }
 };

package/vscode/src/vs/editor/browser/services/hoverService/updatableHoverWidget.js

@@ -5,7 +5,7 @@ import { isMarkdownString } from '../../../../base/common/htmlContent.js';
 import { isString, isFunction } from '../../../../base/common/types.js';
 import { localizeWithPath } from '../../../../nls.js';
 const _moduleId = "vs/editor/browser/services/hoverService/updatableHoverWidget";
-class UpdatableHoverWidget {
+class ManagedHoverWidget {
     constructor(hoverDelegate, target, fadeInAnimation) {
         this.hoverDelegate = hoverDelegate;
         this.target = target;
@@ -79,4 +79,4 @@ class UpdatableHoverWidget {
         this._cancellationTokenSource = undefined;
     }
 }
-export { UpdatableHoverWidget };
+export { ManagedHoverWidget };

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

@@ -151,7 +151,7 @@ function createLineBreaks(targetWindow, requests, fontInfo, tabSize, firstLineBr
             wrappedTextIndentLength
         ));
     }
-    targetWindow.document.body.removeChild(containerDomNode);
+    containerDomNode.remove();
     return result;
 }
 var Constants;

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

@@ -178,9 +178,7 @@ class VisibleLinesCollection {
         if (deleted) {
             for (let i = 0, len = deleted.length; i < len; i++) {
                 const lineDomNode = deleted[i].getDomNode();
-                if (lineDomNode) {
-                    this.domNode.domNode.removeChild(lineDomNode);
-                }
+                lineDomNode?.remove();
             }
         }
         return true;
@@ -190,9 +188,7 @@ class VisibleLinesCollection {
         if (deleted) {
             for (let i = 0, len = deleted.length; i < len; i++) {
                 const lineDomNode = deleted[i].getDomNode();
-                if (lineDomNode) {
-                    this.domNode.domNode.removeChild(lineDomNode);
-                }
+                lineDomNode?.remove();
             }
         }
         return true;
@@ -306,9 +302,7 @@ class ViewLayerRenderer {
     _removeLinesBefore(ctx, removeCount) {
         for (let i = 0; i < removeCount; i++) {
             const lineDomNode = ctx.lines[i].getDomNode();
-            if (lineDomNode) {
-                this.domNode.removeChild(lineDomNode);
-            }
+            lineDomNode?.remove();
         }
         ctx.lines.splice(0, removeCount);
     }
@@ -324,9 +318,7 @@ class ViewLayerRenderer {
         const removeIndex = ctx.linesLength - removeCount;
         for (let i = 0; i < removeCount; i++) {
             const lineDomNode = ctx.lines[removeIndex + i].getDomNode();
-            if (lineDomNode) {
-                this.domNode.removeChild(lineDomNode);
-            }
+            lineDomNode?.remove();
         }
         ctx.lines.splice(removeIndex, removeCount);
     }

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

@@ -85,7 +85,7 @@ class ViewContentWidgets extends ViewPart {
             const myWidget = this._widgets[widgetId];
             delete this._widgets[widgetId];
             const domNode = myWidget.domNode.domNode;
-            domNode.parentNode.removeChild(domNode);
+            domNode.remove();
             domNode.removeAttribute('monaco-visible-content-widget');
             this.setShouldRender();
         }

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

@@ -167,7 +167,7 @@ class GlyphMarginWidgets extends ViewPart {
             const widgetData = this._widgets[widgetId];
             const domNode = widgetData.domNode.domNode;
             delete this._widgets[widgetId];
-            domNode.parentNode?.removeChild(domNode);
+            domNode.remove();
             this.setShouldRender();
         }
     }

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

@@ -192,11 +192,11 @@ class ViewZones extends ViewPart {
             whitespaceAccessor.removeWhitespace(zone.whitespaceId);
             zone.domNode.removeAttribute('monaco-visible-view-zone');
             zone.domNode.removeAttribute('monaco-view-zone');
-            zone.domNode.domNode.parentNode.removeChild(zone.domNode.domNode);
+            zone.domNode.domNode.remove();
             if (zone.marginDomNode) {
                 zone.marginDomNode.removeAttribute('monaco-visible-view-zone');
                 zone.marginDomNode.removeAttribute('monaco-view-zone');
-                zone.marginDomNode.domNode.parentNode.removeChild(zone.marginDomNode.domNode);
+                zone.marginDomNode.domNode.remove();
             }
             this.setShouldRender();
             return true;

package/vscode/src/vs/editor/browser/widget/codeEditor/codeEditorWidget.js

@@ -1238,7 +1238,7 @@ let CodeEditorWidget = class CodeEditorWidget extends Disposable {
     }
     setBanner(domNode, domNodeHeight) {
         if (this._bannerDomNode && this._domElement.contains(this._bannerDomNode)) {
-            this._domElement.removeChild(this._bannerDomNode);
+            this._bannerDomNode.remove();
         }
         this._bannerDomNode = domNode;
         this._configuration.setReservedHeight(domNode ? domNodeHeight : 0);
@@ -1265,7 +1265,18 @@ let CodeEditorWidget = class CodeEditorWidget extends Disposable {
             (callback) => scheduleAtNextAnimationFrame(getWindow(this._domElement), callback),
             this.languageConfigurationService,
             this._themeService,
-            attachedView
+            attachedView,
+            {
+                batchChanges: (cb) => {
+                    try {
+                        this._beginUpdate();
+                        return cb();
+                    }
+                    finally {
+                        this._endUpdate();
+                    }
+                },
+            }
         )));
         listenersToRemove.push(model.onWillDispose(() => this.setModel(null)));
         listenersToRemove.push(viewModel.onEvent((e) => {
@@ -1474,10 +1485,10 @@ let CodeEditorWidget = class CodeEditorWidget extends Disposable {
         this._modelData = null;
         this._domElement.removeAttribute('data-mode-id');
         if (removeDomNode && this._domElement.contains(removeDomNode)) {
-            this._domElement.removeChild(removeDomNode);
+            removeDomNode.remove();
         }
         if (this._bannerDomNode && this._domElement.contains(this._bannerDomNode)) {
-            this._domElement.removeChild(this._bannerDomNode);
+            this._bannerDomNode.remove();
         }
         return model;
     }

package/vscode/src/vs/editor/browser/widget/diffEditor/components/diffEditorEditors.js

@@ -6,7 +6,7 @@ import { derivedOpts, derived } from '../../../../../base/common/observableInter
 import { autorunHandleChanges } from '../../../../../base/common/observableInternal/autorun.js';
 import { observableFromEvent } from '../../../../../base/common/observableInternal/utils.js';
 import '../../../../../base/common/cancellation.js';
-import { obsCodeEditor } from '../../../observableUtilities.js';
+import { observableCodeEditor } from '../../../observableCodeEditor.js';
 import { OverviewRulerFeature } from '../features/overviewRulerFeature.js';
 import { EditorOptions } from '../../../../common/config/editorOptions.js';
 import { Position } from '../../../../common/core/position.js';
@@ -28,14 +28,14 @@ let DiffEditorEditors = class DiffEditorEditors extends Disposable {
         this.original = this._register(this._createLeftHandSideEditor(this._options.editorOptions.get(), this._argCodeEditorWidgetOptions.originalEditor || {}));
         this.modified = this._register(this._createRightHandSideEditor(this._options.editorOptions.get(), this._argCodeEditorWidgetOptions.modifiedEditor || {}));
         this._onDidContentSizeChange = this._register(( (new Emitter())));
-        this.modifiedScrollTop = observableFromEvent(this.modified.onDidScrollChange, () =>  this.modified.getScrollTop());
-        this.modifiedScrollHeight = observableFromEvent(this.modified.onDidScrollChange, () =>  this.modified.getScrollHeight());
-        this.modifiedModel = obsCodeEditor(this.modified).model;
-        this.modifiedSelections = observableFromEvent(this.modified.onDidChangeCursorSelection, () => this.modified.getSelections() ?? []);
+        this.modifiedScrollTop = observableFromEvent(this, this.modified.onDidScrollChange, () =>  this.modified.getScrollTop());
+        this.modifiedScrollHeight = observableFromEvent(this, this.modified.onDidScrollChange, () =>  this.modified.getScrollHeight());
+        this.modifiedModel = observableCodeEditor(this.modified).model;
+        this.modifiedSelections = observableFromEvent(this, this.modified.onDidChangeCursorSelection, () => this.modified.getSelections() ?? []);
         this.modifiedCursor = derivedOpts({ owner: this, equalsFn: Position.equals }, reader => this.modifiedSelections.read(reader)[0]?.getPosition() ?? ( (new Position(1, 1))));
-        this.originalCursor = observableFromEvent(this.original.onDidChangeCursorPosition, () => this.original.getPosition() ?? ( (new Position(1, 1))));
-        this.isOriginalFocused = obsCodeEditor(this.original).isFocused;
-        this.isModifiedFocused = obsCodeEditor(this.modified).isFocused;
+        this.originalCursor = observableFromEvent(this, this.original.onDidChangeCursorPosition, () => this.original.getPosition() ?? ( (new Position(1, 1))));
+        this.isOriginalFocused = observableCodeEditor(this.original).isFocused;
+        this.isModifiedFocused = observableCodeEditor(this.modified).isFocused;
         this.isFocused = derived(this, reader => this.isOriginalFocused.read(reader) || this.isModifiedFocused.read(reader));
         this._argCodeEditorWidgetOptions = null;
         this._register(autorunHandleChanges({

package/vscode/src/vs/editor/browser/widget/diffEditor/components/diffEditorViewZones/diffEditorViewZones.js

@@ -65,7 +65,7 @@ let DiffEditorViewZones = class DiffEditorViewZones extends Disposable {
             }
         }));
         const originalModelTokenizationCompleted = ( ( this._diffModel.map(
-            m => m ? observableFromEvent(m.model.original.onDidChangeTokens, () => m.model.original.tokenization.backgroundTokenizationState === BackgroundTokenizationState.Completed) : undefined
+            m => m ? observableFromEvent(this, m.model.original.onDidChangeTokens, () => m.model.original.tokenization.backgroundTokenizationState === BackgroundTokenizationState.Completed) : undefined
         )).map((m, reader) => m?.read(reader)));
         const alignments = derived((reader) => {
             const diffModel = this._diffModel.read(reader);
@@ -416,14 +416,14 @@ function computeRangeAlignment(originalEditor, modifiedEditor, diffs, originalEd
         let first = true;
         let lastModLineNumber = c.modified.startLineNumber;
         let lastOrigLineNumber = c.original.startLineNumber;
-        function emitAlignment(origLineNumberExclusive, modLineNumberExclusive) {
+        function emitAlignment(origLineNumberExclusive, modLineNumberExclusive, forceAlignment = false) {
             if (origLineNumberExclusive < lastOrigLineNumber || modLineNumberExclusive < lastModLineNumber) {
                 return;
             }
             if (first) {
                 first = false;
             }
-            else if (origLineNumberExclusive === lastOrigLineNumber || modLineNumberExclusive === lastModLineNumber) {
+            else if (!forceAlignment && (origLineNumberExclusive === lastOrigLineNumber || modLineNumberExclusive === lastModLineNumber)) {
                 return;
             }
             const originalRange = ( new LineRange(lastOrigLineNumber, origLineNumberExclusive));
@@ -459,7 +459,7 @@ function computeRangeAlignment(originalEditor, modifiedEditor, diffs, originalEd
                 }
             }
         }
-        emitAlignment(c.original.endLineNumberExclusive, c.modified.endLineNumberExclusive);
+        emitAlignment(c.original.endLineNumberExclusive, c.modified.endLineNumberExclusive, true);
         lastOriginalLineNumber = c.original.endLineNumberExclusive;
         lastModifiedLineNumber = c.modified.endLineNumberExclusive;
     }

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

@@ -14,7 +14,7 @@ let DiffEditorOptions = class DiffEditorOptions {
     constructor(options, _accessibilityService) {
         this._accessibilityService = _accessibilityService;
         this._diffEditorWidth = observableValue(this, 0);
-        this._screenReaderMode = observableFromEvent(this._accessibilityService.onDidChangeScreenReaderOptimized, () => this._accessibilityService.isScreenReaderOptimized());
+        this._screenReaderMode = observableFromEvent(this, this._accessibilityService.onDidChangeScreenReaderOptimized, () => this._accessibilityService.isScreenReaderOptimized());
         this.couldShowInlineViewBecauseOfSize = derived(this, reader => this._options.read(reader).renderSideBySide && this._diffEditorWidth.read(reader) <= this._options.read(reader).renderSideBySideInlineBreakpoint);
         this.renderOverviewRuler = derived(this, reader => this._options.read(reader).renderOverviewRuler);
         this.renderSideBySide = derived(this, reader => this._options.read(reader).renderSideBySide

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

@@ -7,6 +7,7 @@ import { derived } from '../../../../base/common/observableInternal/derived.js';
 import { autorun, autorunWithStore } from '../../../../base/common/observableInternal/autorun.js';
 import { observableSignalFromEvent, observableSignal } from '../../../../base/common/observableInternal/utils.js';
 import { waitForState } from '../../../../base/common/observableInternal/promise.js';
+import { groupAdjacentBy } from '../../../../base/common/arrays.js';
 import { IDiffProviderFactoryService } from './diffProviderFactoryService.js';
 import { readHotReloadableExport, filterWithPrevious } from './utils.js';
 import { LineRange, LineRangeSet } from '../../../common/core/lineRange.js';
@@ -16,7 +17,6 @@ import { TextEditInfo } from '../../../common/model/bracketPairsTextModelPart/br
 import { combineTextEditInfos } from '../../../common/model/bracketPairsTextModelPart/bracketPairsTree/combineTextEditInfos.js';
 import { optimizeSequenceDiffs } from '../../../common/diff/defaultLinesDiffComputer/heuristicSequenceOptimizations.js';
 import { isDefined } from '../../../../base/common/types.js';
-import { groupAdjacentBy } from '../../../../base/common/arrays.js';
 import { softAssert } from '../../../../base/common/assert.js';
 let DiffEditorViewModel = class DiffEditorViewModel extends Disposable {
     setActiveMovedText(movedText) {

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

@@ -1,7 +1,7 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import { h, getWindow } from '../../../../base/browser/dom.js';
 import { findLast } from '../../../../base/common/arraysFind.js';
-import { onUnexpectedError } from '../../../../base/common/errors.js';
+import { onUnexpectedError, BugIndicatingError } from '../../../../base/common/errors.js';
 import { Event } from '../../../../base/common/event.js';
 import { toDisposable } from '../../../../base/common/lifecycle.js';
 import { observableValue, subtransaction, transaction } from '../../../../base/common/observableInternal/base.js';
@@ -117,7 +117,7 @@ let DiffEditorWidget = class DiffEditorWidget extends DelegatingEditor {
         this._contextKeyService.createKey('isInDiffEditor', true);
         this.elements.root.classList.toggle('standalone', codeEditorWidgetOptions.isStandaloneEditor || false);
         this._domElement.appendChild(this.elements.root);
-        this._register(toDisposable(() => this._domElement.removeChild(this.elements.root)));
+        this._register(toDisposable(() => this.elements.root.remove()));
         this._rootSizeObserver = this._register(( new ObservableElementSizeObserver(this.elements.root, options.dimension)));
         this._rootSizeObserver.setAutomaticLayout(options.automaticLayout ?? false);
         this._options = this._instantiationService.createInstance(DiffEditorOptions, options);
@@ -222,6 +222,18 @@ let DiffEditorWidget = class DiffEditorWidget extends DelegatingEditor {
         this._register(autorunWithStore((reader, store) => {
             store.add(new (readHotReloadableExport(RevertButtonsFeature, reader))(this._editors, this._diffModel, this._options, this));
         }));
+        this._register(autorunWithStore((reader, store) => {
+            const model = this._diffModel.read(reader);
+            if (!model) {
+                return;
+            }
+            for (const m of [model.model.original, model.model.modified]) {
+                store.add(m.onWillDispose(e => {
+                    onUnexpectedError(( new BugIndicatingError('TextModel got disposed before DiffEditorWidget model got reset')));
+                    this.setModel(null);
+                }));
+            }
+        }));
     }
     getViewWidth() {
         return this._rootSizeObserver.width.get();

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

@@ -40,7 +40,7 @@ let DiffEditorGutter = class DiffEditorGutter extends Disposable {
         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._actions = observableFromEvent(this, 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);

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

@@ -24,8 +24,8 @@ class MovedBlocksLinesFeature extends Disposable {
         this._originalEditorLayoutInfo = _originalEditorLayoutInfo;
         this._modifiedEditorLayoutInfo = _modifiedEditorLayoutInfo;
         this._editors = _editors;
-        this._originalScrollTop = observableFromEvent(this._editors.original.onDidScrollChange, () => this._editors.original.getScrollTop());
-        this._modifiedScrollTop = observableFromEvent(this._editors.modified.onDidScrollChange, () => this._editors.modified.getScrollTop());
+        this._originalScrollTop = observableFromEvent(this, this._editors.original.onDidScrollChange, () => this._editors.original.getScrollTop());
+        this._modifiedScrollTop = observableFromEvent(this, this._editors.modified.onDidScrollChange, () => this._editors.modified.getScrollTop());
         this._viewZonesChanged = observableSignalFromEvent('onDidChangeViewZones', this._editors.modified.onDidChangeViewZones);
         this.width = observableValue(this, 0);
         this._modifiedViewZonesChangedSignal = observableSignalFromEvent('modified.onDidChangeViewZones', this._editors.modified.onDidChangeViewZones);

package/vscode/src/vs/editor/browser/widget/diffEditor/registrations.contribution.js

@@ -15,12 +15,12 @@ import '../../../../platform/theme/common/colors/quickpickColors.js';
 import '../../../../platform/theme/common/colors/searchColors.js';
 import { registerIcon } from '../../../../platform/theme/common/iconRegistry.js';
 const _moduleId = "vs/editor/browser/widget/diffEditor/registrations.contribution";
-registerColor('diffEditor.move.border', { dark: '#8b8b8b9c', light: '#8b8b8b9c', hcDark: '#8b8b8b9c', hcLight: '#8b8b8b9c', }, ( localizeWithPath(
+registerColor('diffEditor.move.border', '#8b8b8b9c', ( localizeWithPath(
     _moduleId,
     0,
     'The border color for text that got moved in the diff editor.'
 )));
-registerColor('diffEditor.moveActive.border', { dark: '#FFA500', light: '#FFA500', hcDark: '#FFA500', hcLight: '#FFA500', }, ( localizeWithPath(
+registerColor('diffEditor.moveActive.border', '#FFA500', ( localizeWithPath(
     _moduleId,
     1,
     'The active border color for text that got moved in the diff editor.'

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

@@ -14,9 +14,9 @@ class EditorGutter extends Disposable {
         this._editor = _editor;
         this._domNode = _domNode;
         this.itemProvider = itemProvider;
-        this.scrollTop = observableFromEvent(this._editor.onDidScrollChange, (e) =>  this._editor.getScrollTop());
+        this.scrollTop = observableFromEvent(this, this._editor.onDidScrollChange, (e) =>  this._editor.getScrollTop());
         this.isScrollTopZero = ( this.scrollTop.map((scrollTop) =>  scrollTop === 0));
-        this.modelAttached = observableFromEvent(this._editor.onDidChangeModel, (e) =>  this._editor.hasModel());
+        this.modelAttached = observableFromEvent(this, this._editor.onDidChangeModel, (e) =>  this._editor.hasModel());
         this.editorOnDidChangeViewZones = observableSignalFromEvent('onDidChangeViewZones', this._editor.onDidChangeViewZones);
         this.editorOnDidContentSizeChange = observableSignalFromEvent('onDidContentSizeChange', this._editor.onDidContentSizeChange);
         this.domNodeSizeChanged = observableSignal('domNodeSizeChanged');
@@ -90,7 +90,7 @@ class EditorGutter extends Disposable {
         for (const id of unusedIds) {
             const view = this.views.get(id);
             view.gutterItemView.dispose();
-            this._domNode.removeChild(view.domNode);
+            view.domNode.remove();
             this.views.delete(id);
         }
     }

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

@@ -67,13 +67,13 @@ function applyObservableDecorations(editor, decorations) {
 function appendRemoveOnDispose(parent, child) {
     parent.appendChild(child);
     return toDisposable(() => {
-        parent.removeChild(child);
+        child.remove();
     });
 }
 function prependRemoveOnDispose(parent, child) {
     parent.prepend(child);
     return toDisposable(() => {
-        parent.removeChild(child);
+        child.remove();
     });
 }
 class ObservableElementSizeObserver extends Disposable {

package/vscode/src/vs/editor/browser/widget/multiDiffEditor/colors.js

@@ -12,5 +12,5 @@ import '../../../../platform/theme/common/colors/quickpickColors.js';
 import '../../../../platform/theme/common/colors/searchColors.js';
 const _moduleId = "vs/editor/browser/widget/multiDiffEditor/colors";
 registerColor('multiDiffEditor.headerBackground', { dark: '#262626', light: 'tab.inactiveBackground', hcDark: 'tab.inactiveBackground', hcLight: 'tab.inactiveBackground', }, ( localizeWithPath(_moduleId, 0, 'The background color of the diff editor\'s header')));
-registerColor('multiDiffEditor.background', { dark: 'editorBackground', light: 'editorBackground', hcDark: 'editorBackground', hcLight: 'editorBackground', }, ( localizeWithPath(_moduleId, 1, 'The background color of the multi file diff editor')));
+registerColor('multiDiffEditor.background', 'editorBackground', ( localizeWithPath(_moduleId, 1, 'The background color of the multi file diff editor')));
 registerColor('multiDiffEditor.border', { dark: 'sideBarSectionHeader.border', light: '#cccccc', hcDark: 'sideBarSectionHeader.border', hcLight: '#cccccc', }, ( localizeWithPath(_moduleId, 2, 'The border color of the multi file diff editor')));

package/vscode/src/vs/editor/browser/widget/multiDiffEditor/multiDiffEditorWidgetImpl.js

@@ -60,8 +60,8 @@ let MultiDiffEditorWidgetImpl = class MultiDiffEditorWidgetImpl extends Disposab
             template.setData(data);
             return template;
         }))));
-        this.scrollTop = observableFromEvent(this._scrollableElement.onScroll, () =>  this._scrollableElement.getScrollPosition().scrollTop);
-        this.scrollLeft = observableFromEvent(this._scrollableElement.onScroll, () =>  this._scrollableElement.getScrollPosition().scrollLeft);
+        this.scrollTop = observableFromEvent(this, this._scrollableElement.onScroll, () =>  this._scrollableElement.getScrollPosition().scrollTop);
+        this.scrollLeft = observableFromEvent(this, this._scrollableElement.onScroll, () =>  this._scrollableElement.getScrollPosition().scrollLeft);
         this._viewItemsInfo = derivedWithStore(this, (reader, store) => {
             const vm = this._viewModel.read(reader);
             if (!vm) {

package/vscode/src/vs/editor/common/config/editorOptions.d.ts

@@ -668,6 +668,11 @@ interface IEditorOptions {
      * Defaults to false.
      */
     peekWidgetDefaultFocus?: 'tree' | 'editor';
+    /**
+     * Sets a placeholder for the editor.
+     * If set, the placeholder is shown if the editor is empty.
+    */
+    placeholder?: string | undefined;
     /**
      * Controls whether the definition link opens element in the peek widget.
      * Defaults to false.