@codingame/monaco-vscode-api 2.2.2 → 3.0.0

package/vscode/src/vs/workbench/contrib/remote/browser/remoteExplorer.js

@@ -1,6 +1,6 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import { localizeWithPath } from '../../../../nls.js';
-import { Disposable } from '../../../../base/common/lifecycle.js';
+import { localizeWithPath, localize2WithPath } from '../../../../nls.js';
+import { Disposable, MutableDisposable } from '../../../../base/common/lifecycle.js';
 import { Extensions } from '../../../common/views.js';
 import { TUNNEL_VIEW_ID, TUNNEL_VIEW_CONTAINER_ID, PORT_AUTO_SOURCE_SETTING, PORT_AUTO_FALLBACK_SETTING, PORT_AUTO_SOURCE_SETTING_PROCESS, PORT_AUTO_SOURCE_SETTING_HYBRID, PORT_AUTO_SOURCE_SETTING_OUTPUT, PORT_AUTO_FORWARD_SETTING, IRemoteExplorerService } from '../../../services/remote/common/remoteExplorerService.js';
 import { OnPortForward, mapHasAddressLocalhostOrAllInterfaces, TunnelCloseReason, AutoTunnelSource, forwardedPortsViewEnabled, TunnelSource, makeAddress } from '../../../services/remote/common/tunnelModel.js';
@@ -41,6 +41,8 @@ let ForwardedPortsView = class ForwardedPortsView extends Disposable {
         this.tunnelService = tunnelService;
         this.activityService = activityService;
         this.statusbarService = statusbarService;
+        this.contextKeyListener = this._register(( new MutableDisposable()));
+        this.activityBadge = this._register(( new MutableDisposable()));
         this._register(( Registry.as(Extensions.ViewsRegistry)).registerViewWelcomeContent(TUNNEL_VIEW_ID, {
             content: this.environmentService.remoteAuthority ? ( localizeWithPath(
                 'vs/workbench/contrib/remote/browser/remoteExplorer',
@@ -61,7 +63,7 @@ let ForwardedPortsView = class ForwardedPortsView extends Disposable {
     async getViewContainer() {
         return ( Registry.as(Extensions.ViewContainersRegistry)).registerViewContainer({
             id: TUNNEL_VIEW_CONTAINER_ID,
-            title: { value: ( localizeWithPath('vs/workbench/contrib/remote/browser/remoteExplorer', 'ports', "Ports")), original: 'Ports' },
+            title: ( localize2WithPath('vs/workbench/contrib/remote/browser/remoteExplorer', 'ports', "Ports")),
             icon: portsViewIcon,
             ctorDescriptor: ( new SyncDescriptor(
                 ViewPaneContainer,
@@ -73,10 +75,7 @@ let ForwardedPortsView = class ForwardedPortsView extends Disposable {
         }, 1 );
     }
     async enableForwardedPortsView() {
-        if (this.contextKeyListener) {
-            this.contextKeyListener.dispose();
-            this.contextKeyListener = undefined;
-        }
+        this.contextKeyListener.clear();
         const viewEnabled = !!forwardedPortsViewEnabled.getValue(this.contextKeyService);
         if (viewEnabled) {
             const viewContainer = await this.getViewContainer();
@@ -88,7 +87,7 @@ let ForwardedPortsView = class ForwardedPortsView extends Disposable {
             }
         }
         else {
-            this.contextKeyListener = this.contextKeyService.onDidChangeContext(e => {
+            this.contextKeyListener.value = this.contextKeyService.onDidChangeContext(e => {
                 if (e.affectsSome(( new Set(( forwardedPortsViewEnabled.keys()))))) {
                     this.enableForwardedPortsView();
                 }
@@ -113,9 +112,8 @@ let ForwardedPortsView = class ForwardedPortsView extends Disposable {
         });
     }
     async updateActivityBadge() {
-        this._activityBadge?.dispose();
         if (this.remoteExplorerService.tunnelModel.forwarded.size > 0) {
-            this._activityBadge = this.activityService.showViewActivity(TUNNEL_VIEW_ID, {
+            this.activityBadge.value = this.activityService.showViewActivity(TUNNEL_VIEW_ID, {
                 badge: ( new NumberBadge(
                     this.remoteExplorerService.tunnelModel.forwarded.size,
                     n => n === 1 ? ( localizeWithPath(

package/vscode/src/vs/workbench/contrib/remote/browser/tunnelView.js

@@ -41,11 +41,11 @@ import { WorkbenchTable } from '../../../../platform/list/browser/listService.js
 import { Button } from '../../../../base/browser/ui/button/button.js';
 import { registerColor } from '../../../../platform/theme/common/colorRegistry.js';
 import { MarkdownString } from '../../../../base/common/htmlContent.js';
-import { IHoverService } from '../../../../platform/hover/browser/hover.js';
 import { STATUS_BAR_REMOTE_ITEM_BACKGROUND } from '../../../common/theme.js';
 import { Codicon } from '../../../../base/common/codicons.js';
 import { defaultButtonStyles, defaultInputBoxStyles } from '../../../../platform/theme/browser/defaultStyles.js';
 import { makeAddress, forwardedPortsViewEnabled, parseAddress, TunnelCloseReason, mapHasAddressLocalhostOrAllInterfaces, TunnelSource } from '../../../services/remote/common/tunnelModel.js';
+import { getDefaultHoverDelegate } from '../../../../base/browser/ui/hover/hoverDelegate.js';
 var TunnelPanel_1;
 const openPreviewEnabledContext = ( new RawContextKey('openPreviewEnabled', false));
 class TunnelTreeVirtualDelegate {
@@ -356,7 +356,7 @@ class PrivacyColumn {
     }
 }
 let ActionBarRenderer = class ActionBarRenderer extends Disposable {
-    constructor(instantiationService, contextKeyService, menuService, contextViewService, remoteExplorerService, commandService, configurationService, hoverService) {
+    constructor(instantiationService, contextKeyService, menuService, contextViewService, remoteExplorerService, commandService, configurationService) {
         super();
         this.instantiationService = instantiationService;
         this.contextKeyService = contextKeyService;
@@ -365,8 +365,8 @@ let ActionBarRenderer = class ActionBarRenderer extends Disposable {
         this.remoteExplorerService = remoteExplorerService;
         this.commandService = commandService;
         this.configurationService = configurationService;
-        this.hoverService = hoverService;
         this.templateId = 'actionbar';
+        this._hoverDelegate = this._register(getDefaultHoverDelegate('mouse', true));
     }
     set actionRunner(actionRunner) {
         this._actionRunner = actionRunner;
@@ -376,14 +376,12 @@ let ActionBarRenderer = class ActionBarRenderer extends Disposable {
         const icon = append(cell, $('.ports-view-actionbar-cell-icon'));
         const label = ( new IconLabel(cell, {
             supportHighlights: true,
-            hoverDelegate: {
-                showHover: (options) => this.hoverService.showHover(options),
-                delay: this.configurationService.getValue('workbench.hover.delay')
-            }
+            hoverDelegate: this._hoverDelegate
         }));
         const actionsContainer = append(cell, $('.actions'));
         const actionBar = ( new ActionBar(actionsContainer, {
-            actionViewItemProvider: createActionViewItem.bind(undefined, this.instantiationService)
+            actionViewItemProvider: createActionViewItem.bind(undefined, this.instantiationService),
+            hoverDelegate: this._hoverDelegate
         }));
         return { label, icon, actionBar, container: cell, elementDisposable: Disposable.None };
     }
@@ -581,8 +579,7 @@ ActionBarRenderer = ( __decorate([
     ( __param(3, IContextViewService)),
     ( __param(4, IRemoteExplorerService)),
     ( __param(5, ICommandService)),
-    ( __param(6, IConfigurationService)),
-    ( __param(7, IHoverService))
+    ( __param(6, IConfigurationService))
 ], ActionBarRenderer));
 class TunnelItem {
     static createFromTunnel(remoteExplorerService, tunnelService, tunnel, type = TunnelType.Forwarded, closeable) {
@@ -787,7 +784,7 @@ let TunnelPanel = class TunnelPanel extends ViewPane {
     static { TunnelPanel_1 = this; }
     static { this.ID = TUNNEL_VIEW_ID; }
     static { this.TITLE = ( localize2WithPath('vs/workbench/contrib/remote/browser/tunnelView', 'remote.tunnel', "Ports")); }
-    constructor(viewModel, options, keybindingService, contextMenuService, contextKeyService, configurationService, instantiationService, viewDescriptorService, openerService, quickInputService, commandService, menuService, themeService, remoteExplorerService, telemetryService, tunnelService, contextViewService, hoverService) {
+    constructor(viewModel, options, keybindingService, contextMenuService, contextKeyService, configurationService, instantiationService, viewDescriptorService, openerService, quickInputService, commandService, menuService, themeService, remoteExplorerService, telemetryService, tunnelService, contextViewService) {
         super(options, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, telemetryService);
         this.viewModel = viewModel;
         this.quickInputService = quickInputService;
@@ -796,7 +793,6 @@ let TunnelPanel = class TunnelPanel extends ViewPane {
         this.remoteExplorerService = remoteExplorerService;
         this.tunnelService = tunnelService;
         this.contextViewService = contextViewService;
-        this.hoverService = hoverService;
         this.tableDisposables = this._register(( new DisposableStore()));
         this.isEditing = false;
         this.titleActions = [];
@@ -879,8 +875,7 @@ let TunnelPanel = class TunnelPanel extends ViewPane {
             this.contextViewService,
             this.remoteExplorerService,
             this.commandService,
-            this.configurationService,
-            this.hoverService
+            this.configurationService
         ));
         const columns = [( new IconColumn()), ( new PortColumn()), ( new LocalAddressColumn()), ( new RunningProcessColumn())];
         if (this.tunnelService.canChangePrivacy) {
@@ -1099,8 +1094,7 @@ TunnelPanel = TunnelPanel_1 = ( __decorate([
     ( __param(13, IRemoteExplorerService)),
     ( __param(14, ITelemetryService)),
     ( __param(15, ITunnelService)),
-    ( __param(16, IContextViewService)),
-    ( __param(17, IHoverService))
+    ( __param(16, IContextViewService))
 ], TunnelPanel));
 class TunnelPanelDescriptor {
     constructor(viewModel, environmentService) {
@@ -1198,11 +1192,11 @@ var ForwardPortAction;
 ( (function(ForwardPortAction) {
     ForwardPortAction.INLINE_ID = 'remote.tunnel.forwardInline';
     ForwardPortAction.COMMANDPALETTE_ID = 'remote.tunnel.forwardCommandPalette';
-    ForwardPortAction.LABEL = { value: ( localizeWithPath(
+    ForwardPortAction.LABEL = ( localize2WithPath(
         'vs/workbench/contrib/remote/browser/tunnelView',
         'remote.tunnel.forward',
         "Forward a Port"
-    )), original: 'Forward a Port' };
+    ));
     ForwardPortAction.TREEITEM_LABEL = ( localizeWithPath(
         'vs/workbench/contrib/remote/browser/tunnelView',
         'remote.tunnel.forwardItem',
@@ -1320,11 +1314,11 @@ var ClosePortAction;
 ( (function(ClosePortAction) {
     ClosePortAction.INLINE_ID = 'remote.tunnel.closeInline';
     ClosePortAction.COMMANDPALETTE_ID = 'remote.tunnel.closeCommandPalette';
-    ClosePortAction.LABEL = { value: ( localizeWithPath(
+    ClosePortAction.LABEL = ( localize2WithPath(
         'vs/workbench/contrib/remote/browser/tunnelView',
         'remote.tunnel.close',
         "Stop Forwarding Port"
-    )), original: 'Stop Forwarding Port' };
+    ));
     function inlineHandler() {
         return async (accessor, arg) => {
             const contextKeyService = accessor.get(IContextKeyService);

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

@@ -40,7 +40,7 @@ import { IProgressService } from '../../../../platform/progress/common/progress.
 import { Color } from '../../../../base/common/color.js';
 import { ResourceMap } from '../../../../base/common/map.js';
 import { IEditorService } from '../../../services/editor/common/editorService.js';
-import { IAudioCueService, AudioCue } from '../../../../platform/audioCues/browser/audioCueService.js';
+import { IAccessibilitySignalService, AccessibilitySignal } from '../../../../platform/accessibilitySignal/browser/accessibilitySignalService.js';
 import { IAccessibilityService } from '../../../../platform/accessibility/common/accessibility.js';
 import { IQuickDiffService } from '../common/quickDiff.js';
 import { SwitchQuickDiffViewItem, SwitchQuickDiffBaseAction } from './dirtyDiffSwitcher.js';
@@ -186,7 +186,7 @@ let DirtyDiffWidget = class DirtyDiffWidget extends PeekViewWidget {
         this.diffEditor.setModel(diffEditorModel);
         this.dropdown?.setSelection(labeledChange.label);
         const position = ( new Position(getModifiedEndLineNumber(change), 1));
-        const lineHeight = this.editor.getOption(66 );
+        const lineHeight = this.editor.getOption(67 );
         const editorHeight = this.editor.getLayoutInfo().height;
         const editorHeightInLines = Math.floor(editorHeight / lineHeight);
         const height = Math.min(getChangeHeight(change) +  8, Math.floor(editorHeightInLines / 3));
@@ -207,9 +207,9 @@ let DirtyDiffWidget = class DirtyDiffWidget extends PeekViewWidget {
         this._actionbarWidget.context = [diffEditorModel.modified.uri, providerSpecificChanges, contextIndex];
         if (usePosition) {
             this.show(position, height);
+            this.editor.setPosition(position);
+            this.editor.focus();
         }
-        this.editor.setPosition(position);
-        this.editor.focus();
     }
     renderTitle(label) {
         const providerChanges = this.model.mapChanges.get(label);
@@ -515,7 +515,7 @@ class GotoPreviousChangeAction extends EditorAction {
     }
     async run(accessor) {
         const outerEditor = getOuterEditorFromDiffEditor(accessor);
-        const audioCueService = accessor.get(IAudioCueService);
+        const accessibilitySignalService = accessor.get(IAccessibilitySignalService);
         const accessibilityService = accessor.get(IAccessibilityService);
         const codeEditorService = accessor.get(ICodeEditorService);
         if (!outerEditor || !outerEditor.hasModel()) {
@@ -532,7 +532,7 @@ class GotoPreviousChangeAction extends EditorAction {
         }
         const index = model.findPreviousClosestChange(lineNumber, false);
         const change = model.changes[index];
-        await playAudioCueForChange(change.change, audioCueService);
+        await playAccessibilitySymbolForChange(change.change, accessibilitySignalService);
         setPositionAndSelection(change.change, outerEditor, accessibilityService, codeEditorService);
     }
 }
@@ -552,7 +552,7 @@ class GotoNextChangeAction extends EditorAction {
         });
     }
     async run(accessor) {
-        const audioCueService = accessor.get(IAudioCueService);
+        const accessibilitySignalService = accessor.get(IAccessibilitySignalService);
         const outerEditor = getOuterEditorFromDiffEditor(accessor);
         const accessibilityService = accessor.get(IAccessibilityService);
         const codeEditorService = accessor.get(ICodeEditorService);
@@ -570,7 +570,7 @@ class GotoNextChangeAction extends EditorAction {
         }
         const index = model.findNextClosestChange(lineNumber, false);
         const change = model.changes[index].change;
-        await playAudioCueForChange(change, audioCueService);
+        await playAccessibilitySymbolForChange(change, accessibilitySignalService);
         setPositionAndSelection(change, outerEditor, accessibilityService, codeEditorService);
     }
 }
@@ -583,17 +583,17 @@ function setPositionAndSelection(change, editor, accessibilityService, codeEdito
         codeEditorService.getActiveCodeEditor()?.writeScreenReaderContent('diff-navigation');
     }
 }
-async function playAudioCueForChange(change, audioCueService) {
+async function playAccessibilitySymbolForChange(change, accessibilitySignalService) {
     const changeType = getChangeType(change);
     switch (changeType) {
         case ChangeType.Add:
-            audioCueService.playAudioCue(AudioCue.diffLineInserted, { allowManyInParallel: true, source: 'dirtyDiffDecoration' });
+            accessibilitySignalService.playSignal(AccessibilitySignal.diffLineInserted, { allowManyInParallel: true, source: 'dirtyDiffDecoration' });
             break;
         case ChangeType.Delete:
-            audioCueService.playAudioCue(AudioCue.diffLineDeleted, { allowManyInParallel: true, source: 'dirtyDiffDecoration' });
+            accessibilitySignalService.playSignal(AccessibilitySignal.diffLineDeleted, { allowManyInParallel: true, source: 'dirtyDiffDecoration' });
             break;
         case ChangeType.Modify:
-            audioCueService.playAudioCue(AudioCue.diffLineModified, { allowManyInParallel: true, source: 'dirtyDiffDecoration' });
+            accessibilitySignalService.playSignal(AccessibilitySignal.diffLineModified, { allowManyInParallel: true, source: 'dirtyDiffDecoration' });
             break;
     }
 }

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

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

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

@@ -1,10 +1,10 @@
 import { dirname } from '../../../../base/common/resources.js';
-import { localizeWithPath } from '../../../../nls.js';
+import { localize2WithPath, localizeWithPath } from '../../../../nls.js';
 import { ICommandService } from '../../../../platform/commands/common/commands.js';
 import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
 import { IListService } from '../../../../platform/list/browser/listService.js';
 import { IViewsService } from '../../../services/views/common/viewsService.js';
-import { RestrictSearchToFolderId, SearchViewVisibleKey, ResourceFolderFocusKey, ExcludeFolderFromSearchId, RevealInSideBarForSearchResults, FileFocusKey, HasSearchResults, FindInFilesActionId, FindInFolderId, FindInWorkspaceId } from '../common/constants.js';
+import { 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.js';
@@ -24,19 +24,19 @@ import { Schemas } from '../../../../base/common/network.js';
 registerAction2(class RestrictSearchToFolderAction extends Action2 {
     constructor() {
         super({
-            id: RestrictSearchToFolderId,
-            title: {
-                value: ( localizeWithPath(
-                    'vs/workbench/contrib/search/browser/searchActionsFind',
-                    'restrictResultsToFolder',
-                    "Restrict Search to Folder"
-                )),
-                original: 'Restrict Search to Folder'
-            },
+            id: "search.action.restrictSearchToFolder" ,
+            title: ( localize2WithPath(
+                'vs/workbench/contrib/search/browser/searchActionsFind',
+                'restrictResultsToFolder',
+                "Restrict Search to Folder"
+            )),
             category,
             keybinding: {
                 weight: 200 ,
-                when: ( ContextKeyExpr.and(SearchViewVisibleKey, ResourceFolderFocusKey)),
+                when: ( ContextKeyExpr.and(
+                    SearchContext.SearchViewVisibleKey,
+                    SearchContext.ResourceFolderFocusKey
+                )),
                 primary: 1024  | 512  | 36 ,
             },
             menu: [
@@ -44,7 +44,7 @@ registerAction2(class RestrictSearchToFolderAction extends Action2 {
                     id: MenuId.SearchContext,
                     group: 'search',
                     order: 3,
-                    when: ( ContextKeyExpr.and(ResourceFolderFocusKey))
+                    when: ( ContextKeyExpr.and(SearchContext.ResourceFolderFocusKey))
                 }
             ]
         });
@@ -56,22 +56,19 @@ registerAction2(class RestrictSearchToFolderAction extends Action2 {
 registerAction2(class ExcludeFolderFromSearchAction extends Action2 {
     constructor() {
         super({
-            id: ExcludeFolderFromSearchId,
-            title: {
-                value: ( localizeWithPath(
-                    'vs/workbench/contrib/search/browser/searchActionsFind',
-                    'excludeFolderFromSearch',
-                    "Exclude Folder from Search"
-                )),
-                original: 'Exclude Folder from Search'
-            },
+            id: "search.action.excludeFromSearch" ,
+            title: ( localize2WithPath(
+                'vs/workbench/contrib/search/browser/searchActionsFind',
+                'excludeFolderFromSearch',
+                "Exclude Folder from Search"
+            )),
             category,
             menu: [
                 {
                     id: MenuId.SearchContext,
                     group: 'search',
                     order: 4,
-                    when: ( ContextKeyExpr.and(ResourceFolderFocusKey))
+                    when: ( ContextKeyExpr.and(SearchContext.ResourceFolderFocusKey))
                 }
             ]
         });
@@ -83,19 +80,19 @@ registerAction2(class ExcludeFolderFromSearchAction extends Action2 {
 registerAction2(class RevealInSideBarForSearchResultsAction extends Action2 {
     constructor() {
         super({
-            id: RevealInSideBarForSearchResults,
-            title: {
-                value: ( localizeWithPath(
-                    'vs/workbench/contrib/search/browser/searchActionsFind',
-                    'revealInSideBar',
-                    "Reveal in Explorer View"
-                )),
-                original: 'Reveal in Explorer View'
-            },
+            id: "search.action.revealInSideBar" ,
+            title: ( localize2WithPath(
+                'vs/workbench/contrib/search/browser/searchActionsFind',
+                'revealInSideBar',
+                "Reveal in Explorer View"
+            )),
             category,
             menu: [{
                     id: MenuId.SearchContext,
-                    when: ( ContextKeyExpr.and(FileFocusKey, HasSearchResults)),
+                    when: ( ContextKeyExpr.and(
+                        SearchContext.FileFocusKey,
+                        SearchContext.HasSearchResults
+                    )),
                     group: 'search_3',
                     order: 1
                 }]
@@ -136,9 +133,9 @@ registerAction2(class RevealInSideBarForSearchResultsAction extends Action2 {
 registerAction2(class FindInFilesAction extends Action2 {
     constructor() {
         super({
-            id: FindInFilesActionId,
+            id: "workbench.action.findInFiles" ,
             title: {
-                value: ( localizeWithPath(
+                ...( localize2WithPath(
                     'vs/workbench/contrib/search/browser/searchActionsFind',
                     'findInFiles',
                     "Find in Files"
@@ -148,7 +145,6 @@ registerAction2(class FindInFilesAction extends Action2 {
                     { key: 'miFindInFiles', comment: ['&& denotes a mnemonic'] },
                     "Find &&in Files"
                 )),
-                original: 'Find in Files'
             },
             metadata: {
                 description: ( localizeWithPath(
@@ -202,15 +198,12 @@ registerAction2(class FindInFilesAction extends Action2 {
 registerAction2(class FindInFolderAction extends Action2 {
     constructor() {
         super({
-            id: FindInFolderId,
-            title: {
-                value: ( localizeWithPath(
-                    'vs/workbench/contrib/search/browser/searchActionsFind',
-                    'findInFolder',
-                    "Find in Folder..."
-                )),
-                original: 'Find in Folder...'
-            },
+            id: "filesExplorer.findInFolder" ,
+            title: ( localize2WithPath(
+                'vs/workbench/contrib/search/browser/searchActionsFind',
+                'findInFolder',
+                "Find in Folder..."
+            )),
             category,
             keybinding: {
                 weight: 200 ,
@@ -234,15 +227,12 @@ registerAction2(class FindInFolderAction extends Action2 {
 registerAction2(class FindInWorkspaceAction extends Action2 {
     constructor() {
         super({
-            id: FindInWorkspaceId,
-            title: {
-                value: ( localizeWithPath(
-                    'vs/workbench/contrib/search/browser/searchActionsFind',
-                    'findInWorkspace',
-                    "Find in Workspace..."
-                )),
-                original: 'Find in Workspace...'
-            },
+            id: "filesExplorer.findInWorkspace" ,
+            title: ( localize2WithPath(
+                'vs/workbench/contrib/search/browser/searchActionsFind',
+                'findInWorkspace',
+                "Find in Workspace..."
+            )),
             category,
             menu: [
                 {

package/vscode/src/vs/workbench/contrib/search/common/constants.js

@@ -1,66 +1,27 @@
 import { RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
-const FindInFilesActionId = 'workbench.action.findInFiles';
-const FocusSearchFromResults = 'search.action.focusSearchFromResults';
-const OpenMatch = 'search.action.openResult';
-const OpenMatchToSide = 'search.action.openResultToSide';
-const RemoveActionId = 'search.action.remove';
-const CopyPathCommandId = 'search.action.copyPath';
-const CopyMatchCommandId = 'search.action.copyMatch';
-const CopyAllCommandId = 'search.action.copyAll';
-const OpenInEditorCommandId = 'search.action.openInEditor';
-const ClearSearchHistoryCommandId = 'search.action.clearHistory';
-const FocusSearchListCommandID = 'search.action.focusSearchList';
-const ReplaceActionId = 'search.action.replace';
-const ReplaceAllInFileActionId = 'search.action.replaceAllInFile';
-const ReplaceAllInFolderActionId = 'search.action.replaceAllInFolder';
-const CloseReplaceWidgetActionId = 'closeReplaceInFilesWidget';
-const ToggleCaseSensitiveCommandId = 'toggleSearchCaseSensitive';
-const ToggleWholeWordCommandId = 'toggleSearchWholeWord';
-const ToggleRegexCommandId = 'toggleSearchRegex';
-const TogglePreserveCaseId = 'toggleSearchPreserveCase';
-const AddCursorsAtSearchResults = 'addCursorsAtSearchResults';
-const RevealInSideBarForSearchResults = 'search.action.revealInSideBar';
-const ReplaceInFilesActionId = 'workbench.action.replaceInFiles';
-const ShowAllSymbolsActionId = 'workbench.action.showAllSymbols';
-const QuickTextSearchActionId = 'workbench.action.experimental.quickTextSearch';
-const CancelSearchActionId = 'search.action.cancel';
-const RefreshSearchResultsActionId = 'search.action.refreshSearchResults';
-const FocusNextSearchResultActionId = 'search.action.focusNextSearchResult';
-const FocusPreviousSearchResultActionId = 'search.action.focusPreviousSearchResult';
-const ToggleSearchOnTypeActionId = 'workbench.action.toggleSearchOnType';
-const CollapseSearchResultsActionId = 'search.action.collapseSearchResults';
-const ExpandSearchResultsActionId = 'search.action.expandSearchResults';
-const ClearSearchResultsActionId = 'search.action.clearSearchResults';
-const ViewAsTreeActionId = 'search.action.viewAsTree';
-const ViewAsListActionId = 'search.action.viewAsList';
-const ToggleQueryDetailsActionId = 'workbench.action.search.toggleQueryDetails';
-const ExcludeFolderFromSearchId = 'search.action.excludeFromSearch';
-const FocusNextInputActionId = 'search.focus.nextInputBox';
-const FocusPreviousInputActionId = 'search.focus.previousInputBox';
-const RestrictSearchToFolderId = 'search.action.restrictSearchToFolder';
-const FindInFolderId = 'filesExplorer.findInFolder';
-const FindInWorkspaceId = 'filesExplorer.findInWorkspace';
-const SearchViewVisibleKey = ( new RawContextKey('searchViewletVisible', true));
-const SearchViewFocusedKey = ( new RawContextKey('searchViewletFocus', false));
-const InputBoxFocusedKey = ( new RawContextKey('inputBoxFocus', false));
-const SearchInputBoxFocusedKey = ( new RawContextKey('searchInputBoxFocus', false));
-const ReplaceInputBoxFocusedKey = ( new RawContextKey('replaceInputBoxFocus', false));
-const PatternIncludesFocusedKey = ( new RawContextKey('patternIncludesInputBoxFocus', false));
-const PatternExcludesFocusedKey = ( new RawContextKey('patternExcludesInputBoxFocus', false));
-const ReplaceActiveKey = ( new RawContextKey('replaceActive', false));
-const HasSearchResults = ( new RawContextKey('hasSearchResult', false));
-const FirstMatchFocusKey = ( new RawContextKey('firstMatchFocus', false));
-const FileMatchOrMatchFocusKey = ( new RawContextKey('fileMatchOrMatchFocus', false));
-const FileMatchOrFolderMatchFocusKey = ( new RawContextKey('fileMatchOrFolderMatchFocus', false));
-const FileMatchOrFolderMatchWithResourceFocusKey = ( new RawContextKey('fileMatchOrFolderMatchWithResourceFocus', false));
-const FileFocusKey = ( new RawContextKey('fileMatchFocus', false));
-const FolderFocusKey = ( new RawContextKey('folderMatchFocus', false));
-const ResourceFolderFocusKey = ( new RawContextKey('folderMatchWithResourceFocus', false));
-const IsEditableItemKey = ( new RawContextKey('isEditableItem', true));
-const MatchFocusKey = ( new RawContextKey('matchFocus', false));
-const ViewHasSearchPatternKey = ( new RawContextKey('viewHasSearchPattern', false));
-const ViewHasReplacePatternKey = ( new RawContextKey('viewHasReplacePattern', false));
-const ViewHasFilePatternKey = ( new RawContextKey('viewHasFilePattern', false));
-const ViewHasSomeCollapsibleKey = ( new RawContextKey('viewHasSomeCollapsibleResult', false));
-const InTreeViewKey = ( new RawContextKey('inTreeView', false));
-export { AddCursorsAtSearchResults, CancelSearchActionId, ClearSearchHistoryCommandId, ClearSearchResultsActionId, CloseReplaceWidgetActionId, CollapseSearchResultsActionId, CopyAllCommandId, CopyMatchCommandId, CopyPathCommandId, ExcludeFolderFromSearchId, ExpandSearchResultsActionId, FileFocusKey, FileMatchOrFolderMatchFocusKey, FileMatchOrFolderMatchWithResourceFocusKey, FileMatchOrMatchFocusKey, FindInFilesActionId, FindInFolderId, FindInWorkspaceId, FirstMatchFocusKey, FocusNextInputActionId, FocusNextSearchResultActionId, FocusPreviousInputActionId, FocusPreviousSearchResultActionId, FocusSearchFromResults, FocusSearchListCommandID, FolderFocusKey, HasSearchResults, InTreeViewKey, InputBoxFocusedKey, IsEditableItemKey, MatchFocusKey, OpenInEditorCommandId, OpenMatch, OpenMatchToSide, PatternExcludesFocusedKey, PatternIncludesFocusedKey, QuickTextSearchActionId, RefreshSearchResultsActionId, RemoveActionId, ReplaceActionId, ReplaceActiveKey, ReplaceAllInFileActionId, ReplaceAllInFolderActionId, ReplaceInFilesActionId, ReplaceInputBoxFocusedKey, ResourceFolderFocusKey, RestrictSearchToFolderId, RevealInSideBarForSearchResults, SearchInputBoxFocusedKey, SearchViewFocusedKey, SearchViewVisibleKey, ShowAllSymbolsActionId, ToggleCaseSensitiveCommandId, TogglePreserveCaseId, ToggleQueryDetailsActionId, ToggleRegexCommandId, ToggleSearchOnTypeActionId, ToggleWholeWordCommandId, ViewAsListActionId, ViewAsTreeActionId, ViewHasFilePatternKey, ViewHasReplacePatternKey, ViewHasSearchPatternKey, ViewHasSomeCollapsibleKey };
+const SearchContext = {
+    SearchViewVisibleKey: ( new RawContextKey('searchViewletVisible', true)),
+    SearchViewFocusedKey: ( new RawContextKey('searchViewletFocus', false)),
+    InputBoxFocusedKey: ( new RawContextKey('inputBoxFocus', false)),
+    SearchInputBoxFocusedKey: ( new RawContextKey('searchInputBoxFocus', false)),
+    ReplaceInputBoxFocusedKey: ( new RawContextKey('replaceInputBoxFocus', false)),
+    PatternIncludesFocusedKey: ( new RawContextKey('patternIncludesInputBoxFocus', false)),
+    PatternExcludesFocusedKey: ( new RawContextKey('patternExcludesInputBoxFocus', false)),
+    ReplaceActiveKey: ( new RawContextKey('replaceActive', false)),
+    HasSearchResults: ( new RawContextKey('hasSearchResult', false)),
+    FirstMatchFocusKey: ( new RawContextKey('firstMatchFocus', false)),
+    FileMatchOrMatchFocusKey: ( new RawContextKey('fileMatchOrMatchFocus', false)),
+    FileMatchOrFolderMatchFocusKey: ( new RawContextKey('fileMatchOrFolderMatchFocus', false)),
+    FileMatchOrFolderMatchWithResourceFocusKey: ( new RawContextKey('fileMatchOrFolderMatchWithResourceFocus', false)),
+    FileFocusKey: ( new RawContextKey('fileMatchFocus', false)),
+    FolderFocusKey: ( new RawContextKey('folderMatchFocus', false)),
+    ResourceFolderFocusKey: ( new RawContextKey('folderMatchWithResourceFocus', false)),
+    IsEditableItemKey: ( new RawContextKey('isEditableItem', true)),
+    MatchFocusKey: ( new RawContextKey('matchFocus', false)),
+    ViewHasSearchPatternKey: ( new RawContextKey('viewHasSearchPattern', false)),
+    ViewHasReplacePatternKey: ( new RawContextKey('viewHasReplacePattern', false)),
+    ViewHasFilePatternKey: ( new RawContextKey('viewHasFilePattern', false)),
+    ViewHasSomeCollapsibleKey: ( new RawContextKey('viewHasSomeCollapsibleResult', false)),
+    InTreeViewKey: ( new RawContextKey('inTreeView', false)),
+};
+export { SearchContext };

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

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

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

@@ -3,7 +3,7 @@ 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 { localizeWithPath } from '../../../../../nls.js';
+import { localize2WithPath, localizeWithPath } from '../../../../../nls.js';
 import { IQuickInputService } from '../../../../../platform/quickinput/common/quickInput.js';
 import { SnippetsAction } from './abstractSnippetsActions.js';
 import { ISnippetsService } from '../snippets.js';
@@ -13,14 +13,11 @@ class ApplyFileSnippetAction extends SnippetsAction {
     constructor() {
         super({
             id: ApplyFileSnippetAction.Id,
-            title: {
-                value: ( localizeWithPath(
-                    'vs/workbench/contrib/snippets/browser/commands/fileTemplateSnippets',
-                    'label',
-                    'Fill File with Snippet'
-                )),
-                original: 'Fill File with Snippet'
-            },
+            title: ( localize2WithPath(
+                'vs/workbench/contrib/snippets/browser/commands/fileTemplateSnippets',
+                'label',
+                "Fill File with Snippet"
+            )),
             f1: true,
         });
     }

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

@@ -107,11 +107,11 @@ var snippetExt;
             }
         }
     };
-    snippetExt.point = ( ExtensionsRegistry.registerExtensionPoint({
+    snippetExt.point = ExtensionsRegistry.registerExtensionPoint({
         extensionPoint: 'snippets',
         deps: [languagesExtPoint],
         jsonSchema: snippetExt.snippetsContribution
-    }));
+    });
 })(snippetExt || (snippetExt = {})));
 function watch(service, resource, callback) {
     return combinedDisposable(service.watch(resource), service.onDidFilesChange(e => {