@codingame/monaco-vscode-view-common-service-override 7.1.0 → 8.0.0

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

@@ -9,7 +9,7 @@ import { registerEditorContribution, EditorContributionInstantiation, EditorActi
 import { ICodeEditorService } from 'vscode/vscode/vs/editor/browser/services/codeEditorService';
 import { Range } from 'vscode/vscode/vs/editor/common/core/range';
 import { PeekContext } from 'vscode/vscode/vs/editor/contrib/peekView/browser/peekView';
-import { localizeWithPath, localize2WithPath } from 'vscode/vscode/vs/nls';
+import { localize, localize2 } from 'vscode/vscode/vs/nls';
 import { registerAction2, MenuId } from 'vscode/vscode/vs/platform/actions/common/actions';
 import { RawContextKey, ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
 import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey.service';
@@ -21,13 +21,12 @@ import { TypeHierarchyTreePeekWidget } from './typeHierarchyPeek.js';
 import { TypeHierarchyDirection, TypeHierarchyProviderRegistry, TypeHierarchyModel } from 'vscode/vscode/vs/workbench/contrib/typeHierarchy/common/typeHierarchy';
 
 var TypeHierarchyController_1;
-const _moduleId = "vs/workbench/contrib/typeHierarchy/browser/typeHierarchy.contribution";
-const _ctxHasTypeHierarchyProvider = ( (new RawContextKey('editorHasTypeHierarchyProvider', false, ( localizeWithPath(_moduleId, 0, 'Whether a type hierarchy provider is available')))));
-const _ctxTypeHierarchyVisible = ( (new RawContextKey('typeHierarchyVisible', false, ( localizeWithPath(_moduleId, 1, 'Whether type hierarchy peek is currently showing')))));
+const _ctxHasTypeHierarchyProvider = ( (new RawContextKey('editorHasTypeHierarchyProvider', false, ( localize(4156, 'Whether a type hierarchy provider is available')))));
+const _ctxTypeHierarchyVisible = ( (new RawContextKey('typeHierarchyVisible', false, ( localize(4157, 'Whether type hierarchy peek is currently showing')))));
 const _ctxTypeHierarchyDirection = ( (new RawContextKey(
     'typeHierarchyDirection',
     undefined,
-    { type: 'string', description: ( localizeWithPath(_moduleId, 2, 'whether type hierarchy shows super types or subtypes')) }
+    { type: 'string', description: ( localize(4158, 'whether type hierarchy shows super types or subtypes')) }
 )));
 function sanitizedDirection(candidate) {
     return candidate === TypeHierarchyDirection.Subtypes || candidate === TypeHierarchyDirection.Supertypes
@@ -96,14 +95,14 @@ let TypeHierarchyController = class TypeHierarchyController {
                 this._widget.showModel(model);
             }
             else {
-                this._widget.showMessage(( localizeWithPath(_moduleId, 3, "No results")));
+                this._widget.showMessage(( localize(4159, "No results")));
             }
         }).catch(err => {
             if (isCancellationError(err)) {
                 this.endTypeHierarchy();
                 return;
             }
-            this._widget.showMessage(( localizeWithPath(_moduleId, 4, "Failed to show type hierarchy")));
+            this._widget.showMessage(( localize(4160, "Failed to show type hierarchy")));
         });
     }
     async startTypeHierarchyFromTypeHierarchy() {
@@ -148,7 +147,7 @@ registerAction2(class PeekTypeHierarchyAction extends EditorAction2 {
     constructor() {
         super({
             id: 'editor.showTypeHierarchy',
-            title: ( localize2WithPath(_moduleId, 5, 'Peek Type Hierarchy')),
+            title: ( localize2(4161, 'Peek Type Hierarchy')),
             menu: {
                 id: MenuId.EditorContextPeek,
                 group: 'navigation',
@@ -167,7 +166,7 @@ registerAction2(class extends EditorAction2 {
     constructor() {
         super({
             id: 'editor.showSupertypes',
-            title: ( localize2WithPath(_moduleId, 6, 'Show Supertypes')),
+            title: ( localize2(4162, 'Show Supertypes')),
             icon: Codicon.typeHierarchySuper,
             precondition: ( (ContextKeyExpr.and(
                 _ctxTypeHierarchyVisible,
@@ -192,7 +191,7 @@ registerAction2(class extends EditorAction2 {
     constructor() {
         super({
             id: 'editor.showSubtypes',
-            title: ( localize2WithPath(_moduleId, 7, 'Show Subtypes')),
+            title: ( localize2(4163, 'Show Subtypes')),
             icon: Codicon.typeHierarchySub,
             precondition: ( (ContextKeyExpr.and(
                 _ctxTypeHierarchyVisible,
@@ -217,7 +216,7 @@ registerAction2(class extends EditorAction2 {
     constructor() {
         super({
             id: 'editor.refocusTypeHierarchy',
-            title: ( localize2WithPath(_moduleId, 8, 'Refocus Type Hierarchy')),
+            title: ( localize2(4164, 'Refocus Type Hierarchy')),
             precondition: _ctxTypeHierarchyVisible,
             keybinding: {
                 weight: KeybindingWeight.WorkbenchContrib,
@@ -233,7 +232,7 @@ registerAction2(class extends EditorAction2 {
     constructor() {
         super({
             id: 'editor.closeTypeHierarchy',
-            title: ( localizeWithPath(_moduleId, 9, 'Close')),
+            title: ( localize(4165, 'Close')),
             icon: Codicon.close,
             precondition: _ctxTypeHierarchyVisible,
             keybinding: {

package/vscode/src/vs/workbench/contrib/typeHierarchy/browser/typeHierarchyPeek.js

@@ -12,7 +12,7 @@ import { ScrollType } from 'vscode/vscode/vs/editor/common/editorCommon';
 import { TrackedRangeStickiness, OverviewRulerLane } from 'vscode/vscode/vs/editor/common/model';
 import { ITextModelService } from 'vscode/vscode/vs/editor/common/services/resolverService';
 import { PeekViewWidget, peekViewBorder, peekViewTitleBackground, peekViewTitleForeground, peekViewTitleInfoForeground, peekViewResultsBackground, peekViewEditorMatchHighlight, IPeekViewService } from 'vscode/vscode/vs/editor/contrib/peekView/browser/peekView';
-import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { localize } from 'vscode/vscode/vs/nls';
 import { createAndFillInActionBarActions } from 'vscode/vscode/vs/platform/actions/browser/menuEntryActionViewItem';
 import { MenuId } from 'vscode/vscode/vs/platform/actions/common/actions';
 import { IMenuService } from 'vscode/vscode/vs/platform/actions/common/actions.service';
@@ -29,7 +29,6 @@ import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/commo
 import { Orientation } from 'vscode/vscode/vs/base/browser/ui/sash/sash';
 
 var TypeHierarchyTreePeekWidget_1;
-const _moduleId = "vs/workbench/contrib/typeHierarchy/browser/typeHierarchyPeek";
 var State;
 ( ((function(State) {
     State["Loading"] = "loading";
@@ -263,13 +262,13 @@ let TypeHierarchyTreePeekWidget = class TypeHierarchyTreePeekWidget extends Peek
         }
         this._previewDisposable.add(value);
         const title = this._direction === TypeHierarchyDirection.Supertypes
-            ? ( localizeWithPath(_moduleId, 0, "Supertypes of '{0}'", element.model.root.name))
-            : ( localizeWithPath(_moduleId, 1, "Subtypes of '{0}'", element.model.root.name));
+            ? ( localize(9530, "Supertypes of '{0}'", element.model.root.name))
+            : ( localize(9531, "Subtypes of '{0}'", element.model.root.name));
         this.setTitle(title);
     }
     showLoading() {
         this._parent.dataset['state'] = State.Loading;
-        this.setTitle(( localizeWithPath(_moduleId, 2, "Loading...")));
+        this.setTitle(( localize(9532, "Loading...")));
         this._show();
     }
     showMessage(message) {
@@ -288,8 +287,8 @@ let TypeHierarchyTreePeekWidget = class TypeHierarchyTreePeekWidget extends Peek
         await this._tree.expand(root.element);
         if (root.children.length === 0) {
             this.showMessage(this._direction === TypeHierarchyDirection.Supertypes
-                ? ( localizeWithPath(_moduleId, 3, "No supertypes of '{0}'", model.root.name))
-                : ( localizeWithPath(_moduleId, 4, "No subtypes of '{0}'", model.root.name)));
+                ? ( localize(9533, "No supertypes of '{0}'", model.root.name))
+                : ( localize(9534, "No subtypes of '{0}'", model.root.name)));
         }
         else {
             this._parent.dataset['state'] = State.Data;

package/vscode/src/vs/workbench/contrib/typeHierarchy/browser/typeHierarchyTree.js

@@ -5,10 +5,9 @@ import { IconLabel } from 'vscode/vscode/vs/base/browser/ui/iconLabel/iconLabel'
 import { SymbolTag, SymbolKinds } from 'vscode/vscode/vs/editor/common/languages';
 import { compare } from 'vscode/vscode/vs/base/common/strings';
 import { Range } from 'vscode/vscode/vs/editor/common/core/range';
-import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { localize } from 'vscode/vscode/vs/nls';
 import { ThemeIcon } from 'vscode/vscode/vs/base/common/themables';
 
-const _moduleId = "vs/workbench/contrib/typeHierarchy/browser/typeHierarchyTree";
 class Type {
     constructor(item, model, parent) {
         this.item = item;
@@ -117,14 +116,14 @@ class AccessibilityProvider {
         this.getDirection = getDirection;
     }
     getWidgetAriaLabel() {
-        return ( localizeWithPath(_moduleId, 0, "Type Hierarchy"));
+        return ( localize(11191, "Type Hierarchy"));
     }
     getAriaLabel(element) {
         if (this.getDirection() === TypeHierarchyDirection.Supertypes) {
-            return ( localizeWithPath(_moduleId, 1, "supertypes of {0}", element.item.name));
+            return ( localize(11192, "supertypes of {0}", element.item.name));
         }
         else {
-            return ( localizeWithPath(_moduleId, 2, "subtypes of {0}", element.item.name));
+            return ( localize(11193, "subtypes of {0}", element.item.name));
         }
     }
 }

package/vscode/src/vs/workbench/contrib/webview/browser/webviewElement.js

@@ -9,7 +9,7 @@ import { Disposable, toDisposable } from 'vscode/vscode/vs/base/common/lifecycle
 import { FileAccess, COI } from 'vscode/vscode/vs/base/common/network';
 import { URI } from 'vscode/vscode/vs/base/common/uri';
 import { generateUuid } from 'vscode/vscode/vs/base/common/uuid';
-import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { localize } from 'vscode/vscode/vs/nls';
 import { IAccessibilityService } from 'vscode/vscode/vs/platform/accessibility/common/accessibility.service';
 import { MenuId } from 'vscode/vscode/vs/platform/actions/common/actions';
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
@@ -29,7 +29,6 @@ import { WebviewFindWidget } from './webviewFindWidget.js';
 import { decodeAuthority, webviewRootResourceAuthority, webviewGenericCspSource } from 'vscode/vscode/vs/workbench/contrib/webview/common/webview';
 import { IWorkbenchEnvironmentService } from 'vscode/vscode/vs/workbench/services/environment/common/environmentService.service';
 
-const _moduleId = "vs/workbench/contrib/webview/browser/webviewElement";
 var WebviewState;
 ( ((function(WebviewState) {
     let Type;
@@ -159,7 +158,7 @@ let WebviewElement = class WebviewElement extends Disposable {
             this._hasFindResult.fire(didFind);
         }));
         this._register(this.on('fatal-error', (e) => {
-            notificationService.error(( localizeWithPath(_moduleId, 0, "Error loading webview: {0}", e.message)));
+            notificationService.error(( localize(9517, "Error loading webview: {0}", e.message)));
             this._onFatalError.fire({ message: e.message });
         }));
         this._register(this.on('did-keydown', (data) => {
@@ -190,6 +189,7 @@ let WebviewElement = class WebviewElement extends Disposable {
                     y: elementBox.y + data.clientY
                 })
             });
+            this._send('set-context-menu-visible', { visible: true });
         }));
         this._register(this.on('load-resource', async (entry) => {
             try {
@@ -216,7 +216,6 @@ let WebviewElement = class WebviewElement extends Disposable {
         this._register(Event.runAndSubscribe(webviewThemeDataProvider.onThemeDataChanged, () => this.style()));
         this._register(_accessibilityService.onDidChangeReducedMotion(() => this.style()));
         this._register(_accessibilityService.onDidChangeScreenReaderOptimized(() => this.style()));
-        this._register(contextMenuService.onDidShowContextMenu(() => this._send('set-context-menu-visible', { visible: true })));
         this._register(contextMenuService.onDidHideContextMenu(() => this._send('set-context-menu-visible', { visible: false })));
         this._confirmBeforeClose = configurationService.getValue('window.confirmBeforeClose');
         this._register(configurationService.onDidChangeConfiguration(e => {
@@ -228,6 +227,9 @@ let WebviewElement = class WebviewElement extends Disposable {
         this._register(this.on('drag-start', () => {
             this._startBlockingIframeDragEvents();
         }));
+        this._register(this.on('drag', (event) => {
+            this.handleDragEvent('drag', event);
+        }));
         if (initInfo.options.enableFindWidget) {
             this._webviewFindWidget = this._register(instantiationService.createInstance(WebviewFindWidget, this));
         }
@@ -497,6 +499,13 @@ let WebviewElement = class WebviewElement extends Disposable {
         });
         this.window?.dispatchEvent(emulatedKeyboardEvent);
     }
+    handleDragEvent(type, event) {
+        const emulatedDragEvent = ( (new DragEvent(type, event)));
+        Object.defineProperty(emulatedDragEvent, 'target', {
+            get: () => this.element,
+        });
+        this.window?.dispatchEvent(emulatedDragEvent);
+    }
     windowDidDragStart() {
         this._startBlockingIframeDragEvents();
     }

package/vscode/src/vs/workbench/contrib/webviewPanel/browser/webviewCommands.js

@@ -1,6 +1,6 @@
 import { KeyMod, KeyCode } from 'vscode/vscode/vs/base/common/keyCodes';
 import { EditorContextKeys } from 'vscode/vscode/vs/editor/common/editorContextKeys';
-import { localizeWithPath, localize2WithPath } from 'vscode/vscode/vs/nls';
+import { localize, localize2 } from 'vscode/vscode/vs/nls';
 import { Action2, MenuId } from 'vscode/vscode/vs/platform/actions/common/actions';
 import { ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
 import { KeybindingWeight } from 'vscode/vscode/vs/platform/keybinding/common/keybindingsRegistry';
@@ -11,14 +11,13 @@ import { WebviewEditor } from 'vscode/vscode/vs/workbench/contrib/webviewPanel/b
 import { WebviewInput } from 'vscode/vscode/vs/workbench/contrib/webviewPanel/browser/webviewEditorInput';
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
 
-const _moduleId = "vs/workbench/contrib/webviewPanel/browser/webviewCommands";
 const webviewActiveContextKeyExpr = ( (ContextKeyExpr.and(
      (ContextKeyExpr.equals('activeEditor', WebviewEditor.ID)),
      (EditorContextKeys.focus.toNegated())
 )));
 class ShowWebViewEditorFindWidgetAction extends Action2 {
     static { this.ID = 'editor.action.webvieweditor.showFind'; }
-    static { this.LABEL = ( localizeWithPath(_moduleId, 0, "Show find")); }
+    static { this.LABEL = ( localize(9736, "Show find")); }
     constructor() {
         super({
             id: ShowWebViewEditorFindWidgetAction.ID,
@@ -39,7 +38,7 @@ class ShowWebViewEditorFindWidgetAction extends Action2 {
 }
 class HideWebViewEditorFindCommand extends Action2 {
     static { this.ID = 'editor.action.webvieweditor.hideFind'; }
-    static { this.LABEL = ( localizeWithPath(_moduleId, 1, "Stop find")); }
+    static { this.LABEL = ( localize(9737, "Stop find")); }
     constructor() {
         super({
             id: HideWebViewEditorFindCommand.ID,
@@ -60,7 +59,7 @@ class HideWebViewEditorFindCommand extends Action2 {
 }
 class WebViewEditorFindNextCommand extends Action2 {
     static { this.ID = 'editor.action.webvieweditor.findNext'; }
-    static { this.LABEL = ( localizeWithPath(_moduleId, 2, 'Find next')); }
+    static { this.LABEL = ( localize(9738, 'Find next')); }
     constructor() {
         super({
             id: WebViewEditorFindNextCommand.ID,
@@ -81,7 +80,7 @@ class WebViewEditorFindNextCommand extends Action2 {
 }
 class WebViewEditorFindPreviousCommand extends Action2 {
     static { this.ID = 'editor.action.webvieweditor.findPrevious'; }
-    static { this.LABEL = ( localizeWithPath(_moduleId, 3, 'Find previous')); }
+    static { this.LABEL = ( localize(9739, 'Find previous')); }
     constructor() {
         super({
             id: WebViewEditorFindPreviousCommand.ID,
@@ -102,7 +101,7 @@ class WebViewEditorFindPreviousCommand extends Action2 {
 }
 class ReloadWebviewAction extends Action2 {
     static { this.ID = 'workbench.action.webview.reloadWebviewAction'; }
-    static { this.LABEL = ( localize2WithPath(_moduleId, 4, "Reload Webviews")); }
+    static { this.LABEL = ( localize2(9740, "Reload Webviews")); }
     constructor() {
         super({
             id: ReloadWebviewAction.ID,

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

@@ -1,6 +1,6 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
-import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { localize } from 'vscode/vscode/vs/nls';
 import { registerAction2 } from 'vscode/vscode/vs/platform/actions/common/actions';
 import { SyncDescriptor } from 'vscode/vscode/vs/platform/instantiation/common/descriptors';
 import 'vscode/vscode/vs/platform/instantiation/common/extensions';
@@ -17,8 +17,7 @@ import 'vscode/vscode/vs/workbench/contrib/webviewPanel/browser/webviewWorkbench
 import 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
 
-const _moduleId = "vs/workbench/contrib/webviewPanel/browser/webviewPanel.contribution";
-(( (Registry.as(EditorExtensions.EditorPane)))).registerEditorPane(EditorPaneDescriptor.create(WebviewEditor, WebviewEditor.ID, ( localizeWithPath(_moduleId, 0, "webview editor"))), [( (new SyncDescriptor(WebviewInput)))]);
+(( (Registry.as(EditorExtensions.EditorPane)))).registerEditorPane(EditorPaneDescriptor.create(WebviewEditor, WebviewEditor.ID, ( localize(4347, "webview editor"))), [( (new SyncDescriptor(WebviewInput)))]);
 let WebviewPanelContribution = class WebviewPanelContribution extends Disposable {
     static { this.ID = 'workbench.contrib.webviewPanel'; }
     constructor(editorService, editorGroupService) {

package/vscode/src/vs/workbench/services/editor/browser/editorResolverService.js

@@ -12,7 +12,7 @@ import { Schemas } from 'vscode/vscode/vs/base/common/network';
 import { ResolvedStatus, globMatchesResource, editorsAssociationsSettingId, RegisteredEditorPriority, priorityToRank } from 'vscode/vscode/vs/workbench/services/editor/common/editorResolverService';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { IQuickInputService } from 'vscode/vscode/vs/platform/quickinput/common/quickInput.service';
-import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { localize } from 'vscode/vscode/vs/nls';
 import 'vscode/vscode/vs/platform/notification/common/notification';
 import { INotificationService } from 'vscode/vscode/vs/platform/notification/common/notification.service';
 import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry.service';
@@ -27,7 +27,6 @@ import { PauseableEmitter } from 'vscode/vscode/vs/base/common/event';
 import Severity$1 from 'vscode/vscode/vs/base/common/severity';
 
 var EditorResolverService_1;
-const _moduleId = "vs/workbench/services/editor/browser/editorResolverService";
 let EditorResolverService = class EditorResolverService extends Disposable {
     static { EditorResolverService_1 = this; }
     static { this.configureDefaultID = 'promptOpenWith.configureDefault'; }
@@ -451,12 +450,8 @@ let EditorResolverService = class EditorResolverService extends Disposable {
         if (storedChoices[globForResource] && storedChoices[globForResource].find(editorID => editorID === currentEditor.editorId)) {
             return;
         }
-        const handle = this.notificationService.prompt(Severity$1.Warning, ( localizeWithPath(
-            _moduleId,
-            0,
-            'There are multiple default editors available for the resource.'
-        )), [{
-                label: ( localizeWithPath(_moduleId, 1, 'Configure Default')),
+        const handle = this.notificationService.prompt(Severity$1.Warning, ( localize(4069, 'There are multiple default editors available for the resource.')), [{
+                label: ( localize(4070, 'Configure Default')),
                 run: async () => {
                     const picked = await this.doPickEditor(untypedInput, true);
                     if (!picked) {
@@ -477,7 +472,7 @@ let EditorResolverService = class EditorResolverService extends Disposable {
                 }
             },
             {
-                label: ( localizeWithPath(_moduleId, 2, 'Keep {0}', editorName)),
+                label: ( localize(4071, 'Keep {0}', editorName)),
                 run: writeCurrentEditorsToStorage
             }
         ]);
@@ -503,9 +498,9 @@ let EditorResolverService = class EditorResolverService extends Disposable {
             }
         });
         const quickPickEntries = [];
-        const currentlyActiveLabel = ( localizeWithPath(_moduleId, 3, "Active"));
-        const currentDefaultLabel = ( localizeWithPath(_moduleId, 4, "Default"));
-        const currentDefaultAndActiveLabel = ( localizeWithPath(_moduleId, 5, "Active and Default"));
+        const currentlyActiveLabel = ( localize(4072, "Active"));
+        const currentDefaultLabel = ( localize(4073, "Default"));
+        const currentDefaultAndActiveLabel = ( localize(4074, "Active and Default"));
         let defaultViewType = defaultSetting;
         if (!defaultViewType && registeredEditors.length > 2 && registeredEditors[1]?.editorInfo.priority !== RegisteredEditorPriority.option) {
             defaultViewType = registeredEditors[1]?.editorInfo.id;
@@ -530,12 +525,7 @@ let EditorResolverService = class EditorResolverService extends Disposable {
             quickPickEntries.push(separator);
             const configureDefaultEntry = {
                 id: EditorResolverService_1.configureDefaultID,
-                label: ( localizeWithPath(
-                    _moduleId,
-                    6,
-                    "Configure default editor for '{0}'...",
-                    `*${extname(resource)}`
-                )),
+                label: ( localize(4075, "Configure default editor for '{0}'...", `*${extname(resource)}`)),
             };
             quickPickEntries.push(configureDefaultEntry);
         }
@@ -549,13 +539,8 @@ let EditorResolverService = class EditorResolverService extends Disposable {
         const editorPicks = this.mapEditorsToQuickPickEntry(resource, showDefaultPicker);
         const editorPicker = this.quickInputService.createQuickPick();
         const placeHolderMessage = showDefaultPicker ?
-            ( localizeWithPath(
-                _moduleId,
-                7,
-                "Select new default editor for '{0}'",
-                `*${extname(resource)}`
-            )) :
-            ( localizeWithPath(_moduleId, 8, "Select editor for '{0}'", basename(resource)));
+            ( localize(4076, "Select new default editor for '{0}'", `*${extname(resource)}`)) :
+            ( localize(4077, "Select editor for '{0}'", basename(resource)));
         editorPicker.placeholder = placeHolderMessage;
         editorPicker.canAcceptInBackground = true;
         editorPicker.items = editorPicks;

package/vscode/src/vs/workbench/services/history/browser/historyService.js

@@ -1,5 +1,5 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
-import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { localize } from 'vscode/vscode/vs/nls';
 import { URI } from 'vscode/vscode/vs/base/common/uri';
 import { GroupModelChangeKind, isEditorPaneWithSelection, isEditorInput, EditorResourceAccessor, EditorsOrder, EditorCloseContext, SideBySideEditor, isSideBySideEditorInput, isResourceEditorInput, EditorPaneSelectionCompareResult, EditorPaneSelectionChangeReason } from 'vscode/vscode/vs/workbench/common/editor';
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
@@ -35,7 +35,6 @@ import { ILogService } from 'vscode/vscode/vs/platform/log/common/log.service';
 import { mainWindow } from 'vscode/vscode/vs/base/browser/window';
 
 var HistoryService_1, EditorNavigationStack_1;
-const _moduleId = "vs/workbench/services/history/browser/historyService";
 let HistoryService = class HistoryService extends Disposable {
     static { HistoryService_1 = this; }
     static { this.MOUSE_NAVIGATION_SETTING = 'workbench.editor.mouseBackForwardToNavigate'; }
@@ -56,43 +55,33 @@ let HistoryService = class HistoryService extends Disposable {
         this.activeEditorListeners = this._register(( (new DisposableStore())));
         this.lastActiveEditor = undefined;
         this.editorHelper = this.instantiationService.createInstance(EditorHelper);
-        this.canNavigateBackContextKey = (( (new RawContextKey('canNavigateBack', false, ( localizeWithPath(_moduleId, 0, "Whether it is possible to navigate back in editor history")))))).bindTo(this.contextKeyService);
-        this.canNavigateForwardContextKey = (( (new RawContextKey('canNavigateForward', false, ( localizeWithPath(
-            _moduleId,
-            1,
-            "Whether it is possible to navigate forward in editor history"
-        )))))).bindTo(this.contextKeyService);
-        this.canNavigateBackInNavigationsContextKey = (( (new RawContextKey('canNavigateBackInNavigationLocations', false, ( localizeWithPath(
-            _moduleId,
-            2,
+        this.canNavigateBackContextKey = (( (new RawContextKey('canNavigateBack', false, ( localize(4119, "Whether it is possible to navigate back in editor history")))))).bindTo(this.contextKeyService);
+        this.canNavigateForwardContextKey = (( (new RawContextKey('canNavigateForward', false, ( localize(4120, "Whether it is possible to navigate forward in editor history")))))).bindTo(this.contextKeyService);
+        this.canNavigateBackInNavigationsContextKey = (( (new RawContextKey('canNavigateBackInNavigationLocations', false, ( localize(
+            4121,
             "Whether it is possible to navigate back in editor navigation locations history"
         )))))).bindTo(this.contextKeyService);
-        this.canNavigateForwardInNavigationsContextKey = (( (new RawContextKey('canNavigateForwardInNavigationLocations', false, ( localizeWithPath(
-            _moduleId,
-            3,
+        this.canNavigateForwardInNavigationsContextKey = (( (new RawContextKey('canNavigateForwardInNavigationLocations', false, ( localize(
+            4122,
             "Whether it is possible to navigate forward in editor navigation locations history"
         )))))).bindTo(this.contextKeyService);
-        this.canNavigateToLastNavigationLocationContextKey = (( (new RawContextKey('canNavigateToLastNavigationLocation', false, ( localizeWithPath(
-            _moduleId,
-            4,
+        this.canNavigateToLastNavigationLocationContextKey = (( (new RawContextKey('canNavigateToLastNavigationLocation', false, ( localize(
+            4123,
             "Whether it is possible to navigate to the last editor navigation location"
         )))))).bindTo(this.contextKeyService);
-        this.canNavigateBackInEditsContextKey = (( (new RawContextKey('canNavigateBackInEditLocations', false, ( localizeWithPath(
-            _moduleId,
-            5,
+        this.canNavigateBackInEditsContextKey = (( (new RawContextKey('canNavigateBackInEditLocations', false, ( localize(
+            4124,
             "Whether it is possible to navigate back in editor edit locations history"
         )))))).bindTo(this.contextKeyService);
-        this.canNavigateForwardInEditsContextKey = (( (new RawContextKey('canNavigateForwardInEditLocations', false, ( localizeWithPath(
-            _moduleId,
-            6,
+        this.canNavigateForwardInEditsContextKey = (( (new RawContextKey('canNavigateForwardInEditLocations', false, ( localize(
+            4125,
             "Whether it is possible to navigate forward in editor edit locations history"
         )))))).bindTo(this.contextKeyService);
-        this.canNavigateToLastEditLocationContextKey = (( (new RawContextKey('canNavigateToLastEditLocation', false, ( localizeWithPath(
-            _moduleId,
-            7,
+        this.canNavigateToLastEditLocationContextKey = (( (new RawContextKey('canNavigateToLastEditLocation', false, ( localize(
+            4126,
             "Whether it is possible to navigate to the last editor edit location"
         )))))).bindTo(this.contextKeyService);
-        this.canReopenClosedEditorContextKey = (( (new RawContextKey('canReopenClosedEditor', false, ( localizeWithPath(_moduleId, 8, "Whether it is possible to reopen the last closed editor")))))).bindTo(this.contextKeyService);
+        this.canReopenClosedEditorContextKey = (( (new RawContextKey('canReopenClosedEditor', false, ( localize(4127, "Whether it is possible to reopen the last closed editor")))))).bindTo(this.contextKeyService);
         this._onDidChangeEditorNavigationStack = this._register(( (new Emitter())));
         this.onDidChangeEditorNavigationStack = this._onDidChangeEditorNavigationStack.event;
         this.defaultScopedEditorNavigationStack = undefined;

package/vscode/src/vs/workbench/services/progress/browser/progressService.js

@@ -1,6 +1,6 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import './media/progressService.css.js';
-import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { localize } from 'vscode/vscode/vs/nls';
 import { Disposable, toDisposable, DisposableStore, dispose } from 'vscode/vscode/vs/base/common/lifecycle';
 import { ProgressLocation, Progress } from 'vscode/vscode/vs/platform/progress/common/progress';
 import 'vscode/vscode/vs/platform/instantiation/common/instantiation';
@@ -29,7 +29,6 @@ import { ResultKind } from 'vscode/vscode/vs/platform/keybinding/common/keybindi
 import { IUserActivityService } from 'vscode/vscode/vs/workbench/services/userActivity/common/userActivityService.service';
 import Severity$1 from 'vscode/vscode/vs/base/common/severity';
 
-const _moduleId = "vs/workbench/services/progress/browser/progressService";
 let ProgressService = class ProgressService extends Disposable {
     constructor(activityService, paneCompositeService, viewDescriptorService, viewsService, notificationService, statusbarService, layoutService, keybindingService, userActivityService) {
         super();
@@ -132,23 +131,23 @@ let ProgressService = class ProgressService extends Disposable {
             let title;
             const source = options.source && typeof options.source !== 'string' ? options.source.label : options.source;
             if (progressTitle && progressMessage) {
-                text = ( localizeWithPath(_moduleId, 0, "{0}: {1}", progressTitle, progressMessage));
-                title = source ? ( localizeWithPath(_moduleId, 1, "[{0}] {1}: {2}", source, progressTitle, progressMessage)) : text;
+                text = ( localize(4128, "{0}: {1}", progressTitle, progressMessage));
+                title = source ? ( localize(4129, "[{0}] {1}: {2}", source, progressTitle, progressMessage)) : text;
             }
             else if (progressTitle) {
                 text = progressTitle;
-                title = source ? ( localizeWithPath(_moduleId, 2, "[{0}]: {1}", source, progressTitle)) : text;
+                title = source ? ( localize(4130, "[{0}]: {1}", source, progressTitle)) : text;
             }
             else if (progressMessage) {
                 text = progressMessage;
-                title = source ? ( localizeWithPath(_moduleId, 2, "[{0}]: {1}", source, progressMessage)) : text;
+                title = source ? ( localize(4130, "[{0}]: {1}", source, progressMessage)) : text;
             }
             else {
                 this.updateWindowProgress(idx + 1);
                 return;
             }
             const statusEntryProperties = {
-                name: ( localizeWithPath(_moduleId, 3, "Progress Message")),
+                name: ( localize(4131, "Progress Message")),
                 text,
                 showProgress: options.type || true,
                 ariaLabel: text,
@@ -244,7 +243,7 @@ let ProgressService = class ProgressService extends Disposable {
             if (options.cancellable) {
                 const cancelAction = new (class extends Action {
                     constructor() {
-                        super('progress.cancel', ( localizeWithPath(_moduleId, 4, "Cancel")), undefined, true);
+                        super('progress.cancel', ( localize(4132, "Cancel")), undefined, true);
                     }
                     async run() {
                         progressStateModel.cancel();
@@ -429,7 +428,7 @@ let ProgressService = class ProgressService extends Disposable {
         const createDialog = (message) => {
             const buttons = options.buttons || [];
             if (!options.sticky) {
-                buttons.push(options.cancellable ? ( localizeWithPath(_moduleId, 4, "Cancel")) : ( localizeWithPath(_moduleId, 5, "Dismiss")));
+                buttons.push(options.cancellable ? ( localize(4132, "Cancel")) : ( localize(4133, "Dismiss")));
             }
             dialog = ( (new Dialog(this.layoutService.activeContainer, message, buttons, {
                 type: 'pending',

package/vscode/src/vs/workbench/services/views/browser/viewDescriptorService.js

@@ -16,12 +16,11 @@ import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/te
 import { generateUuid } from 'vscode/vscode/vs/base/common/uuid';
 import { getViewsStateStorageId, ViewContainerModel } from '../common/viewContainerModel.js';
 import { registerAction2, MenuId, Action2 } from 'vscode/vscode/vs/platform/actions/common/actions';
-import { localizeWithPath, localize2WithPath } from 'vscode/vscode/vs/nls';
+import { localize, localize2 } from 'vscode/vscode/vs/nls';
 import { ILoggerService } from 'vscode/vscode/vs/platform/log/common/log.service';
 import { Lazy } from 'vscode/vscode/vs/base/common/lazy';
 
 var ViewDescriptorService_1;
-const _moduleId = "vs/workbench/services/views/browser/viewDescriptorService";
 function getViewContainerStorageId(viewContainerId) { return `${viewContainerId}.state`; }
 let ViewDescriptorService = class ViewDescriptorService extends Disposable {
     static { ViewDescriptorService_1 = this; }
@@ -586,7 +585,7 @@ let ViewDescriptorService = class ViewDescriptorService extends Disposable {
                         super({
                             id: `${viewDescriptor.id}.removeView`,
                             viewPaneContainerId: viewContainerModel.viewContainer.id,
-                            title: ( localizeWithPath(_moduleId, 0, "Hide '{0}'", viewDescriptor.name.value)),
+                            title: ( localize(4067, "Hide '{0}'", viewDescriptor.name.value)),
                             precondition: viewDescriptor.canToggleVisibility && (!viewContainerModel.isVisible(viewDescriptor.id) || viewContainerModel.visibleViewDescriptors.length > 1) ? ContextKeyExpr.true() : ( (ContextKeyExpr.false())),
                             menu: [{
                                     id: MenuId.ViewTitleContext,
@@ -613,7 +612,7 @@ let ViewDescriptorService = class ViewDescriptorService extends Disposable {
             constructor() {
                 super({
                     id: `${viewContainer.id}.resetViewContainerLocation`,
-                    title: ( localize2WithPath(_moduleId, 1, "Reset Location")),
+                    title: ( localize2(4068, "Reset Location")),
                     menu: [{
                             id: MenuId.ViewContainerTitleContext,
                             when: ( (ContextKeyExpr.or( (ContextKeyExpr.and(

package/vscode/src/vs/workbench/services/views/common/viewContainerModel.js

@@ -17,15 +17,14 @@ import { registerAction2, Action2 } from 'vscode/vscode/vs/platform/actions/comm
 import { Categories } from 'vscode/vscode/vs/platform/action/common/actionCommonCategories';
 import { IOutputService } from 'vscode/vscode/vs/workbench/services/output/common/output.service';
 import { CounterSet } from 'vscode/vscode/vs/base/common/map';
-import { localize2WithPath } from 'vscode/vscode/vs/nls';
+import { localize2 } from 'vscode/vscode/vs/nls';
 import { Lazy } from 'vscode/vscode/vs/base/common/lazy';
 
-const _moduleId = "vs/workbench/services/views/common/viewContainerModel";
 registerAction2(class extends Action2 {
     constructor() {
         super({
             id: '_workbench.output.showViewsLog',
-            title: ( localize2WithPath(_moduleId, 0, "Show Views Log")),
+            title: ( localize2(9511, "Show Views Log")),
             category: Categories.Developer,
             f1: true
         });