@codingame/monaco-vscode-api 2.0.3-improve-modularity.1 → 2.1.0-update-vscode-1.86.1

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

@@ -1,36 +1,40 @@
-import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import { h, $, reset, addDisposableListener, getWindow } from '../../../../base/browser/dom.js';
-import { renderLabelWithIcons, renderIcon } from '../../../../base/browser/ui/iconLabel/iconLabels.js';
-import { reverseOrder, compareBy, numberComparator } from '../../../../base/common/arrays.js';
-import { Codicon } from '../../../../base/common/codicons.js';
-import { Event } from '../../../../base/common/event.js';
-import { MarkdownString } from '../../../../base/common/htmlContent.js';
-import { Disposable } from '../../../../base/common/lifecycle.js';
-import { derivedDisposable, derivedWithStore, derived } from '../../../../base/common/observableInternal/derived.js';
-import { ThemeIcon } from '../../../../base/common/themables.js';
-import { isDefined } from '../../../../base/common/types.js';
-import { OutlineModel } from './outlineModel.js';
-import { applyObservableDecorations, ViewZoneOverlayWidget, applyStyle, DisposableCancellationTokenSource, PlaceholderViewZone } from './utils.js';
-import { LineRange } from '../../../common/core/lineRange.js';
-import { Position } from '../../../common/core/position.js';
-import { Range } from '../../../common/core/range.js';
-import { SymbolKinds } from '../../../common/languages.js';
-import { ILanguageFeaturesService } from '../../../common/services/languageFeatures.js';
-import { localizeWithPath } from '../../../../nls.js';
-import { transaction, observableValue } from '../../../../base/common/observableInternal/base.js';
-import { autorun, autorunWithStore } from '../../../../base/common/observableInternal/autorun.js';
-import { observableFromEvent, observableSignalFromEvent } from '../../../../base/common/observableInternal/utils.js';
+import { __decorate, __param } from '../../../../../../../../external/tslib/tslib.es6.js';
+import { h, $, reset, addDisposableListener, getWindow } from '../../../../../base/browser/dom.js';
+import { renderLabelWithIcons, renderIcon } from '../../../../../base/browser/ui/iconLabel/iconLabels.js';
+import { Codicon } from '../../../../../base/common/codicons.js';
+import { MarkdownString } from '../../../../../base/common/htmlContent.js';
+import { Disposable } from '../../../../../base/common/lifecycle.js';
+import { derivedDisposable, derivedWithStore, derived } from '../../../../../base/common/observableInternal/derived.js';
+import { ThemeIcon } from '../../../../../base/common/themables.js';
+import { isDefined } from '../../../../../base/common/types.js';
+import { applyObservableDecorations, ViewZoneOverlayWidget, applyStyle, PlaceholderViewZone } from '../utils.js';
+import { LineRange } from '../../../../common/core/lineRange.js';
+import { Position } from '../../../../common/core/position.js';
+import { Range } from '../../../../common/core/range.js';
+import { SymbolKinds } from '../../../../common/languages.js';
+import { localizeWithPath } from '../../../../../nls.js';
+import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
+import { observableValue, transaction } from '../../../../../base/common/observableInternal/base.js';
+import { autorun } from '../../../../../base/common/observableInternal/autorun.js';
+import { observableFromEvent } from '../../../../../base/common/observableInternal/utils.js';
+var HideUnchangedRegionsFeature_1;
 let HideUnchangedRegionsFeature = class HideUnchangedRegionsFeature extends Disposable {
+    static { HideUnchangedRegionsFeature_1 = this; }
+    static { this._breadcrumbsSourceFactory = observableValue('breadcrumbsSourceFactory', undefined); }
+    static setBreadcrumbsSourceFactory(factory) {
+        this._breadcrumbsSourceFactory.set(factory, undefined);
+    }
     get isUpdatingHiddenAreas() { return this._isUpdatingHiddenAreas; }
-    constructor(_editors, _diffModel, _options, _languageFeaturesService) {
+    constructor(_editors, _diffModel, _options, _instantiationService) {
         super();
         this._editors = _editors;
         this._diffModel = _diffModel;
         this._options = _options;
-        this._languageFeaturesService = _languageFeaturesService;
-        this._modifiedOutlineSource = derivedDisposable(this, reader => {
+        this._instantiationService = _instantiationService;
+        this._modifiedOutlineSource = derivedDisposable(this, (reader) => {
             const m = this._editors.modifiedModel.read(reader);
-            return !m ? undefined : ( new OutlineSource(this._languageFeaturesService, m));
+            const factory = HideUnchangedRegionsFeature_1._breadcrumbsSourceFactory.read(reader);
+            return (!m || !factory) ? undefined : factory(m, this._instantiationService);
         });
         this._isUpdatingHiddenAreas = false;
         this._register(this._editors.original.onDidChangeCursorPosition(e => {
@@ -38,8 +42,8 @@ let HideUnchangedRegionsFeature = class HideUnchangedRegionsFeature extends Disp
                 const m = this._diffModel.get();
                 transaction(tx => {
                     for (const s of this._editors.original.getSelections() || []) {
-                        m?.ensureOriginalLineIsVisible(s.getStartPosition().lineNumber, tx);
-                        m?.ensureOriginalLineIsVisible(s.getEndPosition().lineNumber, tx);
+                        m?.ensureOriginalLineIsVisible(s.getStartPosition().lineNumber, 0 , tx);
+                        m?.ensureOriginalLineIsVisible(s.getEndPosition().lineNumber, 0 , tx);
                     }
                 });
             }
@@ -49,15 +53,19 @@ let HideUnchangedRegionsFeature = class HideUnchangedRegionsFeature extends Disp
                 const m = this._diffModel.get();
                 transaction(tx => {
                     for (const s of this._editors.modified.getSelections() || []) {
-                        m?.ensureModifiedLineIsVisible(s.getStartPosition().lineNumber, tx);
-                        m?.ensureModifiedLineIsVisible(s.getEndPosition().lineNumber, tx);
+                        m?.ensureModifiedLineIsVisible(s.getStartPosition().lineNumber, 0 , tx);
+                        m?.ensureModifiedLineIsVisible(s.getEndPosition().lineNumber, 0 , tx);
                     }
                 });
             }
         }));
-        const unchangedRegions = ( this._diffModel.map(
-            (m, reader) => m?.diff.read(reader)?.mappings.length === 0 ? [] : m?.unchangedRegions.read(reader) ?? []
-        ));
+        const unchangedRegions = ( this._diffModel.map((m, reader) => {
+            const regions = m?.unchangedRegions.read(reader) ?? [];
+            if (regions.length === 1 && regions[0].modifiedLineNumber === 1 && regions[0].lineCount === this._editors.modifiedModel.read(reader)?.getLineCount()) {
+                return [];
+            }
+            return regions;
+        }));
         this.viewZones = derivedWithStore(this, (reader, store) => {
             const modifiedOutlineSource = this._modifiedOutlineSource.read(reader);
             if (!modifiedOutlineSource) {
@@ -82,7 +90,7 @@ let HideUnchangedRegionsFeature = class HideUnchangedRegionsFeature extends Disp
                         r.originalUnchangedRange,
                         !sideBySide,
                         modifiedOutlineSource,
-                        l => this._diffModel.get().ensureModifiedLineIsVisible(l, undefined),
+                        l => this._diffModel.get().ensureModifiedLineIsVisible(l, 2 , undefined),
                         this._options
                     )));
                 }
@@ -97,7 +105,7 @@ let HideUnchangedRegionsFeature = class HideUnchangedRegionsFeature extends Disp
                         r.modifiedUnchangedRange,
                         false,
                         modifiedOutlineSource,
-                        l => this._diffModel.get().ensureModifiedLineIsVisible(l, undefined),
+                        l => this._diffModel.get().ensureModifiedLineIsVisible(l, 2 , undefined),
                         this._options
                     )));
                 }
@@ -113,7 +121,7 @@ let HideUnchangedRegionsFeature = class HideUnchangedRegionsFeature extends Disp
             description: 'Fold Unchanged',
             glyphMarginHoverMessage: ( new MarkdownString(undefined, { isTrusted: true, supportThemeIcons: true }))
                 .appendMarkdown(( localizeWithPath(
-                'vs/editor/browser/widget/diffEditor/hideUnchangedRegionsFeature',
+                'vs/editor/browser/widget/diffEditor/features/hideUnchangedRegionsFeature',
                 'foldUnchanged',
                 'Fold Unchanged Region'
             ))),
@@ -197,8 +205,8 @@ let HideUnchangedRegionsFeature = class HideUnchangedRegionsFeature extends Disp
         }));
     }
 };
-HideUnchangedRegionsFeature = ( __decorate([
-    ( __param(3, ILanguageFeaturesService))
+HideUnchangedRegionsFeature = HideUnchangedRegionsFeature_1 = ( __decorate([
+    ( __param(3, IInstantiationService))
 ], HideUnchangedRegionsFeature));
 class CollapsedCodeOverlayWidget extends ViewZoneOverlayWidget {
     constructor(_editor, _viewZone, _unchangedRegion, _unchangedRegionRange, _hide, _modifiedOutlineSource, _revealModifiedHiddenLine, _options) {
@@ -213,20 +221,20 @@ class CollapsedCodeOverlayWidget extends ViewZoneOverlayWidget {
         this._options = _options;
         this._nodes = h('div.diff-hidden-lines', [
             h('div.top@top', { title: ( localizeWithPath(
-                'vs/editor/browser/widget/diffEditor/hideUnchangedRegionsFeature',
+                'vs/editor/browser/widget/diffEditor/features/hideUnchangedRegionsFeature',
                 'diff.hiddenLines.top',
                 'Click or drag to show more above'
             )) }),
             h('div.center@content', { style: { display: 'flex' } }, [
                 h('div@first', { style: { display: 'flex', justifyContent: 'center', alignItems: 'center', flexShrink: '0' } }, [$('a', { title: ( localizeWithPath(
-                    'vs/editor/browser/widget/diffEditor/hideUnchangedRegionsFeature',
+                    'vs/editor/browser/widget/diffEditor/features/hideUnchangedRegionsFeature',
                     'showUnchangedRegion',
                     'Show Unchanged Region'
                 )), role: 'button', onclick: () => { this._unchangedRegion.showAll(undefined); } }, ...renderLabelWithIcons('$(unfold)'))]),
                 h('div@others', { style: { display: 'flex', justifyContent: 'center', alignItems: 'center' } }),
             ]),
             h('div.bottom@bottom', { title: ( localizeWithPath(
-                'vs/editor/browser/widget/diffEditor/hideUnchangedRegionsFeature',
+                'vs/editor/browser/widget/diffEditor/features/hideUnchangedRegionsFeature',
                 'diff.bottom',
                 'Click or drag to show more below'
             )), role: 'button' }),
@@ -290,13 +298,13 @@ class CollapsedCodeOverlayWidget extends ViewZoneOverlayWidget {
             if (!this._hide) {
                 const lineCount = _unchangedRegion.getHiddenModifiedRange(reader).length;
                 const linesHiddenText = ( localizeWithPath(
-                    'vs/editor/browser/widget/diffEditor/hideUnchangedRegionsFeature',
+                    'vs/editor/browser/widget/diffEditor/features/hideUnchangedRegionsFeature',
                     'hiddenLines',
                     '{0} hidden lines',
                     lineCount
                 ));
                 const span = $('span', { title: ( localizeWithPath(
-                    'vs/editor/browser/widget/diffEditor/hideUnchangedRegionsFeature',
+                    'vs/editor/browser/widget/diffEditor/features/hideUnchangedRegionsFeature',
                     'diff.hiddenLines.expandAll',
                     'Double click to unfold'
                 )) }, linesHiddenText);
@@ -336,39 +344,4 @@ class CollapsedCodeOverlayWidget extends ViewZoneOverlayWidget {
         }));
     }
 }
-let OutlineSource = class OutlineSource extends Disposable {
-    constructor(_languageFeaturesService, _textModel) {
-        super();
-        this._languageFeaturesService = _languageFeaturesService;
-        this._textModel = _textModel;
-        this._currentModel = observableValue(this, undefined);
-        const documentSymbolProviderChanged = observableSignalFromEvent('documentSymbolProvider.onDidChange', this._languageFeaturesService.documentSymbolProvider.onDidChange);
-        const textModelChanged = observableSignalFromEvent('_textModel.onDidChangeContent', Event.debounce(e => this._textModel.onDidChangeContent(e), () => undefined, 100));
-        this._register(autorunWithStore(async (reader, store) => {
-            documentSymbolProviderChanged.read(reader);
-            textModelChanged.read(reader);
-            const src = store.add(( new DisposableCancellationTokenSource()));
-            const model = await OutlineModel.create(this._languageFeaturesService.documentSymbolProvider, this._textModel, src.token);
-            if (store.isDisposed) {
-                return;
-            }
-            this._currentModel.set(model, undefined);
-        }));
-    }
-    getBreadcrumbItems(startRange, reader) {
-        const m = this._currentModel.read(reader);
-        if (!m) {
-            return [];
-        }
-        const symbols = m.asListOfDocumentSymbols()
-            .filter(s => startRange.contains(s.range.startLineNumber) && !startRange.contains(s.range.endLineNumber));
-        symbols.sort(reverseOrder(compareBy(s => s.range.endLineNumber - s.range.startLineNumber, numberComparator)));
-        return ( symbols.map(
-            s => ({ name: s.name, kind: s.kind, startLineNumber: s.range.startLineNumber })
-        ));
-    }
-};
-OutlineSource = ( __decorate([
-    ( __param(0, ILanguageFeaturesService))
-], OutlineSource));
 export { HideUnchangedRegionsFeature };

package/vscode/src/vs/editor/browser/widget/diffEditor/{movedBlocksLines.js → features/movedBlocksLinesFeature.js}

@@ -1,19 +1,19 @@
-import { h } from '../../../../base/browser/dom.js';
-import { ActionBar } from '../../../../base/browser/ui/actionbar/actionbar.js';
-import { Action } from '../../../../base/common/actions.js';
-import { tieBreakComparators, compareBy, numberComparator, booleanComparator } from '../../../../base/common/arrays.js';
-import { findMaxIdxBy } from '../../../../base/common/arraysFind.js';
-import { Codicon } from '../../../../base/common/codicons.js';
-import { Disposable, toDisposable } from '../../../../base/common/lifecycle.js';
-import { ThemeIcon } from '../../../../base/common/themables.js';
-import { applyViewZones, ViewZoneOverlayWidget, applyStyle, PlaceholderViewZone } from './utils.js';
-import { OffsetRangeSet, OffsetRange } from '../../../common/core/offsetRange.js';
-import { localizeWithPath } from '../../../../nls.js';
-import { observableFromEvent, observableSignalFromEvent, recomputeInitiallyAndOnChange, constObservable } from '../../../../base/common/observableInternal/utils.js';
-import { observableValue } from '../../../../base/common/observableInternal/base.js';
-import { derivedWithStore, derived } from '../../../../base/common/observableInternal/derived.js';
-import { autorun, autorunWithStore, autorunHandleChanges } from '../../../../base/common/observableInternal/autorun.js';
-class MovedBlocksLinesPart extends Disposable {
+import { h } from '../../../../../base/browser/dom.js';
+import { ActionBar } from '../../../../../base/browser/ui/actionbar/actionbar.js';
+import { Action } from '../../../../../base/common/actions.js';
+import { tieBreakComparators, compareBy, numberComparator, booleanComparator } from '../../../../../base/common/arrays.js';
+import { findMaxIdxBy } from '../../../../../base/common/arraysFind.js';
+import { Codicon } from '../../../../../base/common/codicons.js';
+import { Disposable, toDisposable } from '../../../../../base/common/lifecycle.js';
+import { ThemeIcon } from '../../../../../base/common/themables.js';
+import { applyViewZones, ViewZoneOverlayWidget, applyStyle, PlaceholderViewZone } from '../utils.js';
+import { OffsetRangeSet, OffsetRange } from '../../../../common/core/offsetRange.js';
+import { localizeWithPath } from '../../../../../nls.js';
+import { observableFromEvent, observableSignalFromEvent, recomputeInitiallyAndOnChange, constObservable } from '../../../../../base/common/observableInternal/utils.js';
+import { observableValue } from '../../../../../base/common/observableInternal/base.js';
+import { derivedWithStore, derived } from '../../../../../base/common/observableInternal/derived.js';
+import { autorun, autorunWithStore, autorunHandleChanges } from '../../../../../base/common/observableInternal/autorun.js';
+class MovedBlocksLinesFeature extends Disposable {
     static { this.movedCodeBlockPadding = 4; }
     constructor(_rootElement, _diffModel, _originalEditorLayoutInfo, _modifiedEditorLayoutInfo, _editors) {
         super();
@@ -66,7 +66,7 @@ class MovedBlocksLinesPart extends Disposable {
             const padding = 10;
             const lineAreaLeft = infoOrig.verticalScrollbarWidth;
             const lineAreaWidth = (layout.getTrackCount() - 1) * 10 + padding * 2;
-            const width = lineAreaLeft + lineAreaWidth + (infoMod.contentLeft - MovedBlocksLinesPart.movedCodeBlockPadding);
+            const width = lineAreaLeft + lineAreaWidth + (infoMod.contentLeft - MovedBlocksLinesFeature.movedCodeBlockPadding);
             let idx = 0;
             for (const line of lines) {
                 const track = layout.getTrack(idx);
@@ -113,7 +113,7 @@ class MovedBlocksLinesPart extends Disposable {
             }
             this._element.style.left = `${info.width - info.verticalScrollbarWidth}px`;
             this._element.style.height = `${info.height}px`;
-            this._element.style.width = `${info.verticalScrollbarWidth + info.contentLeft - MovedBlocksLinesPart.movedCodeBlockPadding + this.width.read(reader)}px`;
+            this._element.style.width = `${info.verticalScrollbarWidth + info.contentLeft - MovedBlocksLinesFeature.movedCodeBlockPadding + this.width.read(reader)}px`;
         }));
         this._register(recomputeInitiallyAndOnChange(this._state));
         const movedBlockViewZones = derived(reader => {
@@ -245,13 +245,13 @@ class MovedBlockOverlayWidget extends ViewZoneOverlayWidget {
         let text;
         if (_move.changes.length > 0) {
             text = this._kind === 'original' ? ( localizeWithPath(
-                'vs/editor/browser/widget/diffEditor/movedBlocksLines',
+                'vs/editor/browser/widget/diffEditor/features/movedBlocksLinesFeature',
                 'codeMovedToWithChanges',
                 'Code moved with changes to line {0}-{1}',
                 this._move.lineRangeMapping.modified.startLineNumber,
                 this._move.lineRangeMapping.modified.endLineNumberExclusive - 1
             )) : ( localizeWithPath(
-                'vs/editor/browser/widget/diffEditor/movedBlocksLines',
+                'vs/editor/browser/widget/diffEditor/features/movedBlocksLinesFeature',
                 'codeMovedFromWithChanges',
                 'Code moved with changes from line {0}-{1}',
                 this._move.lineRangeMapping.original.startLineNumber,
@@ -260,13 +260,13 @@ class MovedBlockOverlayWidget extends ViewZoneOverlayWidget {
         }
         else {
             text = this._kind === 'original' ? ( localizeWithPath(
-                'vs/editor/browser/widget/diffEditor/movedBlocksLines',
+                'vs/editor/browser/widget/diffEditor/features/movedBlocksLinesFeature',
                 'codeMovedTo',
                 'Code moved to line {0}-{1}',
                 this._move.lineRangeMapping.modified.startLineNumber,
                 this._move.lineRangeMapping.modified.endLineNumberExclusive - 1
             )) : ( localizeWithPath(
-                'vs/editor/browser/widget/diffEditor/movedBlocksLines',
+                'vs/editor/browser/widget/diffEditor/features/movedBlocksLinesFeature',
                 'codeMovedFrom',
                 'Code moved from line {0}-{1}',
                 this._move.lineRangeMapping.original.startLineNumber,
@@ -295,4 +295,4 @@ class MovedBlockOverlayWidget extends ViewZoneOverlayWidget {
         actionBar.push(actionCompare, { icon: false, label: true });
     }
 }
-export { MovedBlocksLinesPart };
+export { MovedBlocksLinesFeature };

package/vscode/src/vs/editor/browser/widget/diffEditor/{overviewRulerPart.js → features/overviewRulerFeature.js}

@@ -1,21 +1,21 @@
-import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import { h, addStandardDisposableListener, addDisposableListener, EventType } from '../../../../base/browser/dom.js';
-import { createFastDomNode } from '../../../../base/browser/fastDomNode.js';
-import { ScrollbarState } from '../../../../base/browser/ui/scrollbar/scrollbarState.js';
-import { Disposable } from '../../../../base/common/lifecycle.js';
-import { appendRemoveOnDispose } from './utils.js';
-import { Position } from '../../../common/core/position.js';
-import { OverviewRulerZone } from '../../../common/viewModel/overviewZoneManager.js';
-import { diffOverviewRulerInserted, diffInserted, defaultInsertColor, diffOverviewRulerRemoved, diffRemoved, defaultRemoveColor } from '../../../../platform/theme/common/colorRegistry.js';
-import { IThemeService } from '../../../../platform/theme/common/themeService.js';
-import { derived } from '../../../../base/common/observableInternal/derived.js';
-import { autorunWithStore, autorun } from '../../../../base/common/observableInternal/autorun.js';
-import { observableFromEvent, observableSignalFromEvent } from '../../../../base/common/observableInternal/utils.js';
-var OverviewRulerPart_1;
-let OverviewRulerPart = class OverviewRulerPart extends Disposable {
-    static { OverviewRulerPart_1 = this; }
+import { __decorate, __param } from '../../../../../../../../external/tslib/tslib.es6.js';
+import { h, addStandardDisposableListener, addDisposableListener, EventType } from '../../../../../base/browser/dom.js';
+import { createFastDomNode } from '../../../../../base/browser/fastDomNode.js';
+import { ScrollbarState } from '../../../../../base/browser/ui/scrollbar/scrollbarState.js';
+import { Disposable } from '../../../../../base/common/lifecycle.js';
+import { appendRemoveOnDispose } from '../utils.js';
+import { Position } from '../../../../common/core/position.js';
+import { OverviewRulerZone } from '../../../../common/viewModel/overviewZoneManager.js';
+import { diffOverviewRulerInserted, diffInserted, defaultInsertColor, diffOverviewRulerRemoved, diffRemoved, defaultRemoveColor } from '../../../../../platform/theme/common/colorRegistry.js';
+import { IThemeService } from '../../../../../platform/theme/common/themeService.js';
+import { derived } from '../../../../../base/common/observableInternal/derived.js';
+import { autorunWithStore, autorun } from '../../../../../base/common/observableInternal/autorun.js';
+import { observableFromEvent, observableSignalFromEvent } from '../../../../../base/common/observableInternal/utils.js';
+var OverviewRulerFeature_1;
+let OverviewRulerFeature = class OverviewRulerFeature extends Disposable {
+    static { OverviewRulerFeature_1 = this; }
     static { this.ONE_OVERVIEW_WIDTH = 15; }
-    static { this.ENTIRE_DIFF_OVERVIEW_WIDTH = OverviewRulerPart_1.ONE_OVERVIEW_WIDTH * 2; }
+    static { this.ENTIRE_DIFF_OVERVIEW_WIDTH = OverviewRulerFeature_1.ONE_OVERVIEW_WIDTH * 2; }
     constructor(_editors, _rootElement, _diffModel, _rootWidth, _rootHeight, _modifiedEditorLayoutInfo, _themeService) {
         super();
         this._editors = _editors;
@@ -25,7 +25,7 @@ let OverviewRulerPart = class OverviewRulerPart extends Disposable {
         this._rootHeight = _rootHeight;
         this._modifiedEditorLayoutInfo = _modifiedEditorLayoutInfo;
         this._themeService = _themeService;
-        this.width = OverviewRulerPart_1.ENTIRE_DIFF_OVERVIEW_WIDTH;
+        this.width = OverviewRulerFeature_1.ENTIRE_DIFF_OVERVIEW_WIDTH;
         const currentColorTheme = observableFromEvent(this._themeService.onDidColorThemeChange, () => this._themeService.getColorTheme());
         const currentColors = derived(reader => {
             const theme = currentColorTheme.read(reader);
@@ -37,7 +37,7 @@ let OverviewRulerPart = class OverviewRulerPart extends Disposable {
         viewportDomElement.setClassName('diffViewport');
         viewportDomElement.setPosition('absolute');
         const diffOverviewRoot = h('div.diffOverview', {
-            style: { position: 'absolute', top: '0px', width: OverviewRulerPart_1.ENTIRE_DIFF_OVERVIEW_WIDTH + 'px' }
+            style: { position: 'absolute', top: '0px', width: OverviewRulerFeature_1.ENTIRE_DIFF_OVERVIEW_WIDTH + 'px' }
         }).root;
         this._register(appendRemoveOnDispose(diffOverviewRoot, viewportDomElement.domNode));
         this._register(addStandardDisposableListener(diffOverviewRoot, EventType.POINTER_DOWN, (e) => {
@@ -97,18 +97,18 @@ let OverviewRulerPart = class OverviewRulerPart extends Disposable {
                 const width = this._rootWidth.read(reader);
                 const layoutInfo = this._modifiedEditorLayoutInfo.read(reader);
                 if (layoutInfo) {
-                    const freeSpace = OverviewRulerPart_1.ENTIRE_DIFF_OVERVIEW_WIDTH - 2 * OverviewRulerPart_1.ONE_OVERVIEW_WIDTH;
+                    const freeSpace = OverviewRulerFeature_1.ENTIRE_DIFF_OVERVIEW_WIDTH - 2 * OverviewRulerFeature_1.ONE_OVERVIEW_WIDTH;
                     originalOverviewRuler.setLayout({
                         top: 0,
                         height: height,
-                        right: freeSpace + OverviewRulerPart_1.ONE_OVERVIEW_WIDTH,
-                        width: OverviewRulerPart_1.ONE_OVERVIEW_WIDTH,
+                        right: freeSpace + OverviewRulerFeature_1.ONE_OVERVIEW_WIDTH,
+                        width: OverviewRulerFeature_1.ONE_OVERVIEW_WIDTH,
                     });
                     modifiedOverviewRuler.setLayout({
                         top: 0,
                         height: height,
                         right: 0,
-                        width: OverviewRulerPart_1.ONE_OVERVIEW_WIDTH,
+                        width: OverviewRulerFeature_1.ONE_OVERVIEW_WIDTH,
                     });
                     const scrollTop = this._editors.modifiedScrollTop.read(reader);
                     const scrollHeight = this._editors.modifiedScrollHeight.read(reader);
@@ -129,13 +129,13 @@ let OverviewRulerPart = class OverviewRulerPart extends Disposable {
                     viewportDomElement.setHeight(0);
                 }
                 diffOverviewRoot.style.height = height + 'px';
-                diffOverviewRoot.style.left = (width - OverviewRulerPart_1.ENTIRE_DIFF_OVERVIEW_WIDTH) + 'px';
-                viewportDomElement.setWidth(OverviewRulerPart_1.ENTIRE_DIFF_OVERVIEW_WIDTH);
+                diffOverviewRoot.style.left = (width - OverviewRulerFeature_1.ENTIRE_DIFF_OVERVIEW_WIDTH) + 'px';
+                viewportDomElement.setWidth(OverviewRulerFeature_1.ENTIRE_DIFF_OVERVIEW_WIDTH);
             }));
         }));
     }
 };
-OverviewRulerPart = OverviewRulerPart_1 = ( __decorate([
+OverviewRulerFeature = OverviewRulerFeature_1 = ( __decorate([
     ( __param(6, IThemeService))
-], OverviewRulerPart));
-export { OverviewRulerPart };
+], OverviewRulerFeature));
+export { OverviewRulerFeature };

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

@@ -0,0 +1,145 @@
+import { h, addDisposableListener, EventType } from '../../../../../base/browser/dom.js';
+import { renderIcon } from '../../../../../base/browser/ui/iconLabel/iconLabels.js';
+import { Codicon } from '../../../../../base/common/codicons.js';
+import { Disposable, toDisposable } from '../../../../../base/common/lifecycle.js';
+import { LineRangeSet, LineRange } from '../../../../common/core/lineRange.js';
+import { Range } from '../../../../common/core/range.js';
+import { GlyphMarginLane } from '../../../../common/model.js';
+import { localizeWithPath } from '../../../../../nls.js';
+import { derived } from '../../../../../base/common/observableInternal/derived.js';
+import { autorunWithStore } from '../../../../../base/common/observableInternal/autorun.js';
+class RevertButtonsFeature extends Disposable {
+    constructor(_editors, _diffModel, _options, _widget) {
+        super();
+        this._editors = _editors;
+        this._diffModel = _diffModel;
+        this._options = _options;
+        this._widget = _widget;
+        const emptyArr = [];
+        const selectedDiffs = derived(this, (reader) => {
+            const model = this._diffModel.read(reader);
+            const diff = model?.diff.read(reader);
+            if (!diff) {
+                return emptyArr;
+            }
+            const selections = this._editors.modifiedSelections.read(reader);
+            if (selections.every(s => s.isEmpty())) {
+                return emptyArr;
+            }
+            const lineRanges = ( new LineRangeSet(( selections.map(s => LineRange.fromRangeInclusive(s)))));
+            const mappings = diff.mappings.filter(m => m.lineRangeMapping.innerChanges && lineRanges.intersects(m.lineRangeMapping.modified));
+            const result = ( mappings.map(mapping => ({
+                mapping,
+                rangeMappings: mapping.lineRangeMapping.innerChanges.filter(c => ( selections.some(s => Range.areIntersecting(c.modifiedRange, s))))
+            })));
+            if (result.length === 0 || result.every(r => r.rangeMappings.length === 0)) {
+                return emptyArr;
+            }
+            return result;
+        });
+        this._register(autorunWithStore((reader, store) => {
+            const model = this._diffModel.read(reader);
+            const diff = model?.diff.read(reader);
+            if (!model || !diff) {
+                return;
+            }
+            const movedTextToCompare = this._diffModel.read(reader).movedTextToCompare.read(reader);
+            if (movedTextToCompare) {
+                return;
+            }
+            if (!this._options.shouldRenderRevertArrows.read(reader)) {
+                return;
+            }
+            const glyphWidgetsModified = [];
+            const selectedDiffs_ = selectedDiffs.read(reader);
+            const diffsSet = ( new Set(( selectedDiffs_.map(d => d.mapping))));
+            if (selectedDiffs_.length > 0) {
+                const selections = this._editors.modifiedSelections.read(reader);
+                const btn = store.add(( new RevertButton(
+                    selections[selections.length - 1].positionLineNumber,
+                    this._widget,
+                    selectedDiffs_.flatMap(d => d.rangeMappings),
+                    true
+                )));
+                this._editors.modified.addGlyphMarginWidget(btn);
+                glyphWidgetsModified.push(btn);
+            }
+            for (const m of diff.mappings) {
+                if (( diffsSet.has(m))) {
+                    continue;
+                }
+                if (!m.lineRangeMapping.modified.isEmpty && m.lineRangeMapping.innerChanges) {
+                    const btn = store.add(( new RevertButton(
+                        m.lineRangeMapping.modified.startLineNumber,
+                        this._widget,
+                        m.lineRangeMapping.innerChanges,
+                        false
+                    )));
+                    this._editors.modified.addGlyphMarginWidget(btn);
+                    glyphWidgetsModified.push(btn);
+                }
+            }
+            store.add(toDisposable(() => {
+                for (const w of glyphWidgetsModified) {
+                    this._editors.modified.removeGlyphMarginWidget(w);
+                }
+            }));
+        }));
+    }
+}
+class RevertButton extends Disposable {
+    static { this.counter = 0; }
+    getId() { return this._id; }
+    constructor(_lineNumber, _widget, _diffs, _selection) {
+        super();
+        this._lineNumber = _lineNumber;
+        this._widget = _widget;
+        this._diffs = _diffs;
+        this._selection = _selection;
+        this._id = `revertButton${RevertButton.counter++}`;
+        this._domNode = h('div.revertButton', {
+            title: this._selection
+                ? ( localizeWithPath(
+                'vs/editor/browser/widget/diffEditor/features/revertButtonsFeature',
+                'revertSelectedChanges',
+                'Revert Selected Changes'
+            ))
+                : ( localizeWithPath(
+                'vs/editor/browser/widget/diffEditor/features/revertButtonsFeature',
+                'revertChange',
+                'Revert Change'
+            ))
+        }, [renderIcon(Codicon.arrowRight)]).root;
+        this._register(addDisposableListener(this._domNode, EventType.MOUSE_DOWN, e => {
+            if (e.button !== 2) {
+                e.stopPropagation();
+                e.preventDefault();
+            }
+        }));
+        this._register(addDisposableListener(this._domNode, EventType.MOUSE_UP, e => {
+            e.stopPropagation();
+            e.preventDefault();
+        }));
+        this._register(addDisposableListener(this._domNode, EventType.CLICK, (e) => {
+            this._widget.revertRangeMappings(this._diffs);
+            e.stopPropagation();
+            e.preventDefault();
+        }));
+    }
+    getDomNode() {
+        return this._domNode;
+    }
+    getPosition() {
+        return {
+            lane: GlyphMarginLane.Right,
+            range: {
+                startColumn: 1,
+                startLineNumber: this._lineNumber,
+                endColumn: 1,
+                endLineNumber: this._lineNumber,
+            },
+            zIndex: 10001,
+        };
+    }
+}
+export { RevertButton, RevertButtonsFeature };

package/vscode/src/vs/editor/browser/widget/diffEditor/{decorations.js → registrations.contribution.js}

@@ -2,14 +2,30 @@ import { Codicon } from '../../../../base/common/codicons.js';
 import { ThemeIcon } from '../../../../base/common/themables.js';
 import { ModelDecorationOptions } from '../../../common/model/textModel.js';
 import { localizeWithPath } from '../../../../nls.js';
+import { registerColor } from '../../../../platform/theme/common/colorRegistry.js';
 import { registerIcon } from '../../../../platform/theme/common/iconRegistry.js';
+registerColor('diffEditor.move.border', { dark: '#8b8b8b9c', light: '#8b8b8b9c', hcDark: '#8b8b8b9c', hcLight: '#8b8b8b9c', }, ( localizeWithPath(
+    'vs/editor/browser/widget/diffEditor/registrations.contribution',
+    'diffEditor.move.border',
+    '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(
+    'vs/editor/browser/widget/diffEditor/registrations.contribution',
+    'diffEditor.moveActive.border',
+    'The active border color for text that got moved in the diff editor.'
+)));
+registerColor('diffEditor.unchangedRegionShadow', { dark: '#000000', light: '#737373BF', hcDark: '#000000', hcLight: '#737373BF', }, ( localizeWithPath(
+    'vs/editor/browser/widget/diffEditor/registrations.contribution',
+    'diffEditor.unchangedRegionShadow',
+    'The color of the shadow around unchanged region widgets.'
+)));
 const diffInsertIcon = registerIcon('diff-insert', Codicon.add, ( localizeWithPath(
-    'vs/editor/browser/widget/diffEditor/decorations',
+    'vs/editor/browser/widget/diffEditor/registrations.contribution',
     'diffInsertIcon',
     'Line decoration for inserts in the diff editor.'
 )));
 const diffRemoveIcon = registerIcon('diff-remove', Codicon.remove, ( localizeWithPath(
-    'vs/editor/browser/widget/diffEditor/decorations',
+    'vs/editor/browser/widget/diffEditor/registrations.contribution',
     'diffRemoveIcon',
     'Line decoration for removals in the diff editor.'
 )));

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

@@ -6,8 +6,8 @@ import { ElementSizeObserver } from '../../config/elementSizeObserver.js';
 import { Position } from '../../../common/core/position.js';
 import { Range } from '../../../common/core/range.js';
 import { LengthObj } from '../../../common/model/bracketPairsTextModelPart/bracketPairsTree/length.js';
+import { autorunOpts, autorun, autorunWithStore, autorunHandleChanges } from '../../../../base/common/observableInternal/autorun.js';
 import { observableValue, transaction } from '../../../../base/common/observableInternal/base.js';
-import { autorun, autorunWithStore, autorunOpts, autorunHandleChanges } from '../../../../base/common/observableInternal/autorun.js';
 import { observableSignalFromEvent } from '../../../../base/common/observableInternal/utils.js';
 function joinCombine(arr1, arr2, keySelector, combine) {
     if (arr1.length === 0) {
@@ -340,4 +340,12 @@ function bindContextKey(key, service, computeValue) {
         boundKey.set(computeValue(reader));
     });
 }
-export { DisposableCancellationTokenSource, ManagedOverlayWidget, ObservableElementSizeObserver, PlaceholderViewZone, ViewZoneOverlayWidget, animatedObservable, appendRemoveOnDispose, applyObservableDecorations, applyStyle, applyViewZones, bindContextKey, joinCombine, observeHotReloadableExports, readHotReloadableExport, translatePosition };
+function filterWithPrevious(arr, filter) {
+    let prev;
+    return arr.filter(cur => {
+        const result = filter(cur, prev);
+        prev = cur;
+        return result;
+    });
+}
+export { DisposableCancellationTokenSource, ManagedOverlayWidget, ObservableElementSizeObserver, PlaceholderViewZone, ViewZoneOverlayWidget, animatedObservable, appendRemoveOnDispose, applyObservableDecorations, applyStyle, applyViewZones, bindContextKey, filterWithPrevious, joinCombine, observeHotReloadableExports, readHotReloadableExport, translatePosition };

package/vscode/src/vs/editor/browser/widget/hoverWidget/hover.css.js

@@ -0,0 +1,4 @@
+import n from '../../../../../../../external/rollup-plugin-styles/dist/runtime/inject-css.js';
+var css = ".monaco-workbench .workbench-hover{background:var(--vscode-editorHoverWidget-background);border:1px solid var(--vscode-editorHoverWidget-border);border-radius:3px;box-shadow:0 2px 8px var(--vscode-widget-shadow);color:var(--vscode-editorHoverWidget-foreground);font-size:13px;line-height:19px;max-width:700px;overflow:hidden;position:relative;z-index:40}.monaco-workbench .workbench-hover hr{border-bottom:none}.monaco-workbench .workbench-hover:not(.skip-fade-in){animation:fadein .1s linear}.monaco-workbench .workbench-hover.compact{font-size:12px}.monaco-workbench .workbench-hover.compact .hover-contents{padding:2px 8px}.monaco-workbench .workbench-hover-container.locked .workbench-hover{outline:1px solid var(--vscode-editorHoverWidget-border)}.monaco-workbench .workbench-hover-container.locked .workbench-hover:focus,.monaco-workbench .workbench-hover-lock:focus{outline:1px solid var(--vscode-focusBorder)}.monaco-workbench .workbench-hover-container.locked .workbench-hover-lock:hover{background:var(--vscode-toolbar-hoverBackground)}.monaco-workbench .workbench-hover-pointer{pointer-events:none;position:absolute;z-index:41}.monaco-workbench .workbench-hover-pointer:after{background-color:var(--vscode-editorHoverWidget-background);border-bottom:1px solid var(--vscode-editorHoverWidget-border);border-right:1px solid var(--vscode-editorHoverWidget-border);content:\"\";height:5px;position:absolute;width:5px}.monaco-workbench .locked .workbench-hover-pointer:after{border-bottom-width:2px;border-right-width:2px;height:4px;width:4px}.monaco-workbench .workbench-hover-pointer.left{left:-3px}.monaco-workbench .workbench-hover-pointer.right{right:3px}.monaco-workbench .workbench-hover-pointer.top{top:-3px}.monaco-workbench .workbench-hover-pointer.bottom{bottom:3px}.monaco-workbench .workbench-hover-pointer.left:after{transform:rotate(135deg)}.monaco-workbench .workbench-hover-pointer.right:after{transform:rotate(315deg)}.monaco-workbench .workbench-hover-pointer.top:after{transform:rotate(225deg)}.monaco-workbench .workbench-hover-pointer.bottom:after{transform:rotate(45deg)}.monaco-workbench .workbench-hover a{color:var(--vscode-textLink-foreground)}.monaco-workbench .workbench-hover a:focus{outline:1px solid;outline-color:var(--vscode-focusBorder);outline-offset:-1px;text-decoration:underline}.monaco-workbench .workbench-hover a:active,.monaco-workbench .workbench-hover a:hover{color:var(--vscode-textLink-activeForeground)}.monaco-workbench .workbench-hover code{background:var(--vscode-textCodeBlock-background)}.monaco-workbench .workbench-hover .hover-row .actions{background:var(--vscode-editorHoverWidget-statusBarBackground)}.monaco-workbench .workbench-hover.right-aligned{left:1px}.monaco-workbench .workbench-hover.right-aligned .hover-row.status-bar .actions{flex-direction:row-reverse}.monaco-workbench .workbench-hover.right-aligned .hover-row.status-bar .actions .action-container{margin-left:16px;margin-right:0}";
+n(css,{});
+export { css, css as default };