@codingame/monaco-vscode-api 20.5.0 → 21.0.1

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

@@ -192,13 +192,6 @@ function lastNonWhitespaceIndex(str, startIndex = str.length - 1) {
     }
     return -1;
 }
-function getIndentationLength(str) {
-    const idx = firstNonWhitespaceIndex(str);
-    if (idx === -1) {
-        return str.length;
-    }
-    return idx;
-}
 function compare(a, b) {
     if (a < b) {
         return -1;
@@ -834,4 +827,4 @@ function multibyteAwareBtoa(str) {
     return btoa(toBinary(str));
 }
 
-export { AmbiguousCharacters, CodePointIterator, Ellipsis, GraphemeBreakType, GraphemeIterator, InvisibleCharacters, UNUSUAL_LINE_TERMINATORS, UTF8_BOM_CHARACTER, commonPrefixLength, commonSuffixLength, compare, compareIgnoreCase, compareSubstring, compareSubstringIgnoreCase, computeCodePoint, containsRTL, containsUnusualLineTerminators, containsUppercaseCharacter, convertSimple2RegExpPattern, count, createRegExp, equalsIgnoreCase, escape, escapeRegExpCharacters, firstNonWhitespaceIndex, forAnsiStringParts, format, format2, fuzzyContains, getCharContainingOffset, getIndentationLength, getLeadingWhitespace, getLeftDeleteOffset, getNLines, getNextCodePoint, htmlAttributeEncodeValue, isAsciiDigit, isBasicASCII, isEmojiImprecise, isFalsyOrWhitespace, isFullWidthCharacter, isHighSurrogate, isLowSurrogate, isLowerAsciiLetter, isUpperAsciiLetter, joinStrings, lastNonWhitespaceIndex, lcut, ltrim, multibyteAwareBtoa, nextCharLength, noBreakWhitespace, prevCharLength, regExpLeadsToEndlessLoop, removeAnsiEscapeCodes, removeAnsiEscapeCodesFromPrompt, rtrim, singleLetterHash, splitLines, startsWithIgnoreCase, startsWithUTF8BOM, stripWildcards, trim, truncate, truncateMiddle, uppercaseFirstLetter };
+export { AmbiguousCharacters, CodePointIterator, Ellipsis, GraphemeBreakType, GraphemeIterator, InvisibleCharacters, UNUSUAL_LINE_TERMINATORS, UTF8_BOM_CHARACTER, commonPrefixLength, commonSuffixLength, compare, compareIgnoreCase, compareSubstring, compareSubstringIgnoreCase, computeCodePoint, containsRTL, containsUnusualLineTerminators, containsUppercaseCharacter, convertSimple2RegExpPattern, count, createRegExp, equalsIgnoreCase, escape, escapeRegExpCharacters, firstNonWhitespaceIndex, forAnsiStringParts, format, format2, fuzzyContains, getCharContainingOffset, getLeadingWhitespace, getLeftDeleteOffset, getNLines, getNextCodePoint, htmlAttributeEncodeValue, isAsciiDigit, isBasicASCII, isEmojiImprecise, isFalsyOrWhitespace, isFullWidthCharacter, isHighSurrogate, isLowSurrogate, isLowerAsciiLetter, isUpperAsciiLetter, joinStrings, lastNonWhitespaceIndex, lcut, ltrim, multibyteAwareBtoa, nextCharLength, noBreakWhitespace, prevCharLength, regExpLeadsToEndlessLoop, removeAnsiEscapeCodes, removeAnsiEscapeCodesFromPrompt, rtrim, singleLetterHash, splitLines, startsWithIgnoreCase, startsWithUTF8BOM, stripWildcards, trim, truncate, truncateMiddle, uppercaseFirstLetter };

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

@@ -63,9 +63,6 @@ function assertReturnsAllDefined(...args) {
     }
     return result;
 }
-const isOneOf = (value, validValues) => {
-    return validValues.includes(value);
-};
 const hasOwnProperty = Object.prototype.hasOwnProperty;
 function isEmptyObject(obj) {
     if (!isObject(obj)) {
@@ -119,4 +116,4 @@ function upcast(x) {
     return x;
 }
 
-export { areFunctions, assertDefined, assertReturnsAllDefined, assertReturnsDefined, assertType, isBoolean, isDefined, isEmptyObject, isFunction, isIterable, isNumber, isObject, isOneOf, isString, isStringArray, isTypedArray, isUndefined, isUndefinedOrNull, upcast, validateConstraint, validateConstraints };
+export { areFunctions, assertDefined, assertReturnsAllDefined, assertReturnsDefined, assertType, isBoolean, isDefined, isEmptyObject, isFunction, isIterable, isNumber, isObject, isString, isStringArray, isTypedArray, isUndefined, isUndefinedOrNull, upcast, validateConstraint, validateConstraints };

package/vscode/src/vs/base/common/uuid.d.ts

@@ -1,2 +1,4 @@
 export declare function isUUID(value: string): boolean;
 export declare const generateUuid: () => string;
+/** Namespace should be 3 letter. */
+export declare function prefixedUuid(namespace: string): string;

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

@@ -42,5 +42,8 @@ const generateUuid = (function () {
         return result;
     };
 })();
+function prefixedUuid(namespace) {
+    return `${namespace}-${generateUuid()}`;
+}
 
-export { generateUuid, isUUID };
+export { generateUuid, isUUID, prefixedUuid };

package/vscode/src/vs/editor/browser/controller/editContext/native/nativeEditContext.d.ts

@@ -44,6 +44,7 @@ export declare class NativeEditContext extends AbstractEditContext {
     onZonesChanged(e: ViewZonesChangedEvent): boolean;
     onWillPaste(): void;
     private _onWillPaste;
+    onWillCopy(): void;
     writeScreenReaderContent(): void;
     isFocused(): boolean;
     focus(): void;

package/vscode/src/vs/editor/browser/controller/editContext/native/nativeEditContext.js

@@ -3,7 +3,7 @@ import { registerCss } from '@codingame/monaco-vscode-api/css';
 import { __decorate, __param } from '../../../../../../../../external/tslib/tslib.es6.js';
 import * as nativeEditContext from './nativeEditContext.css';
 import { isFirefox } from '../../../../../base/browser/browser.js';
-import { createElement, getWindow, addDisposableListener, getWindowId } from '../../../../../base/browser/dom.js';
+import { createElement, getWindow, addDisposableListener, getActiveElement, getWindowId } from '../../../../../base/browser/dom.js';
 import { FastDomNode } from '../../../../../base/browser/fastDomNode.js';
 import { StandardKeyboardEvent } from '../../../../../base/browser/keyboardEvent.js';
 import { KeyCode } from '../../../../../base/common/keyCodes.js';
@@ -63,7 +63,8 @@ let NativeEditContext = class NativeEditContext extends AbstractEditContext {
         overflowGuardContainer.appendChild(this.domNode);
         overflowGuardContainer.appendChild(this._imeTextArea);
         this._parent = overflowGuardContainer.domNode;
-        this._focusTracker = this._register(( new FocusTracker(this.domNode.domNode, (newFocusValue) => {
+        this._focusTracker = this._register(( new FocusTracker(logService, this.domNode.domNode, (newFocusValue) => {
+            logService.trace('NativeEditContext#handleFocusChange : ', newFocusValue);
             this._screenReaderSupport.handleFocusChange(newFocusValue);
             this._context.viewModel.setHasFocus(newFocusValue);
         })));
@@ -143,10 +144,12 @@ let NativeEditContext = class NativeEditContext extends AbstractEditContext {
             this._emitTypeEvent(this._viewController, e);
         }));
         this._register(editContextAddDisposableListener(this._editContext, 'compositionstart', (e) => {
+            this._updateEditContext();
             this._viewController.compositionStart();
             this._context.viewModel.onCompositionStart();
         }));
         this._register(editContextAddDisposableListener(this._editContext, 'compositionend', (e) => {
+            this._updateEditContext();
             this._viewController.compositionEnd();
             this._context.viewModel.onCompositionEnd();
         }));
@@ -235,6 +238,10 @@ let NativeEditContext = class NativeEditContext extends AbstractEditContext {
     _onWillPaste() {
         this._screenReaderSupport.onWillPaste();
     }
+    onWillCopy() {
+        this.logService.trace('NativeEditContext#onWillCopy');
+        this.logService.trace('NativeEditContext#isFocused : ', this.domNode.domNode === getActiveElement());
+    }
     writeScreenReaderContent() {
         this._screenReaderSupport.writeScreenReaderContent();
     }

package/vscode/src/vs/editor/browser/controller/editContext/native/nativeEditContextUtils.d.ts

@@ -1,4 +1,5 @@
 import { IDisposable, Disposable } from "../../../../../base/common/lifecycle.js";
+import { ILogService } from "../../../../../platform/log/common/log.service.js";
 export interface ITypeData {
     text: string;
     replacePrevCharCnt: number;
@@ -10,7 +11,7 @@ export declare class FocusTracker extends Disposable {
     private readonly _onFocusChange;
     private _isFocused;
     private _isPaused;
-    constructor(_domNode: HTMLElement, _onFocusChange: (newFocusValue: boolean) => void);
+    constructor(_logService: ILogService, _domNode: HTMLElement, _onFocusChange: (newFocusValue: boolean) => void);
     pause(): void;
     resume(): void;
     private _handleFocusedChanged;

package/vscode/src/vs/editor/browser/controller/editContext/native/nativeEditContextUtils.js

@@ -1,21 +1,25 @@
 
+import { __decorate, __param } from '../../../../../../../../external/tslib/tslib.es6.js';
 import { addDisposableListener, getShadowRoot, getActiveElement } from '../../../../../base/browser/dom.js';
 import { Disposable } from '../../../../../base/common/lifecycle.js';
+import { ILogService } from '../../../../../platform/log/common/log.service.js';
 
-class FocusTracker extends Disposable {
-    constructor(_domNode, _onFocusChange) {
+let FocusTracker = class FocusTracker extends Disposable {
+    constructor(_logService, _domNode, _onFocusChange) {
         super();
         this._domNode = _domNode;
         this._onFocusChange = _onFocusChange;
         this._isFocused = false;
         this._isPaused = false;
         this._register(addDisposableListener(this._domNode, 'focus', () => {
+            _logService.trace('NativeEditContext.focus');
             if (this._isPaused) {
                 return;
             }
             this.refreshFocusState();
         }));
         this._register(addDisposableListener(this._domNode, 'blur', () => {
+            _logService.trace('NativeEditContext.blur');
             if (this._isPaused) {
                 return;
             }
@@ -49,7 +53,10 @@ class FocusTracker extends Disposable {
     get isFocused() {
         return this._isFocused;
     }
-}
+};
+FocusTracker = ( __decorate([
+    ( __param(0, ILogService))
+], FocusTracker));
 function editContextAddDisposableListener(target, type, listener, options) {
     target.addEventListener(type, listener, options);
     return {

package/vscode/src/vs/editor/browser/controller/editContext/native/screenReaderSupport.js

@@ -38,6 +38,7 @@ let ScreenReaderSupport = class ScreenReaderSupport extends Disposable {
     }
     handleFocusChange(newFocusValue) {
         this._state.value?.onFocusChange(newFocusValue);
+        this.writeScreenReaderContent();
     }
     onConfigurationChanged(e) {
         this._instantiateScreenReaderContent();

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

@@ -390,9 +390,8 @@ class MouseDownOperation extends Disposable {
             return MouseTarget.createOutsideEditor(mouseColumn, ( new Position(belowLineNumber, model.getLineMaxColumn(belowLineNumber))), 'below', outsideDistance);
         }
         const possibleLineNumber = viewLayout.getLineNumberAtVerticalOffset(viewLayout.getCurrentScrollTop() + e.relativePos.y);
-        const horizontalScrollPadding = 10;
         const layoutInfo = this._context.configuration.options.get(EditorOption.layoutInfo);
-        const xLeftBoundary = layoutInfo.contentLeft + horizontalScrollPadding;
+        const xLeftBoundary = layoutInfo.contentLeft;
         if (e.relativePos.x <= xLeftBoundary) {
             const outsideDistance = xLeftBoundary - e.relativePos.x;
             return MouseTarget.createOutsideEditor(mouseColumn, ( new Position(possibleLineNumber, 1)), 'left', outsideDistance);
@@ -400,7 +399,7 @@ class MouseDownOperation extends Disposable {
         const contentRight = (layoutInfo.minimap.minimapLeft === 0
             ? layoutInfo.width - layoutInfo.verticalScrollbarWidth
             : layoutInfo.minimap.minimapLeft);
-        const xRightBoundary = contentRight - horizontalScrollPadding;
+        const xRightBoundary = contentRight;
         if (e.relativePos.x >= xRightBoundary) {
             const outsideDistance = e.relativePos.x - xRightBoundary;
             return MouseTarget.createOutsideEditor(mouseColumn, ( new Position(possibleLineNumber, model.getLineMaxColumn(possibleLineNumber))), 'right', outsideDistance);

package/vscode/src/vs/editor/browser/editorDom.d.ts

@@ -115,6 +115,7 @@ export declare class DynamicCssRules {
     private readonly _rules;
     private readonly _garbageCollectionScheduler;
     constructor(_editor: ICodeEditor);
+    dispose(): void;
     createClassNameRef(options: CssProperties): ClassNameReference;
     private getOrCreateRule;
     private computeUniqueKey;

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

@@ -4,7 +4,7 @@ import { createStyleSheet } from '../../base/browser/domStylesheets.js';
 import { GlobalPointerMoveMonitor } from '../../base/browser/globalPointerMoveMonitor.js';
 import { StandardMouseEvent } from '../../base/browser/mouseEvent.js';
 import { RunOnceScheduler } from '../../base/common/async.js';
-import { Disposable, DisposableStore } from '../../base/common/lifecycle.js';
+import { Disposable, DisposableMap, DisposableStore } from '../../base/common/lifecycle.js';
 import { asCssVariable } from '../../platform/theme/common/colorUtils.js';
 import '../../platform/theme/common/colors/baseColors.js';
 import '../../platform/theme/common/colors/chartsColors.js';
@@ -168,9 +168,13 @@ class DynamicCssRules {
         this._editor = _editor;
         this._instanceId = ++DynamicCssRules._idPool;
         this._counter = 0;
-        this._rules = ( new Map());
+        this._rules = ( new DisposableMap());
         this._garbageCollectionScheduler = ( new RunOnceScheduler(() => this.garbageCollect(), 1000));
     }
+    dispose() {
+        this._rules.dispose();
+        this._garbageCollectionScheduler.dispose();
+    }
     createClassNameRef(options) {
         const rule = this.getOrCreateRule(options);
         rule.increaseRefCount();
@@ -205,8 +209,7 @@ class DynamicCssRules {
     garbageCollect() {
         for (const rule of ( this._rules.values())) {
             if (!rule.hasReferences()) {
-                this._rules.delete(rule.key);
-                rule.dispose();
+                this._rules.deleteAndDispose(rule.key);
             }
         }
     }

package/vscode/src/vs/editor/browser/observableCodeEditor.d.ts

@@ -1,5 +1,5 @@
 import { Disposable, DisposableStore, IDisposable } from "../../base/common/lifecycle.js";
-import { IObservable, IObservableWithChange, ITransaction } from "../../base/common/observable.js";
+import { DebugLocation, IObservable, IObservableWithChange, ITransaction } from "../../base/common/observable.js";
 import { EditorOption, FindComputedEditorOptionValueById } from "../common/config/editorOptions.js";
 import { LineRange } from "../common/core/ranges/lineRange.js";
 import { OffsetRange } from "../common/core/ranges/offsetRange.js";
@@ -59,7 +59,7 @@ export declare class ObservableCodeEditor extends Disposable {
     readonly contentWidth: IObservable<number>;
     readonly contentHeight: IObservable<number>;
     readonly domNode: IObservableWithChange<HTMLElement | null, void>;
-    getOption<T extends EditorOption>(id: T): IObservable<FindComputedEditorOptionValueById<T>>;
+    getOption<T extends EditorOption>(id: T, debugLocation?: DebugLocation): IObservable<FindComputedEditorOptionValueById<T>>;
     setDecorations(decorations: IObservable<IModelDeltaDecoration[]>): IDisposable;
     private _widgetCounter;
     createOverlayWidget(widget: IObservableOverlayWidget): IDisposable;

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

@@ -13,6 +13,7 @@ import { createElement } from '../../base/browser/dom.js';
 import { TransactionImpl } from '../../base/common/observableInternal/transaction.js';
 import { observableFromEvent } from '../../base/common/observableInternal/observables/observableFromEvent.js';
 import { derivedOpts, derivedWithSetter, derived } from '../../base/common/observableInternal/observables/derived.js';
+import { DebugLocation } from '../../base/common/observableInternal/debugLocation.js';
 import { autorunOpts, autorun } from '../../base/common/observableInternal/reactions/autorun.js';
 import { observableValue } from '../../base/common/observableInternal/observables/observableValue.js';
 import { observableValueOpts } from '../../base/common/observableInternal/observables/observableValueOpts.js';
@@ -209,12 +210,12 @@ class ObservableCodeEditor extends Disposable {
             this._endUpdate();
         }
     }
-    getOption(id) {
+    getOption(id, debugLocation = DebugLocation.ofCaller()) {
         return observableFromEvent(this, cb => this.editor.onDidChangeConfiguration(e => {
             if (e.hasChanged(id)) {
                 cb(undefined);
             }
-        }), () => this.editor.getOption(id));
+        }), () => this.editor.getOption(id), debugLocation);
     }
     setDecorations(decorations) {
         const d = ( new DisposableStore());

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

@@ -121,10 +121,7 @@ let HoverWidget = class HoverWidget extends Widget {
             const markdown = options.content;
             const mdRenderer = this._instantiationService.createInstance(MarkdownRenderer, { codeBlockFontFamily: this._configurationService.getValue('editor').fontFamily || EDITOR_FONT_DEFAULTS.fontFamily });
             const { element, dispose } = mdRenderer.render(markdown, {
-                actionHandler: {
-                    callback: (content) => this._linkHandler(content),
-                    disposables: this._messageListeners
-                },
+                actionHandler: (content) => this._linkHandler(content),
                 asyncRenderCallback: () => {
                     contentsElement.classList.add('code-hover-contents');
                     this.layout();

package/vscode/src/vs/editor/browser/services/inlineCompletionsService.d.ts

@@ -20,6 +20,9 @@ export declare class InlineCompletionsService extends Disposable implements IInl
     setSnoozeDuration(durationMs: number): void;
     isSnoozing(): boolean;
     cancelSnooze(): void;
+    private _lastCompletionId;
+    private _recentCompletionIds;
+    reportNewCompletion(requestUuid: string): void;
     private _reportSnooze;
 }
 export declare class SnoozeInlineCompletion extends Action2 {

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

@@ -33,6 +33,7 @@ let InlineCompletionsService = class InlineCompletionsService extends Disposable
         this._onDidChangeIsSnoozing = this._register(( new Emitter()));
         this.onDidChangeIsSnoozing = this._onDidChangeIsSnoozing.event;
         this._snoozeTimeEnd = undefined;
+        this._recentCompletionIds = [];
         this._timer = this._register(( new WindowIntervalTimer()));
         const inlineCompletionsSnoozing = InlineCompletionsSnoozing.bindTo(this._contextKeyService);
         this._register(this.onDidChangeIsSnoozing(() => inlineCompletionsSnoozing.set(this.isSnoozing())));
@@ -75,10 +76,22 @@ let InlineCompletionsService = class InlineCompletionsService extends Disposable
             this._onDidChangeIsSnoozing.fire(false);
         }
     }
+    reportNewCompletion(requestUuid) {
+        this._lastCompletionId = requestUuid;
+        this._recentCompletionIds.unshift(requestUuid);
+        if (this._recentCompletionIds.length > 5) {
+            this._recentCompletionIds.pop();
+        }
+    }
     _reportSnooze(deltaMs, totalMs) {
         const deltaSeconds = Math.round(deltaMs / 1000);
         const totalSeconds = Math.round(totalMs / 1000);
-        this._telemetryService.publicLog2('inlineCompletions.snooze', { deltaSeconds, totalSeconds });
+        this._telemetryService.publicLog2('inlineCompletions.snooze', {
+            deltaSeconds,
+            totalSeconds,
+            lastCompletionId: this._lastCompletionId,
+            recentCompletionIds: this._recentCompletionIds,
+        });
     }
 };
 InlineCompletionsService = InlineCompletionsService_1 = ( __decorate([

package/vscode/src/vs/editor/browser/services/inlineCompletionsService.service.d.ts

@@ -24,4 +24,8 @@ export interface IInlineCompletionsService {
     * Cancel the current snooze.
     */
     cancelSnooze(): void;
+    /**
+    * Report an inline completion.
+    */
+    reportNewCompletion(requestUuid: string): void;
 }

package/vscode/src/vs/editor/browser/viewParts/minimap/minimap.css

@@ -35,6 +35,7 @@
 	position: absolute;
 	left: -6px;
 	width: 6px;
+	pointer-events: none;
 }
 .monaco-editor.no-minimap-shadow .minimap-shadow-visible {
 	position: absolute;

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

@@ -6,16 +6,23 @@ import { Disposable, toDisposable } from '../../../../base/common/lifecycle.js';
 import '../../../../base/common/observableInternal/index.js';
 import { IDiffProviderFactoryService } from './diffProviderFactoryService.service.js';
 import { filterWithPrevious } from './utils.js';
-import { readHotReloadableExport } from '../../../../base/common/hotReloadHelpers.js';
 import { LineRange, LineRangeSet } from '../../../common/core/ranges/lineRange.js';
-import { DefaultLinesDiffComputer } from '../../../common/diff/defaultLinesDiffComputer/defaultLinesDiffComputer.js';
+import { groupAdjacentBy } from '../../../../base/common/arrays.js';
+import { softAssert } from '../../../../base/common/assert.js';
+import '../../../../base/common/errors.js';
+import '../../../../base/common/strings.js';
+import '../../../common/core/text/positionToOffsetImpl.js';
+import '../../../common/core/text/textLength.js';
 import { LineRangeMapping, DetailedLineRangeMapping, RangeMapping } from '../../../common/diff/rangeMapping.js';
+import '../../../common/diff/defaultLinesDiffComputer/algorithms/diffAlgorithm.js';
+import '../../../common/diff/defaultLinesDiffComputer/utils.js';
+import '../../../../base/common/arraysFind.js';
+import '../../../../base/common/map.js';
+import '../../../common/diff/defaultLinesDiffComputer/linesSliceCharSequence.js';
+import '../../../../base/common/charCode.js';
 import { TextEditInfo } from '../../../common/model/bracketPairsTextModelPart/bracketPairsTree/beforeEditPositionMapper.js';
 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';
 import { observableValue } from '../../../../base/common/observableInternal/observables/observableValue.js';
 import { derived } from '../../../../base/common/observableInternal/observables/derived.js';
 import { transaction } from '../../../../base/common/observableInternal/transaction.js';
@@ -202,8 +209,6 @@ let DiffEditorViewModel = class DiffEditorViewModel extends Disposable {
             contentChangedSignal.read(reader);
             const documentDiffProvider = this._diffProvider.read(reader);
             documentDiffProvider.onChangeSignal.read(reader);
-            readHotReloadableExport(DefaultLinesDiffComputer, reader);
-            readHotReloadableExport(optimizeSequenceDiffs, reader);
             this._isDiffUpToDate.set(false, undefined);
             let originalTextEditInfos = [];
             store.add(model.original.onDidChangeContent((e) => {

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

@@ -151,7 +151,7 @@ let DiffEditorWidget = class DiffEditorWidget extends DelegatingEditor {
         this._register(bindContextKey(EditorContextKeys.diffEditorModifiedUri, this._contextKeyService, reader => this._diffModel.read(reader)?.model.modified.uri.toString() ?? ''));
         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);
+            : this._instantiationService.createInstance(readHotReloadableExport(OverviewRulerFeature), 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))),
@@ -169,12 +169,12 @@ let DiffEditorWidget = class DiffEditorWidget extends DelegatingEditor {
                 () => 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);
+        const unchangedRangesFeature = derivedDisposable(this, reader =>  this._instantiationService.createInstance(readHotReloadableExport(HideUnchangedRegionsFeature), this._editors, this._diffModel, this._options)).recomputeInitiallyAndOnChange(this._store);
+        derivedDisposable(this, reader =>  this._instantiationService.createInstance(readHotReloadableExport(DiffEditorDecorations), this._editors, this._diffModel, this._options, this)).recomputeInitiallyAndOnChange(this._store);
         const origViewZoneIdsToIgnore = ( new Set());
         const modViewZoneIdsToIgnore = ( new Set());
         let isUpdatingViewZones = false;
-        const viewZoneManager = derivedDisposable(this, reader =>  this._instantiationService.createInstance(readHotReloadableExport(DiffEditorViewZones, reader), getWindow(this._domElement), this._editors, this._diffModel, this._options, this, () => isUpdatingViewZones || unchangedRangesFeature.get().isUpdatingHiddenAreas, origViewZoneIdsToIgnore, modViewZoneIdsToIgnore)).recomputeInitiallyAndOnChange(this._store);
+        const viewZoneManager = derivedDisposable(this, reader =>  this._instantiationService.createInstance(readHotReloadableExport(DiffEditorViewZones), getWindow(this._domElement), this._editors, this._diffModel, this._options, this, () => isUpdatingViewZones || unchangedRangesFeature.get().isUpdatingHiddenAreas, origViewZoneIdsToIgnore, modViewZoneIdsToIgnore)).recomputeInitiallyAndOnChange(this._store);
         const originalViewZones = derived(this, (reader) => {
             const orig = viewZoneManager.read(reader).viewZones.read(reader).orig;
             const orig2 = unchangedRangesFeature.read(reader).viewZones.read(reader).origViewZones;
@@ -199,7 +199,7 @@ let DiffEditorWidget = class DiffEditorWidget extends DelegatingEditor {
                 scrollState = undefined;
             }
         }, modViewZoneIdsToIgnore));
-        this._accessibleDiffViewer = derivedDisposable(this, reader => this._instantiationService.createInstance(readHotReloadableExport(AccessibleDiffViewer, reader), this.elements.accessibleDiffViewer, this._accessibleDiffViewerVisible, (visible, tx) => this._accessibleDiffViewerShouldBeVisible.set(visible, tx), ( this._options.onlyShowAccessibleDiffViewer.map(v => !v)), this._rootSizeObserver.width, this._rootSizeObserver.height, ( this._diffModel.map((m, r) => m?.diff.read(r)?.mappings.map(m => m.lineRangeMapping))), ( new AccessibleDiffViewerModelFromEditors(this._editors)))).recomputeInitiallyAndOnChange(this._store);
+        this._accessibleDiffViewer = derivedDisposable(this, reader => this._instantiationService.createInstance(readHotReloadableExport(AccessibleDiffViewer), this.elements.accessibleDiffViewer, this._accessibleDiffViewerVisible, (visible, tx) => this._accessibleDiffViewerShouldBeVisible.set(visible, tx), ( this._options.onlyShowAccessibleDiffViewer.map(v => !v)), this._rootSizeObserver.width, this._rootSizeObserver.height, ( this._diffModel.map((m, r) => m?.diff.read(r)?.mappings.map(m => m.lineRangeMapping))), ( new AccessibleDiffViewerModelFromEditors(this._editors)))).recomputeInitiallyAndOnChange(this._store);
         const visibility = ( this._accessibleDiffViewerVisible.map(v => v ? 'hidden' : 'visible'));
         this._register(applyStyle(this.elements.modified, { visibility }));
         this._register(applyStyle(this.elements.original, { visibility }));
@@ -207,11 +207,11 @@ 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._options, this._sashLayout, this._boundarySashes)
+                ? this._instantiationService.createInstance(readHotReloadableExport(DiffEditorGutter), this.elements.root, this._diffModel, this._editors, this._options, this._sashLayout, this._boundarySashes)
                 : undefined;
         });
         this._register(recomputeInitiallyAndOnChange(this._layoutInfo));
-        derivedDisposable(this, reader =>  new (readHotReloadableExport(MovedBlocksLinesFeature, reader))(this.elements.root, this._diffModel, ( this._layoutInfo.map(i => i.originalEditor)), ( this._layoutInfo.map(i => i.modifiedEditor)), this._editors)).recomputeInitiallyAndOnChange(this._store, value => {
+        derivedDisposable(this, reader =>  new (readHotReloadableExport(MovedBlocksLinesFeature))(this.elements.root, this._diffModel, ( this._layoutInfo.map(i => i.originalEditor)), ( this._layoutInfo.map(i => i.modifiedEditor)), this._editors)).recomputeInitiallyAndOnChange(this._store, value => {
             this._movedBlocksLinesPart.set(value, undefined);
         });
         this._register(Event.runAndSubscribe(this._editors.modified.onDidChangeCursorPosition, e => this._handleCursorPositionChange(e, true)));
@@ -229,7 +229,7 @@ let DiffEditorWidget = class DiffEditorWidget extends DelegatingEditor {
             }
         }));
         this._register(autorunWithStore((reader, store) => {
-            store.add(new (readHotReloadableExport(RevertButtonsFeature, reader))(this._editors, this._diffModel, this._options, this));
+            store.add(new (readHotReloadableExport(RevertButtonsFeature))(this._editors, this._diffModel, this._options, this));
         }));
         this._register(autorunWithStore((reader, store) => {
             const model = this._diffModel.read(reader);

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

@@ -22,9 +22,9 @@ import '../../../../../platform/theme/common/colors/quickpickColors.js';
 import '../../../../../platform/theme/common/colors/searchColors.js';
 import { IThemeService } from '../../../../../platform/theme/common/themeService.service.js';
 import { observableFromEvent } from '../../../../../base/common/observableInternal/observables/observableFromEvent.js';
+import { derived } from '../../../../../base/common/observableInternal/observables/derived.js';
 import { autorunWithStore, autorun } from '../../../../../base/common/observableInternal/reactions/autorun.js';
 import { observableSignalFromEvent } from '../../../../../base/common/observableInternal/observables/observableSignalFromEvent.js';
-import { derived } from '../../../../../base/common/observableInternal/observables/derived.js';
 
 var OverviewRulerFeature_1;
 let OverviewRulerFeature = class OverviewRulerFeature extends Disposable {

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

@@ -78,7 +78,9 @@ class EditorGutter extends Disposable {
                         }
                         const top = gutterItem.range.startLineNumber <= this._editor.getModel().getLineCount()
                             ? this._editor.getTopForLineNumber(gutterItem.range.startLineNumber, true) - scrollTop
-                            : this._editor.getBottomForLineNumber(gutterItem.range.startLineNumber - 1, false) - scrollTop;
+                            : gutterItem.range.startLineNumber > 1
+                                ? this._editor.getBottomForLineNumber(gutterItem.range.startLineNumber - 1, false) - scrollTop
+                                : 0;
                         const bottom = gutterItem.range.endLineNumberExclusive === 1 ?
                             Math.max(top, this._editor.getTopForLineNumber(gutterItem.range.startLineNumber, false) - scrollTop)
                             : Math.max(top, this._editor.getBottomForLineNumber(gutterItem.range.endLineNumberExclusive - 1, true) - scrollTop);

package/vscode/src/vs/editor/browser/widget/markdownRenderer/browser/markdownRenderer.d.ts

@@ -22,8 +22,8 @@ export declare class MarkdownRenderer {
     private readonly _openerService;
     private static _ttpTokenizer;
     constructor(_options: IMarkdownRendererOptions, _languageService: ILanguageService, _openerService: IOpenerService);
-    render(markdown: IMarkdownString | undefined, options?: MarkdownRenderOptions, outElement?: HTMLElement): IMarkdownRenderResult;
-    private _getRenderOptions;
+    render(markdown: IMarkdownString, options?: MarkdownRenderOptions, outElement?: HTMLElement): IMarkdownRenderResult;
+    private renderCodeBlock;
     protected openMarkdownLink(link: string, markdown: IMarkdownString): Promise<void>;
 }
 export declare function openLinkFromMarkdown(openerService: IOpenerService, link: string, isTrusted: boolean | MarkdownStringTrustedOptions | undefined, skipValidation?: boolean): Promise<boolean>;

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

@@ -5,7 +5,6 @@ import { renderMarkdown } from '../../../../../base/browser/markdownRenderer.js'
 import { createElement } from '../../../../../base/browser/dom.js';
 import { createTrustedTypesPolicy } from '../../../../../base/browser/trustedTypes.js';
 import { onUnexpectedError } from '../../../../../base/common/errors.js';
-import { DisposableStore } from '../../../../../base/common/lifecycle.js';
 import { IOpenerService } from '../../../../../platform/opener/common/opener.service.js';
 import { EditorOption } from '../../../../common/config/editorOptions.js';
 import { ILanguageService } from '../../../../common/languages/language.service.js';
@@ -29,51 +28,39 @@ let MarkdownRenderer = class MarkdownRenderer {
         this._openerService = _openerService;
     }
     render(markdown, options, outElement) {
-        if (!markdown) {
-            const element = outElement ?? createElement('span');
-            return { element, dispose: () => { } };
-        }
-        const disposables = ( new DisposableStore());
-        const rendered = disposables.add(renderMarkdown(markdown, { ...this._getRenderOptions(markdown, disposables), ...options }, outElement));
+        const rendered = renderMarkdown(markdown, {
+            codeBlockRenderer: (alias, value) => this.renderCodeBlock(alias, value),
+            actionHandler: (link, mdStr) => this.openMarkdownLink(link, mdStr),
+            ...options,
+        }, outElement);
         rendered.element.classList.add('rendered-markdown');
-        return {
-            element: rendered.element,
-            dispose: () => disposables.dispose()
-        };
+        return rendered;
     }
-    _getRenderOptions(markdown, disposables) {
-        return {
-            codeBlockRenderer: async (languageAlias, value) => {
-                let languageId;
-                if (languageAlias) {
-                    languageId = this._languageService.getLanguageIdByLanguageName(languageAlias);
-                }
-                else if (this._options.editor) {
-                    languageId = this._options.editor.getModel()?.getLanguageId();
-                }
-                if (!languageId) {
-                    languageId = PLAINTEXT_LANGUAGE_ID;
-                }
-                const html = await tokenizeToString(this._languageService, value, languageId);
-                const element = createElement('span');
-                element.innerHTML = (MarkdownRenderer_1._ttpTokenizer?.createHTML(html) ?? html);
-                if (this._options.editor) {
-                    const fontInfo = this._options.editor.getOption(EditorOption.fontInfo);
-                    applyFontInfo(element, fontInfo);
-                }
-                else if (this._options.codeBlockFontFamily) {
-                    element.style.fontFamily = this._options.codeBlockFontFamily;
-                }
-                if (this._options.codeBlockFontSize !== undefined) {
-                    element.style.fontSize = this._options.codeBlockFontSize;
-                }
-                return element;
-            },
-            actionHandler: {
-                callback: (link) => this.openMarkdownLink(link, markdown),
-                disposables
-            }
-        };
+    async renderCodeBlock(languageAlias, value) {
+        let languageId;
+        if (languageAlias) {
+            languageId = this._languageService.getLanguageIdByLanguageName(languageAlias);
+        }
+        else if (this._options.editor) {
+            languageId = this._options.editor.getModel()?.getLanguageId();
+        }
+        if (!languageId) {
+            languageId = PLAINTEXT_LANGUAGE_ID;
+        }
+        const html = await tokenizeToString(this._languageService, value, languageId);
+        const element = createElement('span');
+        element.innerHTML = (MarkdownRenderer_1._ttpTokenizer?.createHTML(html) ?? html);
+        if (this._options.editor) {
+            const fontInfo = this._options.editor.getOption(EditorOption.fontInfo);
+            applyFontInfo(element, fontInfo);
+        }
+        else if (this._options.codeBlockFontFamily) {
+            element.style.fontFamily = this._options.codeBlockFontFamily;
+        }
+        if (this._options.codeBlockFontSize !== undefined) {
+            element.style.fontSize = this._options.codeBlockFontSize;
+        }
+        return element;
     }
     async openMarkdownLink(link, markdown) {
         await openLinkFromMarkdown(this._openerService, link, markdown.isTrusted);