@codingame/monaco-vscode-api 4.5.1 → 5.0.0

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

@@ -5,6 +5,7 @@ import { Disposable } from '../../../../../../base/common/lifecycle.js';
 import { isIOS } from '../../../../../../base/common/platform.js';
 import { ThemeIcon } from '../../../../../../base/common/themables.js';
 import { localizeWithPath } from '../../../../../../nls.js';
+const _moduleId = "vs/editor/browser/widget/diffEditor/components/diffEditorViewZones/inlineDiffDeletedCodeMargin";
 class InlineDiffDeletedCodeMargin extends Disposable {
     get visibility() {
         return this._visibility;
@@ -46,43 +47,27 @@ class InlineDiffDeletedCodeMargin extends Disposable {
                 getActions: () => {
                     const actions = [];
                     const isDeletion = _diff.modified.isEmpty;
-                    actions.push(( new Action('diff.clipboard.copyDeletedContent', isDeletion
+                    actions.push(( (new Action('diff.clipboard.copyDeletedContent', isDeletion
                         ? (_diff.original.length > 1
-                            ? ( localizeWithPath(
-                        'vs/editor/browser/widget/diffEditor/components/diffEditorViewZones/inlineDiffDeletedCodeMargin',
-                        'diff.clipboard.copyDeletedLinesContent.label',
-                        "Copy deleted lines"
-                    ))
-                            : ( localizeWithPath(
-                        'vs/editor/browser/widget/diffEditor/components/diffEditorViewZones/inlineDiffDeletedCodeMargin',
-                        'diff.clipboard.copyDeletedLinesContent.single.label',
-                        "Copy deleted line"
-                    )))
+                            ? ( localizeWithPath(_moduleId, 0, "Copy deleted lines"))
+                            : ( localizeWithPath(_moduleId, 1, "Copy deleted line")))
                         : (_diff.original.length > 1
-                            ? ( localizeWithPath(
-                        'vs/editor/browser/widget/diffEditor/components/diffEditorViewZones/inlineDiffDeletedCodeMargin',
-                        'diff.clipboard.copyChangedLinesContent.label',
-                        "Copy changed lines"
-                    ))
-                            : ( localizeWithPath(
-                        'vs/editor/browser/widget/diffEditor/components/diffEditorViewZones/inlineDiffDeletedCodeMargin',
-                        'diff.clipboard.copyChangedLinesContent.single.label',
-                        "Copy changed line"
-                    ))), undefined, true, async () => {
+                            ? ( localizeWithPath(_moduleId, 2, "Copy changed lines"))
+                            : ( localizeWithPath(_moduleId, 3, "Copy changed line"))), undefined, true, async () => {
                         const originalText = this._originalTextModel.getValueInRange(_diff.original.toExclusiveRange());
                         await this._clipboardService.writeText(originalText);
-                    })));
+                    }))));
                     if (_diff.original.length > 1) {
-                        actions.push(( new Action('diff.clipboard.copyDeletedLineContent', isDeletion
+                        actions.push(( (new Action('diff.clipboard.copyDeletedLineContent', isDeletion
                             ? ( localizeWithPath(
-                            'vs/editor/browser/widget/diffEditor/components/diffEditorViewZones/inlineDiffDeletedCodeMargin',
-                            'diff.clipboard.copyDeletedLineContent.label',
+                            _moduleId,
+                            4,
                             "Copy deleted line ({0})",
                             _diff.original.startLineNumber + currentLineNumberOffset
                         ))
                             : ( localizeWithPath(
-                            'vs/editor/browser/widget/diffEditor/components/diffEditorViewZones/inlineDiffDeletedCodeMargin',
-                            'diff.clipboard.copyChangedLineContent.label',
+                            _moduleId,
+                            5,
                             "Copy changed line ({0})",
                             _diff.original.startLineNumber + currentLineNumberOffset
                         )), undefined, true, async () => {
@@ -92,17 +77,13 @@ class InlineDiffDeletedCodeMargin extends Disposable {
                                 lineContent = eof === 0  ? '\n' : '\r\n';
                             }
                             await this._clipboardService.writeText(lineContent);
-                        })));
+                        }))));
                     }
                     const readOnly = _modifiedEditor.getOption(91 );
                     if (!readOnly) {
-                        actions.push(( new Action('diff.inline.revertChange', ( localizeWithPath(
-                            'vs/editor/browser/widget/diffEditor/components/diffEditorViewZones/inlineDiffDeletedCodeMargin',
-                            'diff.inline.revertChange.label',
-                            "Revert this change"
-                        )), undefined, true, async () => {
+                        actions.push(( (new Action('diff.inline.revertChange', ( localizeWithPath(_moduleId, 6, "Revert this change")), undefined, true, async () => {
                             this._editor.revert(this._diff);
-                        })));
+                        }))));
                     }
                     return actions;
                 },

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

@@ -6,73 +6,58 @@ import { registerAction2, MenuRegistry, MenuId } from '../../../../platform/acti
 import { CommandsRegistry } from '../../../../platform/commands/common/commands.js';
 import { ContextKeyExpr, ContextKeyEqualsExpr } from '../../../../platform/contextkey/common/contextkey.js';
 import './registrations.contribution.js';
+const _moduleId = "vs/editor/browser/widget/diffEditor/diffEditor.contribution";
 registerAction2(ToggleCollapseUnchangedRegions);
 registerAction2(ToggleShowMovedCodeBlocks);
 registerAction2(ToggleUseInlineViewWhenSpaceIsLimited);
 MenuRegistry.appendMenuItem(MenuId.EditorTitle, {
     command: {
-        id: ( new ToggleUseInlineViewWhenSpaceIsLimited()).desc.id,
-        title: ( localizeWithPath(
-            'vs/editor/browser/widget/diffEditor/diffEditor.contribution',
-            'useInlineViewWhenSpaceIsLimited',
-            "Use Inline View When Space Is Limited"
-        )),
-        toggled: ( ContextKeyExpr.has('config.diffEditor.useInlineViewWhenSpaceIsLimited')),
-        precondition: ( ContextKeyExpr.has('isInDiffEditor')),
+        id: ( (new ToggleUseInlineViewWhenSpaceIsLimited())).desc.id,
+        title: ( localizeWithPath(_moduleId, 0, "Use Inline View When Space Is Limited")),
+        toggled: ( (ContextKeyExpr.has('config.diffEditor.useInlineViewWhenSpaceIsLimited'))),
+        precondition: ( (ContextKeyExpr.has('isInDiffEditor'))),
     },
     order: 11,
     group: '1_diff',
-    when: ( ContextKeyExpr.and(
+    when: ( (ContextKeyExpr.and(
         EditorContextKeys.diffEditorRenderSideBySideInlineBreakpointReached,
-        ( ContextKeyExpr.has('isInDiffEditor'))
-    )),
+         (ContextKeyExpr.has('isInDiffEditor'))
+    ))),
 });
 MenuRegistry.appendMenuItem(MenuId.EditorTitle, {
     command: {
-        id: ( new ToggleShowMovedCodeBlocks()).desc.id,
-        title: ( localizeWithPath(
-            'vs/editor/browser/widget/diffEditor/diffEditor.contribution',
-            'showMoves',
-            "Show Moved Code Blocks"
-        )),
+        id: ( (new ToggleShowMovedCodeBlocks())).desc.id,
+        title: ( localizeWithPath(_moduleId, 1, "Show Moved Code Blocks")),
         icon: Codicon.move,
         toggled: ContextKeyEqualsExpr.create('config.diffEditor.experimental.showMoves', true),
-        precondition: ( ContextKeyExpr.has('isInDiffEditor')),
+        precondition: ( (ContextKeyExpr.has('isInDiffEditor'))),
     },
     order: 10,
     group: '1_diff',
-    when: ( ContextKeyExpr.has('isInDiffEditor')),
+    when: ( (ContextKeyExpr.has('isInDiffEditor'))),
 });
 registerAction2(RevertHunkOrSelection);
 for (const ctx of [
-    { icon: Codicon.arrowRight, key: ( EditorContextKeys.diffEditorInlineMode.toNegated()) },
+    { icon: Codicon.arrowRight, key: ( (EditorContextKeys.diffEditorInlineMode.toNegated())) },
     { icon: Codicon.discard, key: EditorContextKeys.diffEditorInlineMode }
 ]) {
     MenuRegistry.appendMenuItem(MenuId.DiffEditorHunkToolbar, {
         command: {
-            id: ( new RevertHunkOrSelection()).desc.id,
-            title: ( localizeWithPath(
-                'vs/editor/browser/widget/diffEditor/diffEditor.contribution',
-                'revertHunk',
-                "Revert Block"
-            )),
+            id: ( (new RevertHunkOrSelection())).desc.id,
+            title: ( localizeWithPath(_moduleId, 2, "Revert Block")),
             icon: ctx.icon,
         },
-        when: ( ContextKeyExpr.and(EditorContextKeys.diffEditorModifiedWritable, ctx.key)),
+        when: ( (ContextKeyExpr.and(EditorContextKeys.diffEditorModifiedWritable, ctx.key))),
         order: 5,
         group: 'primary',
     });
     MenuRegistry.appendMenuItem(MenuId.DiffEditorSelectionToolbar, {
         command: {
-            id: ( new RevertHunkOrSelection()).desc.id,
-            title: ( localizeWithPath(
-                'vs/editor/browser/widget/diffEditor/diffEditor.contribution',
-                'revertSelection',
-                "Revert Selection"
-            )),
+            id: ( (new RevertHunkOrSelection())).desc.id,
+            title: ( localizeWithPath(_moduleId, 3, "Revert Selection")),
             icon: ctx.icon,
         },
-        when: ( ContextKeyExpr.and(EditorContextKeys.diffEditorModifiedWritable, ctx.key)),
+        when: ( (ContextKeyExpr.and(EditorContextKeys.diffEditorModifiedWritable, ctx.key))),
         order: 5,
         group: 'primary',
     });
@@ -84,16 +69,15 @@ registerAction2(ShowAllUnchangedRegions);
 MenuRegistry.appendMenuItem(MenuId.EditorTitle, {
     command: {
         id: AccessibleDiffViewerNext.id,
-        title: ( localizeWithPath(
-            'vs/editor/browser/widget/diffEditor/diffEditor.contribution',
-            'Open Accessible Diff Viewer',
-            "Open Accessible Diff Viewer"
-        )),
-        precondition: ( ContextKeyExpr.has('isInDiffEditor')),
+        title: ( localizeWithPath(_moduleId, 4, "Open Accessible Diff Viewer")),
+        precondition: ( (ContextKeyExpr.has('isInDiffEditor'))),
     },
     order: 10,
     group: '2_diff',
-    when: ( ContextKeyExpr.and(( EditorContextKeys.accessibleDiffViewerVisible.negate()), ( ContextKeyExpr.has('isInDiffEditor')))),
+    when: ( (ContextKeyExpr.and(
+         (EditorContextKeys.accessibleDiffViewerVisible.negate()),
+         (ContextKeyExpr.has('isInDiffEditor'))
+    ))),
 });
 CommandsRegistry.registerCommandAlias('editor.action.diffReview.next', AccessibleDiffViewerNext.id);
 registerAction2(AccessibleDiffViewerNext);

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

@@ -4,6 +4,7 @@ import { derived } from '../../../../base/common/observableInternal/derived.js';
 import '../../../../base/common/observableInternal/autorun.js';
 import { observableFromEvent } from '../../../../base/common/observableInternal/utils.js';
 import '../../../../base/common/cancellation.js';
+import '../../../../base/common/arrays.js';
 import { diffEditorDefaultOptions } from '../../../common/config/diffEditor.js';
 import { boolean, clampedFloat, clampedInt, stringSet } from '../../../common/config/editorOptions.js';
 import { IAccessibilityService } from '../../../../platform/accessibility/common/accessibility.service.js';

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

@@ -217,6 +217,9 @@ let DiffEditorViewModel = class DiffEditorViewModel extends Disposable {
             if (this._cancellationTokenSource.token.isCancellationRequested) {
                 return;
             }
+            if (model.original.isDisposed() || model.modified.isDisposed()) {
+                return;
+            }
             result = normalizeDocumentDiff(result, model.original, model.modified);
             result = result;
             result = result;

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

@@ -1,5 +1,5 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import { h, $, getWindow } from '../../../../base/browser/dom.js';
+import { h, getWindow } from '../../../../base/browser/dom.js';
 import { findLast } from '../../../../base/common/arraysFind.js';
 import { onUnexpectedError } from '../../../../base/common/errors.js';
 import { Event } from '../../../../base/common/event.js';
@@ -9,6 +9,7 @@ import { derived, derivedDisposable } from '../../../../base/common/observableIn
 import { autorun, autorunWithStore } from '../../../../base/common/observableInternal/autorun.js';
 import { recomputeInitiallyAndOnChange, observableFromEvent } from '../../../../base/common/observableInternal/utils.js';
 import '../../../../base/common/cancellation.js';
+import '../../../../base/common/arrays.js';
 import './style.css.js';
 import { EditorExtensionsRegistry } from '../../editorExtensions.js';
 import { ICodeEditorService } from '../../services/codeEditorService.js';
@@ -18,6 +19,7 @@ import { AccessibleDiffViewerModelFromEditors, AccessibleDiffViewer } from './co
 import { DiffEditorDecorations } from './components/diffEditorDecorations.js';
 import { DiffEditorSash } from './components/diffEditorSash.js';
 import { DiffEditorViewZones } from './components/diffEditorViewZones/diffEditorViewZones.js';
+import { DiffEditorGutter } from './features/gutterFeature.js';
 import { HideUnchangedRegionsFeature } from './features/hideUnchangedRegionsFeature.js';
 import { MovedBlocksLinesFeature } from './features/movedBlocksLinesFeature.js';
 import { OverviewRulerFeature } from './features/overviewRulerFeature.js';
@@ -37,7 +39,6 @@ import { DiffEditorEditors } from './components/diffEditorEditors.js';
 import { DelegatingEditor } from './delegatingEditorImpl.js';
 import { DiffEditorOptions } from './diffEditorOptions.js';
 import { DiffEditorViewModel } from './diffEditorViewModel.js';
-import { DiffEditorGutter } from './features/gutterFeature.js';
 let DiffEditorWidget = class DiffEditorWidget extends DelegatingEditor {
     static { this.ENTIRE_DIFF_OVERVIEW_WIDTH = OverviewRulerFeature.ENTIRE_DIFF_OVERVIEW_WIDTH; }
     get onDidContentSizeChange() { return this._editors.onDidContentSizeChange; }
@@ -50,7 +51,6 @@ let DiffEditorWidget = class DiffEditorWidget extends DelegatingEditor {
         this._accessibilitySignalService = _accessibilitySignalService;
         this._editorProgressService = _editorProgressService;
         this.elements = h('div.monaco-diff-editor.side-by-side', { style: { position: 'relative', height: '100%' } }, [
-            h('div.noModificationsOverlay@overlay', { style: { position: 'absolute', height: '100%', visibility: 'hidden', } }, [$('span', {}, 'No Changes')]),
             h('div.editor.original@original', { style: { position: 'absolute', height: '100%', } }),
             h('div.editor.modified@modified', { style: { position: 'absolute', height: '100%', } }),
             h('div.accessibleDiffViewer@accessibleDiffViewer', { style: { position: 'absolute', height: '100%' } }),
@@ -183,13 +183,6 @@ let DiffEditorWidget = class DiffEditorWidget extends DelegatingEditor {
         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 => {
             this._movedBlocksLinesPart.set(value, undefined);
         });
-        this._register(applyStyle(this.elements.overlay, {
-            width: ( this._layoutInfo.map(
-                (i, r) => i.originalEditor.width + (this._options.renderSideBySide.read(r) ? 0 : i.modifiedEditor.width)
-            )),
-            visibility: derived(reader =>  (this._options.hideUnchangedRegions.read(reader) && this._diffModel.read(reader)?.diff.read(reader)?.mappings.length === 0)
-                ? 'visible' : 'hidden'),
-        }));
         this._register(Event.runAndSubscribe(this._editors.modified.onDidChangeCursorPosition, e => this._handleCursorPositionChange(e, true)));
         this._register(Event.runAndSubscribe(this._editors.original.onDidChangeCursorPosition, e => this._handleCursorPositionChange(e, false)));
         const isInitializingDiff = ( this._diffModel.map(this, (m, reader) => {

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

@@ -40,6 +40,14 @@ let WorkerBasedDocumentDiffProvider = class WorkerBasedDocumentDiffProvider {
         if (typeof this.diffAlgorithm !== 'string') {
             return this.diffAlgorithm.computeDiff(original, modified, options, cancellationToken);
         }
+        if (original.isDisposed() || modified.isDisposed()) {
+            return {
+                changes: [],
+                identical: true,
+                quitEarly: false,
+                moves: [],
+            };
+        }
         if (original.getLineCount() === 1 && original.getLineMaxColumn(1) === 1) {
             if (modified.getLineCount() === 1 && modified.getLineMaxColumn(1) === 1) {
                 return {
@@ -83,7 +91,7 @@ let WorkerBasedDocumentDiffProvider = class WorkerBasedDocumentDiffProvider {
             };
         }
         if (!result) {
-            throw new Error('no diff result available');
+            throw ( new Error('no diff result available'));
         }
         if (WorkerBasedDocumentDiffProvider_1.diffCache.size > 10) {
             WorkerBasedDocumentDiffProvider_1.diffCache.delete(( WorkerBasedDocumentDiffProvider_1.diffCache.keys()).next().value);

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

@@ -6,13 +6,14 @@ import { derived } from '../../../../../base/common/observableInternal/derived.j
 import { autorun, autorunWithStore } from '../../../../../base/common/observableInternal/autorun.js';
 import { observableFromEvent } from '../../../../../base/common/observableInternal/utils.js';
 import '../../../../../base/common/cancellation.js';
+import '../../../../../base/common/arrays.js';
 import { prependRemoveOnDispose, applyStyle, appendRemoveOnDispose } from '../utils.js';
 import { EditorGutter } from '../utils/editorGutter.js';
 import { ActionRunnerWithContext } from '../../multiDiffEditor/utils.js';
 import { LineRangeSet, LineRange } from '../../../../common/core/lineRange.js';
 import { OffsetRange } from '../../../../common/core/offsetRange.js';
 import { Range } from '../../../../common/core/range.js';
-import { TextEdit, SingleTextEdit } from '../../../../common/core/textEdit.js';
+import { TextEdit } from '../../../../common/core/textEdit.js';
 import { DetailedLineRangeMapping } from '../../../../common/diff/rangeMapping.js';
 import { TextModelText } from '../../../../common/model/textModelText.js';
 import { MenuWorkbenchToolBar } from '../../../../../platform/actions/browser/toolbar.js';
@@ -120,11 +121,10 @@ let DiffEditorGutter = class DiffEditorGutter extends Disposable {
     }
     computeStagedValue(mapping) {
         const c = mapping.innerChanges ?? [];
-        const edit = ( new TextEdit(( c.map(c => ( new SingleTextEdit(
-            c.originalRange,
-            this._editors.modifiedModel.get().getValueInRange(c.modifiedRange)
-        ))))));
-        const value = edit.apply(( new TextModelText(this._editors.original.getModel())));
+        const modified = ( new TextModelText(this._editors.modifiedModel.get()));
+        const original = ( new TextModelText(this._editors.original.getModel()));
+        const edit = ( new TextEdit(( c.map(c => c.toTextEdit(modified)))));
+        const value = edit.apply(original);
         return value;
     }
     layout(left) {

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

@@ -9,6 +9,7 @@ import { derivedDisposable, derivedWithStore, derived } from '../../../../../bas
 import { autorun } from '../../../../../base/common/observableInternal/autorun.js';
 import { observableFromEvent } from '../../../../../base/common/observableInternal/utils.js';
 import '../../../../../base/common/cancellation.js';
+import '../../../../../base/common/arrays.js';
 import { ThemeIcon } from '../../../../../base/common/themables.js';
 import { isDefined } from '../../../../../base/common/types.js';
 import { applyObservableDecorations, ViewZoneOverlayWidget, applyStyle, PlaceholderViewZone } from '../utils.js';
@@ -19,6 +20,7 @@ import { SymbolKinds } from '../../../../common/languages.js';
 import { localizeWithPath } from '../../../../../nls.js';
 import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
 var HideUnchangedRegionsFeature_1;
+const _moduleId = "vs/editor/browser/widget/diffEditor/features/hideUnchangedRegionsFeature";
 let HideUnchangedRegionsFeature = class HideUnchangedRegionsFeature extends Disposable {
     static { HideUnchangedRegionsFeature_1 = this; }
     static { this._breadcrumbsSourceFactory = observableValue('breadcrumbsSourceFactory', undefined); }
@@ -62,13 +64,13 @@ let HideUnchangedRegionsFeature = class HideUnchangedRegionsFeature extends Disp
                 }
             });
         }));
-        const unchangedRegions = ( this._diffModel.map((m, 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) {
@@ -84,9 +86,9 @@ let HideUnchangedRegionsFeature = class HideUnchangedRegionsFeature extends Disp
                 }
                 {
                     const d = derived(this, reader =>  r.getHiddenOriginalRange(reader).startLineNumber - 1);
-                    const origVz = ( new PlaceholderViewZone(d, 24));
+                    const origVz = ( (new PlaceholderViewZone(d, 24)));
                     origViewZones.push(origVz);
-                    store.add(( new CollapsedCodeOverlayWidget(
+                    store.add(( (new CollapsedCodeOverlayWidget(
                         this._editors.original,
                         origVz,
                         r,
@@ -95,13 +97,13 @@ let HideUnchangedRegionsFeature = class HideUnchangedRegionsFeature extends Disp
                         modifiedOutlineSource,
                         l => this._diffModel.get().ensureModifiedLineIsVisible(l, 2 , undefined),
                         this._options
-                    )));
+                    ))));
                 }
                 {
                     const d = derived(this, reader =>  r.getHiddenModifiedRange(reader).startLineNumber - 1);
-                    const modViewZone = ( new PlaceholderViewZone(d, 24));
+                    const modViewZone = ( (new PlaceholderViewZone(d, 24)));
                     modViewZones.push(modViewZone);
-                    store.add(( new CollapsedCodeOverlayWidget(
+                    store.add(( (new CollapsedCodeOverlayWidget(
                         this._editors.modified,
                         modViewZone,
                         r,
@@ -110,7 +112,7 @@ let HideUnchangedRegionsFeature = class HideUnchangedRegionsFeature extends Disp
                         modifiedOutlineSource,
                         l => this._diffModel.get().ensureModifiedLineIsVisible(l, 2 , undefined),
                         this._options
-                    )));
+                    ))));
                 }
             }
             return { origViewZones, modViewZones, };
@@ -122,25 +124,21 @@ let HideUnchangedRegionsFeature = class HideUnchangedRegionsFeature extends Disp
         };
         const unchangedLinesDecorationShow = {
             description: 'Fold Unchanged',
-            glyphMarginHoverMessage: ( new MarkdownString(undefined, { isTrusted: true, supportThemeIcons: true }))
-                .appendMarkdown(( localizeWithPath(
-                'vs/editor/browser/widget/diffEditor/features/hideUnchangedRegionsFeature',
-                'foldUnchanged',
-                'Fold Unchanged Region'
-            ))),
+            glyphMarginHoverMessage: ( (new MarkdownString(undefined, { isTrusted: true, supportThemeIcons: true })))
+                .appendMarkdown(( localizeWithPath(_moduleId, 0, 'Fold Unchanged Region'))),
             glyphMarginClassName: 'fold-unchanged ' + ThemeIcon.asClassName(Codicon.fold),
             zIndex: 10001,
         };
         this._register(applyObservableDecorations(this._editors.original, derived(this, reader => {
             const curUnchangedRegions = unchangedRegions.read(reader);
-            const result = ( curUnchangedRegions.map(r => ({
+            const result = ( (curUnchangedRegions.map(r => ({
                 range: r.originalUnchangedRange.toInclusiveRange(),
                 options: unchangedLinesDecoration,
-            })));
+            }))));
             for (const r of curUnchangedRegions) {
                 if (r.shouldHideControls(reader)) {
                     result.push({
-                        range: Range.fromPositions(( new Position(r.originalLineNumber, 1))),
+                        range: Range.fromPositions(( (new Position(r.originalLineNumber, 1)))),
                         options: unchangedLinesDecorationShow,
                     });
                 }
@@ -149,10 +147,10 @@ let HideUnchangedRegionsFeature = class HideUnchangedRegionsFeature extends Disp
         })));
         this._register(applyObservableDecorations(this._editors.modified, derived(this, reader => {
             const curUnchangedRegions = unchangedRegions.read(reader);
-            const result = ( curUnchangedRegions.map(r => ({
+            const result = ( (curUnchangedRegions.map(r => ({
                 range: r.modifiedUnchangedRange.toInclusiveRange(),
                 options: unchangedLinesDecoration,
-            })));
+            }))));
             for (const r of curUnchangedRegions) {
                 if (r.shouldHideControls(reader)) {
                     result.push({
@@ -167,8 +165,8 @@ let HideUnchangedRegionsFeature = class HideUnchangedRegionsFeature extends Disp
             const curUnchangedRegions = unchangedRegions.read(reader);
             this._isUpdatingHiddenAreas = true;
             try {
-                this._editors.original.setHiddenAreas(( curUnchangedRegions.map(r => r.getHiddenOriginalRange(reader).toInclusiveRange())).filter(isDefined));
-                this._editors.modified.setHiddenAreas(( curUnchangedRegions.map(r => r.getHiddenModifiedRange(reader).toInclusiveRange())).filter(isDefined));
+                this._editors.original.setHiddenAreas(( (curUnchangedRegions.map(r => r.getHiddenOriginalRange(reader).toInclusiveRange()))).filter(isDefined));
+                this._editors.modified.setHiddenAreas(( (curUnchangedRegions.map(r => r.getHiddenModifiedRange(reader).toInclusiveRange()))).filter(isDefined));
             }
             finally {
                 this._isUpdatingHiddenAreas = false;
@@ -208,9 +206,9 @@ let HideUnchangedRegionsFeature = class HideUnchangedRegionsFeature extends Disp
         }));
     }
 };
-HideUnchangedRegionsFeature = HideUnchangedRegionsFeature_1 = ( __decorate([
-    ( __param(3, IInstantiationService))
-], HideUnchangedRegionsFeature));
+HideUnchangedRegionsFeature = HideUnchangedRegionsFeature_1 = ( (__decorate([
+    ( (__param(3, IInstantiationService)))
+], HideUnchangedRegionsFeature)));
 class CollapsedCodeOverlayWidget extends ViewZoneOverlayWidget {
     constructor(_editor, _viewZone, _unchangedRegion, _unchangedRegionRange, _hide, _modifiedOutlineSource, _revealModifiedHiddenLine, _options) {
         const root = h('div.diff-hidden-lines-widget');
@@ -223,29 +221,17 @@ class CollapsedCodeOverlayWidget extends ViewZoneOverlayWidget {
         this._revealModifiedHiddenLine = _revealModifiedHiddenLine;
         this._options = _options;
         this._nodes = h('div.diff-hidden-lines', [
-            h('div.top@top', { title: ( localizeWithPath(
-                'vs/editor/browser/widget/diffEditor/features/hideUnchangedRegionsFeature',
-                'diff.hiddenLines.top',
-                'Click or drag to show more above'
-            )) }),
+            h('div.top@top', { title: ( localizeWithPath(_moduleId, 1, '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/features/hideUnchangedRegionsFeature',
-                    'showUnchangedRegion',
-                    'Show Unchanged Region'
-                )), role: 'button', onclick: () => { this._unchangedRegion.showAll(undefined); } }, ...renderLabelWithIcons('$(unfold)'))]),
+                h('div@first', { style: { display: 'flex', justifyContent: 'center', alignItems: 'center', flexShrink: '0' } }, [$('a', { title: ( localizeWithPath(_moduleId, 2, '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/features/hideUnchangedRegionsFeature',
-                'diff.bottom',
-                'Click or drag to show more below'
-            )), role: 'button' }),
+            h('div.bottom@bottom', { title: ( localizeWithPath(_moduleId, 3, 'Click or drag to show more below')), role: 'button' }),
         ]);
         root.root.appendChild(this._nodes.root);
         const layoutInfo = observableFromEvent(this._editor.onDidLayoutChange, () => this._editor.getLayoutInfo());
         if (!this._hide) {
-            this._register(applyStyle(this._nodes.first, { width: ( layoutInfo.map((l) => l.contentLeft)) }));
+            this._register(applyStyle(this._nodes.first, { width: ( (layoutInfo.map((l) => l.contentLeft))) }));
         }
         else {
             reset(this._nodes.first);
@@ -351,17 +337,8 @@ class CollapsedCodeOverlayWidget extends ViewZoneOverlayWidget {
             const children = [];
             if (!this._hide) {
                 const lineCount = _unchangedRegion.getHiddenModifiedRange(reader).length;
-                const linesHiddenText = ( localizeWithPath(
-                    'vs/editor/browser/widget/diffEditor/features/hideUnchangedRegionsFeature',
-                    'hiddenLines',
-                    '{0} hidden lines',
-                    lineCount
-                ));
-                const span = $('span', { title: ( localizeWithPath(
-                    'vs/editor/browser/widget/diffEditor/features/hideUnchangedRegionsFeature',
-                    'diff.hiddenLines.expandAll',
-                    'Double click to unfold'
-                )) }, linesHiddenText);
+                const linesHiddenText = ( localizeWithPath(_moduleId, 4, '{0} hidden lines', lineCount));
+                const span = $('span', { title: ( localizeWithPath(_moduleId, 5, 'Double click to unfold')) }, linesHiddenText);
                 span.addEventListener('dblclick', e => {
                     if (e.button !== 0) {
                         return;