@codingame/monaco-vscode-api 7.1.0 → 8.0.0

package/vscode/src/vs/editor/contrib/find/browser/findController.js

@@ -12,7 +12,7 @@ import { CONTEXT_FIND_WIDGET_VISIBLE, CONTEXT_FIND_INPUT_FOCUSED, FindModelBound
 import { FindOptionsWidget } from './findOptionsWidget.js';
 import { FindReplaceState } from './findState.js';
 import { FindWidget } from './findWidget.js';
-import { localizeWithPath } from '../../../../nls.js';
+import { localize } from '../../../../nls.js';
 import { MenuId } from '../../../../platform/actions/common/actions.js';
 import { IClipboardService } from '../../../../platform/clipboard/common/clipboardService.service.js';
 import { ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
@@ -30,7 +30,6 @@ import { IThemeService } from '../../../../platform/theme/common/themeService.se
 import { IHoverService } from '../../../../platform/hover/browser/hover.service.js';
 import Severity$1 from '../../../../base/common/severity.js';
 var CommonFindController_1;
-const _moduleId = "vs/editor/contrib/find/browser/findController";
 const SEARCH_STRING_MAX_LENGTH = 524288;
 function getSelectionSearchString(editor, seedSearchStringFromSelection = 'single', seedSearchStringFromNonEmptySelection = false) {
     if (!editor.hasModel()) {
@@ -307,7 +306,7 @@ let CommonFindController = class CommonFindController extends Disposable {
     replaceAll() {
         if (this._model) {
             if (this._editor.getModel()?.isTooLargeForHeapOperation()) {
-                this._notificationService.warn(( localizeWithPath(_moduleId, 0, "The file is too large to perform a replace all operation.")));
+                this._notificationService.warn(( localize(1346, "The file is too large to perform a replace all operation.")));
                 return false;
             }
             this._model.replaceAll();
@@ -430,7 +429,7 @@ FindController = ( (__decorate([
 ], FindController)));
 const StartFindAction = registerMultiEditorAction(( (new MultiEditorAction({
     id: FIND_IDS.StartFindAction,
-    label: ( localizeWithPath(_moduleId, 1, "Find")),
+    label: ( localize(1347, "Find")),
     alias: 'Find',
     precondition: ( (ContextKeyExpr.or(
         EditorContextKeys.focus,
@@ -444,7 +443,7 @@ const StartFindAction = registerMultiEditorAction(( (new MultiEditorAction({
     menuOpts: {
         menuId: MenuId.MenubarEditMenu,
         group: '3_find',
-        title: ( localizeWithPath(_moduleId, 2, "&&Find")),
+        title: ( localize(1348, "&&Find")),
         order: 1
     }
 }))));
@@ -485,7 +484,7 @@ class StartFindWithArgsAction extends EditorAction {
     constructor() {
         super({
             id: FIND_IDS.StartFindWithArgs,
-            label: ( localizeWithPath(_moduleId, 3, "Find With Arguments")),
+            label: ( localize(1349, "Find With Arguments")),
             alias: 'Find With Arguments',
             precondition: undefined,
             kbOpts: {
@@ -526,7 +525,7 @@ class StartFindWithSelectionAction extends EditorAction {
     constructor() {
         super({
             id: FIND_IDS.StartFindWithSelection,
-            label: ( localizeWithPath(_moduleId, 4, "Find With Selection")),
+            label: ( localize(1350, "Find With Selection")),
             alias: 'Find With Selection',
             precondition: undefined,
             kbOpts: {
@@ -578,7 +577,7 @@ class NextMatchFindAction extends MatchFindAction {
     constructor() {
         super({
             id: FIND_IDS.NextMatchFindAction,
-            label: ( localizeWithPath(_moduleId, 5, "Find Next")),
+            label: ( localize(1351, "Find Next")),
             alias: 'Find Next',
             precondition: undefined,
             kbOpts: [{
@@ -606,7 +605,7 @@ class PreviousMatchFindAction extends MatchFindAction {
     constructor() {
         super({
             id: FIND_IDS.PreviousMatchFindAction,
-            label: ( localizeWithPath(_moduleId, 6, "Find Previous")),
+            label: ( localize(1352, "Find Previous")),
             alias: 'Find Previous',
             precondition: undefined,
             kbOpts: [{
@@ -630,7 +629,7 @@ class MoveToMatchFindAction extends EditorAction {
     constructor() {
         super({
             id: FIND_IDS.GoToMatchFindAction,
-            label: ( localizeWithPath(_moduleId, 7, "Go to Match...")),
+            label: ( localize(1353, "Go to Match...")),
             alias: 'Go to Match...',
             precondition: CONTEXT_FIND_WIDGET_VISIBLE
         });
@@ -646,15 +645,14 @@ class MoveToMatchFindAction extends EditorAction {
             const notificationService = accessor.get(INotificationService);
             notificationService.notify({
                 severity: Severity$1.Warning,
-                message: ( localizeWithPath(_moduleId, 8, "No matches. Try searching for something else."))
+                message: ( localize(1354, "No matches. Try searching for something else."))
             });
             return;
         }
         const quickInputService = accessor.get(IQuickInputService);
         const inputBox = quickInputService.createInputBox();
-        inputBox.placeholder = ( localizeWithPath(
-            _moduleId,
-            9,
+        inputBox.placeholder = ( localize(
+            1355,
             "Type a number to go to a specific match (between 1 and {0})",
             matchesCount
         ));
@@ -683,9 +681,8 @@ class MoveToMatchFindAction extends EditorAction {
                 }
             }
             else {
-                inputBox.validationMessage = ( localizeWithPath(
-                    _moduleId,
-                    10,
+                inputBox.validationMessage = ( localize(
+                    1356,
                     "Please type a number between 1 and {0}",
                     controller.getState().matchesCount
                 ));
@@ -702,9 +699,8 @@ class MoveToMatchFindAction extends EditorAction {
                 inputBox.hide();
             }
             else {
-                inputBox.validationMessage = ( localizeWithPath(
-                    _moduleId,
-                    10,
+                inputBox.validationMessage = ( localize(
+                    1356,
                     "Please type a number between 1 and {0}",
                     controller.getState().matchesCount
                 ));
@@ -775,7 +771,7 @@ class NextSelectionMatchFindAction extends SelectionMatchFindAction {
     constructor() {
         super({
             id: FIND_IDS.NextSelectionMatchFindAction,
-            label: ( localizeWithPath(_moduleId, 11, "Find Next Selection")),
+            label: ( localize(1357, "Find Next Selection")),
             alias: 'Find Next Selection',
             precondition: undefined,
             kbOpts: {
@@ -793,7 +789,7 @@ class PreviousSelectionMatchFindAction extends SelectionMatchFindAction {
     constructor() {
         super({
             id: FIND_IDS.PreviousSelectionMatchFindAction,
-            label: ( localizeWithPath(_moduleId, 12, "Find Previous Selection")),
+            label: ( localize(1358, "Find Previous Selection")),
             alias: 'Find Previous Selection',
             precondition: undefined,
             kbOpts: {
@@ -809,7 +805,7 @@ class PreviousSelectionMatchFindAction extends SelectionMatchFindAction {
 }
 const StartFindReplaceAction = registerMultiEditorAction(( (new MultiEditorAction({
     id: FIND_IDS.StartFindReplaceAction,
-    label: ( localizeWithPath(_moduleId, 13, "Replace")),
+    label: ( localize(1359, "Replace")),
     alias: 'Replace',
     precondition: ( (ContextKeyExpr.or(
         EditorContextKeys.focus,
@@ -824,7 +820,7 @@ const StartFindReplaceAction = registerMultiEditorAction(( (new MultiEditorActio
     menuOpts: {
         menuId: MenuId.MenubarEditMenu,
         group: '3_find',
-        title: ( localizeWithPath(_moduleId, 14, "&&Replace")),
+        title: ( localize(1360, "&&Replace")),
         order: 2
     }
 }))));

package/vscode/src/vs/editor/contrib/find/browser/findModel.js

@@ -71,7 +71,12 @@ class FindModelBoundToEditorModel {
         this._startSearchingTimer = ( new TimeoutTimer());
         this._decorations = ( new FindDecorations(editor));
         this._toDispose.add(this._decorations);
-        this._updateDecorationsScheduler = ( new RunOnceScheduler(() => this.research(false), 100));
+        this._updateDecorationsScheduler = ( new RunOnceScheduler(() => {
+            if (!this._editor.hasModel()) {
+                return;
+            }
+            return this.research(false);
+        }, 100));
         this._toDispose.add(this._updateDecorationsScheduler);
         this._toDispose.add(this._editor.onDidChangeCursorPosition((e) => {
             if (e.reason === CursorChangeReason.Explicit

package/vscode/src/vs/editor/contrib/find/browser/findWidget.js

@@ -15,7 +15,7 @@ import { OverlayWidgetPositionPreference } from '../../../browser/editorBrowser.
 import { EditorOption } from '../../../common/config/editorOptions.js';
 import { Range } from '../../../common/core/range.js';
 import { CONTEXT_FIND_INPUT_FOCUSED, CONTEXT_REPLACE_INPUT_FOCUSED, MATCHES_LIMIT, FIND_IDS } from './findModel.js';
-import { localizeWithPath } from '../../../../nls.js';
+import { localize } from '../../../../nls.js';
 import { AccessibilitySupport } from '../../../../platform/accessibility/common/accessibility.js';
 import { ContextScopedFindInput, ContextScopedReplaceInput } from '../../../../platform/history/browser/contextScopedHistoryWidget.js';
 import { showHistoryKeybindingHint } from '../../../../platform/history/browser/historyWidgetKeybindingHint.js';
@@ -38,34 +38,32 @@ import { isHighContrast } from '../../../../platform/theme/common/theme.js';
 import { assertIsDefined } from '../../../../base/common/types.js';
 import { defaultInputBoxStyles, defaultToggleStyles } from '../../../../platform/theme/browser/defaultStyles.js';
 import { createInstantHoverDelegate, getDefaultHoverDelegate } from '../../../../base/browser/ui/hover/hoverDelegateFactory.js';
-const _moduleId = "vs/editor/contrib/find/browser/findWidget";
-const findCollapsedIcon = registerIcon('find-collapsed', Codicon.chevronRight, ( localizeWithPath(_moduleId, 0, 'Icon to indicate that the editor find widget is collapsed.')));
-const findExpandedIcon = registerIcon('find-expanded', Codicon.chevronDown, ( localizeWithPath(_moduleId, 1, 'Icon to indicate that the editor find widget is expanded.')));
-const findSelectionIcon = registerIcon('find-selection', Codicon.selection, ( localizeWithPath(_moduleId, 2, 'Icon for \'Find in Selection\' in the editor find widget.')));
-const findReplaceIcon = registerIcon('find-replace', Codicon.replace, ( localizeWithPath(_moduleId, 3, 'Icon for \'Replace\' in the editor find widget.')));
-const findReplaceAllIcon = registerIcon('find-replace-all', Codicon.replaceAll, ( localizeWithPath(_moduleId, 4, 'Icon for \'Replace All\' in the editor find widget.')));
-const findPreviousMatchIcon = registerIcon('find-previous-match', Codicon.arrowUp, ( localizeWithPath(_moduleId, 5, 'Icon for \'Find Previous\' in the editor find widget.')));
-const findNextMatchIcon = registerIcon('find-next-match', Codicon.arrowDown, ( localizeWithPath(_moduleId, 6, 'Icon for \'Find Next\' in the editor find widget.')));
-const NLS_FIND_DIALOG_LABEL = ( localizeWithPath(_moduleId, 7, "Find / Replace"));
-const NLS_FIND_INPUT_LABEL = ( localizeWithPath(_moduleId, 8, "Find"));
-const NLS_FIND_INPUT_PLACEHOLDER = ( localizeWithPath(_moduleId, 9, "Find"));
-const NLS_PREVIOUS_MATCH_BTN_LABEL = ( localizeWithPath(_moduleId, 10, "Previous Match"));
-const NLS_NEXT_MATCH_BTN_LABEL = ( localizeWithPath(_moduleId, 11, "Next Match"));
-const NLS_TOGGLE_SELECTION_FIND_TITLE = ( localizeWithPath(_moduleId, 12, "Find in Selection"));
-const NLS_CLOSE_BTN_LABEL = ( localizeWithPath(_moduleId, 13, "Close"));
-const NLS_REPLACE_INPUT_LABEL = ( localizeWithPath(_moduleId, 14, "Replace"));
-const NLS_REPLACE_INPUT_PLACEHOLDER = ( localizeWithPath(_moduleId, 15, "Replace"));
-const NLS_REPLACE_BTN_LABEL = ( localizeWithPath(_moduleId, 16, "Replace"));
-const NLS_REPLACE_ALL_BTN_LABEL = ( localizeWithPath(_moduleId, 17, "Replace All"));
-const NLS_TOGGLE_REPLACE_MODE_BTN_LABEL = ( localizeWithPath(_moduleId, 18, "Toggle Replace"));
-const NLS_MATCHES_COUNT_LIMIT_TITLE = ( localizeWithPath(
-    _moduleId,
-    19,
+const findCollapsedIcon = registerIcon('find-collapsed', Codicon.chevronRight, ( localize(4954, 'Icon to indicate that the editor find widget is collapsed.')));
+const findExpandedIcon = registerIcon('find-expanded', Codicon.chevronDown, ( localize(4955, 'Icon to indicate that the editor find widget is expanded.')));
+const findSelectionIcon = registerIcon('find-selection', Codicon.selection, ( localize(4956, 'Icon for \'Find in Selection\' in the editor find widget.')));
+const findReplaceIcon = registerIcon('find-replace', Codicon.replace, ( localize(4957, 'Icon for \'Replace\' in the editor find widget.')));
+const findReplaceAllIcon = registerIcon('find-replace-all', Codicon.replaceAll, ( localize(4958, 'Icon for \'Replace All\' in the editor find widget.')));
+const findPreviousMatchIcon = registerIcon('find-previous-match', Codicon.arrowUp, ( localize(4959, 'Icon for \'Find Previous\' in the editor find widget.')));
+const findNextMatchIcon = registerIcon('find-next-match', Codicon.arrowDown, ( localize(4960, 'Icon for \'Find Next\' in the editor find widget.')));
+const NLS_FIND_DIALOG_LABEL = ( localize(4961, "Find / Replace"));
+const NLS_FIND_INPUT_LABEL = ( localize(4962, "Find"));
+const NLS_FIND_INPUT_PLACEHOLDER = ( localize(4963, "Find"));
+const NLS_PREVIOUS_MATCH_BTN_LABEL = ( localize(4964, "Previous Match"));
+const NLS_NEXT_MATCH_BTN_LABEL = ( localize(4965, "Next Match"));
+const NLS_TOGGLE_SELECTION_FIND_TITLE = ( localize(4966, "Find in Selection"));
+const NLS_CLOSE_BTN_LABEL = ( localize(4967, "Close"));
+const NLS_REPLACE_INPUT_LABEL = ( localize(4968, "Replace"));
+const NLS_REPLACE_INPUT_PLACEHOLDER = ( localize(4969, "Replace"));
+const NLS_REPLACE_BTN_LABEL = ( localize(4970, "Replace"));
+const NLS_REPLACE_ALL_BTN_LABEL = ( localize(4971, "Replace All"));
+const NLS_TOGGLE_REPLACE_MODE_BTN_LABEL = ( localize(4972, "Toggle Replace"));
+const NLS_MATCHES_COUNT_LIMIT_TITLE = ( localize(
+    4973,
     "Only the first {0} results are highlighted, but all find operations work on the entire text.",
     MATCHES_LIMIT
 ));
-const NLS_MATCHES_LOCATION = ( localizeWithPath(_moduleId, 20, "{0} of {1}"));
-const NLS_NO_RESULTS = ( localizeWithPath(_moduleId, 21, "No results"));
+const NLS_MATCHES_LOCATION = ( localize(4974, "{0} of {1}"));
+const NLS_NO_RESULTS = ( localize(4975, "No results"));
 const FIND_WIDGET_INITIAL_WIDTH = 419;
 const PART_WIDTH = 275;
 const FIND_INPUT_AREA_WIDTH = PART_WIDTH - 54;
@@ -337,13 +335,12 @@ class FindWidget extends Widget {
     _getAriaLabel(label, currentMatch, searchString) {
         if (label === NLS_NO_RESULTS) {
             return searchString === ''
-                ? ( localizeWithPath(_moduleId, 22, "{0} found", label))
-                : ( localizeWithPath(_moduleId, 23, "{0} found for '{1}'", label, searchString));
+                ? ( localize(4976, "{0} found", label))
+                : ( localize(4977, "{0} found for '{1}'", label, searchString));
         }
         if (currentMatch) {
-            const ariaLabel = ( localizeWithPath(
-                _moduleId,
-                24,
+            const ariaLabel = ( localize(
+                4978,
                 "{0} found for '{1}', at {2}",
                 label,
                 searchString,
@@ -356,7 +353,7 @@ class FindWidget extends Widget {
             }
             return ariaLabel;
         }
-        return ( localizeWithPath(_moduleId, 25, "{0} found for '{1}'", label, searchString));
+        return ( localize(4979, "{0} found for '{1}'", label, searchString));
     }
     _updateToggleSelectionFindButton() {
         const selection = this._codeEditor.getSelection();
@@ -688,9 +685,8 @@ class FindWidget extends Widget {
             }
             else {
                 if (isWindows && isNative && !this._ctrlEnterReplaceAllWarningPrompted) {
-                    this._notificationService.info(( localizeWithPath(
-                        _moduleId,
-                        26,
+                    this._notificationService.info(( localize(
+                        4980,
                         'Ctrl+Enter now inserts line break instead of replacing all. You can modify the keybinding for editor.action.replaceAll to override this behavior.'
                     )));
                     this._ctrlEnterReplaceAllWarningPrompted = true;

package/vscode/src/vs/editor/contrib/folding/browser/folding.js

@@ -18,7 +18,7 @@ import { ILanguageConfigurationService } from '../../../common/languages/languag
 import { FoldingModel, setCollapseStateAtLevel, setCollapseStateLevelsUp, setCollapseStateLevelsDown, setCollapseStateUp, toggleCollapseState, setCollapseStateForType, setCollapseStateForMatchingLines, setCollapseStateForRest, getParentFoldLine, getPreviousFoldLine, getNextFoldLine } from './foldingModel.js';
 import { HiddenRangeModel } from './hiddenRangeModel.js';
 import { IndentRangeProvider } from './indentRangeProvider.js';
-import { localizeWithPath } from '../../../../nls.js';
+import { localize } from '../../../../nls.js';
 import { RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
 import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.service.js';
 import { KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
@@ -35,7 +35,6 @@ import { URI } from '../../../../base/common/uri.js';
 import { IModelService } from '../../../common/services/model.js';
 import { IConfigurationService } from '../../../../platform/configuration/common/configuration.service.js';
 var FoldingController_1;
-const _moduleId = "vs/editor/contrib/folding/browser/folding";
 const CONTEXT_FOLDING_ENABLED = ( (new RawContextKey('foldingEnabled', false)));
 let FoldingController = class FoldingController extends Disposable {
     static { FoldingController_1 = this; }
@@ -491,7 +490,7 @@ class UnfoldAction extends FoldingAction {
     constructor() {
         super({
             id: 'editor.unfold',
-            label: ( localizeWithPath(_moduleId, 0, "Unfold")),
+            label: ( localize(453, "Unfold")),
             alias: 'Unfold',
             precondition: CONTEXT_FOLDING_ENABLED,
             kbOpts: {
@@ -553,7 +552,7 @@ class UnFoldRecursivelyAction extends FoldingAction {
     constructor() {
         super({
             id: 'editor.unfoldRecursively',
-            label: ( localizeWithPath(_moduleId, 1, "Unfold Recursively")),
+            label: ( localize(454, "Unfold Recursively")),
             alias: 'Unfold Recursively',
             precondition: CONTEXT_FOLDING_ENABLED,
             kbOpts: {
@@ -571,7 +570,7 @@ class FoldAction extends FoldingAction {
     constructor() {
         super({
             id: 'editor.fold',
-            label: ( localizeWithPath(_moduleId, 2, "Fold")),
+            label: ( localize(455, "Fold")),
             alias: 'Fold',
             precondition: CONTEXT_FOLDING_ENABLED,
             kbOpts: {
@@ -638,7 +637,7 @@ class ToggleFoldAction extends FoldingAction {
     constructor() {
         super({
             id: 'editor.toggleFold',
-            label: ( localizeWithPath(_moduleId, 3, "Toggle Fold")),
+            label: ( localize(456, "Toggle Fold")),
             alias: 'Toggle Fold',
             precondition: CONTEXT_FOLDING_ENABLED,
             kbOpts: {
@@ -657,7 +656,7 @@ class FoldRecursivelyAction extends FoldingAction {
     constructor() {
         super({
             id: 'editor.foldRecursively',
-            label: ( localizeWithPath(_moduleId, 4, "Fold Recursively")),
+            label: ( localize(457, "Fold Recursively")),
             alias: 'Fold Recursively',
             precondition: CONTEXT_FOLDING_ENABLED,
             kbOpts: {
@@ -676,7 +675,7 @@ class ToggleFoldRecursivelyAction extends FoldingAction {
     constructor() {
         super({
             id: 'editor.toggleFoldRecursively',
-            label: ( localizeWithPath(_moduleId, 5, "Toggle Fold Recursively")),
+            label: ( localize(458, "Toggle Fold Recursively")),
             alias: 'Toggle Fold Recursively',
             precondition: CONTEXT_FOLDING_ENABLED,
             kbOpts: {
@@ -695,7 +694,7 @@ class FoldAllBlockCommentsAction extends FoldingAction {
     constructor() {
         super({
             id: 'editor.foldAllBlockComments',
-            label: ( localizeWithPath(_moduleId, 6, "Fold All Block Comments")),
+            label: ( localize(459, "Fold All Block Comments")),
             alias: 'Fold All Block Comments',
             precondition: CONTEXT_FOLDING_ENABLED,
             kbOpts: {
@@ -726,7 +725,7 @@ class FoldAllRegionsAction extends FoldingAction {
     constructor() {
         super({
             id: 'editor.foldAllMarkerRegions',
-            label: ( localizeWithPath(_moduleId, 7, "Fold All Regions")),
+            label: ( localize(460, "Fold All Regions")),
             alias: 'Fold All Regions',
             precondition: CONTEXT_FOLDING_ENABLED,
             kbOpts: {
@@ -757,7 +756,7 @@ class UnfoldAllRegionsAction extends FoldingAction {
     constructor() {
         super({
             id: 'editor.unfoldAllMarkerRegions',
-            label: ( localizeWithPath(_moduleId, 8, "Unfold All Regions")),
+            label: ( localize(461, "Unfold All Regions")),
             alias: 'Unfold All Regions',
             precondition: CONTEXT_FOLDING_ENABLED,
             kbOpts: {
@@ -788,7 +787,7 @@ class FoldAllExceptAction extends FoldingAction {
     constructor() {
         super({
             id: 'editor.foldAllExcept',
-            label: ( localizeWithPath(_moduleId, 9, "Fold All Except Selected")),
+            label: ( localize(462, "Fold All Except Selected")),
             alias: 'Fold All Except Selected',
             precondition: CONTEXT_FOLDING_ENABLED,
             kbOpts: {
@@ -807,7 +806,7 @@ class UnfoldAllExceptAction extends FoldingAction {
     constructor() {
         super({
             id: 'editor.unfoldAllExcept',
-            label: ( localizeWithPath(_moduleId, 10, "Unfold All Except Selected")),
+            label: ( localize(463, "Unfold All Except Selected")),
             alias: 'Unfold All Except Selected',
             precondition: CONTEXT_FOLDING_ENABLED,
             kbOpts: {
@@ -826,7 +825,7 @@ class FoldAllAction extends FoldingAction {
     constructor() {
         super({
             id: 'editor.foldAll',
-            label: ( localizeWithPath(_moduleId, 11, "Fold All")),
+            label: ( localize(464, "Fold All")),
             alias: 'Fold All',
             precondition: CONTEXT_FOLDING_ENABLED,
             kbOpts: {
@@ -844,7 +843,7 @@ class UnfoldAllAction extends FoldingAction {
     constructor() {
         super({
             id: 'editor.unfoldAll',
-            label: ( localizeWithPath(_moduleId, 12, "Unfold All")),
+            label: ( localize(465, "Unfold All")),
             alias: 'Unfold All',
             precondition: CONTEXT_FOLDING_ENABLED,
             kbOpts: {
@@ -872,7 +871,7 @@ class GotoParentFoldAction extends FoldingAction {
     constructor() {
         super({
             id: 'editor.gotoParentFold',
-            label: ( localizeWithPath(_moduleId, 13, "Go to Parent Fold")),
+            label: ( localize(466, "Go to Parent Fold")),
             alias: 'Go to Parent Fold',
             precondition: CONTEXT_FOLDING_ENABLED,
             kbOpts: {
@@ -900,7 +899,7 @@ class GotoPreviousFoldAction extends FoldingAction {
     constructor() {
         super({
             id: 'editor.gotoPreviousFold',
-            label: ( localizeWithPath(_moduleId, 14, "Go to Previous Folding Range")),
+            label: ( localize(467, "Go to Previous Folding Range")),
             alias: 'Go to Previous Folding Range',
             precondition: CONTEXT_FOLDING_ENABLED,
             kbOpts: {
@@ -928,7 +927,7 @@ class GotoNextFoldAction extends FoldingAction {
     constructor() {
         super({
             id: 'editor.gotoNextFold',
-            label: ( localizeWithPath(_moduleId, 15, "Go to Next Folding Range")),
+            label: ( localize(468, "Go to Next Folding Range")),
             alias: 'Go to Next Folding Range',
             precondition: CONTEXT_FOLDING_ENABLED,
             kbOpts: {
@@ -956,7 +955,7 @@ class FoldRangeFromSelectionAction extends FoldingAction {
     constructor() {
         super({
             id: 'editor.createFoldingRangeFromSelection',
-            label: ( localizeWithPath(_moduleId, 16, "Create Folding Range from Selection")),
+            label: ( localize(469, "Create Folding Range from Selection")),
             alias: 'Create Folding Range from Selection',
             precondition: CONTEXT_FOLDING_ENABLED,
             kbOpts: {
@@ -1005,7 +1004,7 @@ class RemoveFoldRangeFromSelectionAction extends FoldingAction {
     constructor() {
         super({
             id: 'editor.removeManualFoldingRanges',
-            label: ( localizeWithPath(_moduleId, 17, "Remove Manual Folding Ranges")),
+            label: ( localize(470, "Remove Manual Folding Ranges")),
             alias: 'Remove Manual Folding Ranges',
             precondition: CONTEXT_FOLDING_ENABLED,
             kbOpts: {
@@ -1050,7 +1049,7 @@ registerEditorAction(RemoveFoldRangeFromSelectionAction);
 for (let i = 1; i <= 7; i++) {
     registerInstantiatedEditorAction(( (new FoldLevelAction({
         id: FoldLevelAction.ID(i),
-        label: ( localizeWithPath(_moduleId, 18, "Fold Level {0}", i)),
+        label: ( localize(471, "Fold Level {0}", i)),
         alias: `Fold Level ${i}`,
         precondition: CONTEXT_FOLDING_ENABLED,
         kbOpts: {

package/vscode/src/vs/editor/contrib/folding/browser/foldingDecorations.js

@@ -1,7 +1,7 @@
 import { Codicon } from '../../../../base/common/codicons.js';
 import { TrackedRangeStickiness, MinimapPosition } from '../../../common/model.js';
 import { ModelDecorationOptions } from '../../../common/model/textModel.js';
-import { localizeWithPath } from '../../../../nls.js';
+import { localize } from '../../../../nls.js';
 import { registerColor, transparent } from '../../../../platform/theme/common/colorUtils.js';
 import { iconForeground } from '../../../../platform/theme/common/colors/baseColors.js';
 import '../../../../platform/theme/common/colors/chartsColors.js';
@@ -16,33 +16,22 @@ import '../../../../platform/theme/common/colors/searchColors.js';
 import { registerIcon } from '../../../../platform/theme/common/iconRegistry.js';
 import { themeColorFromId } from '../../../../platform/theme/common/themeService.js';
 import { ThemeIcon } from '../../../../base/common/themables.js';
-const _moduleId = "vs/editor/contrib/folding/browser/foldingDecorations";
-const foldBackground = registerColor('editor.foldBackground', { light: ( (transparent(editorSelectionBackground, 0.3))), dark: ( (transparent(editorSelectionBackground, 0.3))), hcDark: null, hcLight: null }, ( localizeWithPath(
-    _moduleId,
-    0,
+const foldBackground = registerColor('editor.foldBackground', { light: ( (transparent(editorSelectionBackground, 0.3))), dark: ( (transparent(editorSelectionBackground, 0.3))), hcDark: null, hcLight: null }, ( localize(
+    3383,
     "Background color behind folded ranges. The color must not be opaque so as not to hide underlying decorations."
 )), true);
-registerColor('editor.foldPlaceholderForeground', { light: '#808080', dark: '#808080', hcDark: null, hcLight: null }, ( localizeWithPath(
-    _moduleId,
-    1,
+registerColor('editor.foldPlaceholderForeground', { light: '#808080', dark: '#808080', hcDark: null, hcLight: null }, ( localize(
+    3384,
     "Color of the collapsed text after the first line of a folded range."
 )));
-registerColor('editorGutter.foldingControlForeground', iconForeground, ( localizeWithPath(_moduleId, 2, 'Color of the folding control in the editor gutter.')));
-const foldingExpandedIcon = registerIcon('folding-expanded', Codicon.chevronDown, ( localizeWithPath(_moduleId, 3, 'Icon for expanded ranges in the editor glyph margin.')));
-const foldingCollapsedIcon = registerIcon('folding-collapsed', Codicon.chevronRight, ( localizeWithPath(_moduleId, 4, 'Icon for collapsed ranges in the editor glyph margin.')));
-const foldingManualCollapsedIcon = registerIcon('folding-manual-collapsed', foldingCollapsedIcon, ( localizeWithPath(
-    _moduleId,
-    5,
-    'Icon for manually collapsed ranges in the editor glyph margin.'
-)));
-const foldingManualExpandedIcon = registerIcon('folding-manual-expanded', foldingExpandedIcon, ( localizeWithPath(
-    _moduleId,
-    6,
-    'Icon for manually expanded ranges in the editor glyph margin.'
-)));
+registerColor('editorGutter.foldingControlForeground', iconForeground, ( localize(3385, 'Color of the folding control in the editor gutter.')));
+const foldingExpandedIcon = registerIcon('folding-expanded', Codicon.chevronDown, ( localize(3386, 'Icon for expanded ranges in the editor glyph margin.')));
+const foldingCollapsedIcon = registerIcon('folding-collapsed', Codicon.chevronRight, ( localize(3387, 'Icon for collapsed ranges in the editor glyph margin.')));
+const foldingManualCollapsedIcon = registerIcon('folding-manual-collapsed', foldingCollapsedIcon, ( localize(3388, 'Icon for manually collapsed ranges in the editor glyph margin.')));
+const foldingManualExpandedIcon = registerIcon('folding-manual-expanded', foldingExpandedIcon, ( localize(3389, 'Icon for manually expanded ranges in the editor glyph margin.')));
 const foldedBackgroundMinimap = { color: themeColorFromId(foldBackground), position: MinimapPosition.Inline };
-const collapsed = ( localizeWithPath(_moduleId, 7, "Click to expand the range."));
-const expanded = ( localizeWithPath(_moduleId, 8, "Click to collapse the range."));
+const collapsed = ( localize(3390, "Click to expand the range."));
+const expanded = ( localize(3391, "Click to collapse the range."));
 class FoldingDecorationProvider {
     static { this.COLLAPSED_VISUAL_DECORATION = ModelDecorationOptions.register({
         description: 'folding-collapsed-visual-decoration',

package/vscode/src/vs/editor/contrib/fontZoom/browser/fontZoom.js

@@ -1,12 +1,11 @@
 import { registerEditorAction, EditorAction } from '../../../browser/editorExtensions.js';
 import { EditorZoom } from '../../../common/config/editorZoom.js';
-import { localizeWithPath } from '../../../../nls.js';
-const _moduleId = "vs/editor/contrib/fontZoom/browser/fontZoom";
+import { localize } from '../../../../nls.js';
 class EditorFontZoomIn extends EditorAction {
     constructor() {
         super({
             id: 'editor.action.fontZoomIn',
-            label: ( localizeWithPath(_moduleId, 0, "Increase Editor Font Size")),
+            label: ( localize(1361, "Increase Editor Font Size")),
             alias: 'Increase Editor Font Size',
             precondition: undefined
         });
@@ -19,7 +18,7 @@ class EditorFontZoomOut extends EditorAction {
     constructor() {
         super({
             id: 'editor.action.fontZoomOut',
-            label: ( localizeWithPath(_moduleId, 1, "Decrease Editor Font Size")),
+            label: ( localize(1362, "Decrease Editor Font Size")),
             alias: 'Decrease Editor Font Size',
             precondition: undefined
         });
@@ -32,7 +31,7 @@ class EditorFontZoomReset extends EditorAction {
     constructor() {
         super({
             id: 'editor.action.fontZoomReset',
-            label: ( localizeWithPath(_moduleId, 2, "Reset Editor Font Size")),
+            label: ( localize(1363, "Reset Editor Font Size")),
             alias: 'Reset Editor Font Size',
             precondition: undefined
         });

package/vscode/src/vs/editor/contrib/format/browser/formatActions.js

@@ -14,7 +14,7 @@ import { IEditorWorkerService } from '../../../common/services/editorWorker.js';
 import { ILanguageFeaturesService } from '../../../common/services/languageFeatures.js';
 import { getOnTypeFormattingEdits, formatDocumentRangesWithSelectedProvider, FormattingMode, formatDocumentWithSelectedProvider } from './format.js';
 import { FormattingEdit } from './formattingEdit.js';
-import { localizeWithPath } from '../../../../nls.js';
+import { localize } from '../../../../nls.js';
 import { AccessibilitySignal } from '../../../../platform/accessibilitySignal/browser/accessibilitySignalService.js';
 import { IAccessibilitySignalService } from '../../../../platform/accessibilitySignal/browser/accessibilitySignalService.service.js';
 import { CommandsRegistry } from '../../../../platform/commands/common/commands.js';
@@ -24,7 +24,6 @@ import { IInstantiationService } from '../../../../platform/instantiation/common
 import { KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
 import { Progress } from '../../../../platform/progress/common/progress.js';
 import { IEditorProgressService } from '../../../../platform/progress/common/progress.service.js';
-const _moduleId = "vs/editor/contrib/format/browser/formatActions";
 let FormatOnType = class FormatOnType {
     static { this.ID = 'editor.contrib.autoFormat'; }
     constructor(_editor, _languageFeaturesService, _workerService, _accessibilitySignalService) {
@@ -163,7 +162,7 @@ class FormatDocumentAction extends EditorAction {
     constructor() {
         super({
             id: 'editor.action.formatDocument',
-            label: ( localizeWithPath(_moduleId, 0, "Format Document")),
+            label: ( localize(1364, "Format Document")),
             alias: 'Format Document',
             precondition: ( (ContextKeyExpr.and(
                 EditorContextKeys.notInCompositeEditor,
@@ -194,7 +193,7 @@ class FormatSelectionAction extends EditorAction {
     constructor() {
         super({
             id: 'editor.action.formatSelection',
-            label: ( localizeWithPath(_moduleId, 1, "Format Selection")),
+            label: ( localize(1365, "Format Selection")),
             alias: 'Format Selection',
             precondition: ( (ContextKeyExpr.and(
                 EditorContextKeys.writable,