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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (52) hide show
  1. package/package.json +3 -3
  2. package/vscode/src/vs/workbench/api/browser/viewsExtensionPoint.js +80 -149
  3. package/vscode/src/vs/workbench/browser/actions/listCommands.js +5 -7
  4. package/vscode/src/vs/workbench/browser/actions/navigationActions.js +7 -8
  5. package/vscode/src/vs/workbench/browser/parts/activitybar/activitybarPart.js +24 -26
  6. package/vscode/src/vs/workbench/browser/parts/auxiliarybar/auxiliaryBarPart.js +6 -14
  7. package/vscode/src/vs/workbench/browser/parts/auxiliarybar/media/auxiliaryBarPart.css.js +1 -1
  8. package/vscode/src/vs/workbench/browser/parts/compositeBar.js +2 -3
  9. package/vscode/src/vs/workbench/browser/parts/compositePart.js +4 -5
  10. package/vscode/src/vs/workbench/browser/parts/editor/editor.contribution.js +161 -160
  11. package/vscode/src/vs/workbench/browser/parts/editor/editorConfiguration.js +13 -18
  12. package/vscode/src/vs/workbench/browser/parts/editor/editorDropTarget.js +2 -8
  13. package/vscode/src/vs/workbench/browser/parts/editor/editorPart.js +3 -0
  14. package/vscode/src/vs/workbench/browser/parts/editor/editorParts.js +2 -3
  15. package/vscode/src/vs/workbench/browser/parts/media/paneCompositePart.css.js +1 -1
  16. package/vscode/src/vs/workbench/browser/parts/paneCompositeBar.js +3 -4
  17. package/vscode/src/vs/workbench/browser/parts/paneCompositePart.js +6 -7
  18. package/vscode/src/vs/workbench/browser/parts/panel/panelPart.js +19 -16
  19. package/vscode/src/vs/workbench/browser/parts/sidebar/media/sidebarpart.css.js +1 -1
  20. package/vscode/src/vs/workbench/browser/parts/sidebar/sidebarActions.js +2 -3
  21. package/vscode/src/vs/workbench/browser/parts/sidebar/sidebarPart.js +2 -3
  22. package/vscode/src/vs/workbench/contrib/callHierarchy/browser/callHierarchy.contribution.js +13 -14
  23. package/vscode/src/vs/workbench/contrib/callHierarchy/browser/callHierarchyPeek.js +6 -7
  24. package/vscode/src/vs/workbench/contrib/callHierarchy/browser/callHierarchyTree.js +4 -5
  25. package/vscode/src/vs/workbench/contrib/customEditor/common/contributedCustomEditors.js +2 -3
  26. package/vscode/src/vs/workbench/contrib/customEditor/common/customEditor.js +2 -3
  27. package/vscode/src/vs/workbench/contrib/customEditor/common/extensionPoint.js +18 -24
  28. package/vscode/src/vs/workbench/contrib/languageStatus/browser/languageStatus.contribution.js +9 -10
  29. package/vscode/src/vs/workbench/contrib/limitIndicator/browser/limitIndicator.contribution.js +9 -10
  30. package/vscode/src/vs/workbench/contrib/mergeEditor/browser/commands/commands.js +29 -31
  31. package/vscode/src/vs/workbench/contrib/mergeEditor/browser/commands/devCommands.js +15 -16
  32. package/vscode/src/vs/workbench/contrib/mergeEditor/browser/mergeEditor.contribution.js +4 -5
  33. package/vscode/src/vs/workbench/contrib/mergeEditor/browser/view/colors.js +14 -15
  34. package/vscode/src/vs/workbench/contrib/mergeEditor/browser/view/conflictActions.js +26 -31
  35. package/vscode/src/vs/workbench/contrib/mergeEditor/browser/view/editors/baseCodeEditorView.js +5 -7
  36. package/vscode/src/vs/workbench/contrib/mergeEditor/browser/view/editors/inputCodeEditorView.js +12 -13
  37. package/vscode/src/vs/workbench/contrib/mergeEditor/browser/view/editors/resultCodeEditorView.js +6 -7
  38. package/vscode/src/vs/workbench/contrib/mergeEditor/browser/view/mergeEditor.js +2 -3
  39. package/vscode/src/vs/workbench/contrib/mergeEditor/browser/view/viewModel.js +2 -7
  40. package/vscode/src/vs/workbench/contrib/preferences/browser/keyboardLayoutPicker.js +15 -18
  41. package/vscode/src/vs/workbench/contrib/sash/browser/sash.contribution.js +5 -8
  42. package/vscode/src/vs/workbench/contrib/typeHierarchy/browser/typeHierarchy.contribution.js +11 -12
  43. package/vscode/src/vs/workbench/contrib/typeHierarchy/browser/typeHierarchyPeek.js +6 -7
  44. package/vscode/src/vs/workbench/contrib/typeHierarchy/browser/typeHierarchyTree.js +4 -5
  45. package/vscode/src/vs/workbench/contrib/webview/browser/webviewElement.js +13 -4
  46. package/vscode/src/vs/workbench/contrib/webviewPanel/browser/webviewCommands.js +6 -7
  47. package/vscode/src/vs/workbench/contrib/webviewPanel/browser/webviewPanel.contribution.js +2 -3
  48. package/vscode/src/vs/workbench/services/editor/browser/editorResolverService.js +10 -25
  49. package/vscode/src/vs/workbench/services/history/browser/historyService.js +16 -27
  50. package/vscode/src/vs/workbench/services/progress/browser/progressService.js +8 -9
  51. package/vscode/src/vs/workbench/services/views/browser/viewDescriptorService.js +3 -4
  52. package/vscode/src/vs/workbench/services/views/common/viewContainerModel.js +2 -3
package/vscode/src/vs/workbench/browser/parts/editor/editorConfiguration.js CHANGED
@@ -1,5 +1,5 @@
1
1
  import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
2
- import { localizeWithPath } from 'vscode/vscode/vs/nls';
2
+ import { localize } from 'vscode/vscode/vs/nls';
3
3
  import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
4
4
  import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
5
5
  import { Extensions, ConfigurationScope } from 'vscode/vscode/vs/platform/configuration/common/configurationRegistry';
@@ -13,7 +13,6 @@ import { IWorkbenchEnvironmentService } from 'vscode/vscode/vs/workbench/service
13
13
  import { getLargeFileConfirmationLimit, ByteSize } from 'vscode/vscode/vs/platform/files/common/files';
14
14
 
15
15
  var DynamicEditorConfigurations_1;
16
- const _moduleId = "vs/workbench/browser/parts/editor/editorConfiguration";
17
16
  let DynamicEditorConfigurations = class DynamicEditorConfigurations extends Disposable {
18
17
  static { DynamicEditorConfigurations_1 = this; }
19
18
  static { this.ID = 'workbench.contrib.dynamicEditorConfigurations'; }
@@ -25,22 +24,22 @@ let DynamicEditorConfigurations = class DynamicEditorConfigurations extends Disp
25
24
  static { this.AUTO_LOCK_EXTRA_EDITORS = [
26
25
  {
27
26
  id: 'workbench.input.interactive',
28
- label: ( localizeWithPath(_moduleId, 0, 'Interactive Window')),
27
+ label: ( localize(9728, 'Interactive Window')),
29
28
  priority: RegisteredEditorPriority.builtin
30
29
  },
31
30
  {
32
31
  id: 'mainThreadWebview-markdown.preview',
33
- label: ( localizeWithPath(_moduleId, 1, "Markdown Preview")),
32
+ label: ( localize(9729, "Markdown Preview")),
34
33
  priority: RegisteredEditorPriority.builtin
35
34
  },
36
35
  {
37
36
  id: 'mainThreadWebview-simpleBrowser.view',
38
- label: ( localizeWithPath(_moduleId, 2, "Simple Browser")),
37
+ label: ( localize(9730, "Simple Browser")),
39
38
  priority: RegisteredEditorPriority.builtin
40
39
  },
41
40
  {
42
41
  id: 'mainThreadWebview-browserPreview',
43
- label: ( localizeWithPath(_moduleId, 3, "Live Preview")),
42
+ label: ( localize(9731, "Live Preview")),
44
43
  priority: RegisteredEditorPriority.builtin
45
44
  }
46
45
  ]; }
@@ -84,9 +83,8 @@ let DynamicEditorConfigurations = class DynamicEditorConfigurations extends Disp
84
83
  properties: {
85
84
  'workbench.editor.autoLockGroups': {
86
85
  type: 'object',
87
- description: ( localizeWithPath(
88
- _moduleId,
89
- 4,
86
+ description: ( localize(
87
+ 9732,
90
88
  "If an editor matching one of the listed types is opened as the first in an editor group and more than one group is open, the group is automatically locked. Locked groups will only be used for opening editors when explicitly chosen by a user gesture (for example drag and drop), but not by default. Consequently, the active editor in a locked group is less likely to be replaced accidentally with a different editor."
91
89
  )),
92
90
  properties: autoLockGroupConfiguration,
@@ -103,9 +101,8 @@ let DynamicEditorConfigurations = class DynamicEditorConfigurations extends Disp
103
101
  type: 'string',
104
102
  default: '',
105
103
  enum: [...binaryEditorCandidates, ''],
106
- description: ( localizeWithPath(
107
- _moduleId,
108
- 5,
104
+ description: ( localize(
105
+ 9733,
109
106
  "The default editor for files detected as binary. If undefined, the user will be presented with a picker."
110
107
  )),
111
108
  }
@@ -117,9 +114,8 @@ let DynamicEditorConfigurations = class DynamicEditorConfigurations extends Disp
117
114
  properties: {
118
115
  'workbench.editorAssociations': {
119
116
  type: 'object',
120
- markdownDescription: ( localizeWithPath(
121
- _moduleId,
122
- 6,
117
+ markdownDescription: ( localize(
118
+ 9734,
123
119
  "Configure [glob patterns](https://aka.ms/vscode-glob-patterns) to editors (for example `\"*.hex\": \"hexEditor.hexedit\"`). These have precedence over the default behavior."
124
120
  )),
125
121
  patternProperties: {
@@ -140,9 +136,8 @@ let DynamicEditorConfigurations = class DynamicEditorConfigurations extends Disp
140
136
  default: getLargeFileConfirmationLimit(this.environmentService.remoteAuthority) / ByteSize.MB,
141
137
  minimum: 1,
142
138
  scope: ConfigurationScope.RESOURCE,
143
- markdownDescription: ( localizeWithPath(
144
- _moduleId,
145
- 7,
139
+ markdownDescription: ( localize(
140
+ 9735,
146
141
  "Controls the minimum size of a file in MB before asking for confirmation when opening in the editor. Note that this setting may not apply to all editor types and environments."
147
142
  )),
148
143
  }
package/vscode/src/vs/workbench/browser/parts/editor/editorDropTarget.js CHANGED
@@ -7,7 +7,7 @@ import { RunOnceScheduler } from 'vscode/vscode/vs/base/common/async';
7
7
  import { toDisposable } from 'vscode/vscode/vs/base/common/lifecycle';
8
8
  import { isMacintosh, isWeb } from 'vscode/vscode/vs/base/common/platform';
9
9
  import { assertIsDefined, assertAllDefined } from 'vscode/vscode/vs/base/common/types';
10
- import { localizeWithPath } from 'vscode/vscode/vs/nls';
10
+ import { localize } from 'vscode/vscode/vs/nls';
11
11
  import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
12
12
  import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
13
13
  import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
@@ -38,7 +38,6 @@ import { ITreeViewsDnDService } from 'vscode/vscode/vs/editor/common/services/tr
38
38
  import { DraggedTreeItemsIdentifier } from 'vscode/vscode/vs/editor/common/services/treeViewsDnd';
39
39
 
40
40
  var DropOverlay_1;
41
- const _moduleId = "vs/workbench/browser/parts/editor/editorDropTarget";
42
41
  function isDropIntoEditorEnabledGlobally(configurationService) {
43
42
  return configurationService.getValue('editor.dropIntoEditor.enabled');
44
43
  }
@@ -80,12 +79,7 @@ let DropOverlay = class DropOverlay extends Themable {
80
79
  this.overlay.classList.add('editor-group-overlay-indicator');
81
80
  container.appendChild(this.overlay);
82
81
  if (this.enableDropIntoEditor) {
83
- this.dropIntoPromptElement = renderFormattedText(( localizeWithPath(
84
- _moduleId,
85
- 0,
86
- "Hold __{0}__ to drop into editor",
87
- isMacintosh ? '⇧' : 'Shift'
88
- )), {});
82
+ this.dropIntoPromptElement = renderFormattedText(( localize(10821, "Hold __{0}__ to drop into editor", isMacintosh ? '⇧' : 'Shift')), {});
89
83
  this.dropIntoPromptElement.classList.add('editor-group-overlay-drop-into-prompt');
90
84
  this.overlay.appendChild(this.dropIntoPromptElement);
91
85
  }
package/vscode/src/vs/workbench/browser/parts/editor/editorPart.js CHANGED
@@ -792,6 +792,9 @@ let EditorPart = class EditorPart extends Part {
792
792
  if (e.eventData.clientY > boundingRect.bottom - proximity) {
793
793
  openVerticalPosition = Position.BOTTOM;
794
794
  }
795
+ if (e.eventData.clientY < boundingRect.top + proximity) {
796
+ openVerticalPosition = Position.TOP;
797
+ }
795
798
  if (horizontalOpenerTimeout && openHorizontalPosition !== lastOpenHorizontalPosition) {
796
799
  clearTimeout(horizontalOpenerTimeout);
797
800
  horizontalOpenerTimeout = undefined;
package/vscode/src/vs/workbench/browser/parts/editor/editorParts.js CHANGED
@@ -1,5 +1,5 @@
1
1
  import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
2
- import { localizeWithPath } from 'vscode/vscode/vs/nls';
2
+ import { localize } from 'vscode/vscode/vs/nls';
3
3
  import { GroupsOrder, GroupLocation } from 'vscode/vscode/vs/workbench/services/editor/common/editorGroupsService';
4
4
  import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
5
5
  import { Emitter } from 'vscode/vscode/vs/base/common/event';
@@ -19,7 +19,6 @@ import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/
19
19
  import { isHTMLElement } from 'vscode/vscode/vs/base/browser/dom';
20
20
 
21
21
  var EditorParts_1;
22
- const _moduleId = "vs/workbench/browser/parts/editor/editorParts";
23
22
  let EditorParts = class EditorParts extends MultiWindowParts {
24
23
  static { EditorParts_1 = this; }
25
24
  constructor(instantiationService, storageService, themeService, auxiliaryWindowService, contextKeyService) {
@@ -126,7 +125,7 @@ let EditorParts = class EditorParts extends MultiWindowParts {
126
125
  }
127
126
  }
128
127
  getGroupsLabel(index) {
129
- return ( localizeWithPath(_moduleId, 0, "Window {0}", index + 1));
128
+ return ( localize(3057, "Window {0}", index + 1));
130
129
  }
131
130
  getPart(groupOrElement) {
132
131
  if (this._parts.size > 1) {
package/vscode/src/vs/workbench/browser/parts/media/paneCompositePart.css.js CHANGED
@@ -1,6 +1,6 @@
1
1
  import n from 'vscode/external/rollup-plugin-styles/dist/runtime/inject-css.js';
2
2
 
3
- var css = ".monaco-workbench .pane-composite-part>.title.has-composite-bar>.title-actions .monaco-action-bar .actions-container{justify-content:flex-end}.monaco-workbench .pane-composite-part>.title.has-composite-bar>.global-actions .monaco-action-bar .action-item,.monaco-workbench .pane-composite-part>.title.has-composite-bar>.title-actions .monaco-action-bar .action-item{margin-right:4px}.monaco-workbench .pane-composite-part>.title.has-composite-bar>.title-actions .monaco-action-bar .action-item .action-label{outline-offset:-2px}.monaco-workbench .pane-composite-part>.title.has-composite-bar>.title-label{display:none}.monaco-workbench .pane-composite-part>.header-or-footer{background-color:var(--vscode-activityBarTop-background);padding-left:4px;padding-right:4px}.monaco-workbench .pane-composite-part>.header{border-bottom:1px solid var(--vscode-sideBarActivityBarTop-border)}.monaco-workbench .pane-composite-part>.footer{border-top:1px solid var(--vscode-sideBarActivityBarTop-border)}.monaco-workbench .pane-composite-part>.header-or-footer>.composite-bar-container,.monaco-workbench .pane-composite-part>.title>.composite-bar-container{display:flex}.monaco-workbench .pane-composite-part>.header-or-footer .composite-bar-container{flex:1}.monaco-workbench .pane-composite-part>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-label.codicon-more,.monaco-workbench .pane-composite-part>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-label.codicon-more{align-items:center;color:inherit!important;display:flex;justify-content:center;margin-left:0;margin-right:0}.monaco-workbench .pane-composite-part>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar,.monaco-workbench .pane-composite-part>.title>.composite-bar-container>.composite-bar>.monaco-action-bar{height:35px;line-height:27px}.monaco-workbench .pane-composite-part>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item,.monaco-workbench .pane-composite-part>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item{display:flex;font-size:11px;padding:2px 10px;text-transform:uppercase}.monaco-workbench .pane-composite-part>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.icon,.monaco-workbench .pane-composite-part>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.icon{height:35px;padding:0 5px}.monaco-workbench .pane-composite-part>.header-or-footer>.composite-bar-container>.composite-bar .monaco-action-bar .action-label.codicon,.monaco-workbench .pane-composite-part>.title>.composite-bar-container>.composite-bar .monaco-action-bar .action-label.codicon{font-size:18px}.monaco-workbench .pane-composite-part>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.icon .action-label:not(.codicon),.monaco-workbench .pane-composite-part>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.icon .action-label:not(.codicon){height:16px;width:16px}.monaco-workbench .pane-composite-part>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:after,.monaco-workbench .pane-composite-part>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:before,.monaco-workbench .pane-composite-part>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:after,.monaco-workbench .pane-composite-part>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:before{background-color:var(--insert-border-color);content:\"\";display:none;height:24px;opacity:0;position:absolute;transition-delay:.1s;transition-duration:0ms;transition-property:opacity;width:2px}.monaco-workbench .pane-composite-part>.header-or-footer>.composite-bar-container.dragged-over>.composite-bar>.monaco-action-bar .action-item:after,.monaco-workbench .pane-composite-part>.header-or-footer>.composite-bar-container.dragged-over>.composite-bar>.monaco-action-bar .action-item:before,.monaco-workbench .pane-composite-part>.title>.composite-bar-container.dragged-over>.composite-bar>.monaco-action-bar .action-item:after,.monaco-workbench .pane-composite-part>.title>.composite-bar-container.dragged-over>.composite-bar>.monaco-action-bar .action-item:before{display:block}.monaco-workbench .pane-composite-part>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:before,.monaco-workbench .pane-composite-part>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:before{left:1px;margin-left:-2px}.monaco-workbench .pane-composite-part>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:after,.monaco-workbench .pane-composite-part>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:after{margin-right:-2px;right:1px}.monaco-workbench .pane-composite-part>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:first-of-type:before,.monaco-workbench .pane-composite-part>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:first-of-type:before{left:2px;margin-left:-2px}.monaco-workbench .pane-composite-part>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:last-of-type:after,.monaco-workbench .pane-composite-part>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:last-of-type:after{margin-right:-2px;right:2px}.monaco-workbench .pane-composite-part>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.left:after,.monaco-workbench .pane-composite-part>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.left:before,.monaco-workbench .pane-composite-part>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.right:after,.monaco-workbench .pane-composite-part>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.right:before,.monaco-workbench .pane-composite-part>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.left:after,.monaco-workbench .pane-composite-part>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.left:before,.monaco-workbench .pane-composite-part>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.right:after,.monaco-workbench .pane-composite-part>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.right:before{transition-delay:0s}.monaco-workbench .pane-composite-part>.header-or-footer>.composite-bar-container.dragged-over-head>.composite-bar>.monaco-action-bar .action-item:first-of-type:before,.monaco-workbench .pane-composite-part>.header-or-footer>.composite-bar-container.dragged-over-tail>.composite-bar>.monaco-action-bar .action-item:last-of-type:after,.monaco-workbench .pane-composite-part>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.left:before,.monaco-workbench .pane-composite-part>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.right+.action-item:before,.monaco-workbench .pane-composite-part>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:last-of-type.right:after,.monaco-workbench .pane-composite-part>.title>.composite-bar-container.dragged-over-head>.composite-bar>.monaco-action-bar .action-item:first-of-type:before,.monaco-workbench .pane-composite-part>.title>.composite-bar-container.dragged-over-tail>.composite-bar>.monaco-action-bar .action-item:last-of-type:after,.monaco-workbench .pane-composite-part>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.left:before,.monaco-workbench .pane-composite-part>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.right+.action-item:before,.monaco-workbench .pane-composite-part>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:last-of-type.right:after{opacity:1}.monaco-workbench .pane-composite-part>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item .action-label,.monaco-workbench .pane-composite-part>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item .action-label{border-radius:0;margin-right:0;padding:2px}.monaco-workbench .pane-composite-part>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.icon .action-label.codicon,.monaco-workbench .pane-composite-part>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:not(.icon) .action-label,.monaco-workbench .pane-composite-part>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.icon .action-label.codicon,.monaco-workbench .pane-composite-part>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:not(.icon) .action-label{background:none!important}.monaco-workbench .pane-composite-part>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.checked .action-label,.monaco-workbench .pane-composite-part>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.checked .action-label{margin-right:0}.monaco-workbench .pane-composite-part>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .badge,.monaco-workbench .pane-composite-part>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .badge{align-items:center;display:flex;margin-left:8px}.monaco-workbench .pane-composite-part>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.icon .badge,.monaco-workbench .pane-composite-part>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.icon .badge{margin-left:0}.monaco-workbench .pane-composite-part>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .badge .badge-content,.monaco-workbench .pane-composite-part>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .badge .badge-content{border-radius:11px;box-sizing:border-box;display:inline-block;font-size:11px;font-weight:400;height:18px;line-height:11px;min-width:18px;padding:3px 5px;position:relative;text-align:center}.monaco-workbench .pane-composite-part>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.icon .badge.compact,.monaco-workbench .pane-composite-part>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.icon .badge.compact{bottom:0;height:100%;left:0;margin:auto;overflow:hidden;position:absolute;top:0;width:100%;z-index:2}.monaco-workbench .pane-composite-part>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.icon .badge.compact .badge-content,.monaco-workbench .pane-composite-part>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.icon .badge.compact .badge-content{border-radius:16px;font-size:9px;font-weight:600;height:13px;line-height:13px;min-width:13px;padding:0 2px;position:absolute;right:0;text-align:center;top:17px}.monaco-workbench .pane-composite-part>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.icon .badge.compact.progress-badge .badge-content:before,.monaco-workbench .pane-composite-part>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.icon .badge.compact.progress-badge .badge-content:before{left:1px;mask-size:11px;-webkit-mask-size:11px;top:3px}.monaco-workbench .pane-composite-part>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item .active-item-indicator,.monaco-workbench .pane-composite-part>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item .active-item-indicator{bottom:0;height:100%;left:10px;overflow:hidden;pointer-events:none;position:absolute;top:-4px;width:calc(100% - 20px);z-index:1}.monaco-workbench .pane-composite-part>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.icon .active-item-indicator,.monaco-workbench .pane-composite-part>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.icon .active-item-indicator{left:2px;top:1px;width:calc(100% - 4px)}.monaco-workbench .pane-composite-part>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.icon.checked,.monaco-workbench .pane-composite-part>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.icon.checked{background-color:var(--vscode-activityBarTop-activeBackground)}.monaco-workbench .pane-composite-part>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.checked .active-item-indicator:before,.monaco-workbench .pane-composite-part>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:focus .active-item-indicator:before,.monaco-workbench .pane-composite-part>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.checked .active-item-indicator:before,.monaco-workbench .pane-composite-part>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:focus .active-item-indicator:before{border-top-style:solid;border-top-width:1px;bottom:2px;content:\"\";height:0;position:absolute;width:100%;z-index:1}.monaco-workbench .pane-composite-part>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.clicked:not(.checked):focus .active-item-indicator:before,.monaco-workbench .pane-composite-part>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.clicked:not(.checked):focus .active-item-indicator:before{border-top-color:transparent!important}.monaco-workbench .pane-composite-part>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:focus .active-item-indicator:before,.monaco-workbench .pane-composite-part>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:focus .active-item-indicator:before{border-top-color:var(--vscode-focusBorder)!important;border-top-width:2px}.monaco-workbench .pane-composite-part>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.checked .action-label,.monaco-workbench .pane-composite-part>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:hover .action-label,.monaco-workbench .pane-composite-part>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.checked .action-label,.monaco-workbench .pane-composite-part>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:hover .action-label{outline:var(--vscode-contrastActiveBorder,unset) solid 1px!important}.monaco-workbench .pane-composite-part>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:not(.checked):hover .action-label,.monaco-workbench .pane-composite-part>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:not(.checked):hover .action-label{outline:var(--vscode-contrastActiveBorder,unset) dashed 1px!important}.monaco-workbench .pane-composite-part .empty-pane-message-area{display:none;height:100%;width:100%}.monaco-workbench .pane-composite-part .empty-pane-message-area.visible{align-content:center;align-items:center;display:flex;justify-content:center}.monaco-workbench .pane-composite-part .empty-pane-message-area .empty-pane-message{margin:12px;text-align:center}";
3
+ var css = ".monaco-workbench .pane-composite-part>.title.has-composite-bar>.title-actions .monaco-action-bar .actions-container{justify-content:flex-end}.monaco-workbench .pane-composite-part>.title.has-composite-bar>.global-actions .monaco-action-bar .action-item,.monaco-workbench .pane-composite-part>.title.has-composite-bar>.title-actions .monaco-action-bar .action-item{margin-right:4px}.monaco-workbench .pane-composite-part>.title.has-composite-bar>.title-actions .monaco-action-bar .action-item .action-label{outline-offset:-2px}.monaco-workbench .pane-composite-part>.title.has-composite-bar>.title-label{display:none}.monaco-workbench .pane-composite-part>.header-or-footer{background-color:var(--vscode-activityBarTop-background);padding-left:4px;padding-right:4px}.monaco-workbench .pane-composite-part>.header{border-bottom:1px solid var(--vscode-sideBarActivityBarTop-border)}.monaco-workbench .pane-composite-part>.footer{border-top:1px solid var(--vscode-sideBarActivityBarTop-border)}.monaco-workbench .pane-composite-part>.header-or-footer>.composite-bar-container,.monaco-workbench .pane-composite-part>.title>.composite-bar-container{display:flex}.monaco-workbench .pane-composite-part>.header-or-footer .composite-bar-container{flex:1}.monaco-workbench .pane-composite-part>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-label.codicon-more,.monaco-workbench .pane-composite-part>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-label.codicon-more{align-items:center;color:inherit!important;display:flex;justify-content:center;margin-left:0;margin-right:0}.monaco-workbench .pane-composite-part>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar,.monaco-workbench .pane-composite-part>.title>.composite-bar-container>.composite-bar>.monaco-action-bar{height:35px;line-height:27px}.monaco-workbench .pane-composite-part>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item,.monaco-workbench .pane-composite-part>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item{display:flex;font-size:11px;padding:2px 10px;text-transform:uppercase}.monaco-workbench .pane-composite-part>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.icon,.monaco-workbench .pane-composite-part>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.icon{height:35px;padding:0 3px}.monaco-workbench .pane-composite-part>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.icon .action-label:not(.codicon),.monaco-workbench .pane-composite-part>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.icon .action-label:not(.codicon){height:16px;width:16px}.monaco-workbench .pane-composite-part>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:after,.monaco-workbench .pane-composite-part>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:before,.monaco-workbench .pane-composite-part>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:after,.monaco-workbench .pane-composite-part>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:before{background-color:var(--insert-border-color);content:\"\";display:none;height:24px;opacity:0;position:absolute;transition-delay:.1s;transition-duration:0ms;transition-property:opacity;width:2px}.monaco-workbench .pane-composite-part>.header-or-footer>.composite-bar-container.dragged-over>.composite-bar>.monaco-action-bar .action-item:after,.monaco-workbench .pane-composite-part>.header-or-footer>.composite-bar-container.dragged-over>.composite-bar>.monaco-action-bar .action-item:before,.monaco-workbench .pane-composite-part>.title>.composite-bar-container.dragged-over>.composite-bar>.monaco-action-bar .action-item:after,.monaco-workbench .pane-composite-part>.title>.composite-bar-container.dragged-over>.composite-bar>.monaco-action-bar .action-item:before{display:block}.monaco-workbench .pane-composite-part>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:before,.monaco-workbench .pane-composite-part>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:before{left:1px;margin-left:-2px}.monaco-workbench .pane-composite-part>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:after,.monaco-workbench .pane-composite-part>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:after{margin-right:-2px;right:1px}.monaco-workbench .pane-composite-part>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:first-of-type:before,.monaco-workbench .pane-composite-part>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:first-of-type:before{left:2px;margin-left:-2px}.monaco-workbench .pane-composite-part>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:last-of-type:after,.monaco-workbench .pane-composite-part>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:last-of-type:after{margin-right:-2px;right:2px}.monaco-workbench .pane-composite-part>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.left:after,.monaco-workbench .pane-composite-part>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.left:before,.monaco-workbench .pane-composite-part>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.right:after,.monaco-workbench .pane-composite-part>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.right:before,.monaco-workbench .pane-composite-part>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.left:after,.monaco-workbench .pane-composite-part>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.left:before,.monaco-workbench .pane-composite-part>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.right:after,.monaco-workbench .pane-composite-part>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.right:before{transition-delay:0s}.monaco-workbench .pane-composite-part>.header-or-footer>.composite-bar-container.dragged-over-head>.composite-bar>.monaco-action-bar .action-item:first-of-type:before,.monaco-workbench .pane-composite-part>.header-or-footer>.composite-bar-container.dragged-over-tail>.composite-bar>.monaco-action-bar .action-item:last-of-type:after,.monaco-workbench .pane-composite-part>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.left:before,.monaco-workbench .pane-composite-part>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.right+.action-item:before,.monaco-workbench .pane-composite-part>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:last-of-type.right:after,.monaco-workbench .pane-composite-part>.title>.composite-bar-container.dragged-over-head>.composite-bar>.monaco-action-bar .action-item:first-of-type:before,.monaco-workbench .pane-composite-part>.title>.composite-bar-container.dragged-over-tail>.composite-bar>.monaco-action-bar .action-item:last-of-type:after,.monaco-workbench .pane-composite-part>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.left:before,.monaco-workbench .pane-composite-part>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.right+.action-item:before,.monaco-workbench .pane-composite-part>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:last-of-type.right:after{opacity:1}.monaco-workbench .pane-composite-part>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item .action-label,.monaco-workbench .pane-composite-part>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item .action-label{border-radius:0;margin-right:0;padding:2px}.monaco-workbench .pane-composite-part>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.icon .action-label.codicon,.monaco-workbench .pane-composite-part>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:not(.icon) .action-label,.monaco-workbench .pane-composite-part>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.icon .action-label.codicon,.monaco-workbench .pane-composite-part>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:not(.icon) .action-label{background:none!important}.monaco-workbench .pane-composite-part>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.checked .action-label,.monaco-workbench .pane-composite-part>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.checked .action-label{margin-right:0}.monaco-workbench .pane-composite-part>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .badge,.monaco-workbench .pane-composite-part>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .badge{align-items:center;display:flex;margin-left:8px}.monaco-workbench .pane-composite-part>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.icon .badge,.monaco-workbench .pane-composite-part>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.icon .badge{margin-left:0}.monaco-workbench .pane-composite-part>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .badge .badge-content,.monaco-workbench .pane-composite-part>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .badge .badge-content{border-radius:11px;box-sizing:border-box;display:inline-block;font-size:11px;font-weight:400;height:18px;line-height:11px;min-width:18px;padding:3px 5px;position:relative;text-align:center}.monaco-workbench .pane-composite-part>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.icon .badge.compact,.monaco-workbench .pane-composite-part>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.icon .badge.compact{bottom:0;height:100%;left:0;margin:auto;overflow:hidden;position:absolute;top:0;width:100%;z-index:2}.monaco-workbench .pane-composite-part>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.icon .badge.compact .badge-content,.monaco-workbench .pane-composite-part>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.icon .badge.compact .badge-content{border-radius:16px;font-size:9px;font-weight:600;height:13px;line-height:13px;min-width:13px;padding:0 2px;position:absolute;right:0;text-align:center;top:17px}.monaco-workbench .pane-composite-part>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.icon .badge.compact.compact-content .badge-content,.monaco-workbench .pane-composite-part>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.icon .badge.compact.compact-content .badge-content{font-size:8px;padding:0 3px}.monaco-workbench .pane-composite-part>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.icon .badge.compact.progress-badge .badge-content:before,.monaco-workbench .pane-composite-part>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.icon .badge.compact.progress-badge .badge-content:before{left:1px;mask-size:11px;-webkit-mask-size:11px;top:3px}.monaco-workbench .pane-composite-part>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item .active-item-indicator,.monaco-workbench .pane-composite-part>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item .active-item-indicator{bottom:0;height:100%;left:10px;overflow:hidden;pointer-events:none;position:absolute;top:-4px;width:calc(100% - 20px);z-index:1}.monaco-workbench .pane-composite-part>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.icon .active-item-indicator,.monaco-workbench .pane-composite-part>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.icon .active-item-indicator{left:2px;top:1px;width:calc(100% - 4px)}.monaco-workbench .pane-composite-part>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.icon.checked,.monaco-workbench .pane-composite-part>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.icon.checked{background-color:var(--vscode-activityBarTop-activeBackground)}.monaco-workbench .pane-composite-part>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.checked .active-item-indicator:before,.monaco-workbench .pane-composite-part>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:focus .active-item-indicator:before,.monaco-workbench .pane-composite-part>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.checked .active-item-indicator:before,.monaco-workbench .pane-composite-part>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:focus .active-item-indicator:before{border-top-style:solid;border-top-width:1px;bottom:2px;content:\"\";height:0;position:absolute;width:100%;z-index:1}.monaco-workbench .pane-composite-part>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.clicked:not(.checked):focus .active-item-indicator:before,.monaco-workbench .pane-composite-part>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.clicked:not(.checked):focus .active-item-indicator:before{border-top-color:transparent!important}.monaco-workbench .pane-composite-part>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:focus .active-item-indicator:before,.monaco-workbench .pane-composite-part>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:focus .active-item-indicator:before{border-top-color:var(--vscode-focusBorder)!important;border-top-width:2px}.monaco-workbench .pane-composite-part>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.checked .action-label,.monaco-workbench .pane-composite-part>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:hover .action-label,.monaco-workbench .pane-composite-part>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.checked .action-label,.monaco-workbench .pane-composite-part>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:hover .action-label{outline:var(--vscode-contrastActiveBorder,unset) solid 1px!important}.monaco-workbench .pane-composite-part>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:not(.checked):hover .action-label,.monaco-workbench .pane-composite-part>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:not(.checked):hover .action-label{outline:var(--vscode-contrastActiveBorder,unset) dashed 1px!important}.monaco-workbench .pane-composite-part .empty-pane-message-area{display:none;height:100%;width:100%}.monaco-workbench .pane-composite-part .empty-pane-message-area.visible{align-content:center;align-items:center;display:flex;justify-content:center}.monaco-workbench .pane-composite-part .empty-pane-message-area .empty-pane-message{margin:12px;text-align:center}";
4
4
  n(css,{});
5
5
 
6
6
  export { css, css as default };
package/vscode/src/vs/workbench/browser/parts/paneCompositeBar.js CHANGED
@@ -1,5 +1,5 @@
1
1
  import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
2
- import { localizeWithPath } from 'vscode/vscode/vs/nls';
2
+ import { localize } from 'vscode/vscode/vs/nls';
3
3
  import { ActionsOrientation } from 'vscode/vscode/vs/base/browser/ui/actionbar/actionbar';
4
4
  import { IActivityService } from 'vscode/vscode/vs/workbench/services/activity/common/activity.service';
5
5
  import { Parts } from 'vscode/vscode/vs/workbench/services/layout/browser/layoutService';
@@ -27,7 +27,6 @@ import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/te
27
27
  import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
28
28
 
29
29
  var ViewContainerActivityAction_1;
30
- const _moduleId = "vs/workbench/browser/parts/paneCompositeBar";
31
30
  let PaneCompositeBar = class PaneCompositeBar extends Disposable {
32
31
  constructor(options, part, paneCompositePart, instantiationService, storageService, extensionService, viewDescriptorService, contextKeyService, environmentService, layoutService) {
33
32
  super();
@@ -96,7 +95,7 @@ let PaneCompositeBar = class PaneCompositeBar extends Disposable {
96
95
  const viewContainer = this.viewDescriptorService.getViewContainerById(compositeId);
97
96
  const defaultLocation = this.viewDescriptorService.getDefaultViewContainerLocation(viewContainer);
98
97
  if (defaultLocation !== this.viewDescriptorService.getViewContainerLocation(viewContainer)) {
99
- actions.push(toAction({ id: 'resetLocationAction', label: ( localizeWithPath(_moduleId, 0, "Reset Location")), run: () => this.viewDescriptorService.moveViewContainerToLocation(viewContainer, defaultLocation, undefined, 'resetLocationAction') }));
98
+ actions.push(toAction({ id: 'resetLocationAction', label: ( localize(9274, "Reset Location")), run: () => this.viewDescriptorService.moveViewContainerToLocation(viewContainer, defaultLocation, undefined, 'resetLocationAction') }));
100
99
  }
101
100
  else {
102
101
  const viewContainerModel = this.viewDescriptorService.getViewContainerModel(viewContainer);
@@ -104,7 +103,7 @@ let PaneCompositeBar = class PaneCompositeBar extends Disposable {
104
103
  const viewToReset = viewContainerModel.allViewDescriptors[0];
105
104
  const defaultContainer = this.viewDescriptorService.getDefaultContainerById(viewToReset.id);
106
105
  if (defaultContainer !== viewContainer) {
107
- actions.push(toAction({ id: 'resetLocationAction', label: ( localizeWithPath(_moduleId, 0, "Reset Location")), run: () => this.viewDescriptorService.moveViewsToContainer([viewToReset], defaultContainer, undefined, 'resetLocationAction') }));
106
+ actions.push(toAction({ id: 'resetLocationAction', label: ( localize(9274, "Reset Location")), run: () => this.viewDescriptorService.moveViewsToContainer([viewToReset], defaultContainer, undefined, 'resetLocationAction') }));
108
107
  }
109
108
  }
110
109
  }
package/vscode/src/vs/workbench/browser/parts/paneCompositePart.js CHANGED
@@ -19,7 +19,7 @@ import { IKeybindingService } from 'vscode/vscode/vs/platform/keybinding/common/
19
19
  import { IThemeService } from 'vscode/vscode/vs/platform/theme/common/themeService.service';
20
20
  import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey.service';
21
21
  import { IExtensionService } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions.service';
22
- import { localizeWithPath } from 'vscode/vscode/vs/nls';
22
+ import { localize } from 'vscode/vscode/vs/nls';
23
23
  import { CompositeDragAndDropObserver, toggleDropEffect } from 'vscode/vscode/vs/workbench/browser/dnd';
24
24
  import { EDITOR_DRAG_AND_DROP_BACKGROUND } from 'vscode/vscode/vs/workbench/common/theme';
25
25
  import { CompositeMenuActions } from 'vscode/vscode/vs/workbench/browser/actions';
@@ -35,7 +35,6 @@ import { IHoverService } from 'vscode/vscode/vs/platform/hover/browser/hover.ser
35
35
  import { WorkbenchToolBar, HiddenItemStrategy } from 'vscode/vscode/vs/platform/actions/browser/toolbar';
36
36
 
37
37
  var AbstractPaneCompositePart_1;
38
- const _moduleId = "vs/workbench/browser/parts/paneCompositePart";
39
38
  var CompositeBarPosition;
40
39
  ( ((function(CompositeBarPosition) {
41
40
  CompositeBarPosition[CompositeBarPosition["TOP"] = 0] = "TOP";
@@ -143,7 +142,7 @@ let AbstractPaneCompositePart = class AbstractPaneCompositePart extends Composit
143
142
  this.emptyPaneMessageElement.classList.add('empty-pane-message-area');
144
143
  const messageElement = document.createElement('div');
145
144
  messageElement.classList.add('empty-pane-message');
146
- messageElement.innerText = ( localizeWithPath(_moduleId, 0, "Drag a view here to display."));
145
+ messageElement.innerText = ( localize(9271, "Drag a view here to display."));
147
146
  this.emptyPaneMessageElement.appendChild(messageElement);
148
147
  parent.appendChild(this.emptyPaneMessageElement);
149
148
  this._register(CompositeDragAndDropObserver.INSTANCE.registerTarget(this.emptyPaneMessageElement, {
@@ -193,7 +192,7 @@ let AbstractPaneCompositePart = class AbstractPaneCompositePart extends Composit
193
192
  orientation: ActionsOrientation.HORIZONTAL,
194
193
  getKeyBinding: action => this.keybindingService.lookupKeybinding(action.id),
195
194
  anchorAlignmentProvider: () => this.getTitleAreaDropDownAnchorAlignment(),
196
- toggleMenuTitle: ( localizeWithPath(_moduleId, 1, "More Actions...")),
195
+ toggleMenuTitle: ( localize(9272, "More Actions...")),
197
196
  hoverDelegate: this.toolbarHoverDelegate,
198
197
  hiddenItemStrategy: HiddenItemStrategy.NoHide
199
198
  }));
@@ -448,10 +447,10 @@ let AbstractPaneCompositePart = class AbstractPaneCompositePart extends Composit
448
447
  const viewsActions = [];
449
448
  const scopedContextKeyService = disposables.add(this.contextKeyService.createScoped(this.element));
450
449
  scopedContextKeyService.createKey('viewContainer', viewPaneContainer.viewContainer.id);
451
- const menu = disposables.add(this.menuService.createMenu(ViewsSubMenu, scopedContextKeyService));
452
- createAndFillInActionBarActions(menu, { shouldForwardArgs: true, renderShortTitle: true }, { primary: viewsActions, secondary: [] }, () => true);
450
+ const menu = this.menuService.getMenuActions(ViewsSubMenu, scopedContextKeyService, { shouldForwardArgs: true, renderShortTitle: true });
451
+ createAndFillInActionBarActions(menu, { primary: viewsActions, secondary: [] }, () => true);
453
452
  disposables.dispose();
454
- return viewsActions.length > 1 && ( (viewsActions.some(a => a.enabled))) ? ( (new SubmenuAction('views', ( localizeWithPath(_moduleId, 2, "Views")), viewsActions))) : undefined;
453
+ return viewsActions.length > 1 && ( (viewsActions.some(a => a.enabled))) ? ( (new SubmenuAction('views', ( localize(9273, "Views")), viewsActions))) : undefined;
455
454
  }
456
455
  return undefined;
457
456
  }
package/vscode/src/vs/workbench/browser/parts/panel/panelPart.js CHANGED
@@ -1,6 +1,6 @@
1
1
  import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
2
2
  import 'vscode/vscode/vs/workbench/browser/parts/panel/media/panelpart.css';
3
- import { localizeWithPath } from 'vscode/vscode/vs/nls';
3
+ import { localize } from 'vscode/vscode/vs/nls';
4
4
  import { Separator, SubmenuAction, toAction } from 'vscode/vscode/vs/base/common/actions';
5
5
  import { ActionsOrientation } from 'vscode/vscode/vs/base/browser/ui/actionbar/actionbar';
6
6
  import { ActivePanelContext, PanelFocusContext } from 'vscode/vscode/vs/workbench/common/contextkeys';
@@ -39,7 +39,6 @@ import { createAndFillInContextMenuActions } from 'vscode/vscode/vs/platform/act
39
39
  import { IHoverService } from 'vscode/vscode/vs/platform/hover/browser/hover.service';
40
40
 
41
41
  var PanelPart_1;
42
- const _moduleId = "vs/workbench/browser/parts/panel/panelPart";
43
42
  let PanelPart = class PanelPart extends AbstractPaneCompositePart {
44
43
  static { PanelPart_1 = this; }
45
44
  get preferredHeight() {
@@ -72,6 +71,7 @@ let PanelPart = class PanelPart extends AbstractPaneCompositePart {
72
71
  const borderColor = this.getColor(PANEL_BORDER) || this.getColor(contrastBorder) || '';
73
72
  container.style.borderLeftColor = borderColor;
74
73
  container.style.borderRightColor = borderColor;
74
+ container.style.borderBottomColor = borderColor;
75
75
  const title = this.getTitleArea();
76
76
  if (title) {
77
77
  title.style.borderTopColor = this.getColor(PANEL_BORDER) || this.getColor(contrastBorder) || '';
@@ -106,28 +106,31 @@ let PanelPart = class PanelPart extends AbstractPaneCompositePart {
106
106
  };
107
107
  }
108
108
  fillExtraContextMenuActions(actions) {
109
- const panelPositionMenu = this.menuService.createMenu(MenuId.PanelPositionMenu, this.contextKeyService);
110
- const panelAlignMenu = this.menuService.createMenu(MenuId.PanelAlignmentMenu, this.contextKeyService);
109
+ const panelPositionMenu = this.menuService.getMenuActions(MenuId.PanelPositionMenu, this.contextKeyService, { shouldForwardArgs: true });
110
+ const panelAlignMenu = this.menuService.getMenuActions(MenuId.PanelAlignmentMenu, this.contextKeyService, { shouldForwardArgs: true });
111
111
  const positionActions = [];
112
112
  const alignActions = [];
113
- createAndFillInContextMenuActions(panelPositionMenu, { shouldForwardArgs: true }, { primary: [], secondary: positionActions });
114
- createAndFillInContextMenuActions(panelAlignMenu, { shouldForwardArgs: true }, { primary: [], secondary: alignActions });
115
- panelAlignMenu.dispose();
116
- panelPositionMenu.dispose();
113
+ createAndFillInContextMenuActions(panelPositionMenu, { primary: [], secondary: positionActions });
114
+ createAndFillInContextMenuActions(panelAlignMenu, { primary: [], secondary: alignActions });
117
115
  actions.push(...[
118
116
  ( (new Separator())),
119
- ( (new SubmenuAction('workbench.action.panel.position', ( localizeWithPath(_moduleId, 0, "Panel Position")), positionActions))),
120
- ( (new SubmenuAction('workbench.action.panel.align', ( localizeWithPath(_moduleId, 1, "Align Panel")), alignActions))),
121
- toAction({ id: TogglePanelAction.ID, label: ( localizeWithPath(_moduleId, 2, "Hide Panel")), run: () => this.commandService.executeCommand(TogglePanelAction.ID) })
117
+ ( (new SubmenuAction('workbench.action.panel.position', ( localize(3302, "Panel Position")), positionActions))),
118
+ ( (new SubmenuAction('workbench.action.panel.align', ( localize(3303, "Align Panel")), alignActions))),
119
+ toAction({ id: TogglePanelAction.ID, label: ( localize(3304, "Hide Panel")), run: () => this.commandService.executeCommand(TogglePanelAction.ID) })
122
120
  ]);
123
121
  }
124
122
  layout(width, height, top, left) {
125
123
  let dimensions;
126
- if (this.layoutService.getPanelPosition() === Position.RIGHT) {
127
- dimensions = ( (new Dimension(width - 1, height)));
128
- }
129
- else {
130
- dimensions = ( (new Dimension(width, height)));
124
+ switch (this.layoutService.getPanelPosition()) {
125
+ case Position.RIGHT:
126
+ dimensions = ( (new Dimension(width - 1, height)));
127
+ break;
128
+ case Position.TOP:
129
+ dimensions = ( (new Dimension(width, height - 1)));
130
+ break;
131
+ default:
132
+ dimensions = ( (new Dimension(width, height)));
133
+ break;
131
134
  }
132
135
  super.layout(dimensions.width, dimensions.height, top, left);
133
136
  }
package/vscode/src/vs/workbench/browser/parts/sidebar/media/sidebarpart.css.js CHANGED
@@ -1,6 +1,6 @@
1
1
  import n from 'vscode/external/rollup-plugin-styles/dist/runtime/inject-css.js';
2
2
 
3
- var css = ".monaco-workbench.nosidebar>.part.sidebar{display:none!important;visibility:hidden!important}.monaco-workbench .part.sidebar .title-actions .actions-container{justify-content:flex-end}.monaco-workbench .part.sidebar .title-actions .action-item{margin-right:4px}.monaco-workbench .part.sidebar>.title{background-color:var(--vscode-sideBarTitle-background)}.monaco-workbench .part.sidebar>.title>.title-label h2{text-transform:uppercase}.monaco-workbench .viewlet .collapsible.header .title{overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.monaco-workbench .viewlet .collapsible.header .actions{width:0}.monaco-workbench .viewlet .collapsible.header.focused .actions,.monaco-workbench .viewlet .split-view-view:hover>.header .actions{flex:1;width:auto}.monaco-workbench .viewlet .collapsible.header .actions .action-label{background-position:50%;background-repeat:no-repeat;background-size:16px;height:22px;margin-right:0;width:28px}.monaco-workbench .viewlet .collapsible.header .actions .action-label .label,.monaco-workbench .viewlet .collapsible.header.collapsed .actions{display:none}.monaco-workbench .viewlet .collapsible.header .action-label{background-repeat:no-repeat;height:16px;margin-right:.2em;width:16px}.monaco-workbench .part.sidebar>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:focus,.monaco-workbench .part.sidebar>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:focus{outline:0!important}.monaco-workbench .part.sidebar>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item .action-label,.monaco-workbench .part.sidebar>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item .action-label{border-radius:0;outline-offset:2px}.monaco-workbench .part.sidebar>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item .action-label:before,.monaco-workbench .part.sidebar>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item .action-label:before{left:6px;position:absolute}.monaco-workbench .part.sidebar>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.checked.clicked:focus .active-item-indicator:before,.monaco-workbench .part.sidebar>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.checked:not(:focus) .active-item-indicator:before,.monaco-workbench .part.sidebar>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.checked.clicked:focus .active-item-indicator:before,.monaco-workbench .part.sidebar>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.checked:not(:focus) .active-item-indicator:before{border-top-color:var(--vscode-activityBarTop-activeBorder)!important}.monaco-workbench .part.sidebar>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:focus .action-label,.monaco-workbench .part.sidebar>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:hover .action-label,.monaco-workbench .part.sidebar>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:focus .action-label,.monaco-workbench .part.sidebar>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:hover .action-label{color:var(--vscode-activityBarTop-foreground)!important}.monaco-workbench .sidebar.pane-composite-part>.title>.composite-bar-container{flex:1}.monaco-workbench .sidebar.part.pane-composite-part>.composite.title.has-composite-bar>.title-actions{flex:inherit}.monaco-workbench .sidebar.pane-composite-part>.title.has-composite-bar>.title-actions .monaco-action-bar .action-item{max-width:150px}";
3
+ var css = ".monaco-workbench.nosidebar>.part.sidebar{display:none!important;visibility:hidden!important}.monaco-workbench .part.sidebar .title-actions .actions-container{justify-content:flex-end}.monaco-workbench .part.sidebar .title-actions .action-item{margin-right:4px}.monaco-workbench .part.sidebar>.title{background-color:var(--vscode-sideBarTitle-background)}.monaco-workbench .part.sidebar>.title>.title-label h2{text-transform:uppercase}.monaco-workbench .viewlet .collapsible.header .title{overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.monaco-workbench .viewlet .collapsible.header .actions{width:0}.monaco-workbench .viewlet .collapsible.header.focused .actions,.monaco-workbench .viewlet .split-view-view:hover>.header .actions{flex:1;width:auto}.monaco-workbench .viewlet .collapsible.header .actions .action-label{background-position:50%;background-repeat:no-repeat;background-size:16px;height:22px;margin-right:0;width:28px}.monaco-workbench .viewlet .collapsible.header .actions .action-label .label,.monaco-workbench .viewlet .collapsible.header.collapsed .actions{display:none}.monaco-workbench .viewlet .collapsible.header .action-label{background-repeat:no-repeat;height:16px;margin-right:.2em;width:16px}.monaco-workbench .part.sidebar>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:focus,.monaco-workbench .part.sidebar>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:focus{outline:0!important}.monaco-workbench .part.sidebar>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item .action-label,.monaco-workbench .part.sidebar>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item .action-label{border-radius:0;outline-offset:2px}.monaco-workbench .part.sidebar>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item .action-label:before,.monaco-workbench .part.sidebar>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item .action-label:before{left:5px;position:absolute}.monaco-workbench .part.sidebar>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.checked.clicked:focus .active-item-indicator:before,.monaco-workbench .part.sidebar>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.checked:not(:focus) .active-item-indicator:before,.monaco-workbench .part.sidebar>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.checked.clicked:focus .active-item-indicator:before,.monaco-workbench .part.sidebar>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.checked:not(:focus) .active-item-indicator:before{border-top-color:var(--vscode-activityBarTop-activeBorder)!important}.monaco-workbench .part.sidebar>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:focus .action-label,.monaco-workbench .part.sidebar>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:hover .action-label,.monaco-workbench .part.sidebar>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:focus .action-label,.monaco-workbench .part.sidebar>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:hover .action-label{color:var(--vscode-activityBarTop-foreground)!important}.monaco-workbench .sidebar.pane-composite-part>.title>.composite-bar-container{flex:1}.monaco-workbench .sidebar.part.pane-composite-part>.composite.title.has-composite-bar>.title-actions{flex:inherit}.monaco-workbench .sidebar.pane-composite-part>.title.has-composite-bar>.title-actions .monaco-action-bar .action-item{max-width:150px}";
4
4
  n(css,{});
5
5
 
6
6
  export { css, css as default };
package/vscode/src/vs/workbench/browser/parts/sidebar/sidebarActions.js CHANGED
@@ -1,5 +1,5 @@
1
1
  import './media/sidebarpart.css.js';
2
- import { localize2WithPath } from 'vscode/vscode/vs/nls';
2
+ import { localize2 } from 'vscode/vscode/vs/nls';
3
3
  import { Action2, registerAction2 } from 'vscode/vscode/vs/platform/actions/common/actions';
4
4
  import { Parts } from 'vscode/vscode/vs/workbench/services/layout/browser/layoutService';
5
5
  import { IWorkbenchLayoutService } from 'vscode/vscode/vs/workbench/services/layout/browser/layoutService.service';
@@ -9,12 +9,11 @@ import { Categories } from 'vscode/vscode/vs/platform/action/common/actionCommon
9
9
  import { IPaneCompositePartService } from 'vscode/vscode/vs/workbench/services/panecomposite/browser/panecomposite.service';
10
10
  import { ViewContainerLocation } from 'vscode/vscode/vs/workbench/common/views';
11
11
 
12
- const _moduleId = "vs/workbench/browser/parts/sidebar/sidebarActions";
13
12
  class FocusSideBarAction extends Action2 {
14
13
  constructor() {
15
14
  super({
16
15
  id: 'workbench.action.focusSideBar',
17
- title: ( localize2WithPath(_moduleId, 0, 'Focus into Primary Side Bar')),
16
+ title: ( localize2(9270, 'Focus into Primary Side Bar')),
18
17
  category: Categories.View,
19
18
  f1: true,
20
19
  keybinding: {
package/vscode/src/vs/workbench/browser/parts/sidebar/sidebarPart.js CHANGED
@@ -38,7 +38,7 @@ import { registerAction2, Action2 } from 'vscode/vscode/vs/platform/actions/comm
38
38
  import { IMenuService } from 'vscode/vscode/vs/platform/actions/common/actions.service';
39
39
  import { Separator } from 'vscode/vscode/vs/base/common/actions';
40
40
  import { ToggleActivityBarVisibilityActionId } from 'vscode/vscode/vs/workbench/browser/actions/layoutActions';
41
- import { localize2WithPath } from 'vscode/vscode/vs/nls';
41
+ import { localize2 } from 'vscode/vscode/vs/nls';
42
42
  import { IHoverService } from 'vscode/vscode/vs/platform/hover/browser/hover.service';
43
43
  import { LayoutPriority } from 'vscode/vscode/vs/base/browser/ui/splitview/splitview';
44
44
  import 'vscode/vscode/vs/base/browser/dom';
@@ -50,7 +50,6 @@ import 'vscode/vscode/vs/base/common/lifecycle';
50
50
  import '../../../../base/browser/ui/grid/gridview.css.js';
51
51
 
52
52
  var SidebarPart_1;
53
- const _moduleId = "vs/workbench/browser/parts/sidebar/sidebarPart";
54
53
  let SidebarPart = class SidebarPart extends AbstractPaneCompositePart {
55
54
  static { SidebarPart_1 = this; }
56
55
  static { this.activeViewletSettingsKey = 'workbench.sidebar.activeviewletid'; }
@@ -218,7 +217,7 @@ let SidebarPart = class SidebarPart extends AbstractPaneCompositePart {
218
217
  constructor() {
219
218
  super({
220
219
  id: ToggleActivityBarVisibilityActionId,
221
- title: ( localize2WithPath(_moduleId, 0, "Toggle Activity Bar Visibility")),
220
+ title: ( localize2(3282, "Toggle Activity Bar Visibility")),
222
221
  });
223
222
  }
224
223
  run() {
package/vscode/src/vs/workbench/contrib/callHierarchy/browser/callHierarchy.contribution.js CHANGED
@@ -1,5 +1,5 @@
1
1
  import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
2
- import { localizeWithPath, localize2WithPath } from 'vscode/vscode/vs/nls';
2
+ import { localize, localize2 } from 'vscode/vscode/vs/nls';
3
3
  import { CallHierarchyDirection, CallHierarchyProviderRegistry, CallHierarchyModel } from 'vscode/vscode/vs/workbench/contrib/callHierarchy/common/callHierarchy';
4
4
  import { CancellationTokenSource } from 'vscode/vscode/vs/base/common/cancellation';
5
5
  import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
@@ -23,13 +23,12 @@ import { registerIcon } from 'vscode/vscode/vs/platform/theme/common/iconRegistr
23
23
  import { isCancellationError } from 'vscode/vscode/vs/base/common/errors';
24
24
 
25
25
  var CallHierarchyController_1;
26
- const _moduleId = "vs/workbench/contrib/callHierarchy/browser/callHierarchy.contribution";
27
- const _ctxHasCallHierarchyProvider = ( (new RawContextKey('editorHasCallHierarchyProvider', false, ( localizeWithPath(_moduleId, 0, 'Whether a call hierarchy provider is available')))));
28
- const _ctxCallHierarchyVisible = ( (new RawContextKey('callHierarchyVisible', false, ( localizeWithPath(_moduleId, 1, 'Whether call hierarchy peek is currently showing')))));
26
+ const _ctxHasCallHierarchyProvider = ( (new RawContextKey('editorHasCallHierarchyProvider', false, ( localize(4144, 'Whether a call hierarchy provider is available')))));
27
+ const _ctxCallHierarchyVisible = ( (new RawContextKey('callHierarchyVisible', false, ( localize(4145, 'Whether call hierarchy peek is currently showing')))));
29
28
  const _ctxCallHierarchyDirection = ( (new RawContextKey(
30
29
  'callHierarchyDirection',
31
30
  undefined,
32
- { type: 'string', description: ( localizeWithPath(_moduleId, 2, 'Whether call hierarchy shows incoming or outgoing calls')) }
31
+ { type: 'string', description: ( localize(4146, 'Whether call hierarchy shows incoming or outgoing calls')) }
33
32
  )));
34
33
  function sanitizedDirection(candidate) {
35
34
  return candidate === CallHierarchyDirection.CallsFrom || candidate === CallHierarchyDirection.CallsTo
@@ -117,14 +116,14 @@ let CallHierarchyController = class CallHierarchyController {
117
116
  this._widget.showModel(model);
118
117
  }
119
118
  else {
120
- this._widget.showMessage(( localizeWithPath(_moduleId, 3, "No results")));
119
+ this._widget.showMessage(( localize(4147, "No results")));
121
120
  }
122
121
  }).catch(err => {
123
122
  if (isCancellationError(err)) {
124
123
  this.endCallHierarchy();
125
124
  return;
126
125
  }
127
- this._widget.showMessage(( localizeWithPath(_moduleId, 4, "Failed to show call hierarchy")));
126
+ this._widget.showMessage(( localize(4148, "Failed to show call hierarchy")));
128
127
  });
129
128
  }
130
129
  showOutgoingCalls() {
@@ -152,7 +151,7 @@ registerAction2(class PeekCallHierarchyAction extends EditorAction2 {
152
151
  constructor() {
153
152
  super({
154
153
  id: 'editor.showCallHierarchy',
155
- title: ( localize2WithPath(_moduleId, 5, 'Peek Call Hierarchy')),
154
+ title: ( localize2(4149, 'Peek Call Hierarchy')),
156
155
  menu: {
157
156
  id: MenuId.EditorContextPeek,
158
157
  group: 'navigation',
@@ -180,8 +179,8 @@ registerAction2(class extends EditorAction2 {
180
179
  constructor() {
181
180
  super({
182
181
  id: 'editor.showIncomingCalls',
183
- title: ( localize2WithPath(_moduleId, 6, 'Show Incoming Calls')),
184
- icon: registerIcon('callhierarchy-incoming', Codicon.callIncoming, ( localizeWithPath(_moduleId, 7, 'Icon for incoming calls in the call hierarchy view.'))),
182
+ title: ( localize2(4150, 'Show Incoming Calls')),
183
+ icon: registerIcon('callhierarchy-incoming', Codicon.callIncoming, ( localize(4151, 'Icon for incoming calls in the call hierarchy view.'))),
185
184
  precondition: ( (ContextKeyExpr.and(
186
185
  _ctxCallHierarchyVisible,
187
186
  (_ctxCallHierarchyDirection.isEqualTo(CallHierarchyDirection.CallsFrom))
@@ -205,8 +204,8 @@ registerAction2(class extends EditorAction2 {
205
204
  constructor() {
206
205
  super({
207
206
  id: 'editor.showOutgoingCalls',
208
- title: ( localize2WithPath(_moduleId, 8, 'Show Outgoing Calls')),
209
- icon: registerIcon('callhierarchy-outgoing', Codicon.callOutgoing, ( localizeWithPath(_moduleId, 9, 'Icon for outgoing calls in the call hierarchy view.'))),
207
+ title: ( localize2(4152, 'Show Outgoing Calls')),
208
+ icon: registerIcon('callhierarchy-outgoing', Codicon.callOutgoing, ( localize(4153, 'Icon for outgoing calls in the call hierarchy view.'))),
210
209
  precondition: ( (ContextKeyExpr.and(
211
210
  _ctxCallHierarchyVisible,
212
211
  (_ctxCallHierarchyDirection.isEqualTo(CallHierarchyDirection.CallsTo))
@@ -230,7 +229,7 @@ registerAction2(class extends EditorAction2 {
230
229
  constructor() {
231
230
  super({
232
231
  id: 'editor.refocusCallHierarchy',
233
- title: ( localize2WithPath(_moduleId, 10, 'Refocus Call Hierarchy')),
232
+ title: ( localize2(4154, 'Refocus Call Hierarchy')),
234
233
  precondition: _ctxCallHierarchyVisible,
235
234
  keybinding: {
236
235
  weight: KeybindingWeight.WorkbenchContrib,
@@ -246,7 +245,7 @@ registerAction2(class extends EditorAction2 {
246
245
  constructor() {
247
246
  super({
248
247
  id: 'editor.closeCallHierarchy',
249
- title: ( localizeWithPath(_moduleId, 11, 'Close')),
248
+ title: ( localize(4155, 'Close')),
250
249
  icon: Codicon.close,
251
250
  precondition: _ctxCallHierarchyVisible,
252
251
  keybinding: {
package/vscode/src/vs/workbench/contrib/callHierarchy/browser/callHierarchyPeek.js CHANGED
@@ -5,7 +5,7 @@ import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/c
5
5
  import { CallHierarchyDirection } from 'vscode/vscode/vs/workbench/contrib/callHierarchy/common/callHierarchy';
6
6
  import { WorkbenchAsyncDataTree } from 'vscode/vscode/vs/platform/list/browser/listService';
7
7
  import { Sorter, AccessibilityProvider, IdentityProvider, VirtualDelegate, CallRenderer, DataSource } from './callHierarchyTree.js';
8
- import { localizeWithPath } from 'vscode/vscode/vs/nls';
8
+ import { localize } from 'vscode/vscode/vs/nls';
9
9
  import { ScrollType } from 'vscode/vscode/vs/editor/common/editorCommon';
10
10
  import { Range } from 'vscode/vscode/vs/editor/common/core/range';
11
11
  import { SplitView, Sizing } from 'vscode/vscode/vs/base/browser/ui/splitview/splitview';
@@ -29,7 +29,6 @@ import { createAndFillInActionBarActions } from 'vscode/vscode/vs/platform/actio
29
29
  import { Orientation } from 'vscode/vscode/vs/base/browser/ui/sash/sash';
30
30
 
31
31
  var CallHierarchyTreePeekWidget_1;
32
- const _moduleId = "vs/workbench/contrib/callHierarchy/browser/callHierarchyPeek";
33
32
  var State;
34
33
  ( ((function(State) {
35
34
  State["Loading"] = "loading";
@@ -268,13 +267,13 @@ let CallHierarchyTreePeekWidget = class CallHierarchyTreePeekWidget extends Peek
268
267
  }
269
268
  this._previewDisposable.add(value);
270
269
  const title = this._direction === CallHierarchyDirection.CallsFrom
271
- ? ( localizeWithPath(_moduleId, 0, "Calls from '{0}'", element.model.root.name))
272
- : ( localizeWithPath(_moduleId, 1, "Callers of '{0}'", element.model.root.name));
270
+ ? ( localize(9525, "Calls from '{0}'", element.model.root.name))
271
+ : ( localize(9526, "Callers of '{0}'", element.model.root.name));
273
272
  this.setTitle(title);
274
273
  }
275
274
  showLoading() {
276
275
  this._parent.dataset['state'] = State.Loading;
277
- this.setTitle(( localizeWithPath(_moduleId, 2, "Loading...")));
276
+ this.setTitle(( localize(9527, "Loading...")));
278
277
  this._show();
279
278
  }
280
279
  showMessage(message) {
@@ -293,8 +292,8 @@ let CallHierarchyTreePeekWidget = class CallHierarchyTreePeekWidget extends Peek
293
292
  await this._tree.expand(root.element);
294
293
  if (root.children.length === 0) {
295
294
  this.showMessage(this._direction === CallHierarchyDirection.CallsFrom
296
- ? ( localizeWithPath(_moduleId, 3, "No calls from '{0}'", model.root.name))
297
- : ( localizeWithPath(_moduleId, 4, "No callers of '{0}'", model.root.name)));
295
+ ? ( localize(9528, "No calls from '{0}'", model.root.name))
296
+ : ( localize(9529, "No callers of '{0}'", model.root.name)));
298
297
  }
299
298
  else {
300
299
  this._parent.dataset['state'] = State.Data;