@codingame/monaco-vscode-api 2.2.1 → 3.0.0

package/vscode/src/vs/workbench/contrib/mergeEditor/browser/commands/commands.js

@@ -129,14 +129,11 @@ class SetMixedLayout extends Action2 {
     constructor() {
         super({
             id: 'merge.mixedLayout',
-            title: {
-                value: ( localizeWithPath(
-                    'vs/workbench/contrib/mergeEditor/browser/commands/commands',
-                    'layout.mixed',
-                    'Mixed Layout'
-                )),
-                original: 'Mixed Layout',
-            },
+            title: ( localize2WithPath(
+                'vs/workbench/contrib/mergeEditor/browser/commands/commands',
+                'layout.mixed',
+                "Mixed Layout"
+            )),
             toggled: ( ctxMergeEditorLayout.isEqualTo('mixed')),
             menu: [
                 {
@@ -186,14 +183,11 @@ class ShowNonConflictingChanges extends Action2 {
     constructor() {
         super({
             id: 'merge.showNonConflictingChanges',
-            title: {
-                value: ( localizeWithPath(
-                    'vs/workbench/contrib/mergeEditor/browser/commands/commands',
-                    'showNonConflictingChanges',
-                    'Show Non-Conflicting Changes'
-                )),
-                original: 'Show Non-Conflicting Changes',
-            },
+            title: ( localize2WithPath(
+                'vs/workbench/contrib/mergeEditor/browser/commands/commands',
+                'showNonConflictingChanges',
+                "Show Non-Conflicting Changes"
+            )),
             toggled: ( ctxMergeEditorShowNonConflictingChanges.isEqualTo(true)),
             menu: [
                 {
@@ -217,14 +211,11 @@ class ShowHideBase extends Action2 {
     constructor() {
         super({
             id: 'merge.showBase',
-            title: {
-                value: ( localizeWithPath(
-                    'vs/workbench/contrib/mergeEditor/browser/commands/commands',
-                    'layout.showBase',
-                    'Show Base'
-                )),
-                original: 'Show Base',
-            },
+            title: ( localize2WithPath(
+                'vs/workbench/contrib/mergeEditor/browser/commands/commands',
+                'layout.showBase',
+                "Show Base"
+            )),
             toggled: ( ctxMergeEditorShowBase.isEqualTo(true)),
             menu: [
                 {
@@ -247,14 +238,11 @@ class ShowHideTopBase extends Action2 {
     constructor() {
         super({
             id: 'merge.showBaseTop',
-            title: {
-                value: ( localizeWithPath(
-                    'vs/workbench/contrib/mergeEditor/browser/commands/commands',
-                    'layout.showBaseTop',
-                    'Show Base Top'
-                )),
-                original: 'Show Base Top',
-            },
+            title: ( localize2WithPath(
+                'vs/workbench/contrib/mergeEditor/browser/commands/commands',
+                'layout.showBaseTop',
+                "Show Base Top"
+            )),
             toggled: ( ContextKeyExpr.and(ctxMergeEditorShowBase, ctxMergeEditorShowBaseAtTop)),
             menu: [
                 {
@@ -277,14 +265,11 @@ class ShowHideCenterBase extends Action2 {
     constructor() {
         super({
             id: 'merge.showBaseCenter',
-            title: {
-                value: ( localizeWithPath(
-                    'vs/workbench/contrib/mergeEditor/browser/commands/commands',
-                    'layout.showBaseCenter',
-                    'Show Base Center'
-                )),
-                original: 'Show Base Center',
-            },
+            title: ( localize2WithPath(
+                'vs/workbench/contrib/mergeEditor/browser/commands/commands',
+                'layout.showBaseCenter',
+                "Show Base Center"
+            )),
             toggled: ( ContextKeyExpr.and(ctxMergeEditorShowBase, ( ctxMergeEditorShowBaseAtTop.negate()))),
             menu: [
                 {
@@ -303,27 +288,21 @@ class ShowHideCenterBase extends Action2 {
         }
     }
 }
-const mergeEditorCategory = {
-    value: ( localizeWithPath(
-        'vs/workbench/contrib/mergeEditor/browser/commands/commands',
-        'mergeEditor',
-        'Merge Editor'
-    )),
-    original: 'Merge Editor',
-};
+const mergeEditorCategory = ( localize2WithPath(
+    'vs/workbench/contrib/mergeEditor/browser/commands/commands',
+    'mergeEditor',
+    "Merge Editor"
+));
 class OpenResultResource extends MergeEditorAction {
     constructor() {
         super({
             id: 'merge.openResult',
             icon: Codicon.goToFile,
-            title: {
-                value: ( localizeWithPath(
-                    'vs/workbench/contrib/mergeEditor/browser/commands/commands',
-                    'openfile',
-                    'Open File'
-                )),
-                original: 'Open File',
-            },
+            title: ( localize2WithPath(
+                'vs/workbench/contrib/mergeEditor/browser/commands/commands',
+                'openfile',
+                "Open File"
+            )),
             category: mergeEditorCategory,
             menu: [{
                     id: MenuId.EditorTitle,
@@ -344,14 +323,11 @@ class GoToNextUnhandledConflict extends MergeEditorAction {
         super({
             id: 'merge.goToNextUnhandledConflict',
             category: mergeEditorCategory,
-            title: {
-                value: ( localizeWithPath(
-                    'vs/workbench/contrib/mergeEditor/browser/commands/commands',
-                    'merge.goToNextUnhandledConflict',
-                    'Go to Next Unhandled Conflict'
-                )),
-                original: 'Go to Next Unhandled Conflict',
-            },
+            title: ( localize2WithPath(
+                'vs/workbench/contrib/mergeEditor/browser/commands/commands',
+                'merge.goToNextUnhandledConflict',
+                "Go to Next Unhandled Conflict"
+            )),
             icon: Codicon.arrowDown,
             menu: [
                 {
@@ -375,14 +351,11 @@ class GoToPreviousUnhandledConflict extends MergeEditorAction {
         super({
             id: 'merge.goToPreviousUnhandledConflict',
             category: mergeEditorCategory,
-            title: {
-                value: ( localizeWithPath(
-                    'vs/workbench/contrib/mergeEditor/browser/commands/commands',
-                    'merge.goToPreviousUnhandledConflict',
-                    'Go to Previous Unhandled Conflict'
-                )),
-                original: 'Go to Previous Unhandled Conflict',
-            },
+            title: ( localize2WithPath(
+                'vs/workbench/contrib/mergeEditor/browser/commands/commands',
+                'merge.goToPreviousUnhandledConflict',
+                "Go to Previous Unhandled Conflict"
+            )),
             icon: Codicon.arrowUp,
             menu: [
                 {
@@ -406,14 +379,11 @@ class ToggleActiveConflictInput1 extends MergeEditorAction {
         super({
             id: 'merge.toggleActiveConflictInput1',
             category: mergeEditorCategory,
-            title: {
-                value: ( localizeWithPath(
-                    'vs/workbench/contrib/mergeEditor/browser/commands/commands',
-                    'merge.toggleCurrentConflictFromLeft',
-                    'Toggle Current Conflict from Left'
-                )),
-                original: 'Toggle Current Conflict from Left',
-            },
+            title: ( localize2WithPath(
+                'vs/workbench/contrib/mergeEditor/browser/commands/commands',
+                'merge.toggleCurrentConflictFromLeft',
+                "Toggle Current Conflict from Left"
+            )),
             f1: true,
             precondition: ctxIsMergeEditor,
         });
@@ -427,14 +397,11 @@ class ToggleActiveConflictInput2 extends MergeEditorAction {
         super({
             id: 'merge.toggleActiveConflictInput2',
             category: mergeEditorCategory,
-            title: {
-                value: ( localizeWithPath(
-                    'vs/workbench/contrib/mergeEditor/browser/commands/commands',
-                    'merge.toggleCurrentConflictFromRight',
-                    'Toggle Current Conflict from Right'
-                )),
-                original: 'Toggle Current Conflict from Right',
-            },
+            title: ( localize2WithPath(
+                'vs/workbench/contrib/mergeEditor/browser/commands/commands',
+                'merge.toggleCurrentConflictFromRight',
+                "Toggle Current Conflict from Right"
+            )),
             f1: true,
             precondition: ctxIsMergeEditor,
         });
@@ -448,14 +415,11 @@ class CompareInput1WithBaseCommand extends MergeEditorAction {
         super({
             id: 'mergeEditor.compareInput1WithBase',
             category: mergeEditorCategory,
-            title: {
-                value: ( localizeWithPath(
-                    'vs/workbench/contrib/mergeEditor/browser/commands/commands',
-                    'mergeEditor.compareInput1WithBase',
-                    'Compare Input 1 With Base'
-                )),
-                original: 'Compare Input 1 With Base',
-            },
+            title: ( localize2WithPath(
+                'vs/workbench/contrib/mergeEditor/browser/commands/commands',
+                'mergeEditor.compareInput1WithBase',
+                "Compare Input 1 With Base"
+            )),
             shortTitle: ( localizeWithPath(
                 'vs/workbench/contrib/mergeEditor/browser/commands/commands',
                 'mergeEditor.compareWithBase',
@@ -477,14 +441,11 @@ class CompareInput2WithBaseCommand extends MergeEditorAction {
         super({
             id: 'mergeEditor.compareInput2WithBase',
             category: mergeEditorCategory,
-            title: {
-                value: ( localizeWithPath(
-                    'vs/workbench/contrib/mergeEditor/browser/commands/commands',
-                    'mergeEditor.compareInput2WithBase',
-                    'Compare Input 2 With Base'
-                )),
-                original: 'Compare Input 2 With Base',
-            },
+            title: ( localize2WithPath(
+                'vs/workbench/contrib/mergeEditor/browser/commands/commands',
+                'mergeEditor.compareInput2WithBase',
+                "Compare Input 2 With Base"
+            )),
             shortTitle: ( localizeWithPath(
                 'vs/workbench/contrib/mergeEditor/browser/commands/commands',
                 'mergeEditor.compareWithBase',
@@ -525,14 +486,11 @@ class OpenBaseFile extends MergeEditorAction {
         super({
             id: 'merge.openBaseEditor',
             category: mergeEditorCategory,
-            title: {
-                value: ( localizeWithPath(
-                    'vs/workbench/contrib/mergeEditor/browser/commands/commands',
-                    'merge.openBaseEditor',
-                    'Open Base File'
-                )),
-                original: 'Open Base File',
-            },
+            title: ( localize2WithPath(
+                'vs/workbench/contrib/mergeEditor/browser/commands/commands',
+                'merge.openBaseEditor',
+                "Open Base File"
+            )),
             f1: true,
             precondition: ctxIsMergeEditor,
         });
@@ -547,14 +505,11 @@ class AcceptAllInput1 extends MergeEditorAction {
         super({
             id: 'merge.acceptAllInput1',
             category: mergeEditorCategory,
-            title: {
-                value: ( localizeWithPath(
-                    'vs/workbench/contrib/mergeEditor/browser/commands/commands',
-                    'merge.acceptAllInput1',
-                    'Accept All Changes from Left'
-                )),
-                original: 'Accept All Changes from Left',
-            },
+            title: ( localize2WithPath(
+                'vs/workbench/contrib/mergeEditor/browser/commands/commands',
+                'merge.acceptAllInput1',
+                "Accept All Changes from Left"
+            )),
             f1: true,
             precondition: ctxIsMergeEditor,
             menu: { id: MenuId.MergeInput1Toolbar, group: 'primary' },
@@ -570,14 +525,11 @@ class AcceptAllInput2 extends MergeEditorAction {
         super({
             id: 'merge.acceptAllInput2',
             category: mergeEditorCategory,
-            title: {
-                value: ( localizeWithPath(
-                    'vs/workbench/contrib/mergeEditor/browser/commands/commands',
-                    'merge.acceptAllInput2',
-                    'Accept All Changes from Right'
-                )),
-                original: 'Accept All Changes from Right',
-            },
+            title: ( localize2WithPath(
+                'vs/workbench/contrib/mergeEditor/browser/commands/commands',
+                'merge.acceptAllInput2',
+                "Accept All Changes from Right"
+            )),
             f1: true,
             precondition: ctxIsMergeEditor,
             menu: { id: MenuId.MergeInput2Toolbar, group: 'primary' },
@@ -593,14 +545,11 @@ class ResetToBaseAndAutoMergeCommand extends MergeEditorAction {
         super({
             id: 'mergeEditor.resetResultToBaseAndAutoMerge',
             category: mergeEditorCategory,
-            title: {
-                value: ( localizeWithPath(
-                    'vs/workbench/contrib/mergeEditor/browser/commands/commands',
-                    'mergeEditor.resetResultToBaseAndAutoMerge',
-                    'Reset Result'
-                )),
-                original: 'Reset Result',
-            },
+            title: ( localize2WithPath(
+                'vs/workbench/contrib/mergeEditor/browser/commands/commands',
+                'mergeEditor.resetResultToBaseAndAutoMerge',
+                "Reset Result"
+            )),
             shortTitle: ( localizeWithPath(
                 'vs/workbench/contrib/mergeEditor/browser/commands/commands',
                 'mergeEditor.resetResultToBaseAndAutoMerge.short',
@@ -621,14 +570,11 @@ class ResetCloseWithConflictsChoice extends Action2 {
         super({
             id: 'mergeEditor.resetCloseWithConflictsChoice',
             category: mergeEditorCategory,
-            title: {
-                value: ( localizeWithPath(
-                    'vs/workbench/contrib/mergeEditor/browser/commands/commands',
-                    'mergeEditor.resetChoice',
-                    'Reset Choice for \'Close with Conflicts\''
-                )),
-                original: 'Reset Choice for \'Close with Conflicts\'',
-            },
+            title: ( localize2WithPath(
+                'vs/workbench/contrib/mergeEditor/browser/commands/commands',
+                'mergeEditor.resetChoice',
+                "Reset Choice for \'Close with Conflicts\'"
+            )),
             f1: true,
         });
     }
@@ -641,14 +587,11 @@ class AcceptMerge extends MergeEditorAction2 {
         super({
             id: 'mergeEditor.acceptMerge',
             category: mergeEditorCategory,
-            title: {
-                value: ( localizeWithPath(
-                    'vs/workbench/contrib/mergeEditor/browser/commands/commands',
-                    'mergeEditor.acceptMerge',
-                    'Complete Merge'
-                )),
-                original: 'Complete Merge',
-            },
+            title: ( localize2WithPath(
+                'vs/workbench/contrib/mergeEditor/browser/commands/commands',
+                'mergeEditor.acceptMerge',
+                "Complete Merge"
+            )),
             f1: false,
             precondition: ctxIsMergeEditor
         });

package/vscode/src/vs/workbench/contrib/mergeEditor/browser/commands/devCommands.js

@@ -2,7 +2,7 @@ import { VSBuffer } from '../../../../../base/common/buffer.js';
 import { Codicon } from '../../../../../base/common/codicons.js';
 import { URI } from '../../../../../base/common/uri.js';
 import { ILanguageService } from '../../../../../editor/common/languages/language.js';
-import { localizeWithPath, localize2WithPath } from '../../../../../nls.js';
+import { localize2WithPath, localizeWithPath } from '../../../../../nls.js';
 import { Action2 } from '../../../../../platform/actions/common/actions.js';
 import { IClipboardService } from '../../../../../platform/clipboard/common/clipboardService.js';
 import '../../../../../../../../override/vs/platform/dialogs/common/dialogs.js';
@@ -23,14 +23,11 @@ class MergeEditorCopyContentsToJSON extends Action2 {
         super({
             id: 'merge.dev.copyContentsJson',
             category: MERGE_EDITOR_CATEGORY,
-            title: {
-                value: ( localizeWithPath(
-                    'vs/workbench/contrib/mergeEditor/browser/commands/devCommands',
-                    'merge.dev.copyState',
-                    'Copy Merge Editor State as JSON'
-                )),
-                original: 'Copy Merge Editor State as JSON',
-            },
+            title: ( localize2WithPath(
+                'vs/workbench/contrib/mergeEditor/browser/commands/devCommands',
+                'merge.dev.copyState',
+                "Copy Merge Editor State as JSON"
+            )),
             icon: Codicon.layoutCentered,
             f1: true,
             precondition: ctxIsMergeEditor,
@@ -88,14 +85,11 @@ class MergeEditorSaveContentsToFolder extends Action2 {
         super({
             id: 'merge.dev.saveContentsToFolder',
             category: MERGE_EDITOR_CATEGORY,
-            title: {
-                value: ( localizeWithPath(
-                    'vs/workbench/contrib/mergeEditor/browser/commands/devCommands',
-                    'merge.dev.saveContentsToFolder',
-                    'Save Merge Editor State to Folder'
-                )),
-                original: 'Save Merge Editor State to Folder',
-            },
+            title: ( localize2WithPath(
+                'vs/workbench/contrib/mergeEditor/browser/commands/devCommands',
+                'merge.dev.saveContentsToFolder',
+                "Save Merge Editor State to Folder"
+            )),
             icon: Codicon.layoutCentered,
             f1: true,
             precondition: ctxIsMergeEditor,
@@ -170,14 +164,11 @@ class MergeEditorLoadContentsFromFolder extends Action2 {
         super({
             id: 'merge.dev.loadContentsFromFolder',
             category: MERGE_EDITOR_CATEGORY,
-            title: {
-                value: ( localizeWithPath(
-                    'vs/workbench/contrib/mergeEditor/browser/commands/devCommands',
-                    'merge.dev.loadContentsFromFolder',
-                    'Load Merge Editor State from Folder'
-                )),
-                original: 'Load Merge Editor State from Folder',
-            },
+            title: ( localize2WithPath(
+                'vs/workbench/contrib/mergeEditor/browser/commands/devCommands',
+                'merge.dev.loadContentsFromFolder',
+                "Load Merge Editor State from Folder"
+            )),
             icon: Codicon.layoutCentered,
             f1: true
         });

package/vscode/src/vs/workbench/contrib/mergeEditor/browser/mergeEditor.contribution.js

@@ -4,7 +4,7 @@ import { Extensions } from '../../../../platform/configuration/common/configurat
 import { SyncDescriptor } from '../../../../platform/instantiation/common/descriptors.js';
 import { Registry } from '../../../../platform/registry/common/platform.js';
 import { EditorPaneDescriptor } from '../../../browser/editor.js';
-import { Extensions as Extensions$1 } from '../../../common/contributions.js';
+import { Extensions as Extensions$1, registerWorkbenchContribution2 } from '../../../common/contributions.js';
 import { EditorExtensions } from '../../../common/editor.js';
 import { OpenResultResource, SetMixedLayout, SetColumnLayout, OpenMergeEditor, OpenBaseFile, ShowNonConflictingChanges, ShowHideBase, ShowHideTopBase, ShowHideCenterBase, GoToNextUnhandledConflict, GoToPreviousUnhandledConflict, ToggleActiveConflictInput1, ToggleActiveConflictInput2, CompareInput1WithBaseCommand, CompareInput2WithBaseCommand, AcceptAllInput1, AcceptAllInput2, ResetToBaseAndAutoMergeCommand, AcceptMerge, ResetCloseWithConflictsChoice } from './commands/commands.js';
 import { MergeEditorCopyContentsToJSON, MergeEditorSaveContentsToFolder, MergeEditorLoadContentsFromFolder } from './commands/devCommands.js';
@@ -71,6 +71,4 @@ registerAction2(MergeEditorLoadContentsFromFolder);
 ( Registry
     .as(Extensions$1.Workbench))
     .registerWorkbenchContribution(MergeEditorOpenHandlerContribution, 3 );
-( Registry
-    .as(Extensions$1.Workbench))
-    .registerWorkbenchContribution(MergeEditorResolverContribution, 1 );
+registerWorkbenchContribution2(MergeEditorResolverContribution.ID, MergeEditorResolverContribution, 1 );

package/vscode/src/vs/workbench/contrib/mergeEditor/browser/model/mergeEditorModel.js

@@ -12,7 +12,8 @@ import { TextModelDiffs } from './textModelDiffs.js';
 import { leftJoin } from '../utils.js';
 import { ModifiedBaseRange, ModifiedBaseRangeState, ModifiedBaseRangeStateKind } from './modifiedBaseRange.js';
 import { derived } from '../../../../../base/common/observableInternal/derived.js';
-import { waitForState, keepObserved } from '../../../../../base/common/observableInternal/utils.js';
+import { waitForState } from '../../../../../base/common/observableInternal/promise.js';
+import { keepObserved } from '../../../../../base/common/observableInternal/utils.js';
 import { autorunHandleChanges } from '../../../../../base/common/observableInternal/autorun.js';
 import { transaction, observableValue } from '../../../../../base/common/observableInternal/base.js';
 let MergeEditorModel = class MergeEditorModel extends EditorModel {

package/vscode/src/vs/workbench/contrib/mergeEditor/browser/model/textModelDiffs.js

@@ -10,32 +10,32 @@ import { autorun } from '../../../../../base/common/observableInternal/autorun.j
 import { observableSignal } from '../../../../../base/common/observableInternal/utils.js';
 class TextModelDiffs extends Disposable {
     get isApplyingChange() {
-        return this.barrier.isActive;
+        return this._barrier.isActive;
     }
     constructor(baseTextModel, textModel, diffComputer) {
         super();
         this.baseTextModel = baseTextModel;
         this.textModel = textModel;
         this.diffComputer = diffComputer;
-        this.recomputeCount = 0;
+        this._recomputeCount = 0;
         this._state = observableValue(this, 1 );
         this._diffs = observableValue(this, []);
-        this.barrier = ( new ReentrancyBarrier());
-        this.isDisposed = false;
-        this.isInitializing = true;
+        this._barrier = ( new ReentrancyBarrier());
+        this._isDisposed = false;
+        this._isInitializing = true;
         const recomputeSignal = observableSignal('recompute');
         this._register(autorun(reader => {
             recomputeSignal.read(reader);
-            this.recompute(reader);
+            this._recompute(reader);
         }));
-        this._register(baseTextModel.onDidChangeContent(this.barrier.makeExclusive(() => {
+        this._register(baseTextModel.onDidChangeContent(this._barrier.makeExclusive(() => {
             recomputeSignal.trigger(undefined);
         })));
-        this._register(textModel.onDidChangeContent(this.barrier.makeExclusive(() => {
+        this._register(textModel.onDidChangeContent(this._barrier.makeExclusive(() => {
             recomputeSignal.trigger(undefined);
         })));
         this._register(toDisposable(() => {
-            this.isDisposed = true;
+            this._isDisposed = true;
         }));
     }
     get state() {
@@ -44,21 +44,21 @@ class TextModelDiffs extends Disposable {
     get diffs() {
         return this._diffs;
     }
-    recompute(reader) {
-        this.recomputeCount++;
-        const currentRecomputeIdx = this.recomputeCount;
+    _recompute(reader) {
+        this._recomputeCount++;
+        const currentRecomputeIdx = this._recomputeCount;
         if (this._state.get() === 1 ) {
-            this.isInitializing = true;
+            this._isInitializing = true;
         }
         transaction(tx => {
-            this._state.set(this.isInitializing ? 1  : 3 , tx, 0 );
+            this._state.set(this._isInitializing ? 1  : 3 , tx, 0 );
         });
         const result = this.diffComputer.computeDiff(this.baseTextModel, this.textModel, reader);
         result.then((result) => {
-            if (this.isDisposed) {
+            if (this._isDisposed) {
                 return;
             }
-            if (currentRecomputeIdx !== this.recomputeCount) {
+            if (currentRecomputeIdx !== this._recomputeCount) {
                 return;
             }
             transaction(tx => {
@@ -69,7 +69,7 @@ class TextModelDiffs extends Disposable {
                 else {
                     this._state.set(4 , tx, 1 );
                 }
-                this.isInitializing = false;
+                this._isInitializing = false;
             });
         });
     }
@@ -89,7 +89,7 @@ class TextModelDiffs extends Disposable {
             if (len === diffs.length) {
                 throw new BugIndicatingError();
             }
-            this.barrier.runExclusivelyOrThrow(() => {
+            this._barrier.runExclusivelyOrThrow(() => {
                 const edits = diffToRemove.getReverseLineEdit().toEdits(this.textModel.getLineCount());
                 this.textModel.pushEditOperations(null, edits, () => null, group);
             });
@@ -127,7 +127,7 @@ class TextModelDiffs extends Disposable {
             firstAfter = true;
             newDiffs.push(editMapping.addOutputLineDelta(delta));
         }
-        this.barrier.runExclusivelyOrThrow(() => {
+        this._barrier.runExclusivelyOrThrow(() => {
             const edits = ( new LineRangeEdit(edit.range.delta(delta), edit.newLines)).toEdits(this.textModel.getLineCount());
             this.textModel.pushEditOperations(null, edits, () => null, group);
         });

package/vscode/src/vs/workbench/contrib/mergeEditor/browser/view/conflictActions.js

@@ -42,7 +42,7 @@ class ConflictActionsFactory extends Disposable {
         this._editor.getContainerDomNode().style.setProperty(fontFeaturesVar, editorFontInfo.fontFeatureSettings);
     }
     _getLayoutInfo() {
-        const lineHeightFactor = Math.max(1.3, this._editor.getOption(66 ) / this._editor.getOption(52 ));
+        const lineHeightFactor = Math.max(1.3, this._editor.getOption(67 ) / this._editor.getOption(52 ));
         let fontSize = this._editor.getOption(19 );
         if (!fontSize || fontSize < 5) {
             fontSize = (this._editor.getOption(52 ) * .9) | 0;

package/vscode/src/vs/workbench/contrib/mergeEditor/browser/view/mergeEditor.js

@@ -577,6 +577,7 @@ MergeEditorOpenHandlerContribution = ( __decorate([
     ( __param(1, ICodeEditorService))
 ], MergeEditorOpenHandlerContribution));
 let MergeEditorResolverContribution = class MergeEditorResolverContribution extends Disposable {
+    static { this.ID = 'workbench.contrib.mergeEditorResolver'; }
     constructor(editorResolverService, instantiationService) {
         super();
         const mergeEditorInputFactory = (mergeEditor) => {

package/vscode/src/vs/workbench/contrib/notebook/browser/controller/cellOutputActions.js

@@ -17,7 +17,7 @@ registerAction2(class CopyCellOutputAction extends Action2 {
             title: ( localizeWithPath(
                 'vs/workbench/contrib/notebook/browser/controller/cellOutputActions',
                 'notebookActions.copyOutput',
-                "Copy Output"
+                "Copy Cell Output"
             )),
             menu: {
                 id: MenuId.NotebookOutputToolbar,
@@ -34,12 +34,26 @@ registerAction2(class CopyCellOutputAction extends Action2 {
             return;
         }
         let outputViewModel;
-        if ('outputId' in outputContext && typeof outputContext.outputId === 'string') {
+        if (outputContext && 'outputId' in outputContext && typeof outputContext.outputId === 'string') {
             outputViewModel = getOutputViewModelFromId(outputContext.outputId, notebookEditor);
         }
-        else {
+        else if (outputContext && 'outputViewModel' in outputContext) {
             outputViewModel = outputContext.outputViewModel;
         }
+        if (!outputViewModel) {
+            const activeCell = notebookEditor.getActiveCell();
+            if (!activeCell) {
+                return;
+            }
+            if (activeCell.focusedOutputId !== undefined) {
+                outputViewModel = activeCell.outputsViewModels.find(output => {
+                    return output.model.outputId === activeCell.focusedOutputId;
+                });
+            }
+            else {
+                outputViewModel = activeCell.outputsViewModels.find(output => output.pickedMimeType?.isTrusted);
+            }
+        }
         if (!outputViewModel) {
             return;
         }