@codingame/monaco-vscode-view-common-service-override 33.0.9 → 34.0.0

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

@@ -139,7 +139,7 @@ let ResultCodeEditorView = class ResultCodeEditorView extends CodeEditorView {
                 return;
             }
             this.editor.setModel(vm.model.resultTextModel);
-            reset(this.htmlElements.title, ...renderLabelWithIcons(( localize(11502, "Result"))));
+            reset(this.htmlElements.title, ...renderLabelWithIcons(( localize(11685, "Result"))));
             reset(
                 this.htmlElements.description,
                 ...renderLabelWithIcons(this._labelService.getUriLabel(vm.model.resultTextModel.uri, {
@@ -158,7 +158,7 @@ let ResultCodeEditorView = class ResultCodeEditorView extends CodeEditorView {
                 return;
             }
             const count = model.unhandledConflictsCount.read(reader);
-            const text = count === 1 ? ( localize(11503, "{0} Conflict Remaining", count)) : ( localize(11504, "{0} Conflicts Remaining ", count));
+            const text = count === 1 ? ( localize(11686, "{0} Conflict Remaining", count)) : ( localize(11687, "{0} Conflicts Remaining ", count));
             remainingConflictsActionBar.clear();
             remainingConflictsActionBar.push({
                 class: undefined,
@@ -169,7 +169,7 @@ let ResultCodeEditorView = class ResultCodeEditorView extends CodeEditorView {
                     vm.model.telemetry.reportConflictCounterClicked();
                     vm.goToNextModifiedBaseRange(m => !model.isHandled(m).read(undefined));
                 },
-                tooltip: count > 0 ? ( localize(11505, "Go to next conflict")) : ( localize(11506, "All conflicts handled, the merge can be completed now."))
+                tooltip: count > 0 ? ( localize(11688, "Go to next conflict")) : ( localize(11689, "All conflicts handled, the merge can be completed now."))
             });
         }));
         this._register(applyObservableDecorations(this.editor, this.decorations));

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

@@ -149,7 +149,7 @@ let MergeEditor = class MergeEditor extends AbstractTextEditor {
         if (this.input) {
             return this.input.getName();
         }
-        return localize(11507, "Text Merge Editor");
+        return localize(11690, "Text Merge Editor");
     }
     createEditorControl(parent, initialOptions) {
         this.rootHtmlElement = parent;

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

@@ -238,7 +238,7 @@ let MergeEditorViewModel = class MergeEditorViewModel extends Disposable {
     toggleActiveConflict(inputNumber) {
         const activeModifiedBaseRange = this.activeModifiedBaseRange.get();
         if (!activeModifiedBaseRange) {
-            this.notificationService.error(( localize(11508, "There is currently no conflict focused that can be toggled.")));
+            this.notificationService.error(( localize(11691, "There is currently no conflict focused that can be toggled.")));
             return;
         }
         transaction(tx => {

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

@@ -26,11 +26,11 @@ let KeyboardLayoutPickerContribution = class KeyboardLayoutPickerContribution ex
         this.keyboardLayoutService = keyboardLayoutService;
         this.statusbarService = statusbarService;
         this.pickerElement = this._register(( new MutableDisposable()));
-        const name = ( localize(12225, "Keyboard Layout"));
+        const name = ( localize(12413, "Keyboard Layout"));
         const layout = this.keyboardLayoutService.getCurrentKeyboardLayout();
         if (layout) {
             const layoutInfo = parseKeyboardLayoutDescription(layout);
-            const text = ( localize(12226, "Layout: {0}", layoutInfo.label));
+            const text = ( localize(12414, "Layout: {0}", layoutInfo.label));
             this.pickerElement.value = this.statusbarService.addEntry({
                 name,
                 text,
@@ -42,7 +42,7 @@ let KeyboardLayoutPickerContribution = class KeyboardLayoutPickerContribution ex
             const layout = this.keyboardLayoutService.getCurrentKeyboardLayout();
             const layoutInfo = parseKeyboardLayoutDescription(layout);
             if (this.pickerElement.value) {
-                const text = ( localize(12226, "Layout: {0}", layoutInfo.label));
+                const text = ( localize(12414, "Layout: {0}", layoutInfo.label));
                 this.pickerElement.value.update({
                     name,
                     text,
@@ -50,7 +50,7 @@ let KeyboardLayoutPickerContribution = class KeyboardLayoutPickerContribution ex
                     command: KEYBOARD_LAYOUT_OPEN_PICKER
                 });
             } else {
-                const text = ( localize(12226, "Layout: {0}", layoutInfo.label));
+                const text = ( localize(12414, "Layout: {0}", layoutInfo.label));
                 this.pickerElement.value = this.statusbarService.addEntry({
                     name,
                     text,
@@ -68,17 +68,17 @@ registerWorkbenchContribution2(
     WorkbenchPhase.BlockStartup
 );
 const DEFAULT_CONTENT = [`// ${( localize(
-    12227,
+    12415,
     "Defines the keyboard layout used in VS Code in the browser environment."
 ))}`, `// ${( localize(
-    12228,
+    12416,
     "Open VS Code and run \"Developer: Inspect Key Mappings (JSON)\" from Command Palette."
 ))}`, ``, `// Once you have the keyboard layout info, please paste it below.`, "\n"].join("\n");
 registerAction2(class extends Action2 {
     constructor() {
         super({
             id: KEYBOARD_LAYOUT_OPEN_PICKER,
-            title: ( localize2(12229, "Change Keyboard Layout")),
+            title: ( localize2(12417, "Change Keyboard Layout")),
             f1: true
         });
     }
@@ -113,21 +113,21 @@ registerAction2(class extends Action2 {
             const platform = isMacintosh ? "Mac" : isWindows ? "Win" : "Linux";
             picks.unshift({
                 type: "separator",
-                label: ( localize(12230, "Keyboard Layouts ({0})", platform))
+                label: ( localize(12418, "Keyboard Layouts ({0})", platform))
             });
         }
         const configureKeyboardLayout = {
-            label: ( localize(12231, "Configure Keyboard Layout"))
+            label: ( localize(12419, "Configure Keyboard Layout"))
         };
         picks.unshift(configureKeyboardLayout);
         const autoDetectMode = {
-            label: ( localize(12232, "Auto Detect")),
+            label: ( localize(12420, "Auto Detect")),
             description: isAutoDetect ? `Current: ${parseKeyboardLayoutDescription(currentLayout).label}` : undefined,
             picked: isAutoDetect ? true : undefined
         };
         picks.unshift(autoDetectMode);
         const pick = await quickInputService.pick(picks, {
-            placeHolder: ( localize(12233, "Select Keyboard Layout")),
+            placeHolder: ( localize(12421, "Select Keyboard Layout")),
             matchOnDescription: true
         });
         if (!pick) {
@@ -153,7 +153,7 @@ registerAction2(class extends Action2 {
                     }
                 });
             }, error => {
-                throw ( new Error(( localize(12234, "Unable to create '{0}' ({1}).", (file.toString()), error))));
+                throw ( new Error(( localize(12422, "Unable to create '{0}' ({1}).", (file.toString()), error))));
             });
             return Promise.resolve();
         }

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

@@ -21,7 +21,7 @@ registerWorkbenchContribution2(
             minimum: 1,
             maximum: 20,
             description: ( localize(
-                12801,
+                12989,
                 "Controls the feedback area size in pixels of the dragging area in between views/editors. Set it to a larger value if you feel it's hard to resize views using the mouse."
             ))
         },
@@ -31,7 +31,7 @@ registerWorkbenchContribution2(
             minimum: 0,
             maximum: 2000,
             description: ( localize(
-                12802,
+                12990,
                 "Controls the hover feedback delay in milliseconds of the dragging area in between views/editors."
             ))
         }

package/vscode/src/vs/workbench/contrib/scrollLocking/browser/scrollLocking.js

@@ -122,8 +122,8 @@ let SyncScroll = class SyncScroll extends Disposable {
     toggleStatusbarItem(active) {
         if (active) {
             if (!this.statusBarEntry.value) {
-                const text = ( localize(13002, "Scrolling Locked"));
-                const tooltip = ( localize(13003, "Lock Scrolling Enabled"));
+                const text = ( localize(13190, "Scrolling Locked"));
+                const tooltip = ( localize(13191, "Lock Scrolling Enabled"));
                 this.statusBarEntry.value = this.statusbarService.addEntry({
                     name: text,
                     text,
@@ -148,13 +148,13 @@ let SyncScroll = class SyncScroll extends Disposable {
                 super({
                     id: "workbench.action.toggleLockedScrolling",
                     title: {
-                        ...( localize2(13004, "Toggle Locked Scrolling Across Editors")),
-                        mnemonicTitle: ( localize(13005, "Locked Scrolling"))
+                        ...( localize2(13192, "Toggle Locked Scrolling Across Editors")),
+                        mnemonicTitle: ( localize(13193, "Locked Scrolling"))
                     },
                     category: Categories.View,
                     f1: true,
                     metadata: {
-                        description: ( localize(13006, "Synchronize Scrolling Editors"))
+                        description: ( localize(13194, "Synchronize Scrolling Editors"))
                     }
                 });
             }
@@ -167,8 +167,8 @@ let SyncScroll = class SyncScroll extends Disposable {
                 super({
                     id: "workbench.action.holdLockedScrolling",
                     title: {
-                        ...( localize2(13007, "Hold Locked Scrolling Across Editors")),
-                        mnemonicTitle: ( localize(13008, "Locked Scrolling"))
+                        ...( localize2(13195, "Hold Locked Scrolling Across Editors")),
+                        mnemonicTitle: ( localize(13196, "Locked Scrolling"))
                     },
                     category: Categories.View
                 });

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

@@ -22,11 +22,11 @@ import { TypeHierarchyTreePeekWidget } from './typeHierarchyPeek.js';
 import { TypeHierarchyDirection, TypeHierarchyProviderRegistry, TypeHierarchyModel } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/typeHierarchy/common/typeHierarchy';
 
 var TypeHierarchyController_1;
-const _ctxHasTypeHierarchyProvider = ( new RawContextKey("editorHasTypeHierarchyProvider", false, ( localize(15405, "Whether a type hierarchy provider is available"))));
-const _ctxTypeHierarchyVisible = ( new RawContextKey("typeHierarchyVisible", false, ( localize(15406, "Whether type hierarchy peek is currently showing"))));
+const _ctxHasTypeHierarchyProvider = ( new RawContextKey("editorHasTypeHierarchyProvider", false, ( localize(15612, "Whether a type hierarchy provider is available"))));
+const _ctxTypeHierarchyVisible = ( new RawContextKey("typeHierarchyVisible", false, ( localize(15613, "Whether type hierarchy peek is currently showing"))));
 const _ctxTypeHierarchyDirection = ( new RawContextKey("typeHierarchyDirection", undefined, {
     type: "string",
-    description: ( localize(15407, "whether type hierarchy shows super types or subtypes"))
+    description: ( localize(15614, "whether type hierarchy shows super types or subtypes"))
 }));
 function sanitizedDirection(candidate) {
     return candidate === TypeHierarchyDirection.Subtypes || candidate === TypeHierarchyDirection.Supertypes ? candidate : TypeHierarchyDirection.Subtypes;
@@ -121,14 +121,14 @@ let TypeHierarchyController = class TypeHierarchyController {
                 this._sessionDisposables.add(model);
                 this._widget.showModel(model);
             } else {
-                this._widget.showMessage(( localize(15408, "No results")));
+                this._widget.showMessage(( localize(15615, "No results")));
             }
         }).catch(err => {
             if (isCancellationError(err)) {
                 this.endTypeHierarchy();
                 return;
             }
-            this._widget.showMessage(( localize(15409, "Failed to show type hierarchy")));
+            this._widget.showMessage(( localize(15616, "Failed to show type hierarchy")));
         });
     }
     async startTypeHierarchyFromTypeHierarchy() {
@@ -179,7 +179,7 @@ registerAction2(class PeekTypeHierarchyAction extends EditorAction2 {
     constructor() {
         super({
             id: "editor.showTypeHierarchy",
-            title: ( localize2(15410, "Peek Type Hierarchy")),
+            title: ( localize2(15617, "Peek Type Hierarchy")),
             menu: {
                 id: MenuId.EditorContextPeek,
                 group: "navigation",
@@ -198,7 +198,7 @@ registerAction2(class extends EditorAction2 {
     constructor() {
         super({
             id: "editor.showSupertypes",
-            title: ( localize2(15411, "Show Supertypes")),
+            title: ( localize2(15618, "Show Supertypes")),
             icon: Codicon.typeHierarchySuper,
             precondition: ( ContextKeyExpr.and(_ctxTypeHierarchyVisible, ( _ctxTypeHierarchyDirection.isEqualTo(TypeHierarchyDirection.Subtypes)))),
             keybinding: {
@@ -220,7 +220,7 @@ registerAction2(class extends EditorAction2 {
     constructor() {
         super({
             id: "editor.showSubtypes",
-            title: ( localize2(15412, "Show Subtypes")),
+            title: ( localize2(15619, "Show Subtypes")),
             icon: Codicon.typeHierarchySub,
             precondition: ( ContextKeyExpr.and(_ctxTypeHierarchyVisible, ( _ctxTypeHierarchyDirection.isEqualTo(TypeHierarchyDirection.Supertypes)))),
             keybinding: {
@@ -242,7 +242,7 @@ registerAction2(class extends EditorAction2 {
     constructor() {
         super({
             id: "editor.refocusTypeHierarchy",
-            title: ( localize2(15413, "Refocus Type Hierarchy")),
+            title: ( localize2(15620, "Refocus Type Hierarchy")),
             precondition: _ctxTypeHierarchyVisible,
             keybinding: {
                 weight: KeybindingWeight.WorkbenchContrib,
@@ -258,7 +258,7 @@ registerAction2(class extends EditorAction2 {
     constructor() {
         super({
             id: "editor.closeTypeHierarchy",
-            title: ( localize(15414, "Close")),
+            title: ( localize(15621, "Close")),
             icon: Codicon.close,
             precondition: _ctxTypeHierarchyVisible,
             keybinding: {

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

@@ -326,12 +326,12 @@ let TypeHierarchyTreePeekWidget = class TypeHierarchyTreePeekWidget extends Peek
             this._previewDisposable.add(toDisposable(() => decorationsCollection.clear()));
         }
         this._previewDisposable.add(value);
-        const title = this._direction === TypeHierarchyDirection.Supertypes ? ( localize(15415, "Supertypes of '{0}'", element.model.root.name)) : ( localize(15416, "Subtypes of '{0}'", element.model.root.name));
+        const title = this._direction === TypeHierarchyDirection.Supertypes ? ( localize(15622, "Supertypes of '{0}'", element.model.root.name)) : ( localize(15623, "Subtypes of '{0}'", element.model.root.name));
         this.setTitle(title);
     }
     showLoading() {
         this._parent.dataset["state"] = State.Loading;
-        this.setTitle(( localize(15417, "Loading...")));
+        this.setTitle(( localize(15624, "Loading...")));
         this._show();
     }
     showMessage(message) {
@@ -349,7 +349,7 @@ let TypeHierarchyTreePeekWidget = class TypeHierarchyTreePeekWidget extends Peek
         const root = this._tree.getNode(model).children[0];
         await this._tree.expand(root.element);
         if (root.children.length === 0) {
-            this.showMessage(this._direction === TypeHierarchyDirection.Supertypes ? ( localize(15418, "No supertypes of '{0}'", model.root.name)) : ( localize(15419, "No subtypes of '{0}'", model.root.name)));
+            this.showMessage(this._direction === TypeHierarchyDirection.Supertypes ? ( localize(15625, "No supertypes of '{0}'", model.root.name)) : ( localize(15626, "No subtypes of '{0}'", model.root.name)));
         } else {
             this._parent.dataset["state"] = State.Data;
             if (!viewState || this._tree.getFocus().length === 0) {

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

@@ -123,13 +123,13 @@ class AccessibilityProvider {
         this.getDirection = getDirection;
     }
     getWidgetAriaLabel() {
-        return localize(15420, "Type Hierarchy");
+        return localize(15627, "Type Hierarchy");
     }
     getAriaLabel(element) {
         if (this.getDirection() === TypeHierarchyDirection.Supertypes) {
-            return localize(15421, "supertypes of {0}", element.item.name);
+            return localize(15628, "supertypes of {0}", element.item.name);
         } else {
-            return localize(15422, "subtypes of {0}", element.item.name);
+            return localize(15629, "subtypes of {0}", element.item.name);
         }
     }
 }

package/vscode/src/vs/workbench/contrib/webview/browser/webviewElement.d.ts

@@ -118,6 +118,8 @@ export declare class WebviewElement extends Disposable implements IWebviewElemen
     private doUpdateContent;
     protected style(): void;
     protected handleFocusChange(isFocused: boolean): void;
+    private shouldForwardKeyEvent;
+    private isActiveElement;
     private handleKeyEvent;
     private handleDragEvent;
     windowDidDragStart(): void;

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

@@ -174,6 +174,9 @@ let WebviewElement = class WebviewElement extends Disposable {
                 uri
             }
         ) => {
+            if (!this.isActiveElement()) {
+                return;
+            }
             this._onDidClickLink.fire(uri);
         }));
         this._register(this.on("onmessage", (
@@ -220,7 +223,7 @@ let WebviewElement = class WebviewElement extends Disposable {
             this._hasFindResult.fire(didFind);
         }));
         this._register(this.on("fatal-error", e => {
-            notificationService.error(( localize(15779, "Error loading webview: {0}", e.message)));
+            notificationService.error(( localize(15986, "Error loading webview: {0}", e.message)));
             this._onFatalError.fire({
                 message: e.message
             });
@@ -643,7 +646,16 @@ let WebviewElement = class WebviewElement extends Disposable {
             this._onDidBlur.fire();
         }
     }
+    shouldForwardKeyEvent(event) {
+        return event.isTrusted || !!this._content.options.forwardUntrustedKeypressEvents;
+    }
+    isActiveElement() {
+        return !!this.element && this.window?.document.activeElement === this.element;
+    }
     handleKeyEvent(type, event) {
+        if (!this.shouldForwardKeyEvent(event) || !this.isActiveElement()) {
+            return;
+        }
         const emulatedKeyboardEvent = ( new KeyboardEvent(type, event));
         Object.defineProperty(emulatedKeyboardEvent, "target", {
             get: () => this.element

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

@@ -18,7 +18,7 @@ class ShowWebViewEditorFindWidgetAction extends Action2 {
         this.ID = "editor.action.webvieweditor.showFind";
     }
     static {
-        this.LABEL = ( localize(15810, "Show find"));
+        this.LABEL = ( localize(16017, "Show find"));
     }
     constructor() {
         super({
@@ -43,7 +43,7 @@ class HideWebViewEditorFindCommand extends Action2 {
         this.ID = "editor.action.webvieweditor.hideFind";
     }
     static {
-        this.LABEL = ( localize(15811, "Stop find"));
+        this.LABEL = ( localize(16018, "Stop find"));
     }
     constructor() {
         super({
@@ -68,7 +68,7 @@ class WebViewEditorFindNextCommand extends Action2 {
         this.ID = "editor.action.webvieweditor.findNext";
     }
     static {
-        this.LABEL = ( localize(15812, "Find next"));
+        this.LABEL = ( localize(16019, "Find next"));
     }
     constructor() {
         super({
@@ -93,7 +93,7 @@ class WebViewEditorFindPreviousCommand extends Action2 {
         this.ID = "editor.action.webvieweditor.findPrevious";
     }
     static {
-        this.LABEL = ( localize(15813, "Find previous"));
+        this.LABEL = ( localize(16020, "Find previous"));
     }
     constructor() {
         super({
@@ -118,7 +118,7 @@ class ReloadWebviewAction extends Action2 {
         this.ID = "workbench.action.webview.reloadWebviewAction";
     }
     static {
-        this.LABEL = ( localize2(15814, "Reload Webviews"));
+        this.LABEL = ( localize2(16021, "Reload Webviews"));
     }
     constructor() {
         super({

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

@@ -126,6 +126,7 @@ function restoreWebviewOptions(options) {
 function restoreWebviewContentOptions(options) {
     return {
         ...options,
+        forwardUntrustedKeypressEvents: options.forwardUntrustedKeypressEvents ?? true,
         localResourceRoots: options.localResourceRoots?.map(uri => reviveUri(uri))
     };
 }

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

@@ -19,7 +19,7 @@ import '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/ins
 import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
 
 ( Registry.as(EditorExtensions.EditorPane)).registerEditorPane(
-    EditorPaneDescriptor.create(WebviewEditor, WebviewEditor.ID, ( localize(15816, "webview editor"))),
+    EditorPaneDescriptor.create(WebviewEditor, WebviewEditor.ID, ( localize(16023, "webview editor"))),
     [( new SyncDescriptor(WebviewInput))]
 );
 let WebviewPanelContribution = class WebviewPanelContribution extends Disposable {

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

@@ -636,8 +636,8 @@ let EditorResolverService = class EditorResolverService extends Disposable {
         if (storedChoices[globForResource]?.find(editorID => editorID === currentEditor.editorId)) {
             return;
         }
-        const handle = this.notificationService.prompt(Severity.Warning, ( localize(16650, "There are multiple default editors available for the resource.")), [{
-            label: ( localize(16651, "Configure Default")),
+        const handle = this.notificationService.prompt(Severity.Warning, ( localize(16865, "There are multiple default editors available for the resource.")), [{
+            label: ( localize(16866, "Configure Default")),
             run: async () => {
                 const picked = await this.doPickEditor(untypedInput, true);
                 if (!picked) {
@@ -655,7 +655,7 @@ let EditorResolverService = class EditorResolverService extends Disposable {
                 }]);
             }
         }, {
-            label: ( localize(16652, "Keep {0}", editorName)),
+            label: ( localize(16867, "Keep {0}", editorName)),
             run: writeCurrentEditorsToStorage
         }]);
         const onCloseListener = handle.onDidClose(() => {
@@ -681,9 +681,9 @@ let EditorResolverService = class EditorResolverService extends Disposable {
             }
         });
         const quickPickEntries = [];
-        const currentlyActiveLabel = ( localize(16653, "Active"));
-        const currentDefaultLabel = ( localize(16654, "Default"));
-        const currentDefaultAndActiveLabel = ( localize(16655, "Active and Default"));
+        const currentlyActiveLabel = ( localize(16868, "Active"));
+        const currentDefaultLabel = ( localize(16869, "Default"));
+        const currentDefaultAndActiveLabel = ( localize(16870, "Active and Default"));
         let defaultViewType = defaultSetting;
         if (!defaultViewType && registeredEditors.length > 2 && this.getEffectivePriority(registeredEditors[1].editorInfo, associationType) !== RegisteredEditorPriority.option) {
             defaultViewType = registeredEditors[1]?.editorInfo.id;
@@ -710,7 +710,7 @@ let EditorResolverService = class EditorResolverService extends Disposable {
             quickPickEntries.push(separator);
             const configureDefaultEntry = {
                 id: EditorResolverService_1.configureDefaultID,
-                label: ( localize(16656, "Configure default editor for '{0}'...", `*${extname(resource)}`))
+                label: ( localize(16871, "Configure default editor for '{0}'...", `*${extname(resource)}`))
             };
             quickPickEntries.push(configureDefaultEntry);
         }
@@ -731,7 +731,7 @@ let EditorResolverService = class EditorResolverService extends Disposable {
         const editorPicker = disposables.add(this.quickInputService.createQuickPick({
             useSeparators: true
         }));
-        const placeHolderMessage = showDefaultPicker ? ( localize(16657, "Select new default editor for '{0}'", `*${extname(resource)}`)) : ( localize(16658, "Select editor for '{0}'", basename(resource)));
+        const placeHolderMessage = showDefaultPicker ? ( localize(16872, "Select new default editor for '{0}'", `*${extname(resource)}`)) : ( localize(16873, "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

@@ -101,33 +101,33 @@ let HistoryService = class HistoryService extends Disposable {
             return matcher;
         }));
         this.editorHelper = this.instantiationService.createInstance(EditorHelper);
-        this.canNavigateBackContextKey = ( new RawContextKey("canNavigateBack", false, ( localize(16873, "Whether it is possible to navigate back in editor history")))).bindTo(this.contextKeyService);
-        this.canNavigateForwardContextKey = ( new RawContextKey("canNavigateForward", false, ( localize(16874, "Whether it is possible to navigate forward in editor history")))).bindTo(this.contextKeyService);
+        this.canNavigateBackContextKey = ( new RawContextKey("canNavigateBack", false, ( localize(17088, "Whether it is possible to navigate back in editor history")))).bindTo(this.contextKeyService);
+        this.canNavigateForwardContextKey = ( new RawContextKey("canNavigateForward", false, ( localize(17089, "Whether it is possible to navigate forward in editor history")))).bindTo(this.contextKeyService);
         this.canNavigateBackInNavigationsContextKey = ( new RawContextKey("canNavigateBackInNavigationLocations", false, ( localize(
-            16875,
+            17090,
             "Whether it is possible to navigate back in editor navigation locations history"
         )))).bindTo(this.contextKeyService);
         this.canNavigateForwardInNavigationsContextKey = ( new RawContextKey("canNavigateForwardInNavigationLocations", false, ( localize(
-            16876,
+            17091,
             "Whether it is possible to navigate forward in editor navigation locations history"
         )))).bindTo(this.contextKeyService);
         this.canNavigateToLastNavigationLocationContextKey = ( new RawContextKey("canNavigateToLastNavigationLocation", false, ( localize(
-            16877,
+            17092,
             "Whether it is possible to navigate to the last editor navigation location"
         )))).bindTo(this.contextKeyService);
         this.canNavigateBackInEditsContextKey = ( new RawContextKey("canNavigateBackInEditLocations", false, ( localize(
-            16878,
+            17093,
             "Whether it is possible to navigate back in editor edit locations history"
         )))).bindTo(this.contextKeyService);
         this.canNavigateForwardInEditsContextKey = ( new RawContextKey("canNavigateForwardInEditLocations", false, ( localize(
-            16879,
+            17094,
             "Whether it is possible to navigate forward in editor edit locations history"
         )))).bindTo(this.contextKeyService);
         this.canNavigateToLastEditLocationContextKey = ( new RawContextKey("canNavigateToLastEditLocation", false, ( localize(
-            16880,
+            17095,
             "Whether it is possible to navigate to the last editor edit location"
         )))).bindTo(this.contextKeyService);
-        this.canReopenClosedEditorContextKey = ( new RawContextKey("canReopenClosedEditor", false, ( localize(16881, "Whether it is possible to reopen the last closed editor")))).bindTo(this.contextKeyService);
+        this.canReopenClosedEditorContextKey = ( new RawContextKey("canReopenClosedEditor", false, ( localize(17096, "Whether it is possible to reopen the last closed editor")))).bindTo(this.contextKeyService);
         this.registerListeners();
         if (this.editorService.activeEditorPane) {
             this.onDidActiveEditorChange();

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

@@ -157,7 +157,9 @@ let ProgressService = class ProgressService extends Disposable {
             this.updateWindowProgress();
             Promise.all([timeout(150), promise]).finally(() => {
                 const idx = this.windowProgressStack.indexOf(task);
-                this.windowProgressStack.splice(idx, 1);
+                if (idx !== -1) {
+                    this.windowProgressStack.splice(idx, 1);
+                }
                 this.updateWindowProgress();
             });
         }, 150);
@@ -173,20 +175,20 @@ 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 = ( localize(17010, "{0}: {1}", progressTitle, progressMessage));
-                title = source ? ( localize(17011, "[{0}] {1}: {2}", source, progressTitle, progressMessage)) : text;
+                text = ( localize(17225, "{0}: {1}", progressTitle, progressMessage));
+                title = source ? ( localize(17226, "[{0}] {1}: {2}", source, progressTitle, progressMessage)) : text;
             } else if (progressTitle) {
                 text = progressTitle;
-                title = source ? ( localize(17012, "[{0}]: {1}", source, progressTitle)) : text;
+                title = source ? ( localize(17227, "[{0}]: {1}", source, progressTitle)) : text;
             } else if (progressMessage) {
                 text = progressMessage;
-                title = source ? ( localize(17012, "[{0}]: {1}", source, progressMessage)) : text;
+                title = source ? ( localize(17227, "[{0}]: {1}", source, progressMessage)) : text;
             } else {
                 this.updateWindowProgress(idx + 1);
                 return;
             }
             const statusEntryProperties = {
-                name: ( localize(17013, "Progress Message")),
+                name: ( localize(17228, "Progress Message")),
                 text,
                 showProgress: options.type || true,
                 ariaLabel: text,
@@ -292,7 +294,7 @@ let ProgressService = class ProgressService extends Disposable {
                     constructor() {
                         super(
                             "progress.cancel",
-                            typeof options.cancellable === "string" ? options.cancellable : ( localize(17014, "Cancel")),
+                            typeof options.cancellable === "string" ? options.cancellable : ( localize(17229, "Cancel")),
                             undefined,
                             true
                         );
@@ -484,7 +486,7 @@ let ProgressService = class ProgressService extends Disposable {
             const buttons = options.buttons || [];
             if (!options.sticky) {
                 buttons.push(
-                    options.cancellable ? (typeof options.cancellable === "boolean" ? ( localize(17014, "Cancel")) : options.cancellable) : ( localize(17015, "Dismiss"))
+                    options.cancellable ? (typeof options.cancellable === "boolean" ? ( localize(17229, "Cancel")) : options.cancellable) : ( localize(17230, "Dismiss"))
                 );
             }
             dialog = ( new Dialog(

package/vscode/src/vs/workbench/services/views/browser/viewDescriptorService.d.ts

@@ -78,7 +78,6 @@ export declare class ViewDescriptorService extends Disposable implements IViewDe
     getViewContainerByViewId(viewId: string): ViewContainer | null;
     getViewContainerLocation(viewContainer: ViewContainer): ViewContainerLocation;
     getDefaultViewContainerLocation(viewContainer: ViewContainer): ViewContainerLocation;
-    private getEffectiveViewContainerLocation;
     getDefaultContainerById(viewId: string): ViewContainer | null;
     getViewContainerModel(container: ViewContainer): ViewContainerModel;
     getViewContainerById(id: string): ViewContainer | null;