@codingame/monaco-vscode-api 2.2.2 → 3.1.0

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

@@ -5,7 +5,7 @@ import { renderLabelWithIcons } from '../../../../base/browser/ui/iconLabel/icon
 import { DisposableStore, dispose, toDisposable, Disposable } from '../../../../base/common/lifecycle.js';
 import Severity from '../../../../base/common/severity.js';
 import { getCodeEditor } from '../../../../editor/browser/editorBrowser.js';
-import { localizeWithPath } from '../../../../nls.js';
+import { localizeWithPath, localize2WithPath } from '../../../../nls.js';
 import { Registry } from '../../../../platform/registry/common/platform.js';
 import { ThemeIcon } from '../../../../base/common/themables.js';
 import { Extensions } from '../../../common/contributions.js';
@@ -27,6 +27,7 @@ import { IInstantiationService } from '../../../../platform/instantiation/common
 import { Categories } from '../../../../platform/action/common/actionCommonCategories.js';
 import { IEditorGroupsService } from '../../../services/editor/common/editorGroupsService.js';
 import { ServiceCollection } from '../../../../platform/instantiation/common/serviceCollection.js';
+import { nativeHoverDelegate } from '../../../../platform/hover/browser/hover.js';
 var LanguageStatus_1;
 class LanguageStatusViewModel {
     constructor(combined, dedicated) {
@@ -274,7 +275,7 @@ let LanguageStatus = class LanguageStatus {
                 })).toString())
             }, undefined, this._openerService)));
         }
-        const actionBar = ( new ActionBar(right, {}));
+        const actionBar = ( new ActionBar(right, { hoverDelegate: nativeHoverDelegate }));
         store.add(actionBar);
         let action;
         if (!isPinned) {
@@ -390,14 +391,11 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'editor.inlayHints.Reset',
-            title: {
-                value: ( localizeWithPath(
-                    'vs/workbench/contrib/languageStatus/browser/languageStatus.contribution',
-                    'reset',
-                    'Reset Language Status Interaction Counter'
-                )),
-                original: 'Reset Language Status Interaction Counter'
-            },
+            title: ( localize2WithPath(
+                'vs/workbench/contrib/languageStatus/browser/languageStatus.contribution',
+                'reset',
+                "Reset Language Status Interaction Counter"
+            )),
             category: Categories.View,
             f1: true
         });

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

@@ -1,8 +1,8 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
-import { Registry } from '../../../../platform/registry/common/platform.js';
-import { Extensions } from '../../../common/contributions.js';
+import { registerWorkbenchContribution2 } from '../../../common/contributions.js';
 let ListContext = class ListContext {
+    static { this.ID = 'workbench.contrib.listContext'; }
     constructor(contextKeyService) {
         contextKeyService.createKey('listSupportsTypeNavigation', true);
         contextKeyService.createKey('listSupportsKeyboardNavigation', true);
@@ -11,5 +11,5 @@ let ListContext = class ListContext {
 ListContext = ( __decorate([
     ( __param(0, IContextKeyService))
 ], ListContext));
-( Registry.as(Extensions.Workbench)).registerWorkbenchContribution(ListContext, 1 );
+registerWorkbenchContribution2(ListContext.ID, ListContext, 1 );
 export { ListContext };

package/vscode/src/vs/workbench/contrib/logs/common/defaultLogLevels.js

@@ -0,0 +1,140 @@
+import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
+import { getLogLevel, ILogService, ILoggerService, LogLevelToString, parseLogLevel } from '../../../../platform/log/common/log.js';
+import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
+import { IWorkbenchEnvironmentService } from '../../../services/environment/common/environmentService.js';
+import { toFileOperationResult, IFileService } from '../../../../platform/files/common/files.js';
+import { IJSONEditingService } from '../../../services/configuration/common/jsonEditing.js';
+import { isUndefined, isString } from '../../../../base/common/types.js';
+import { EXTENSION_IDENTIFIER_WITH_LOG_REGEX } from '../../../../platform/environment/common/environmentService.js';
+import { parse } from '../../../../base/common/json.js';
+const IDefaultLogLevelsService = ( createDecorator('IDefaultLogLevelsService'));
+let DefaultLogLevelsService = class DefaultLogLevelsService {
+    constructor(environmentService, fileService, jsonEditingService, logService, loggerService) {
+        this.environmentService = environmentService;
+        this.fileService = fileService;
+        this.jsonEditingService = jsonEditingService;
+        this.logService = logService;
+        this.loggerService = loggerService;
+    }
+    async getDefaultLogLevels() {
+        const argvLogLevel = await this._parseLogLevelsFromArgv();
+        return {
+            default: argvLogLevel?.default ?? this._getDefaultLogLevelFromEnv(),
+            extensions: argvLogLevel?.extensions ?? this._getExtensionsDefaultLogLevelsFromEnv()
+        };
+    }
+    async setDefaultLogLevel(defaultLogLevel, extensionId) {
+        const argvLogLevel = (await this._parseLogLevelsFromArgv()) ?? {};
+        if (extensionId) {
+            extensionId = extensionId.toLowerCase();
+            const argvLogLevel = (await this._parseLogLevelsFromArgv()) ?? {};
+            const currentDefaultLogLevel = this._getDefaultLogLevel(argvLogLevel, extensionId);
+            argvLogLevel.extensions = argvLogLevel.extensions ?? [];
+            const extension = argvLogLevel.extensions.find(([extension]) => extension === extensionId);
+            if (extension) {
+                extension[1] = defaultLogLevel;
+            }
+            else {
+                argvLogLevel.extensions.push([extensionId, defaultLogLevel]);
+            }
+            await this._writeLogLevelsToArgv(argvLogLevel);
+            const extensionLoggers = [...this.loggerService.getRegisteredLoggers()].filter(logger => logger.extensionId && logger.extensionId.toLowerCase() === extensionId);
+            for (const { resource } of extensionLoggers) {
+                if (this.loggerService.getLogLevel(resource) === currentDefaultLogLevel) {
+                    this.loggerService.setLogLevel(resource, defaultLogLevel);
+                }
+            }
+        }
+        else {
+            const currentLogLevel = this._getDefaultLogLevel(argvLogLevel);
+            argvLogLevel.default = defaultLogLevel;
+            await this._writeLogLevelsToArgv(argvLogLevel);
+            if (this.loggerService.getLogLevel() === currentLogLevel) {
+                this.loggerService.setLogLevel(defaultLogLevel);
+            }
+        }
+    }
+    _getDefaultLogLevel(argvLogLevels, extension) {
+        if (extension) {
+            const extensionLogLevel = argvLogLevels.extensions?.find(([extensionId]) => extensionId === extension);
+            if (extensionLogLevel) {
+                return extensionLogLevel[1];
+            }
+        }
+        return argvLogLevels.default ?? getLogLevel(this.environmentService);
+    }
+    async _writeLogLevelsToArgv(logLevels) {
+        const logLevelsValue = [];
+        if (!isUndefined(logLevels.default)) {
+            logLevelsValue.push(LogLevelToString(logLevels.default));
+        }
+        for (const [extension, logLevel] of logLevels.extensions ?? []) {
+            logLevelsValue.push(`${extension}=${LogLevelToString(logLevel)}`);
+        }
+        await this.jsonEditingService.write(this.environmentService.argvResource, [{ path: ['log-level'], value: logLevelsValue.length ? logLevelsValue : undefined }], true);
+    }
+    async _parseLogLevelsFromArgv() {
+        const result = { extensions: [] };
+        const logLevels = await this._readLogLevelsFromArgv();
+        for (const extensionLogLevel of logLevels) {
+            const matches = EXTENSION_IDENTIFIER_WITH_LOG_REGEX.exec(extensionLogLevel);
+            if (matches && matches[1] && matches[2]) {
+                const logLevel = parseLogLevel(matches[2]);
+                if (!isUndefined(logLevel)) {
+                    result.extensions?.push([matches[1].toLowerCase(), logLevel]);
+                }
+            }
+            else {
+                const logLevel = parseLogLevel(extensionLogLevel);
+                if (!isUndefined(logLevel)) {
+                    result.default = logLevel;
+                }
+            }
+        }
+        return !isUndefined(result.default) || result.extensions?.length ? result : undefined;
+    }
+    async migrateLogLevels() {
+        const logLevels = await this._readLogLevelsFromArgv();
+        const regex = /^([^.]+\..+):(.+)$/;
+        if (( logLevels.some(extensionLogLevel => regex.test(extensionLogLevel)))) {
+            const argvLogLevel = await this._parseLogLevelsFromArgv();
+            if (argvLogLevel) {
+                await this._writeLogLevelsToArgv(argvLogLevel);
+            }
+        }
+    }
+    async _readLogLevelsFromArgv() {
+        try {
+            const content = await this.fileService.readFile(this.environmentService.argvResource);
+            const argv = parse(( content.value.toString()));
+            return isString(argv['log-level']) ? [argv['log-level']] : Array.isArray(argv['log-level']) ? argv['log-level'] : [];
+        }
+        catch (error) {
+            if (toFileOperationResult(error) !== 1 ) {
+                this.logService.error(error);
+            }
+        }
+        return [];
+    }
+    _getDefaultLogLevelFromEnv() {
+        return getLogLevel(this.environmentService);
+    }
+    _getExtensionsDefaultLogLevelsFromEnv() {
+        const result = [];
+        for (const [extension, logLevelValue] of this.environmentService.extensionLogLevel ?? []) {
+            const logLevel = parseLogLevel(logLevelValue);
+            if (!isUndefined(logLevel)) {
+                result.push([extension, logLevel]);
+            }
+        }
+        return result;
+    }
+};
+DefaultLogLevelsService = ( __decorate([
+    ( __param(0, IWorkbenchEnvironmentService)),
+    ( __param(1, IFileService)),
+    ( __param(2, IJSONEditingService)),
+    ( __param(3, ILogService)),
+    ( __param(4, ILoggerService))
+], DefaultLogLevelsService));
+export { DefaultLogLevelsService, IDefaultLogLevelsService };

package/vscode/src/vs/workbench/contrib/markdown/browser/markdownDocumentRenderer.js

@@ -171,7 +171,7 @@ function sanitize(documentContent, allowUnknownProtocols) {
         hook.dispose();
     }
 }
-async function renderMarkdownDocument(text, extensionService, languageService, shouldSanitize = true, allowUnknownProtocols = false, token) {
+async function renderMarkdownDocument(text, extensionService, languageService, shouldSanitize = true, allowUnknownProtocols = false, token, settingRenderer) {
     const highlight = (code, lang, callback) => {
         if (!callback) {
             return code;
@@ -185,14 +185,18 @@ async function renderMarkdownDocument(text, extensionService, languageService, s
                 callback(null, '');
                 return;
             }
-            const languageId = languageService.getLanguageIdByLanguageName(lang);
+            const languageId = languageService.getLanguageIdByLanguageName(lang) ?? languageService.getLanguageIdByLanguageName(lang.split(/\s+|:|,|(?!^)\{|\?]/, 1)[0]);
             const html = await tokenizeToString(languageService, code, languageId);
             callback(null, `<code>${html}</code>`);
         });
         return '';
     };
+    const renderer = new marked.Renderer();
+    if (settingRenderer) {
+        renderer.html = settingRenderer.getHtmlRenderer();
+    }
     return ( new Promise((resolve, reject) => {
-        marked(text, { highlight }, (err, value) => err ? reject(err) : resolve(value));
+        marked(text, { highlight, renderer }, (err, value) => err ? reject(err) : resolve(value));
     })).then(raw => {
         if (shouldSanitize) {
             return sanitize(raw, allowUnknownProtocols);

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
         });