@codingame/monaco-vscode-api 7.0.11 → 7.1.1

package/vscode/src/vs/workbench/contrib/scm/browser/dirtydiffDecorator.js

@@ -1,5 +1,5 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import { localizeWithPath } from '../../../../nls.js';
+import { localize } from '../../../../nls.js';
 import './media/dirtydiffDecorator.css.js';
 import { ThrottledDelayer } from '../../../../base/common/async.js';
 import { Disposable, DisposableStore, toDisposable, dispose } from '../../../../base/common/lifecycle.js';
@@ -64,7 +64,6 @@ import { IAccessibilityService } from '../../../../platform/accessibility/common
 import { IQuickDiffService } from '../common/quickDiff.service.js';
 import { SwitchQuickDiffViewItem, SwitchQuickDiffBaseAction } from './dirtyDiffSwitcher.js';
 var DirtyDiffController_1, DirtyDiffDecorator_1;
-const _moduleId = "vs/workbench/contrib/scm/browser/dirtydiffDecorator";
 class DiffActionRunner extends ActionRunner {
     runAction(action, context) {
         if (action instanceof MenuItemAction) {
@@ -237,17 +236,15 @@ let DirtyDiffWidget = class DirtyDiffWidget extends PeekViewWidget {
         let detail;
         if (!this.shouldUseDropdown()) {
             detail = this.model.changes.length > 1
-                ? ( localizeWithPath(
-                _moduleId,
-                0,
+                ? ( localize(
+                6329,
                 "{0} - {1} of {2} changes",
                 label,
                 providerIndex + 1,
                 providerChanges.length
             ))
-                : ( localizeWithPath(
-                _moduleId,
-                1,
+                : ( localize(
+                6330,
                 "{0} - {1} of {2} change",
                 label,
                 providerIndex + 1,
@@ -257,20 +254,8 @@ let DirtyDiffWidget = class DirtyDiffWidget extends PeekViewWidget {
         }
         else {
             detail = this.model.changes.length > 1
-                ? ( localizeWithPath(
-                _moduleId,
-                2,
-                "{0} of {1} changes",
-                providerIndex + 1,
-                providerChanges.length
-            ))
-                : ( localizeWithPath(
-                _moduleId,
-                3,
-                "{0} of {1} change",
-                providerIndex + 1,
-                providerChanges.length
-            ));
+                ? ( localize(6331, "{0} of {1} changes", providerIndex + 1, providerChanges.length))
+                : ( localize(6332, "{0} of {1} change", providerIndex + 1, providerChanges.length));
             this.dropdownContainer.style.display = 'inherit';
         }
         this.setTitle(this.title, detail);
@@ -328,7 +313,7 @@ let DirtyDiffWidget = class DirtyDiffWidget extends PeekViewWidget {
         this._actionbarWidget.clear();
         this._actionbarWidget.push(actions.reverse(), { label: false, icon: true });
         this._actionbarWidget.push([next, previous], { label: false, icon: true });
-        this._actionbarWidget.push(( (new Action('peekview.close', ( localizeWithPath(_moduleId, 4, "Close")), ThemeIcon.asClassName(Codicon.close), true, () => this.dispose()))), { label: false, icon: true });
+        this._actionbarWidget.push(( (new Action('peekview.close', ( localize(6333, "Close")), ThemeIcon.asClassName(Codicon.close), true, () => this.dispose()))), { label: false, icon: true });
     }
     _fillHead(container) {
         super._fillHead(container, true);
@@ -433,7 +418,7 @@ class ShowPreviousChangeAction extends EditorAction {
     constructor(outerEditor) {
         super({
             id: 'editor.action.dirtydiff.previous',
-            label: ( localizeWithPath(_moduleId, 5, "Show Previous Change")),
+            label: ( localize(6334, "Show Previous Change")),
             alias: 'Show Previous Change',
             precondition: ( (TextCompareEditorActiveContext.toNegated())),
             kbOpts: { kbExpr: EditorContextKeys.editorTextFocus, primary: KeyMod$1.Shift | KeyMod$1.Alt | KeyCode.F3, weight: KeybindingWeight.EditorContrib }
@@ -460,7 +445,7 @@ class ShowNextChangeAction extends EditorAction {
     constructor(outerEditor) {
         super({
             id: 'editor.action.dirtydiff.next',
-            label: ( localizeWithPath(_moduleId, 6, "Show Next Change")),
+            label: ( localize(6335, "Show Next Change")),
             alias: 'Show Next Change',
             precondition: ( (TextCompareEditorActiveContext.toNegated())),
             kbOpts: { kbExpr: EditorContextKeys.editorTextFocus, primary: KeyMod$1.Alt | KeyCode.F3, weight: KeybindingWeight.EditorContrib }
@@ -487,7 +472,7 @@ MenuRegistry.appendMenuItem(MenuId.MenubarGoMenu, {
     group: '7_change_nav',
     command: {
         id: 'editor.action.dirtydiff.next',
-        title: ( localizeWithPath(_moduleId, 7, "Next &&Change"))
+        title: ( localize(6336, "Next &&Change"))
     },
     order: 1
 });
@@ -495,7 +480,7 @@ MenuRegistry.appendMenuItem(MenuId.MenubarGoMenu, {
     group: '7_change_nav',
     command: {
         id: 'editor.action.dirtydiff.previous',
-        title: ( localizeWithPath(_moduleId, 8, "Previous &&Change"))
+        title: ( localize(6337, "Previous &&Change"))
     },
     order: 2
 });
@@ -503,7 +488,7 @@ class GotoPreviousChangeAction extends EditorAction {
     constructor() {
         super({
             id: 'workbench.action.editor.previousChange',
-            label: ( localizeWithPath(_moduleId, 9, "Go to Previous Change")),
+            label: ( localize(6338, "Go to Previous Change")),
             alias: 'Go to Previous Change',
             precondition: ( (TextCompareEditorActiveContext.toNegated())),
             kbOpts: { kbExpr: EditorContextKeys.editorTextFocus, primary: KeyMod$1.Shift | KeyMod$1.Alt | KeyCode.F5, weight: KeybindingWeight.EditorContrib }
@@ -537,7 +522,7 @@ class GotoNextChangeAction extends EditorAction {
     constructor() {
         super({
             id: 'workbench.action.editor.nextChange',
-            label: ( localizeWithPath(_moduleId, 10, "Go to Next Change")),
+            label: ( localize(6339, "Go to Next Change")),
             alias: 'Go to Next Change',
             precondition: ( (TextCompareEditorActiveContext.toNegated())),
             kbOpts: { kbExpr: EditorContextKeys.editorTextFocus, primary: KeyMod$1.Alt | KeyCode.F5, weight: KeybindingWeight.EditorContrib }
@@ -856,36 +841,20 @@ const editorGutterModifiedBackground = registerColor('editorGutter.modifiedBackg
     light: '#2090D3',
     hcDark: '#1B81A8',
     hcLight: '#2090D3'
-}, ( localizeWithPath(
-    _moduleId,
-    11,
-    "Editor gutter background color for lines that are modified."
-)));
+}, ( localize(6340, "Editor gutter background color for lines that are modified.")));
 const editorGutterAddedBackground = registerColor('editorGutter.addedBackground', {
     dark: '#487E02',
     light: '#48985D',
     hcDark: '#487E02',
     hcLight: '#48985D'
-}, ( localizeWithPath(_moduleId, 12, "Editor gutter background color for lines that are added.")));
-const editorGutterDeletedBackground = registerColor('editorGutter.deletedBackground', editorErrorForeground, ( localizeWithPath(
-    _moduleId,
-    13,
-    "Editor gutter background color for lines that are deleted."
-)));
-const minimapGutterModifiedBackground = registerColor('minimapGutter.modifiedBackground', editorGutterModifiedBackground, ( localizeWithPath(
-    _moduleId,
-    14,
-    "Minimap gutter background color for lines that are modified."
-)));
-const minimapGutterAddedBackground = registerColor('minimapGutter.addedBackground', editorGutterAddedBackground, ( localizeWithPath(_moduleId, 15, "Minimap gutter background color for lines that are added.")));
-const minimapGutterDeletedBackground = registerColor('minimapGutter.deletedBackground', editorGutterDeletedBackground, ( localizeWithPath(
-    _moduleId,
-    16,
-    "Minimap gutter background color for lines that are deleted."
-)));
-const overviewRulerModifiedForeground = registerColor('editorOverviewRuler.modifiedForeground', ( (transparent(editorGutterModifiedBackground, 0.6))), ( localizeWithPath(_moduleId, 17, 'Overview ruler marker color for modified content.')));
-const overviewRulerAddedForeground = registerColor('editorOverviewRuler.addedForeground', ( (transparent(editorGutterAddedBackground, 0.6))), ( localizeWithPath(_moduleId, 18, 'Overview ruler marker color for added content.')));
-const overviewRulerDeletedForeground = registerColor('editorOverviewRuler.deletedForeground', ( (transparent(editorGutterDeletedBackground, 0.6))), ( localizeWithPath(_moduleId, 19, 'Overview ruler marker color for deleted content.')));
+}, ( localize(6341, "Editor gutter background color for lines that are added.")));
+const editorGutterDeletedBackground = registerColor('editorGutter.deletedBackground', editorErrorForeground, ( localize(6342, "Editor gutter background color for lines that are deleted.")));
+const minimapGutterModifiedBackground = registerColor('minimapGutter.modifiedBackground', editorGutterModifiedBackground, ( localize(6343, "Minimap gutter background color for lines that are modified.")));
+const minimapGutterAddedBackground = registerColor('minimapGutter.addedBackground', editorGutterAddedBackground, ( localize(6344, "Minimap gutter background color for lines that are added.")));
+const minimapGutterDeletedBackground = registerColor('minimapGutter.deletedBackground', editorGutterDeletedBackground, ( localize(6345, "Minimap gutter background color for lines that are deleted.")));
+const overviewRulerModifiedForeground = registerColor('editorOverviewRuler.modifiedForeground', ( (transparent(editorGutterModifiedBackground, 0.6))), ( localize(6346, 'Overview ruler marker color for modified content.')));
+const overviewRulerAddedForeground = registerColor('editorOverviewRuler.addedForeground', ( (transparent(editorGutterAddedBackground, 0.6))), ( localize(6347, 'Overview ruler marker color for added content.')));
+const overviewRulerDeletedForeground = registerColor('editorOverviewRuler.deletedForeground', ( (transparent(editorGutterDeletedBackground, 0.6))), ( localize(6348, 'Overview ruler marker color for deleted content.')));
 let DirtyDiffDecorator = DirtyDiffDecorator_1 = class DirtyDiffDecorator extends Disposable {
     static createDecoration(className, tooltip, options) {
         const decorationOptions = {
@@ -920,7 +889,7 @@ let DirtyDiffDecorator = DirtyDiffDecorator_1 = class DirtyDiffDecorator extends
         const gutter = decorations === 'all' || decorations === 'gutter';
         const overview = decorations === 'all' || decorations === 'overview';
         const minimap = decorations === 'all' || decorations === 'minimap';
-        const diffAdded = ( localizeWithPath(_moduleId, 20, 'Added lines'));
+        const diffAdded = ( localize(6349, 'Added lines'));
         this.addedOptions = DirtyDiffDecorator_1.createDecoration('dirty-diff-added', diffAdded, {
             gutter,
             overview: { active: overview, color: overviewRulerAddedForeground },
@@ -933,7 +902,7 @@ let DirtyDiffDecorator = DirtyDiffDecorator_1 = class DirtyDiffDecorator extends
             minimap: { active: minimap, color: minimapGutterAddedBackground },
             isWholeLine: true
         });
-        const diffModified = ( localizeWithPath(_moduleId, 21, 'Changed lines'));
+        const diffModified = ( localize(6350, 'Changed lines'));
         this.modifiedOptions = DirtyDiffDecorator_1.createDecoration('dirty-diff-modified', diffModified, {
             gutter,
             overview: { active: overview, color: overviewRulerModifiedForeground },
@@ -946,7 +915,7 @@ let DirtyDiffDecorator = DirtyDiffDecorator_1 = class DirtyDiffDecorator extends
             minimap: { active: minimap, color: minimapGutterModifiedBackground },
             isWholeLine: true
         });
-        this.deletedOptions = DirtyDiffDecorator_1.createDecoration('dirty-diff-deleted', ( localizeWithPath(_moduleId, 22, 'Removed lines')), {
+        this.deletedOptions = DirtyDiffDecorator_1.createDecoration('dirty-diff-deleted', ( localize(6351, 'Removed lines')), {
             gutter,
             overview: { active: overview, color: overviewRulerDeletedForeground },
             minimap: { active: minimap, color: minimapGutterDeletedBackground },

package/vscode/src/vs/workbench/contrib/search/browser/anythingQuickAccess.js

@@ -20,7 +20,7 @@ import { ILabelService } from '../../../../platform/label/common/label.service.j
 import { getIconClasses } from '../../../../editor/common/services/getIconClasses.js';
 import { IModelService } from '../../../../editor/common/services/model.js';
 import { ILanguageService } from '../../../../editor/common/languages/language.js';
-import { localizeWithPath } from '../../../../nls.js';
+import { localize } from '../../../../nls.js';
 import { IWorkingCopyService } from '../../../services/workingCopy/common/workingCopyService.service.js';
 import { IConfigurationService } from '../../../../platform/configuration/common/configuration.service.js';
 import { isEditorInput, EditorResourceAccessor } from '../../../common/editor.js';
@@ -53,7 +53,6 @@ import { IQuickChatService } from '../../chat/browser/chat.service.js';
 import { ILogService } from '../../../../platform/log/common/log.service.js';
 import { ICustomEditorLabelService } from '../../../services/editor/common/customEditorLabelService.service.js';
 var AnythingQuickAccessProvider_1;
-const _moduleId = "vs/workbench/contrib/search/browser/anythingQuickAccess";
 function isEditorSymbolQuickPickItem(pick) {
     const candidate = pick;
     return !!candidate?.range && !!candidate.resource;
@@ -62,7 +61,7 @@ let AnythingQuickAccessProvider = class AnythingQuickAccessProvider extends Pick
     static { AnythingQuickAccessProvider_1 = this; }
     static { this.PREFIX = ''; }
     static { this.NO_RESULTS_PICK = {
-        label: ( localizeWithPath(_moduleId, 0, "No matching results"))
+        label: ( localize(8281, "No matching results"))
     }; }
     static { this.MAX_RESULTS = 512; }
     static { this.TYPING_SEARCH_DELAY = 200; }
@@ -258,7 +257,7 @@ let AnythingQuickAccessProvider = class AnythingQuickAccessProvider extends Pick
         }
         if (this.pickState.isQuickNavigating) {
             if (picks.length > 0) {
-                picks.push({ type: 'separator', label: ( localizeWithPath(_moduleId, 1, "recently opened")) });
+                picks.push({ type: 'separator', label: ( localize(8282, "recently opened")) });
             }
             picks = historyEditorPicks;
         }
@@ -267,7 +266,7 @@ let AnythingQuickAccessProvider = class AnythingQuickAccessProvider extends Pick
                 picks.push(...this.getHelpPicks(query, token, options));
             }
             if (historyEditorPicks.length !== 0) {
-                picks.push({ type: 'separator', label: ( localizeWithPath(_moduleId, 1, "recently opened")) });
+                picks.push({ type: 'separator', label: ( localize(8282, "recently opened")) });
                 picks.push(...historyEditorPicks);
             }
         }
@@ -288,7 +287,7 @@ let AnythingQuickAccessProvider = class AnythingQuickAccessProvider extends Pick
                     return [];
                 }
                 return additionalPicks.length > 0 ? [
-                    { type: 'separator', label: this.configuration.includeSymbols ? ( localizeWithPath(_moduleId, 2, "file and symbol results")) : ( localizeWithPath(_moduleId, 3, "file results")) },
+                    { type: 'separator', label: this.configuration.includeSymbols ? ( localize(8283, "file and symbol results")) : ( localize(8284, "file results")) },
                     ...additionalPicks
                 ] : [];
             })(),
@@ -547,7 +546,7 @@ let AnythingQuickAccessProvider = class AnythingQuickAccessProvider extends Pick
                 description: helpEntry.prefix ?? provider.prefix,
                 commandCenterOrder: helpEntry.commandCenterOrder,
                 keybinding: helpEntry.commandId ? this.keybindingService.lookupKeybinding(helpEntry.commandId) : undefined,
-                ariaLabel: ( localizeWithPath(_moduleId, 4, "{0}, {1}", label, helpEntry.description)),
+                ariaLabel: ( localize(8285, "{0}, {1}", label, helpEntry.description)),
                 accept: () => {
                     this.quickInputService.quickAccess.show(provider.prefix, {
                         preserveValue: true,
@@ -558,7 +557,7 @@ let AnythingQuickAccessProvider = class AnythingQuickAccessProvider extends Pick
         }))));
         if (this.quickChatService.enabled) {
             providers.push({
-                label: ( localizeWithPath(_moduleId, 5, "Open Quick Chat")),
+                label: ( localize(8286, "Open Quick Chat")),
                 commandCenterOrder: 30,
                 keybinding: this.keybindingService.lookupKeybinding(ASK_QUICK_QUESTION_ACTION_ID),
                 accept: () => this.quickChatService.toggle()
@@ -689,13 +688,13 @@ let AnythingQuickAccessProvider = class AnythingQuickAccessProvider extends Pick
             buttons.push({
                 iconClass: openSideBySideDirection === 'right' ? ThemeIcon.asClassName(Codicon.splitHorizontal) : ThemeIcon.asClassName(Codicon.splitVertical),
                 tooltip: openSideBySideDirection === 'right' ?
-                    ( localizeWithPath(_moduleId, 6, "Open to the Side")) :
-                    ( localizeWithPath(_moduleId, 7, "Open to the Bottom"))
+                    ( localize(8287, "Open to the Side")) :
+                    ( localize(8288, "Open to the Bottom"))
             });
             if (isEditorHistoryEntry) {
                 buttons.push({
                     iconClass: isDirty ? ('dirty-anything ' + ThemeIcon.asClassName(Codicon.circleFilled)) : ThemeIcon.asClassName(Codicon.close),
-                    tooltip: ( localizeWithPath(_moduleId, 8, "Remove from Recently Opened")),
+                    tooltip: ( localize(8289, "Remove from Recently Opened")),
                     alwaysVisible: isDirty
                 });
             }
@@ -704,7 +703,7 @@ let AnythingQuickAccessProvider = class AnythingQuickAccessProvider extends Pick
         return {
             resource,
             label,
-            ariaLabel: isDirty ? ( localizeWithPath(_moduleId, 9, "{0} unsaved changes", labelAndDescription)) : labelAndDescription,
+            ariaLabel: isDirty ? ( localize(8290, "{0} unsaved changes", labelAndDescription)) : labelAndDescription,
             description,
             get iconClasses() { return iconClassesValue.value; },
             get buttons() { return buttonsValue.value; },

package/vscode/src/vs/workbench/contrib/search/browser/searchActionsBase.js

@@ -1,9 +1,8 @@
 import { isAncestorOfActiveElement } from '../../../../base/browser/dom.js';
-import { localize2WithPath } from '../../../../nls.js';
+import { localize2 } from '../../../../nls.js';
 import { searchComparer, FileMatch, Match, FolderMatch } from './searchModel.js';
 import { VIEW_ID } from '../../../services/search/common/search.js';
-const _moduleId = "vs/workbench/contrib/search/browser/searchActionsBase";
-const category = ( localize2WithPath(_moduleId, 0, "Search"));
+const category = ( localize2(8428, "Search"));
 function isSearchViewFocused(viewsService) {
     const searchView = getSearchView(viewsService);
     return !!(searchView && isAncestorOfActiveElement(searchView.getContainer()));

package/vscode/src/vs/workbench/contrib/search/browser/searchActionsFind.js

@@ -1,5 +1,5 @@
 import { dirname } from '../../../../base/common/resources.js';
-import { localize2WithPath, localizeWithPath } from '../../../../nls.js';
+import { localize2, localize } from '../../../../nls.js';
 import { ICommandService } from '../../../../platform/commands/common/commands.service.js';
 import { IConfigurationService } from '../../../../platform/configuration/common/configuration.service.js';
 import { IListService } from '../../../../platform/list/browser/listService.service.js';
@@ -8,7 +8,6 @@ import { IViewsService } from '../../../services/views/common/viewsService.servi
 import { SearchCommandIds, SearchContext } from '../common/constants.js';
 import { OpenEditorCommandId } from '../../searchEditor/browser/constants.js';
 import { FileMatch, Match } from './searchModel.js';
-import { IEditorService } from '../../../services/editor/common/editorService.service.js';
 import { ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
 import { registerAction2, Action2, MenuId } from '../../../../platform/actions/common/actions.js';
 import { KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
@@ -26,12 +25,12 @@ import { IConfigurationResolverService } from '../../../services/configurationRe
 import { IHistoryService } from '../../../services/history/common/history.service.js';
 import { Schemas } from '../../../../base/common/network.js';
 import { IEditorGroupsService } from '../../../services/editor/common/editorGroupsService.service.js';
-const _moduleId = "vs/workbench/contrib/search/browser/searchActionsFind";
+import { IEditorService } from '../../../services/editor/common/editorService.service.js';
 registerAction2(class RestrictSearchToFolderAction extends Action2 {
     constructor() {
         super({
             id: SearchCommandIds.RestrictSearchToFolderId,
-            title: ( localize2WithPath(_moduleId, 0, "Restrict Search to Folder")),
+            title: ( localize2(8380, "Restrict Search to Folder")),
             category,
             keybinding: {
                 weight: KeybindingWeight.WorkbenchContrib,
@@ -56,7 +55,7 @@ registerAction2(class ExpandSelectedTreeCommandAction extends Action2 {
     constructor() {
         super({
             id: SearchCommandIds.ExpandRecursivelyCommandId,
-            title: ( localizeWithPath(_moduleId, 1, "Expand Recursively")),
+            title: ( localize(8381, "Expand Recursively")),
             category,
             menu: [{
                     id: MenuId.SearchContext,
@@ -74,7 +73,7 @@ registerAction2(class ExcludeFolderFromSearchAction extends Action2 {
     constructor() {
         super({
             id: SearchCommandIds.ExcludeFolderFromSearchId,
-            title: ( localize2WithPath(_moduleId, 2, "Exclude Folder from Search")),
+            title: ( localize2(8382, "Exclude Folder from Search")),
             category,
             menu: [
                 {
@@ -94,7 +93,7 @@ registerAction2(class RevealInSideBarForSearchResultsAction extends Action2 {
     constructor() {
         super({
             id: SearchCommandIds.RevealInSideBarForSearchResults,
-            title: ( localize2WithPath(_moduleId, 3, "Reveal in Explorer View")),
+            title: ( localize2(8383, "Reveal in Explorer View")),
             category,
             menu: [{
                     id: MenuId.SearchContext,
@@ -141,14 +140,14 @@ registerAction2(class FindInFilesAction extends Action2 {
         super({
             id: SearchCommandIds.FindInFilesActionId,
             title: {
-                ...( localize2WithPath(_moduleId, 4, "Find in Files")),
-                mnemonicTitle: ( localizeWithPath(_moduleId, 5, "Find &&in Files")),
+                ...( localize2(8384, "Find in Files")),
+                mnemonicTitle: ( localize(8385, "Find &&in Files")),
             },
             metadata: {
-                description: ( localizeWithPath(_moduleId, 6, "Open a workspace search")),
+                description: ( localize(8386, "Open a workspace search")),
                 args: [
                     {
-                        name: ( localizeWithPath(_moduleId, 7, "A set of options for the search")),
+                        name: ( localize(8387, "A set of options for the search")),
                         schema: {
                             type: 'object',
                             properties: {
@@ -190,7 +189,7 @@ registerAction2(class FindInFolderAction extends Action2 {
     constructor() {
         super({
             id: SearchCommandIds.FindInFolderId,
-            title: ( localize2WithPath(_moduleId, 8, "Find in Folder...")),
+            title: ( localize2(8388, "Find in Folder...")),
             category,
             keybinding: {
                 weight: KeybindingWeight.WorkbenchContrib,
@@ -215,7 +214,7 @@ registerAction2(class FindInWorkspaceAction extends Action2 {
     constructor() {
         super({
             id: SearchCommandIds.FindInWorkspaceId,
-            title: ( localize2WithPath(_moduleId, 9, "Find in Workspace...")),
+            title: ( localize2(8389, "Find in Workspace...")),
             category,
             menu: [
                 {
@@ -252,7 +251,6 @@ function expandSelectSubtree(accessor) {
     }
 }
 async function searchWithFolderCommand(accessor, isFromExplorer, isIncludes, resource, folderMatch) {
-    const listService = accessor.get(IListService);
     const fileService = accessor.get(IFileService);
     const viewsService = accessor.get(IViewsService);
     const contextService = accessor.get(IWorkspaceContextService);
@@ -261,10 +259,10 @@ async function searchWithFolderCommand(accessor, isFromExplorer, isIncludes, res
     const mode = searchConfig.mode;
     let resources;
     if (isFromExplorer) {
-        resources = getMultiSelectedResources(resource, listService, accessor.get(IEditorService), accessor.get(IEditorGroupsService), accessor.get(IExplorerService));
+        resources = getMultiSelectedResources(resource, accessor.get(IListService), accessor.get(IEditorService), accessor.get(IEditorGroupsService), accessor.get(IExplorerService));
     }
     else {
-        const searchView = getSearchView(accessor.get(IViewsService));
+        const searchView = getSearchView(viewsService);
         if (!searchView) {
             return;
         }

package/vscode/src/vs/workbench/contrib/search/browser/searchModel.js

@@ -45,7 +45,7 @@ import { isINotebookFileMatchWithModel, contentMatchesToTextSearchMatches, webvi
 import { INotebookSearchService } from '../common/notebookSearch.service.js';
 import { isINotebookFileMatchNoModel, rawCellPrefix } from '../common/searchNotebookHelpers.js';
 import { ReplacePattern } from '../../../services/search/common/replace.js';
-import { OneLineRange, resultIsMatch, DEFAULT_MAX_SEARCH_RESULTS, SearchSortOrder, QueryType, SearchCompletionExitCode } from '../../../services/search/common/search.js';
+import { resultIsMatch, DEFAULT_MAX_SEARCH_RESULTS, OneLineRange, SearchSortOrder, QueryType, SearchCompletionExitCode } from '../../../services/search/common/search.js';
 import { ISearchService } from '../../../services/search/common/search.service.js';
 import { editorMatchesToTextSearchResults, getTextSearchMatchWithModelContext } from '../../../services/search/common/searchHelpers.js';
 import { CellSearchModel } from '../common/cellSearchModel.js';

package/vscode/src/vs/workbench/contrib/search/browser/symbolsQuickAccess.js

@@ -1,5 +1,5 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import { localizeWithPath } from '../../../../nls.js';
+import { localize } from '../../../../nls.js';
 import { PickerQuickAccessProvider, TriggerAction } from '../../../../platform/quickinput/browser/pickerQuickAccess.js';
 import { ThrottledDelayer } from '../../../../base/common/async.js';
 import { getWorkspaceSymbols } from '../common/search.js';
@@ -17,7 +17,6 @@ import { prepareQuery, pieceToQuery, scoreFuzzy2 } from '../../../../base/common
 import { Codicon } from '../../../../base/common/codicons.js';
 import { ThemeIcon } from '../../../../base/common/themables.js';
 var SymbolsQuickAccessProvider_1;
-const _moduleId = "vs/workbench/contrib/search/browser/symbolsQuickAccess";
 let SymbolsQuickAccessProvider = class SymbolsQuickAccessProvider extends PickerQuickAccessProvider {
     static { SymbolsQuickAccessProvider_1 = this; }
     static { this.PREFIX = '#'; }
@@ -42,7 +41,7 @@ let SymbolsQuickAccessProvider = class SymbolsQuickAccessProvider extends Picker
         super(SymbolsQuickAccessProvider_1.PREFIX, {
             canAcceptInBackground: true,
             noResultsPick: {
-                label: ( localizeWithPath(_moduleId, 0, "No matching workspace symbols"))
+                label: ( localize(8374, "No matching workspace symbols"))
             }
         });
         this.labelService = labelService;
@@ -150,7 +149,7 @@ let SymbolsQuickAccessProvider = class SymbolsQuickAccessProvider extends Picker
                 buttons: [
                     {
                         iconClass: openSideBySideDirection === 'right' ? ThemeIcon.asClassName(Codicon.splitHorizontal) : ThemeIcon.asClassName(Codicon.splitVertical),
-                        tooltip: openSideBySideDirection === 'right' ? ( localizeWithPath(_moduleId, 1, "Open to the Side")) : ( localizeWithPath(_moduleId, 2, "Open to the Bottom"))
+                        tooltip: openSideBySideDirection === 'right' ? ( localize(8375, "Open to the Side")) : ( localize(8376, "Open to the Bottom"))
                     }
                 ],
                 trigger: (buttonIndex, keyMods) => {

package/vscode/src/vs/workbench/contrib/snippets/browser/commands/abstractSnippetsActions.js

@@ -1,9 +1,8 @@
 import { EditorAction2 } from '../../../../../editor/browser/editorExtensions.js';
-import { localize2WithPath } from '../../../../../nls.js';
+import { localize2 } from '../../../../../nls.js';
 import { Action2 } from '../../../../../platform/actions/common/actions.js';
-const _moduleId = "vs/workbench/contrib/snippets/browser/commands/abstractSnippetsActions";
 const defaultOptions = {
-    category: ( localize2WithPath(_moduleId, 0, "Snippets")),
+    category: ( localize2(10532, "Snippets")),
 };
 class SnippetsAction extends Action2 {
     constructor(desc) {

package/vscode/src/vs/workbench/contrib/snippets/browser/commands/fileTemplateSnippets.js

@@ -3,18 +3,17 @@ import { compare } from '../../../../../base/common/strings.js';
 import { getCodeEditor } from '../../../../../editor/browser/editorBrowser.js';
 import { ILanguageService } from '../../../../../editor/common/languages/language.js';
 import { SnippetController2 } from '../../../../../editor/contrib/snippet/browser/snippetController2.js';
-import { localize2WithPath, localizeWithPath } from '../../../../../nls.js';
+import { localize2, localize } from '../../../../../nls.js';
 import { IQuickInputService } from '../../../../../platform/quickinput/common/quickInput.service.js';
 import { SnippetsAction } from './abstractSnippetsActions.js';
 import { ISnippetsService } from '../snippets.service.js';
 import { IEditorService } from '../../../../services/editor/common/editorService.service.js';
-const _moduleId = "vs/workbench/contrib/snippets/browser/commands/fileTemplateSnippets";
 class ApplyFileSnippetAction extends SnippetsAction {
     static { this.Id = 'workbench.action.populateFileFromSnippet'; }
     constructor() {
         super({
             id: ApplyFileSnippetAction.Id,
-            title: ( localize2WithPath(_moduleId, 0, "Fill File with Snippet")),
+            title: ( localize2(6761, "Fill File with Snippet")),
             f1: true,
         });
     }
@@ -76,7 +75,7 @@ class ApplyFileSnippetAction extends SnippetsAction {
             }
         }
         const pick = await quickInputService.pick(picks, {
-            placeHolder: ( localizeWithPath(_moduleId, 1, 'Select a snippet')),
+            placeHolder: ( localize(6762, 'Select a snippet')),
             matchOnDetail: true,
         });
         return pick?.snippet;

package/vscode/src/vs/workbench/contrib/snippets/browser/snippetCompletionProvider.js

@@ -6,14 +6,13 @@ import { Range } from '../../../../editor/common/core/range.js';
 import { CompletionItemKind, CompletionItemInsertTextRule, CompletionTriggerKind } from '../../../../editor/common/languages.js';
 import { ILanguageService } from '../../../../editor/common/languages/language.js';
 import { SnippetParser } from '../../../../editor/contrib/snippet/browser/snippetParser.js';
-import { localizeWithPath } from '../../../../nls.js';
+import { localize } from '../../../../nls.js';
 import { ISnippetsService } from './snippets.service.js';
 import { Snippet, SnippetSource } from './snippetsFile.js';
 import { isPatternInWord } from '../../../../base/common/filters.js';
 import { StopWatch } from '../../../../base/common/stopwatch.js';
 import { ILanguageConfigurationService } from '../../../../editor/common/languages/languageConfigurationRegistry.js';
 import { CommandsRegistry } from '../../../../platform/commands/common/commands.js';
-const _moduleId = "vs/workbench/contrib/snippets/browser/snippetCompletionProvider";
 const markSnippetAsUsed = '_snippet.markAsUsed';
 CommandsRegistry.registerCommand(markSnippetAsUsed, (accessor, ...args) => {
     const snippetsService = accessor.get(ISnippetsService);
@@ -26,13 +25,7 @@ class SnippetCompletion {
     constructor(snippet, range) {
         this.snippet = snippet;
         this.label = { label: snippet.prefix, description: snippet.name };
-        this.detail = ( localizeWithPath(
-            _moduleId,
-            0,
-            "{0} ({1})",
-            snippet.description || snippet.name,
-            snippet.source
-        ));
+        this.detail = ( localize(6742, "{0} ({1})", snippet.description || snippet.name, snippet.source));
         this.insertText = snippet.codeSnippet;
         this.extensionId = snippet.extensionId;
         this.range = range;
@@ -125,22 +118,15 @@ let SnippetCompletionProvider = class SnippetCompletionProvider {
             const item = suggestions[i];
             let to = i + 1;
             for (; to < suggestions.length && item.label === suggestions[to].label; to++) {
-                suggestions[to].label.label = ( localizeWithPath(
-                    _moduleId,
-                    1,
+                suggestions[to].label.label = ( localize(
+                    6743,
                     "{0}, {1}",
                     suggestions[to].label.label,
                     suggestions[to].snippet.name
                 ));
             }
             if (to > i + 1) {
-                suggestions[i].label.label = ( localizeWithPath(
-                    _moduleId,
-                    1,
-                    "{0}, {1}",
-                    suggestions[i].label.label,
-                    suggestions[i].snippet.name
-                ));
+                suggestions[i].label.label = ( localize(6743, "{0}, {1}", suggestions[i].label.label, suggestions[i].snippet.name));
                 i = to;
             }
         }

package/vscode/src/vs/workbench/contrib/snippets/browser/snippetsFile.js

@@ -1,5 +1,5 @@
 import { parse, getNodeType } from '../../../../base/common/json.js';
-import { localizeWithPath } from '../../../../nls.js';
+import { localize } from '../../../../nls.js';
 import { extname, basename } from '../../../../base/common/path.js';
 import { SnippetParser, Placeholder, Variable, Text } from '../../../../editor/contrib/snippet/browser/snippetParser.js';
 import { KnownSnippetVariableNames } from '../../../../editor/contrib/snippet/browser/snippetVariables.js';
@@ -8,7 +8,6 @@ import { isObject } from '../../../../base/common/types.js';
 import { tail } from '../../../../base/common/arrays.js';
 import { Iterable } from '../../../../base/common/iterator.js';
 import { WindowIdleValue, getActiveWindow } from '../../../../base/browser/dom.js';
-const _moduleId = "vs/workbench/contrib/snippets/browser/snippetsFile";
 class SnippetBodyInsights {
     constructor(body) {
         this.isBogous = false;
@@ -212,14 +211,14 @@ class SnippetFile {
             source = this._extension.displayName || this._extension.name;
         }
         else if (this.source === SnippetSource.Workspace) {
-            source = ( localizeWithPath(_moduleId, 0, "Workspace Snippet"));
+            source = ( localize(6739, "Workspace Snippet"));
         }
         else {
             if (this.isGlobalSnippets) {
-                source = ( localizeWithPath(_moduleId, 1, "Global User Snippet"));
+                source = ( localize(6740, "Global User Snippet"));
             }
             else {
-                source = ( localizeWithPath(_moduleId, 2, "User Snippet"));
+                source = ( localize(6741, "User Snippet"));
             }
         }
         for (const _prefix of Iterable.wrap(prefix)) {