@codingame/monaco-vscode-view-common-service-override 9.0.2 → 9.0.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-view-common-service-override",
-  "version": "9.0.2",
+  "version": "9.0.3",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -26,7 +26,7 @@
     }
   },
   "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@9.0.2",
-    "@codingame/monaco-vscode-bulk-edit-service-override": "9.0.2"
+    "vscode": "npm:@codingame/monaco-vscode-api@9.0.3",
+    "@codingame/monaco-vscode-bulk-edit-service-override": "9.0.3"
   }
 }

package/vscode/src/vs/workbench/browser/parts/compositeBar.js

@@ -122,7 +122,7 @@ let CompositeBar = class CompositeBar extends Widget {
                 return item && this.instantiationService.createInstance(CompositeActionViewItem, { ...options, draggable: true, colors: this.options.colors, icon: this.options.icon, hoverOptions: this.options.activityHoverOptions, compact: this.options.compact }, action, item.pinnedAction, item.toggleBadgeAction, compositeId => this.options.getContextMenuActionsForComposite(compositeId), () => this.getContextMenuActions(), this.options.dndHandler, this);
             },
             orientation: this.options.orientation,
-            ariaLabel: ( localize(11175, "Active View Switcher")),
+            ariaLabel: ( localize(11162, "Active View Switcher")),
             ariaRole: 'tablist',
             preventLoopNavigation: this.options.preventLoopNavigation,
             triggerKeys: { keyDown: true }

package/vscode/src/vs/workbench/contrib/callHierarchy/browser/callHierarchyPeek.js

@@ -267,13 +267,13 @@ let CallHierarchyTreePeekWidget = class CallHierarchyTreePeekWidget extends Peek
         }
         this._previewDisposable.add(value);
         const title = this._direction === CallHierarchyDirection.CallsFrom
-            ? ( localize(9545, "Calls from '{0}'", element.model.root.name))
-            : ( localize(9546, "Callers of '{0}'", element.model.root.name));
+            ? ( localize(9550, "Calls from '{0}'", element.model.root.name))
+            : ( localize(9551, "Callers of '{0}'", element.model.root.name));
         this.setTitle(title);
     }
     showLoading() {
         this._parent.dataset['state'] = State.Loading;
-        this.setTitle(( localize(9547, "Loading...")));
+        this.setTitle(( localize(9552, "Loading...")));
         this._show();
     }
     showMessage(message) {
@@ -292,8 +292,8 @@ let CallHierarchyTreePeekWidget = class CallHierarchyTreePeekWidget extends Peek
         await this._tree.expand(root.element);
         if (root.children.length === 0) {
             this.showMessage(this._direction === CallHierarchyDirection.CallsFrom
-                ? ( localize(9548, "No calls from '{0}'", model.root.name))
-                : ( localize(9549, "No callers of '{0}'", model.root.name)));
+                ? ( localize(9553, "No calls from '{0}'", model.root.name))
+                : ( localize(9554, "No callers of '{0}'", model.root.name)));
         }
         else {
             this._parent.dataset['state'] = State.Data;

package/vscode/src/vs/workbench/contrib/callHierarchy/browser/callHierarchyTree.js

@@ -128,14 +128,14 @@ class AccessibilityProvider {
         this.getDirection = getDirection;
     }
     getWidgetAriaLabel() {
-        return ( localize(11242, "Call Hierarchy"));
+        return ( localize(11245, "Call Hierarchy"));
     }
     getAriaLabel(element) {
         if (this.getDirection() === CallHierarchyDirection.CallsFrom) {
-            return ( localize(11243, "calls from {0}", element.item.name));
+            return ( localize(11246, "calls from {0}", element.item.name));
         }
         else {
-            return ( localize(11244, "callers of {0}", element.item.name));
+            return ( localize(11247, "callers of {0}", element.item.name));
         }
     }
 }

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

@@ -159,8 +159,8 @@ let InputCodeEditorView = class InputCodeEditorView extends CodeEditorView {
             }
             this.editor.setModel(this.inputNumber === 1 ? vm.model.input1.textModel : vm.model.input2.textModel);
             const title = this.inputNumber === 1
-                ? vm.model.input1.title || ( localize(11276, 'Input 1'))
-                : vm.model.input2.title || ( localize(11277, 'Input 2'));
+                ? vm.model.input1.title || ( localize(11271, 'Input 1'))
+                : vm.model.input2.title || ( localize(11272, 'Input 2'));
             const description = this.inputNumber === 1
                 ? vm.model.input1.description
                 : vm.model.input2.description;
@@ -242,19 +242,19 @@ class ModifiedBaseRangeGutterItemModel {
         const both = state.includesInput1 && state.includesInput2;
         return [
             this.baseRange.input1Diffs.length > 0
-                ? action('mergeEditor.acceptInput1', ( localize(11278, 'Accept {0}', this.model.input1.title)), state.toggle(1), state.includesInput1)
+                ? action('mergeEditor.acceptInput1', ( localize(11273, 'Accept {0}', this.model.input1.title)), state.toggle(1), state.includesInput1)
                 : undefined,
             this.baseRange.input2Diffs.length > 0
-                ? action('mergeEditor.acceptInput2', ( localize(11278, 'Accept {0}', this.model.input2.title)), state.toggle(2), state.includesInput2)
+                ? action('mergeEditor.acceptInput2', ( localize(11273, 'Accept {0}', this.model.input2.title)), state.toggle(2), state.includesInput2)
                 : undefined,
             this.baseRange.isConflicting
-                ? setFields(action('mergeEditor.acceptBoth', ( localize(11279, 'Accept Both')), state.withInputValue(1, !both).withInputValue(2, !both), both), { enabled: this.baseRange.canBeCombined })
+                ? setFields(action('mergeEditor.acceptBoth', ( localize(11274, 'Accept Both')), state.withInputValue(1, !both).withInputValue(2, !both), both), { enabled: this.baseRange.canBeCombined })
                 : undefined,
             ( (new Separator())),
             this.baseRange.isConflicting
-                ? setFields(action('mergeEditor.swap', ( localize(11280, 'Swap')), state.swap(), false), { enabled: !state.kind && (!both || this.baseRange.isOrderRelevant) })
+                ? setFields(action('mergeEditor.swap', ( localize(11275, 'Swap')), state.swap(), false), { enabled: !state.kind && (!both || this.baseRange.isOrderRelevant) })
                 : undefined,
-            setFields(( (new Action('mergeEditor.markAsHandled', ( localize(11281, 'Mark as Handled')), undefined, true, () => {
+            setFields(( (new Action('mergeEditor.markAsHandled', ( localize(11276, 'Mark as Handled')), undefined, true, () => {
                 transaction((tx) => {
                     this.model.setHandled(this.baseRange, !handled, tx);
                 });
@@ -297,10 +297,10 @@ class MergeConflictGutterItemView extends Disposable {
             const item = this.item.read(reader);
             const value = item.toggleState.read(reader);
             const iconMap = {
-                [InputState.excluded]: { icon: undefined, checked: false, title: ( localize(11282, "Accept")) },
-                [InputState.unrecognized]: { icon: Codicon.circleFilled, checked: false, title: ( localize(11283, "Accept (result is dirty)")) },
-                [InputState.first]: { icon: Codicon.check, checked: true, title: ( localize(11284, "Undo accept")) },
-                [InputState.second]: { icon: Codicon.checkAll, checked: true, title: ( localize(11285, "Undo accept (currently second)")) },
+                [InputState.excluded]: { icon: undefined, checked: false, title: ( localize(11277, "Accept")) },
+                [InputState.unrecognized]: { icon: Codicon.circleFilled, checked: false, title: ( localize(11278, "Accept (result is dirty)")) },
+                [InputState.first]: { icon: Codicon.check, checked: true, title: ( localize(11279, "Undo accept")) },
+                [InputState.second]: { icon: Codicon.checkAll, checked: true, title: ( localize(11280, "Undo accept (currently second)")) },
             };
             const state = iconMap[value];
             checkBox.setIcon(state.icon);

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

@@ -131,7 +131,7 @@ let ResultCodeEditorView = class ResultCodeEditorView extends CodeEditorView {
                 return;
             }
             this.editor.setModel(vm.model.resultTextModel);
-            reset(this.htmlElements.title, ...renderLabelWithIcons(( localize(11271, 'Result'))));
+            reset(this.htmlElements.title, ...renderLabelWithIcons(( localize(11281, 'Result'))));
             reset(this.htmlElements.description, ...renderLabelWithIcons(this._labelService.getUriLabel(vm.model.resultTextModel.uri, { relative: true })));
         }));
         const remainingConflictsActionBar = this._register(( (new ActionBar(this.htmlElements.detail))));
@@ -146,8 +146,8 @@ let ResultCodeEditorView = class ResultCodeEditorView extends CodeEditorView {
             }
             const count = model.unhandledConflictsCount.read(reader);
             const text = count === 1
-                ? ( localize(11272, '{0} Conflict Remaining', count))
-                : ( localize(11273, '{0} Conflicts Remaining ', count));
+                ? ( localize(11282, '{0} Conflict Remaining', count))
+                : ( localize(11283, '{0} Conflicts Remaining ', count));
             remainingConflictsActionBar.clear();
             remainingConflictsActionBar.push({
                 class: undefined,
@@ -159,8 +159,8 @@ let ResultCodeEditorView = class ResultCodeEditorView extends CodeEditorView {
                     vm.goToNextModifiedBaseRange(m => !model.isHandled(m).get());
                 },
                 tooltip: count > 0
-                    ? ( localize(11274, 'Go to next conflict'))
-                    : ( localize(11275, 'All conflicts handled, the merge can be completed now.')),
+                    ? ( localize(11284, 'Go to next conflict'))
+                    : ( localize(11285, 'All conflicts handled, the merge can be completed now.')),
             });
         }));
         this._register(applyObservableDecorations(this.editor, this.decorations));

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

@@ -262,13 +262,13 @@ let TypeHierarchyTreePeekWidget = class TypeHierarchyTreePeekWidget extends Peek
         }
         this._previewDisposable.add(value);
         const title = this._direction === TypeHierarchyDirection.Supertypes
-            ? ( localize(9550, "Supertypes of '{0}'", element.model.root.name))
-            : ( localize(9551, "Subtypes of '{0}'", element.model.root.name));
+            ? ( localize(9545, "Supertypes of '{0}'", element.model.root.name))
+            : ( localize(9546, "Subtypes of '{0}'", element.model.root.name));
         this.setTitle(title);
     }
     showLoading() {
         this._parent.dataset['state'] = State.Loading;
-        this.setTitle(( localize(9552, "Loading...")));
+        this.setTitle(( localize(9547, "Loading...")));
         this._show();
     }
     showMessage(message) {
@@ -287,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
-                ? ( localize(9553, "No supertypes of '{0}'", model.root.name))
-                : ( localize(9554, "No subtypes of '{0}'", model.root.name)));
+                ? ( localize(9548, "No supertypes of '{0}'", model.root.name))
+                : ( localize(9549, "No subtypes of '{0}'", model.root.name)));
         }
         else {
             this._parent.dataset['state'] = State.Data;

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

@@ -116,14 +116,14 @@ class AccessibilityProvider {
         this.getDirection = getDirection;
     }
     getWidgetAriaLabel() {
-        return ( localize(11245, "Type Hierarchy"));
+        return ( localize(11242, "Type Hierarchy"));
     }
     getAriaLabel(element) {
         if (this.getDirection() === TypeHierarchyDirection.Supertypes) {
-            return ( localize(11246, "supertypes of {0}", element.item.name));
+            return ( localize(11243, "supertypes of {0}", element.item.name));
         }
         else {
-            return ( localize(11247, "subtypes of {0}", element.item.name));
+            return ( localize(11244, "subtypes of {0}", element.item.name));
         }
     }
 }