@codingame/monaco-vscode-view-common-service-override 4.5.0 → 4.5.2

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

@@ -23,6 +23,7 @@ import { EditorGutter } from '../editorGutter.js';
 import { ctxIsMergeResultEditor } from 'vscode/vscode/vs/workbench/contrib/mergeEditor/common/mergeEditor';
 import { CodeEditorView, createSelectionsAutorun, TitleMenu } from './codeEditorView.js';
 
+const _moduleId = "vs/workbench/contrib/mergeEditor/browser/view/editors/resultCodeEditorView";
 let ResultCodeEditorView = class ResultCodeEditorView extends CodeEditorView {
     constructor(viewModel, instantiationService, _labelService, configurationService) {
         super(instantiationService, viewModel, configurationService);
@@ -34,7 +35,7 @@ let ResultCodeEditorView = class ResultCodeEditorView extends CodeEditorView {
             }
             const model = viewModel.model;
             const textModel = model.resultTextModel;
-            const result = ( new Array());
+            const result = ( (new Array()));
             const baseRangeWithStoreAndTouchingDiffs = join(model.modifiedBaseRanges.read(reader), model.baseResultDiffs.read(reader), (baseRange, diff) => baseRange.baseRange.touches(diff.inputRange)
                 ? CompareResult.neitherLessOrGreaterThan
                 : LineRange.compareByStart(baseRange.baseRange, diff.inputRange));
@@ -119,10 +120,10 @@ let ResultCodeEditorView = class ResultCodeEditorView extends CodeEditorView {
         this.htmlElements.root.classList.add(`result`);
         this._register(autorunWithStore((reader, store) => {
             if (this.checkboxesVisible.read(reader)) {
-                store.add(( new EditorGutter(this.editor, this.htmlElements.gutterDiv, {
+                store.add(( (new EditorGutter(this.editor, this.htmlElements.gutterDiv, {
                     getIntersectingGutterItems: (range, reader) => [],
-                    createView: (item, target) => { throw new BugIndicatingError(); },
-                })));
+                    createView: (item, target) => { throw ( (new BugIndicatingError())); },
+                }))));
             }
         }));
         this._register(autorun(reader => {
@@ -131,14 +132,10 @@ let ResultCodeEditorView = class ResultCodeEditorView extends CodeEditorView {
                 return;
             }
             this.editor.setModel(vm.model.resultTextModel);
-            reset(this.htmlElements.title, ...renderLabelWithIcons(( localizeWithPath(
-                'vs/workbench/contrib/mergeEditor/browser/view/editors/resultCodeEditorView',
-                'result',
-                'Result'
-            ))));
+            reset(this.htmlElements.title, ...renderLabelWithIcons(( localizeWithPath(_moduleId, 0, 'Result'))));
             reset(this.htmlElements.description, ...renderLabelWithIcons(this._labelService.getUriLabel(vm.model.resultTextModel.uri, { relative: true })));
         }));
-        const remainingConflictsActionBar = this._register(( new ActionBar(this.htmlElements.detail)));
+        const remainingConflictsActionBar = this._register(( (new ActionBar(this.htmlElements.detail))));
         this._register(autorun(reader => {
             const vm = this.viewModel.read(reader);
             if (!vm) {
@@ -150,18 +147,8 @@ let ResultCodeEditorView = class ResultCodeEditorView extends CodeEditorView {
             }
             const count = model.unhandledConflictsCount.read(reader);
             const text = count === 1
-                ? ( localizeWithPath(
-                'vs/workbench/contrib/mergeEditor/browser/view/editors/resultCodeEditorView',
-                'mergeEditor.remainingConflicts',
-                '{0} Conflict Remaining',
-                count
-            ))
-                : ( localizeWithPath(
-                'vs/workbench/contrib/mergeEditor/browser/view/editors/resultCodeEditorView',
-                'mergeEditor.remainingConflict',
-                '{0} Conflicts Remaining ',
-                count
-            ));
+                ? ( localizeWithPath(_moduleId, 1, '{0} Conflict Remaining', count))
+                : ( localizeWithPath(_moduleId, 2, '{0} Conflicts Remaining ', count));
             remainingConflictsActionBar.clear();
             remainingConflictsActionBar.push({
                 class: undefined,
@@ -173,16 +160,8 @@ let ResultCodeEditorView = class ResultCodeEditorView extends CodeEditorView {
                     vm.goToNextModifiedBaseRange(m => !model.isHandled(m).get());
                 },
                 tooltip: count > 0
-                    ? ( localizeWithPath(
-                    'vs/workbench/contrib/mergeEditor/browser/view/editors/resultCodeEditorView',
-                    'goToNextConflict',
-                    'Go to next conflict'
-                ))
-                    : ( localizeWithPath(
-                    'vs/workbench/contrib/mergeEditor/browser/view/editors/resultCodeEditorView',
-                    'allConflictHandled',
-                    'All conflicts handled, the merge can be completed now.'
-                )),
+                    ? ( localizeWithPath(_moduleId, 3, 'Go to next conflict'))
+                    : ( localizeWithPath(_moduleId, 4, 'All conflicts handled, the merge can be completed now.')),
             });
         }));
         this._register(applyObservableDecorations(this.editor, this.decorations));
@@ -190,10 +169,10 @@ let ResultCodeEditorView = class ResultCodeEditorView extends CodeEditorView {
         this._register(instantiationService.createInstance(TitleMenu, MenuId.MergeInputResultToolbar, this.htmlElements.toolbar));
     }
 };
-ResultCodeEditorView = ( __decorate([
-    ( __param(1, IInstantiationService)),
-    ( __param(2, ILabelService)),
-    ( __param(3, IConfigurationService))
-], ResultCodeEditorView));
+ResultCodeEditorView = ( (__decorate([
+    ( (__param(1, IInstantiationService))),
+    ( (__param(2, ILabelService))),
+    ( (__param(3, IConfigurationService)))
+], ResultCodeEditorView)));
 
 export { ResultCodeEditorView };

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

@@ -45,6 +45,7 @@ import { ResultCodeEditorView } from './editors/resultCodeEditorView.js';
 import { AbstractTextEditor } from 'vscode/vscode/vs/workbench/browser/parts/editor/textEditor';
 
 var MergeEditor_1, MergeEditorLayoutStore_1;
+const _moduleId = "vs/workbench/contrib/mergeEditor/browser/view/mergeEditor";
 let MergeEditor = class MergeEditor extends AbstractTextEditor {
     static { MergeEditor_1 = this; }
     static { this.ID = 'mergeEditor'; }
@@ -66,9 +67,9 @@ let MergeEditor = class MergeEditor extends AbstractTextEditor {
         this._configurationService = _configurationService;
         this._codeEditorService = _codeEditorService;
         this.configurationService = configurationService;
-        this._sessionDisposables = ( new DisposableStore());
+        this._sessionDisposables = ( (new DisposableStore()));
         this._viewModel = observableValue(this, undefined);
-        this._grid = this._register(( new MutableDisposable()));
+        this._grid = this._register(( (new MutableDisposable())));
         this.input1View = this._register(this.instantiationService.createInstance(InputCodeEditorView, 1, this._viewModel));
         this.baseView = observableValue(this, undefined);
         this.baseViewOptions = observableValue(this, undefined);
@@ -84,23 +85,23 @@ let MergeEditor = class MergeEditor extends AbstractTextEditor {
         this._ctxBaseUri = ctxMergeBaseUri.bindTo(this.contextKeyService);
         this._ctxShowNonConflictingChanges = ctxMergeEditorShowNonConflictingChanges.bindTo(this.contextKeyService);
         this._inputModel = observableValue(this, undefined);
-        this.viewZoneComputer = ( new ViewZoneComputer(
+        this.viewZoneComputer = ( (new ViewZoneComputer(
             this.input1View.editor,
             this.input2View.editor,
             this.inputResultView.editor
-        ));
+        )));
         this.codeLensesVisible = observableConfigValue('mergeEditor.showCodeLenses', true, this.configurationService);
-        this.scrollSynchronizer = this._register(( new ScrollSynchronizer(
+        this.scrollSynchronizer = this._register(( (new ScrollSynchronizer(
             this._viewModel,
             this.input1View,
             this.input2View,
             this.baseView,
             this.inputResultView,
             this._layoutModeObs
-        )));
-        this._onDidChangeSizeConstraints = ( new Emitter());
+        ))));
+        this._onDidChangeSizeConstraints = ( (new Emitter()));
         this.onDidChangeSizeConstraints = this._onDidChangeSizeConstraints.event;
-        this.baseViewDisposables = this._register(( new DisposableStore()));
+        this.baseViewDisposables = this._register(( (new DisposableStore())));
         this.showNonConflictingChangesStore = this.instantiationService.createInstance((PersistentStore), 'mergeEditor/showNonConflictingChanges');
         this.showNonConflictingChanges = observableValue(this, this.showNonConflictingChangesStore.get() ?? false);
     }
@@ -120,11 +121,7 @@ let MergeEditor = class MergeEditor extends AbstractTextEditor {
         if (this.input) {
             return this.input.getName();
         }
-        return ( localizeWithPath(
-            'vs/workbench/contrib/mergeEditor/browser/view/mergeEditor',
-            'mergeEditor',
-            "Text Merge Editor"
-        ));
+        return ( localizeWithPath(_moduleId, 0, "Text Merge Editor"));
     }
     createEditorControl(parent, initialOptions) {
         this.rootHtmlElement = parent;
@@ -155,7 +152,7 @@ let MergeEditor = class MergeEditor extends AbstractTextEditor {
     }
     async setInput(input, options, context, token) {
         if (!(input instanceof MergeEditorInput)) {
-            throw new BugIndicatingError('ONLY MergeEditorInput is supported');
+            throw ( (new BugIndicatingError('ONLY MergeEditorInput is supported')));
         }
         await super.setInput(input, options, context, token);
         this._sessionDisposables.clear();
@@ -178,8 +175,8 @@ let MergeEditor = class MergeEditor extends AbstractTextEditor {
             this._inputModel.set(inputModel, tx);
         });
         this._sessionDisposables.add(viewModel);
-        this._ctxResultUri.set(( inputModel.resultUri.toString()));
-        this._ctxBaseUri.set(( model.base.uri.toString()));
+        this._ctxResultUri.set(( (inputModel.resultUri.toString())));
+        this._ctxBaseUri.set(( (model.base.uri.toString())));
         this._sessionDisposables.add(toDisposable(() => {
             this._ctxBaseUri.reset();
             this._ctxResultUri.reset();
@@ -238,7 +235,7 @@ let MergeEditor = class MergeEditor extends AbstractTextEditor {
         const that = this;
         this._sessionDisposables.add(new (class {
             constructor() {
-                this._disposable = ( new DisposableStore());
+                this._disposable = ( (new DisposableStore()));
                 for (const model of this.baseInput1Input2()) {
                     this._disposable.add(model.onDidChangeContent(() => this._checkBaseInput1Input2AllEmpty()));
                 }
@@ -272,7 +269,7 @@ let MergeEditor = class MergeEditor extends AbstractTextEditor {
             shouldAlignBase,
             shouldAlignResult,
         });
-        const disposableStore = ( new DisposableStore());
+        const disposableStore = ( (new DisposableStore()));
         if (baseViewZoneAccessor) {
             for (const v of viewZones.baseViewZones) {
                 v.create(baseViewZoneAccessor, baseViewZoneIds, disposableStore);
@@ -511,20 +508,20 @@ let MergeEditor = class MergeEditor extends AbstractTextEditor {
         this._ctxShowNonConflictingChanges.set(this.showNonConflictingChanges.get());
     }
 };
-MergeEditor = MergeEditor_1 = ( __decorate([
-    ( __param(1, IInstantiationService)),
-    ( __param(2, IContextKeyService)),
-    ( __param(3, ITelemetryService)),
-    ( __param(4, IStorageService)),
-    ( __param(5, IThemeService)),
-    ( __param(6, ITextResourceConfigurationService)),
-    ( __param(7, IConfigurationService)),
-    ( __param(8, IEditorService)),
-    ( __param(9, IEditorGroupsService)),
-    ( __param(10, IFileService)),
-    ( __param(11, ICodeEditorService)),
-    ( __param(12, IConfigurationService))
-], MergeEditor));
+MergeEditor = MergeEditor_1 = ( (__decorate([
+    ( (__param(1, IInstantiationService))),
+    ( (__param(2, IContextKeyService))),
+    ( (__param(3, ITelemetryService))),
+    ( (__param(4, IStorageService))),
+    ( (__param(5, IThemeService))),
+    ( (__param(6, ITextResourceConfigurationService))),
+    ( (__param(7, IConfigurationService))),
+    ( (__param(8, IEditorService))),
+    ( (__param(9, IEditorGroupsService))),
+    ( (__param(10, IFileService))),
+    ( (__param(11, ICodeEditorService))),
+    ( (__param(12, IConfigurationService)))
+], MergeEditor)));
 let MergeEditorLayoutStore = class MergeEditorLayoutStore {
     static { MergeEditorLayoutStore_1 = this; }
     static { this._key = 'mergeEditor/layout'; }
@@ -554,9 +551,9 @@ let MergeEditorLayoutStore = class MergeEditorLayoutStore {
         }
     }
 };
-MergeEditorLayoutStore = MergeEditorLayoutStore_1 = ( __decorate([
-    ( __param(0, IStorageService))
-], MergeEditorLayoutStore));
+MergeEditorLayoutStore = MergeEditorLayoutStore_1 = ( (__decorate([
+    ( (__param(0, IStorageService)))
+], MergeEditorLayoutStore)));
 let MergeEditorOpenHandlerContribution = class MergeEditorOpenHandlerContribution extends Disposable {
     constructor(_editorService, codeEditorService) {
         super();
@@ -578,10 +575,10 @@ let MergeEditorOpenHandlerContribution = class MergeEditorOpenHandlerContributio
         return null;
     }
 };
-MergeEditorOpenHandlerContribution = ( __decorate([
-    ( __param(0, IEditorService)),
-    ( __param(1, ICodeEditorService))
-], MergeEditorOpenHandlerContribution));
+MergeEditorOpenHandlerContribution = ( (__decorate([
+    ( (__param(0, IEditorService))),
+    ( (__param(1, ICodeEditorService)))
+], MergeEditorOpenHandlerContribution)));
 let MergeEditorResolverContribution = class MergeEditorResolverContribution extends Disposable {
     static { this.ID = 'workbench.contrib.mergeEditorResolver'; }
     constructor(editorResolverService, instantiationService) {
@@ -611,9 +608,9 @@ let MergeEditorResolverContribution = class MergeEditorResolverContribution exte
         }));
     }
 };
-MergeEditorResolverContribution = ( __decorate([
-    ( __param(0, IEditorResolverService)),
-    ( __param(1, IInstantiationService))
-], MergeEditorResolverContribution));
+MergeEditorResolverContribution = ( (__decorate([
+    ( (__param(0, IEditorResolverService))),
+    ( (__param(1, IInstantiationService)))
+], MergeEditorResolverContribution)));
 
 export { MergeEditor, MergeEditorOpenHandlerContribution, MergeEditorResolverContribution };

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

@@ -13,6 +13,7 @@ import { INotificationService } from 'vscode/vscode/vs/platform/notification/com
 import { LineRange } from 'vscode/vscode/vs/workbench/contrib/mergeEditor/browser/model/lineRange';
 import { observableConfigValue } from 'vscode/vscode/vs/workbench/contrib/mergeEditor/browser/utils';
 
+const _moduleId = "vs/workbench/contrib/mergeEditor/browser/view/viewModel";
 let MergeEditorViewModel = class MergeEditorViewModel extends Disposable {
     constructor(model, inputCodeEditorView1, inputCodeEditorView2, resultCodeEditorView, baseCodeEditorView, showNonConflictingChanges, configurationService, notificationService) {
         super();
@@ -25,7 +26,7 @@ let MergeEditorViewModel = class MergeEditorViewModel extends Disposable {
         this.configurationService = configurationService;
         this.notificationService = notificationService;
         this.manuallySetActiveModifiedBaseRange = observableValue(this, { range: undefined, counter: 0 });
-        this.attachedHistory = this._register(( new AttachedHistory(this.model.resultTextModel)));
+        this.attachedHistory = this._register(( (new AttachedHistory(this.model.resultTextModel))));
         this.shouldUseAppendInsteadOfAccept = observableConfigValue('mergeEditor.shouldUseAppendInsteadOfAccept', false, this.configurationService);
         this.counter = 0;
         this.lastFocusedEditor = derivedObservableWithWritableCache(this, (reader, lastValue) => {
@@ -54,7 +55,7 @@ let MergeEditorViewModel = class MergeEditorViewModel extends Disposable {
                 return undefined;
             }
             const selections = sourceEditor.selection.read(reader) || [];
-            const rangesInBase = ( selections.map((selection) => {
+            const rangesInBase = ( (selections.map((selection) => {
                 if (sourceEditor === this.inputCodeEditorView1) {
                     return this.model.translateInputRangeToBase(1, selection);
                 }
@@ -70,7 +71,7 @@ let MergeEditorViewModel = class MergeEditorViewModel extends Disposable {
                 else {
                     return selection;
                 }
-            }));
+            })));
             return {
                 rangesInBase,
                 sourceEditor
@@ -104,10 +105,10 @@ let MergeEditorViewModel = class MergeEditorViewModel extends Disposable {
             const baseRangeStates = [];
             for (const change of e.changes) {
                 const rangeInBase = this.model.translateResultRangeToBase(Range.lift(change.range));
-                const baseRanges = this.model.findModifiedBaseRangesInRange(( new LineRange(
+                const baseRanges = this.model.findModifiedBaseRangesInRange(( (new LineRange(
                     rangeInBase.startLineNumber,
                     rangeInBase.endLineNumber - rangeInBase.startLineNumber
-                )));
+                ))));
                 if (baseRanges.length === 1) {
                     const isHandled = this.model.isHandled(baseRanges[0]).get();
                     if (!isHandled) {
@@ -204,8 +205,8 @@ let MergeEditorViewModel = class MergeEditorViewModel extends Disposable {
         const activeModifiedBaseRange = this.activeModifiedBaseRange.get();
         if (!activeModifiedBaseRange) {
             this.notificationService.error(( localizeWithPath(
-                'vs/workbench/contrib/mergeEditor/browser/view/viewModel',
-                'noConflictMessage',
+                _moduleId,
+                0,
                 "There is currently no conflict focused that can be toggled."
             )));
             return;
@@ -222,10 +223,10 @@ let MergeEditorViewModel = class MergeEditorViewModel extends Disposable {
         });
     }
 };
-MergeEditorViewModel = ( __decorate([
-    ( __param(6, IConfigurationService)),
-    ( __param(7, INotificationService))
-], MergeEditorViewModel));
+MergeEditorViewModel = ( (__decorate([
+    ( (__param(6, IConfigurationService))),
+    ( (__param(7, INotificationService)))
+], MergeEditorViewModel)));
 class AttachedHistory extends Disposable {
     constructor(model) {
         super();

package/vscode/src/vs/workbench/contrib/preferences/browser/keyboardLayoutPicker.js

@@ -15,27 +15,19 @@ import { IFileService } from 'vscode/vscode/vs/platform/files/common/files.servi
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
 import { VSBuffer } from 'vscode/vscode/vs/base/common/buffer';
 
+const _moduleId = "vs/workbench/contrib/preferences/browser/keyboardLayoutPicker";
 let KeyboardLayoutPickerContribution = class KeyboardLayoutPickerContribution extends Disposable {
     static { this.ID = 'workbench.contrib.keyboardLayoutPicker'; }
     constructor(keyboardLayoutService, statusbarService) {
         super();
         this.keyboardLayoutService = keyboardLayoutService;
         this.statusbarService = statusbarService;
-        this.pickerElement = this._register(( new MutableDisposable()));
-        const name = ( localizeWithPath(
-            'vs/workbench/contrib/preferences/browser/keyboardLayoutPicker',
-            'status.workbench.keyboardLayout',
-            "Keyboard Layout"
-        ));
+        this.pickerElement = this._register(( (new MutableDisposable())));
+        const name = ( localizeWithPath(_moduleId, 0, "Keyboard Layout"));
         const layout = this.keyboardLayoutService.getCurrentKeyboardLayout();
         if (layout) {
             const layoutInfo = parseKeyboardLayoutDescription(layout);
-            const text = ( localizeWithPath(
-                'vs/workbench/contrib/preferences/browser/keyboardLayoutPicker',
-                'keyboardLayout',
-                "Layout: {0}",
-                layoutInfo.label
-            ));
+            const text = ( localizeWithPath(_moduleId, 1, "Layout: {0}", layoutInfo.label));
             this.pickerElement.value = this.statusbarService.addEntry({
                 name,
                 text,
@@ -47,12 +39,7 @@ let KeyboardLayoutPickerContribution = class KeyboardLayoutPickerContribution ex
             const layout = this.keyboardLayoutService.getCurrentKeyboardLayout();
             const layoutInfo = parseKeyboardLayoutDescription(layout);
             if (this.pickerElement.value) {
-                const text = ( localizeWithPath(
-                    'vs/workbench/contrib/preferences/browser/keyboardLayoutPicker',
-                    'keyboardLayout',
-                    "Layout: {0}",
-                    layoutInfo.label
-                ));
+                const text = ( localizeWithPath(_moduleId, 1, "Layout: {0}", layoutInfo.label));
                 this.pickerElement.value.update({
                     name,
                     text,
@@ -61,12 +48,7 @@ let KeyboardLayoutPickerContribution = class KeyboardLayoutPickerContribution ex
                 });
             }
             else {
-                const text = ( localizeWithPath(
-                    'vs/workbench/contrib/preferences/browser/keyboardLayoutPicker',
-                    'keyboardLayout',
-                    "Layout: {0}",
-                    layoutInfo.label
-                ));
+                const text = ( localizeWithPath(_moduleId, 1, "Layout: {0}", layoutInfo.label));
                 this.pickerElement.value = this.statusbarService.addEntry({
                     name,
                     text,
@@ -77,20 +59,20 @@ let KeyboardLayoutPickerContribution = class KeyboardLayoutPickerContribution ex
         }));
     }
 };
-KeyboardLayoutPickerContribution = ( __decorate([
-    ( __param(0, IKeyboardLayoutService)),
-    ( __param(1, IStatusbarService))
-], KeyboardLayoutPickerContribution));
+KeyboardLayoutPickerContribution = ( (__decorate([
+    ( (__param(0, IKeyboardLayoutService))),
+    ( (__param(1, IStatusbarService)))
+], KeyboardLayoutPickerContribution)));
 registerWorkbenchContribution2(KeyboardLayoutPickerContribution.ID, KeyboardLayoutPickerContribution, 1 );
 const DEFAULT_CONTENT = [
     `// ${( localizeWithPath(
-        'vs/workbench/contrib/preferences/browser/keyboardLayoutPicker',
-        'displayLanguage',
+        _moduleId,
+        2,
         'Defines the keyboard layout used in VS Code in the browser environment.'
     ))}`,
     `// ${( localizeWithPath(
-        'vs/workbench/contrib/preferences/browser/keyboardLayoutPicker',
-        'doc',
+        _moduleId,
+        3,
         'Open VS Code and run "Developer: Inspect Key Mappings (JSON)" from Command Palette.'
     ))}`,
     ``,
@@ -101,11 +83,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: KEYBOARD_LAYOUT_OPEN_PICKER,
-            title: ( localize2WithPath(
-                'vs/workbench/contrib/preferences/browser/keyboardLayoutPicker',
-                'keyboard.chooseLayout',
-                "Change Keyboard Layout"
-            )),
+            title: ( localize2WithPath(_moduleId, 4, "Change Keyboard Layout")),
             f1: true
         });
     }
@@ -120,7 +98,7 @@ registerAction2(class extends Action2 {
         const currentLayout = keyboardLayoutService.getCurrentKeyboardLayout();
         const layoutConfig = configurationService.getValue('keyboard.layout');
         const isAutoDetect = layoutConfig === 'autodetect';
-        const picks = ( layouts.map(layout => {
+        const picks = ( (layouts.map(layout => {
             const picked = !isAutoDetect && areKeyboardLayoutsEqual(currentLayout, layout);
             const layoutInfo = parseKeyboardLayoutDescription(layout);
             return {
@@ -130,39 +108,22 @@ registerAction2(class extends Action2 {
                 description: layoutInfo.description + (picked ? ' (Current layout)' : ''),
                 picked: !isAutoDetect && areKeyboardLayoutsEqual(currentLayout, layout)
             };
-        })).sort((a, b) => {
+        }))).sort((a, b) => {
             return a.label < b.label ? -1 : (a.label > b.label ? 1 : 0);
         });
         if (picks.length > 0) {
             const platform = isMacintosh ? 'Mac' : isWindows ? 'Win' : 'Linux';
-            picks.unshift({ type: 'separator', label: ( localizeWithPath(
-                'vs/workbench/contrib/preferences/browser/keyboardLayoutPicker',
-                'layoutPicks',
-                "Keyboard Layouts ({0})",
-                platform
-            )) });
+            picks.unshift({ type: 'separator', label: ( localizeWithPath(_moduleId, 5, "Keyboard Layouts ({0})", platform)) });
         }
-        const configureKeyboardLayout = { label: ( localizeWithPath(
-            'vs/workbench/contrib/preferences/browser/keyboardLayoutPicker',
-            'configureKeyboardLayout',
-            "Configure Keyboard Layout"
-        )) };
+        const configureKeyboardLayout = { label: ( localizeWithPath(_moduleId, 6, "Configure Keyboard Layout")) };
         picks.unshift(configureKeyboardLayout);
         const autoDetectMode = {
-            label: ( localizeWithPath(
-                'vs/workbench/contrib/preferences/browser/keyboardLayoutPicker',
-                'autoDetect',
-                "Auto Detect"
-            )),
+            label: ( localizeWithPath(_moduleId, 7, "Auto Detect")),
             description: isAutoDetect ? `Current: ${parseKeyboardLayoutDescription(currentLayout).label}` : undefined,
             picked: isAutoDetect ? true : undefined
         };
         picks.unshift(autoDetectMode);
-        const pick = await quickInputService.pick(picks, { placeHolder: ( localizeWithPath(
-            'vs/workbench/contrib/preferences/browser/keyboardLayoutPicker',
-            'pickKeyboardLayout',
-            "Select Keyboard Layout"
-        )), matchOnDescription: true });
+        const pick = await quickInputService.pick(picks, { placeHolder: ( localizeWithPath(_moduleId, 8, "Select Keyboard Layout")), matchOnDescription: true });
         if (!pick) {
             return;
         }
@@ -184,7 +145,9 @@ registerAction2(class extends Action2 {
                     options: { pinned: true }
                 });
             }, (error) => {
-                throw new Error(localizeWithPath('vs/workbench/contrib/preferences/browser/keyboardLayoutPicker', 'fail.createSettings', "Unable to create '{0}' ({1}).", file.toString(), error));
+                throw ( (new Error(
+                    localizeWithPath(_moduleId, 9, "Unable to create '{0}' ({1}).", ( (file.toString())), error)
+                )));
             });
             return Promise.resolve();
         }

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

@@ -6,9 +6,10 @@ import { Extensions } from 'vscode/vscode/vs/workbench/common/contributions';
 import { SashSettingsController } from './sash.js';
 import { isIOS } from 'vscode/vscode/vs/base/common/platform';
 
-( Registry.as(Extensions.Workbench))
+const _moduleId = "vs/workbench/contrib/sash/browser/sash.contribution";
+( (Registry.as(Extensions.Workbench)))
     .registerWorkbenchContribution(SashSettingsController, 3 );
-( Registry.as(Extensions$1.Configuration))
+( (Registry.as(Extensions$1.Configuration)))
     .registerConfiguration({
     ...workbenchConfigurationNodeBase,
     properties: {
@@ -18,8 +19,8 @@ import { isIOS } from 'vscode/vscode/vs/base/common/platform';
             minimum: 1,
             maximum: 20,
             description: ( localizeWithPath(
-                'vs/workbench/contrib/sash/browser/sash.contribution',
-                'sashSize',
+                _moduleId,
+                0,
                 "Controls the feedback area size in pixels of the dragging area in between views/editors. Set it to a larger value if you feel it's hard to resize views using the mouse."
             ))
         },
@@ -29,8 +30,8 @@ import { isIOS } from 'vscode/vscode/vs/base/common/platform';
             minimum: 0,
             maximum: 2000,
             description: ( localizeWithPath(
-                'vs/workbench/contrib/sash/browser/sash.contribution',
-                'sashHoverDelay',
+                _moduleId,
+                1,
                 "Controls the hover feedback delay in milliseconds of the dragging area in between views/editors."
             ))
         },