@codingame/monaco-vscode-view-common-service-override 4.5.1 → 5.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 (70) hide show
  1. package/package.json +3 -3
  2. package/viewCommon.js +3 -6
  3. package/vscode/src/vs/base/browser/ui/grid/grid.js +12 -12
  4. package/vscode/src/vs/base/browser/ui/grid/gridview.js +26 -26
  5. package/vscode/src/vs/platform/languagePacks/common/localizedStrings.js +4 -3
  6. package/vscode/src/vs/workbench/api/browser/viewsExtensionPoint.js +142 -221
  7. package/vscode/src/vs/workbench/browser/actions/listCommands.js +49 -45
  8. package/vscode/src/vs/workbench/browser/actions/navigationActions.js +7 -30
  9. package/vscode/src/vs/workbench/browser/media/style.css.js +1 -1
  10. package/vscode/src/vs/workbench/browser/parts/activitybar/activitybarPart.js +67 -138
  11. package/vscode/src/vs/workbench/browser/parts/auxiliarybar/auxiliaryBarPart.js +25 -38
  12. package/vscode/src/vs/workbench/browser/parts/auxiliarybar/media/auxiliaryBarPart.css.js +1 -1
  13. package/vscode/src/vs/workbench/browser/parts/compositeBar.js +26 -27
  14. package/vscode/src/vs/workbench/browser/parts/compositePart.js +20 -34
  15. package/vscode/src/vs/workbench/browser/parts/editor/auxiliaryEditorPart.js +7 -4
  16. package/vscode/src/vs/workbench/browser/parts/editor/editor.contribution.js +216 -765
  17. package/vscode/src/vs/workbench/browser/parts/editor/editorConfiguration.js +27 -42
  18. package/vscode/src/vs/workbench/browser/parts/editor/editorDropTarget.js +24 -23
  19. package/vscode/src/vs/workbench/browser/parts/editor/editorPart.js +54 -19
  20. package/vscode/src/vs/workbench/browser/parts/editor/editorParts.js +122 -72
  21. package/vscode/src/vs/workbench/browser/parts/paneCompositeBar.js +51 -54
  22. package/vscode/src/vs/workbench/browser/parts/paneCompositePart.js +44 -44
  23. package/vscode/src/vs/workbench/browser/parts/panel/panelPart.js +25 -26
  24. package/vscode/src/vs/workbench/browser/parts/sidebar/media/sidebarpart.css.js +1 -1
  25. package/vscode/src/vs/workbench/browser/parts/sidebar/sidebarActions.js +2 -5
  26. package/vscode/src/vs/workbench/browser/parts/sidebar/sidebarPart.js +22 -22
  27. package/vscode/src/vs/workbench/browser/window.js +41 -92
  28. package/vscode/src/vs/workbench/contrib/callHierarchy/browser/callHierarchy.contribution.js +41 -78
  29. package/vscode/src/vs/workbench/contrib/callHierarchy/browser/callHierarchyPeek.js +23 -46
  30. package/vscode/src/vs/workbench/contrib/callHierarchy/browser/callHierarchyTree.js +36 -27
  31. package/vscode/src/vs/workbench/contrib/customEditor/browser/customEditorInputFactory.js +1 -1
  32. package/vscode/src/vs/workbench/contrib/customEditor/browser/customEditors.js +1 -1
  33. package/vscode/src/vs/workbench/contrib/customEditor/common/contributedCustomEditors.js +14 -15
  34. package/vscode/src/vs/workbench/contrib/customEditor/common/customEditor.js +10 -11
  35. package/vscode/src/vs/workbench/contrib/customEditor/common/customEditorModelManager.js +1 -1
  36. package/vscode/src/vs/workbench/contrib/customEditor/common/extensionPoint.js +25 -52
  37. package/vscode/src/vs/workbench/contrib/languageStatus/browser/languageStatus.contribution.js +59 -88
  38. package/vscode/src/vs/workbench/contrib/limitIndicator/browser/limitIndicator.contribution.js +18 -48
  39. package/vscode/src/vs/workbench/contrib/mergeEditor/browser/commands/commands.js +61 -150
  40. package/vscode/src/vs/workbench/contrib/mergeEditor/browser/commands/devCommands.js +15 -70
  41. package/vscode/src/vs/workbench/contrib/mergeEditor/browser/mergeEditor.contribution.js +9 -20
  42. package/vscode/src/vs/workbench/contrib/mergeEditor/browser/view/colors.js +14 -65
  43. package/vscode/src/vs/workbench/contrib/mergeEditor/browser/view/conflictActions.js +39 -113
  44. package/vscode/src/vs/workbench/contrib/mergeEditor/browser/view/editorGutter.js +1 -0
  45. package/vscode/src/vs/workbench/contrib/mergeEditor/browser/view/editors/baseCodeEditorView.js +13 -19
  46. package/vscode/src/vs/workbench/contrib/mergeEditor/browser/view/editors/codeEditorView.js +1 -0
  47. package/vscode/src/vs/workbench/contrib/mergeEditor/browser/view/editors/inputCodeEditorView.js +35 -75
  48. package/vscode/src/vs/workbench/contrib/mergeEditor/browser/view/editors/resultCodeEditorView.js +16 -37
  49. package/vscode/src/vs/workbench/contrib/mergeEditor/browser/view/mergeEditor.js +41 -43
  50. package/vscode/src/vs/workbench/contrib/mergeEditor/browser/view/scrollSynchronizer.js +6 -5
  51. package/vscode/src/vs/workbench/contrib/mergeEditor/browser/view/viewModel.js +13 -11
  52. package/vscode/src/vs/workbench/contrib/preferences/browser/keyboardLayoutPicker.js +24 -61
  53. package/vscode/src/vs/workbench/contrib/sash/browser/sash.contribution.js +7 -6
  54. package/vscode/src/vs/workbench/contrib/typeHierarchy/browser/typeHierarchy.contribution.js +37 -70
  55. package/vscode/src/vs/workbench/contrib/typeHierarchy/browser/typeHierarchyPeek.js +23 -46
  56. package/vscode/src/vs/workbench/contrib/typeHierarchy/browser/typeHierarchyTree.js +26 -27
  57. package/vscode/src/vs/workbench/contrib/webview/browser/overlayWebview.js +2 -2
  58. package/vscode/src/vs/workbench/contrib/webview/browser/webviewElement.js +50 -52
  59. package/vscode/src/vs/workbench/contrib/webview/browser/webviewFindWidget.js +5 -3
  60. package/vscode/src/vs/workbench/contrib/webviewPanel/browser/webviewCommands.js +18 -34
  61. package/vscode/src/vs/workbench/contrib/webviewPanel/browser/webviewPanel.contribution.js +7 -10
  62. package/vscode/src/vs/workbench/contrib/webviewView/browser/webviewViewPane.js +13 -11
  63. package/vscode/src/vs/workbench/contrib/webviewView/browser/webviewViewService.js +2 -2
  64. package/vscode/src/vs/workbench/services/auxiliaryWindow/browser/auxiliaryWindowService.js +79 -49
  65. package/vscode/src/vs/workbench/services/driver/browser/driver.js +9 -7
  66. package/vscode/src/vs/workbench/services/editor/browser/editorResolverService.js +45 -68
  67. package/vscode/src/vs/workbench/services/history/browser/historyService.js +95 -98
  68. package/vscode/src/vs/workbench/services/progress/browser/progressService.js +34 -74
  69. package/vscode/src/vs/workbench/services/views/browser/viewDescriptorService.js +69 -67
  70. package/vscode/src/vs/workbench/services/views/common/viewContainerModel.js +52 -47
@@ -44,6 +44,7 @@ import { IExtensionService } from 'vscode/vscode/vs/workbench/services/extension
44
44
  import { IWorkbenchEnvironmentService } from 'vscode/vscode/vs/workbench/services/environment/common/environmentService.service';
45
45
 
46
46
  var ActivitybarPart_1;
47
+ const _moduleId = "vs/workbench/browser/parts/activitybar/activitybarPart";
47
48
  let ActivitybarPart = class ActivitybarPart extends Part {
48
49
  static { ActivitybarPart_1 = this; }
49
50
  static { this.ACTION_HEIGHT = 48; }
@@ -58,7 +59,7 @@ let ActivitybarPart = class ActivitybarPart extends Part {
58
59
  this.maximumWidth = 48;
59
60
  this.minimumHeight = 0;
60
61
  this.maximumHeight = Number.POSITIVE_INFINITY;
61
- this.compositeBar = this._register(( new MutableDisposable()));
62
+ this.compositeBar = this._register(( (new MutableDisposable())));
62
63
  }
63
64
  createCompositeBar() {
64
65
  return this.instantiationService.createInstance(ActivityBarCompositeBar, {
@@ -153,12 +154,12 @@ let ActivitybarPart = class ActivitybarPart extends Part {
153
154
  };
154
155
  }
155
156
  };
156
- ActivitybarPart = ActivitybarPart_1 = ( __decorate([
157
- ( __param(1, IInstantiationService)),
158
- ( __param(2, IWorkbenchLayoutService)),
159
- ( __param(3, IThemeService)),
160
- ( __param(4, IStorageService))
161
- ], ActivitybarPart));
157
+ ActivitybarPart = ActivitybarPart_1 = ( (__decorate([
158
+ ( (__param(1, IInstantiationService))),
159
+ ( (__param(2, IWorkbenchLayoutService))),
160
+ ( (__param(3, IThemeService))),
161
+ ( (__param(4, IStorageService)))
162
+ ], ActivitybarPart)));
162
163
  let ActivityBarCompositeBar = class ActivityBarCompositeBar extends PaneCompositeBar {
163
164
  constructor(options, part, paneCompositePart, showGlobalActivities, instantiationService, storageService, extensionService, viewDescriptorService, contextKeyService, environmentService, configurationService, menuService, layoutService) {
164
165
  super({
@@ -170,7 +171,7 @@ let ActivityBarCompositeBar = class ActivityBarCompositeBar extends PaneComposit
170
171
  }, part, paneCompositePart, instantiationService, storageService, extensionService, viewDescriptorService, contextKeyService, environmentService, layoutService);
171
172
  this.configurationService = configurationService;
172
173
  this.menuService = menuService;
173
- this.keyboardNavigationDisposables = this._register(( new DisposableStore()));
174
+ this.keyboardNavigationDisposables = this._register(( (new DisposableStore())));
174
175
  if (showGlobalActivities) {
175
176
  this.globalCompositeBar = this._register(instantiationService.createInstance(GlobalCompositeBar, () => this.getContextMenuActions(), (theme) => this.options.colors(theme), this.options.activityHoverOptions));
176
177
  }
@@ -188,22 +189,18 @@ let ActivityBarCompositeBar = class ActivityBarCompositeBar extends PaneComposit
188
189
  fillContextMenuActions(actions, e) {
189
190
  const menuBarVisibility = getMenuBarVisibility(this.configurationService);
190
191
  if (menuBarVisibility === 'compact' || menuBarVisibility === 'hidden' || menuBarVisibility === 'toggle') {
191
- actions.unshift(...[toAction({ id: 'toggleMenuVisibility', label: ( localizeWithPath('vs/workbench/browser/parts/activitybar/activitybarPart', 'menu', "Menu")), checked: menuBarVisibility === 'compact', run: () => this.configurationService.updateValue('window.menuBarVisibility', menuBarVisibility === 'compact' ? 'toggle' : 'compact') }), ( new Separator())]);
192
+ actions.unshift(...[toAction({ id: 'toggleMenuVisibility', label: ( localizeWithPath(_moduleId, 0, "Menu")), checked: menuBarVisibility === 'compact', run: () => this.configurationService.updateValue('window.menuBarVisibility', menuBarVisibility === 'compact' ? 'toggle' : 'compact') }), ( (new Separator()))]);
192
193
  }
193
194
  if (menuBarVisibility === 'compact' && this.menuBarContainer && e?.target) {
194
195
  if (isAncestor(e.target, this.menuBarContainer)) {
195
- actions.unshift(...[toAction({ id: 'hideCompactMenu', label: ( localizeWithPath(
196
- 'vs/workbench/browser/parts/activitybar/activitybarPart',
197
- 'hideMenu',
198
- "Hide Menu"
199
- )), run: () => this.configurationService.updateValue('window.menuBarVisibility', 'toggle') }), ( new Separator())]);
196
+ actions.unshift(...[toAction({ id: 'hideCompactMenu', label: ( localizeWithPath(_moduleId, 1, "Hide Menu")), run: () => this.configurationService.updateValue('window.menuBarVisibility', 'toggle') }), ( (new Separator()))]);
200
197
  }
201
198
  }
202
199
  if (this.globalCompositeBar) {
203
- actions.push(( new Separator()));
200
+ actions.push(( (new Separator())));
204
201
  actions.push(...this.globalCompositeBar.getContextMenuActions());
205
202
  }
206
- actions.push(( new Separator()));
203
+ actions.push(( (new Separator())));
207
204
  actions.push(...this.getActivityBarContextMenuActions());
208
205
  }
209
206
  uninstallMenubar() {
@@ -231,7 +228,7 @@ let ActivityBarCompositeBar = class ActivityBarCompositeBar extends PaneComposit
231
228
  this.keyboardNavigationDisposables.clear();
232
229
  if (this.menuBarContainer) {
233
230
  this.keyboardNavigationDisposables.add(addDisposableListener(this.menuBarContainer, EventType.KEY_DOWN, e => {
234
- const kbEvent = ( new StandardKeyboardEvent(e));
231
+ const kbEvent = ( (new StandardKeyboardEvent(e)));
235
232
  if (kbEvent.equals(18 ) || kbEvent.equals(17 )) {
236
233
  this.focus();
237
234
  }
@@ -239,7 +236,7 @@ let ActivityBarCompositeBar = class ActivityBarCompositeBar extends PaneComposit
239
236
  }
240
237
  if (this.compositeBarContainer) {
241
238
  this.keyboardNavigationDisposables.add(addDisposableListener(this.compositeBarContainer, EventType.KEY_DOWN, e => {
242
- const kbEvent = ( new StandardKeyboardEvent(e));
239
+ const kbEvent = ( (new StandardKeyboardEvent(e)));
243
240
  if (kbEvent.equals(18 ) || kbEvent.equals(17 )) {
244
241
  this.globalCompositeBar?.focus();
245
242
  }
@@ -250,7 +247,7 @@ let ActivityBarCompositeBar = class ActivityBarCompositeBar extends PaneComposit
250
247
  }
251
248
  if (this.globalCompositeBar) {
252
249
  this.keyboardNavigationDisposables.add(addDisposableListener(this.globalCompositeBar.element, EventType.KEY_DOWN, e => {
253
- const kbEvent = ( new StandardKeyboardEvent(e));
250
+ const kbEvent = ( (new StandardKeyboardEvent(e)));
254
251
  if (kbEvent.equals(16 ) || kbEvent.equals(15 )) {
255
252
  this.focus(this.getVisiblePaneCompositeIds().length - 1);
256
253
  }
@@ -294,61 +291,45 @@ let ActivityBarCompositeBar = class ActivityBarCompositeBar extends PaneComposit
294
291
  createAndFillInContextMenuActions(activityBarPositionMenu, { shouldForwardArgs: true, renderShortTitle: true }, { primary: [], secondary: positionActions });
295
292
  activityBarPositionMenu.dispose();
296
293
  return [
297
- ( new SubmenuAction('workbench.action.panel.position', ( localizeWithPath(
298
- 'vs/workbench/browser/parts/activitybar/activitybarPart',
299
- 'activity bar position',
300
- "Activity Bar Position"
301
- )), positionActions)),
302
- toAction({ id: ToggleSidebarPositionAction.ID, label: ToggleSidebarPositionAction.getLabel(this.layoutService), run: () => this.instantiationService.invokeFunction(accessor => ( new ToggleSidebarPositionAction()).run(accessor)) })
294
+ ( (new SubmenuAction('workbench.action.panel.position', ( localizeWithPath(_moduleId, 2, "Activity Bar Position")), positionActions))),
295
+ toAction({ id: ToggleSidebarPositionAction.ID, label: ToggleSidebarPositionAction.getLabel(this.layoutService), run: () => this.instantiationService.invokeFunction(accessor => ( (new ToggleSidebarPositionAction())).run(accessor)) })
303
296
  ];
304
297
  }
305
298
  };
306
- ActivityBarCompositeBar = ( __decorate([
307
- ( __param(4, IInstantiationService)),
308
- ( __param(5, IStorageService)),
309
- ( __param(6, IExtensionService)),
310
- ( __param(7, IViewDescriptorService)),
311
- ( __param(8, IContextKeyService)),
312
- ( __param(9, IWorkbenchEnvironmentService)),
313
- ( __param(10, IConfigurationService)),
314
- ( __param(11, IMenuService)),
315
- ( __param(12, IWorkbenchLayoutService))
316
- ], ActivityBarCompositeBar));
299
+ ActivityBarCompositeBar = ( (__decorate([
300
+ ( (__param(4, IInstantiationService))),
301
+ ( (__param(5, IStorageService))),
302
+ ( (__param(6, IExtensionService))),
303
+ ( (__param(7, IViewDescriptorService))),
304
+ ( (__param(8, IContextKeyService))),
305
+ ( (__param(9, IWorkbenchEnvironmentService))),
306
+ ( (__param(10, IConfigurationService))),
307
+ ( (__param(11, IMenuService))),
308
+ ( (__param(12, IWorkbenchLayoutService)))
309
+ ], ActivityBarCompositeBar)));
317
310
  registerAction2(class extends Action2 {
318
311
  constructor() {
319
312
  super({
320
313
  id: 'workbench.action.activityBarLocation.default',
321
314
  title: {
322
- ...( localize2WithPath(
323
- 'vs/workbench/browser/parts/activitybar/activitybarPart',
324
- 'positionActivityBarDefault',
325
- 'Move Activity Bar to Side'
326
- )),
327
- mnemonicTitle: ( localizeWithPath(
328
- 'vs/workbench/browser/parts/activitybar/activitybarPart',
329
- { key: 'miDefaultActivityBar', comment: ['&& denotes a mnemonic'] },
330
- "&&Default"
331
- )),
315
+ ...( localize2WithPath(_moduleId, 3, 'Move Activity Bar to Side')),
316
+ mnemonicTitle: ( localizeWithPath(_moduleId, 4, "&&Default")),
332
317
  },
333
- shortTitle: ( localizeWithPath(
334
- 'vs/workbench/browser/parts/activitybar/activitybarPart',
335
- 'default',
336
- "Default"
337
- )),
318
+ shortTitle: ( localizeWithPath(_moduleId, 5, "Default")),
338
319
  category: Categories.View,
339
- toggled: ( ContextKeyExpr.equals(
320
+ toggled: ( (ContextKeyExpr.equals(
340
321
  `config.${"workbench.activityBar.location" }`,
341
322
  "default"
342
- )),
323
+ ))),
343
324
  menu: [{
344
325
  id: MenuId.ActivityBarPositionMenu,
345
326
  order: 1
346
327
  }, {
347
328
  id: MenuId.CommandPalette,
348
- when: ( ContextKeyExpr.notEquals(
329
+ when: ( (ContextKeyExpr.notEquals(
349
330
  `config.${"workbench.activityBar.location" }`,
350
331
  "default"
351
- )),
332
+ ))),
352
333
  }]
353
334
  });
354
335
  }
@@ -362,32 +343,24 @@ registerAction2(class extends Action2 {
362
343
  super({
363
344
  id: 'workbench.action.activityBarLocation.top',
364
345
  title: {
365
- ...( localize2WithPath(
366
- 'vs/workbench/browser/parts/activitybar/activitybarPart',
367
- 'positionActivityBarTop',
368
- 'Move Activity Bar to Top'
369
- )),
370
- mnemonicTitle: ( localizeWithPath(
371
- 'vs/workbench/browser/parts/activitybar/activitybarPart',
372
- { key: 'miTopActivityBar', comment: ['&& denotes a mnemonic'] },
373
- "&&Top"
374
- )),
346
+ ...( localize2WithPath(_moduleId, 6, 'Move Activity Bar to Top')),
347
+ mnemonicTitle: ( localizeWithPath(_moduleId, 7, "&&Top")),
375
348
  },
376
- shortTitle: ( localizeWithPath('vs/workbench/browser/parts/activitybar/activitybarPart', 'top', "Top")),
349
+ shortTitle: ( localizeWithPath(_moduleId, 8, "Top")),
377
350
  category: Categories.View,
378
- toggled: ( ContextKeyExpr.equals(
351
+ toggled: ( (ContextKeyExpr.equals(
379
352
  `config.${"workbench.activityBar.location" }`,
380
353
  "top"
381
- )),
354
+ ))),
382
355
  menu: [{
383
356
  id: MenuId.ActivityBarPositionMenu,
384
357
  order: 2
385
358
  }, {
386
359
  id: MenuId.CommandPalette,
387
- when: ( ContextKeyExpr.notEquals(
360
+ when: ( (ContextKeyExpr.notEquals(
388
361
  `config.${"workbench.activityBar.location" }`,
389
362
  "top"
390
- )),
363
+ ))),
391
364
  }]
392
365
  });
393
366
  }
@@ -401,36 +374,24 @@ registerAction2(class extends Action2 {
401
374
  super({
402
375
  id: 'workbench.action.activityBarLocation.bottom',
403
376
  title: {
404
- ...( localize2WithPath(
405
- 'vs/workbench/browser/parts/activitybar/activitybarPart',
406
- 'positionActivityBarBottom',
407
- 'Move Activity Bar to Bottom'
408
- )),
409
- mnemonicTitle: ( localizeWithPath(
410
- 'vs/workbench/browser/parts/activitybar/activitybarPart',
411
- { key: 'miBottomActivityBar', comment: ['&& denotes a mnemonic'] },
412
- "&&Bottom"
413
- )),
377
+ ...( localize2WithPath(_moduleId, 9, 'Move Activity Bar to Bottom')),
378
+ mnemonicTitle: ( localizeWithPath(_moduleId, 10, "&&Bottom")),
414
379
  },
415
- shortTitle: ( localizeWithPath(
416
- 'vs/workbench/browser/parts/activitybar/activitybarPart',
417
- 'bottom',
418
- "Bottom"
419
- )),
380
+ shortTitle: ( localizeWithPath(_moduleId, 11, "Bottom")),
420
381
  category: Categories.View,
421
- toggled: ( ContextKeyExpr.equals(
382
+ toggled: ( (ContextKeyExpr.equals(
422
383
  `config.${"workbench.activityBar.location" }`,
423
384
  "bottom"
424
- )),
385
+ ))),
425
386
  menu: [{
426
387
  id: MenuId.ActivityBarPositionMenu,
427
388
  order: 3
428
389
  }, {
429
390
  id: MenuId.CommandPalette,
430
- when: ( ContextKeyExpr.notEquals(
391
+ when: ( (ContextKeyExpr.notEquals(
431
392
  `config.${"workbench.activityBar.location" }`,
432
393
  "bottom"
433
- )),
394
+ ))),
434
395
  }]
435
396
  });
436
397
  }
@@ -444,32 +405,24 @@ registerAction2(class extends Action2 {
444
405
  super({
445
406
  id: 'workbench.action.activityBarLocation.hide',
446
407
  title: {
447
- ...( localize2WithPath(
448
- 'vs/workbench/browser/parts/activitybar/activitybarPart',
449
- 'hideActivityBar',
450
- 'Hide Activity Bar'
451
- )),
452
- mnemonicTitle: ( localizeWithPath(
453
- 'vs/workbench/browser/parts/activitybar/activitybarPart',
454
- { key: 'miHideActivityBar', comment: ['&& denotes a mnemonic'] },
455
- "&&Hidden"
456
- )),
408
+ ...( localize2WithPath(_moduleId, 12, 'Hide Activity Bar')),
409
+ mnemonicTitle: ( localizeWithPath(_moduleId, 13, "&&Hidden")),
457
410
  },
458
- shortTitle: ( localizeWithPath('vs/workbench/browser/parts/activitybar/activitybarPart', 'hide', "Hidden")),
411
+ shortTitle: ( localizeWithPath(_moduleId, 14, "Hidden")),
459
412
  category: Categories.View,
460
- toggled: ( ContextKeyExpr.equals(
413
+ toggled: ( (ContextKeyExpr.equals(
461
414
  `config.${"workbench.activityBar.location" }`,
462
415
  "hidden"
463
- )),
416
+ ))),
464
417
  menu: [{
465
418
  id: MenuId.ActivityBarPositionMenu,
466
419
  order: 4
467
420
  }, {
468
421
  id: MenuId.CommandPalette,
469
- when: ( ContextKeyExpr.notEquals(
422
+ when: ( (ContextKeyExpr.notEquals(
470
423
  `config.${"workbench.activityBar.location" }`,
471
424
  "hidden"
472
- )),
425
+ ))),
473
426
  }]
474
427
  });
475
428
  }
@@ -480,39 +433,27 @@ registerAction2(class extends Action2 {
480
433
  });
481
434
  MenuRegistry.appendMenuItem(MenuId.MenubarAppearanceMenu, {
482
435
  submenu: MenuId.ActivityBarPositionMenu,
483
- title: ( localizeWithPath(
484
- 'vs/workbench/browser/parts/activitybar/activitybarPart',
485
- 'positionActivituBar',
486
- "Activity Bar Position"
487
- )),
436
+ title: ( localizeWithPath(_moduleId, 15, "Activity Bar Position")),
488
437
  group: '3_workbench_layout_move',
489
438
  order: 2
490
439
  });
491
440
  MenuRegistry.appendMenuItem(MenuId.ViewContainerTitleContext, {
492
441
  submenu: MenuId.ActivityBarPositionMenu,
493
- title: ( localizeWithPath(
494
- 'vs/workbench/browser/parts/activitybar/activitybarPart',
495
- 'positionActivituBar',
496
- "Activity Bar Position"
497
- )),
498
- when: ( ContextKeyExpr.equals(
442
+ title: ( localizeWithPath(_moduleId, 15, "Activity Bar Position")),
443
+ when: ( (ContextKeyExpr.equals(
499
444
  'viewContainerLocation',
500
445
  ViewContainerLocationToString(0 )
501
- )),
446
+ ))),
502
447
  group: '3_workbench_layout_move',
503
448
  order: 1
504
449
  });
505
450
  MenuRegistry.appendMenuItem(MenuId.ViewTitleContext, {
506
451
  submenu: MenuId.ActivityBarPositionMenu,
507
- title: ( localizeWithPath(
508
- 'vs/workbench/browser/parts/activitybar/activitybarPart',
509
- 'positionActivituBar',
510
- "Activity Bar Position"
511
- )),
512
- when: ( ContextKeyExpr.equals(
452
+ title: ( localizeWithPath(_moduleId, 15, "Activity Bar Position")),
453
+ when: ( (ContextKeyExpr.equals(
513
454
  'viewLocation',
514
455
  ViewContainerLocationToString(0 )
515
- )),
456
+ ))),
516
457
  group: '3_workbench_layout_move',
517
458
  order: 1
518
459
  });
@@ -542,11 +483,7 @@ registerAction2(class PreviousSideBarViewAction extends SwitchSideBarViewAction
542
483
  constructor() {
543
484
  super({
544
485
  id: 'workbench.action.previousSideBarView',
545
- title: ( localize2WithPath(
546
- 'vs/workbench/browser/parts/activitybar/activitybarPart',
547
- 'previousSideBarView',
548
- 'Previous Primary Side Bar View'
549
- )),
486
+ title: ( localize2WithPath(_moduleId, 16, 'Previous Primary Side Bar View')),
550
487
  category: Categories.View,
551
488
  f1: true
552
489
  }, -1);
@@ -556,11 +493,7 @@ registerAction2(class NextSideBarViewAction extends SwitchSideBarViewAction {
556
493
  constructor() {
557
494
  super({
558
495
  id: 'workbench.action.nextSideBarView',
559
- title: ( localize2WithPath(
560
- 'vs/workbench/browser/parts/activitybar/activitybarPart',
561
- 'nextSideBarView',
562
- 'Next Primary Side Bar View'
563
- )),
496
+ title: ( localize2WithPath(_moduleId, 17, 'Next Primary Side Bar View')),
564
497
  category: Categories.View,
565
498
  f1: true
566
499
  }, 1);
@@ -570,11 +503,7 @@ registerAction2(class FocusActivityBarAction extends Action2 {
570
503
  constructor() {
571
504
  super({
572
505
  id: 'workbench.action.focusActivityBar',
573
- title: ( localize2WithPath(
574
- 'vs/workbench/browser/parts/activitybar/activitybarPart',
575
- 'focusActivityBar',
576
- 'Focus Activity Bar'
577
- )),
506
+ title: ( localize2WithPath(_moduleId, 18, 'Focus Activity Bar')),
578
507
  category: Categories.View,
579
508
  f1: true
580
509
  });
@@ -39,8 +39,10 @@ import { $ } from 'vscode/vscode/vs/base/browser/dom';
39
39
  import { WorkbenchToolBar } from 'vscode/vscode/vs/platform/actions/browser/toolbar';
40
40
  import { ActionViewItem } from 'vscode/vscode/vs/base/browser/ui/actionbar/actionViewItems';
41
41
  import { CompositeMenuActions } from 'vscode/vscode/vs/workbench/browser/actions';
42
+ import { IHoverService } from 'vscode/vscode/vs/platform/hover/browser/hover.service';
42
43
 
43
44
  var AuxiliaryBarPart_1;
45
+ const _moduleId = "vs/workbench/browser/parts/auxiliarybar/auxiliaryBarPart";
44
46
  let AuxiliaryBarPart = class AuxiliaryBarPart extends AbstractPaneCompositePart {
45
47
  static { AuxiliaryBarPart_1 = this; }
46
48
  static { this.activePanelSettingsKey = 'workbench.auxiliarybar.activepanelid'; }
@@ -61,11 +63,11 @@ let AuxiliaryBarPart = class AuxiliaryBarPart extends AbstractPaneCompositePart
61
63
  }
62
64
  return Math.max(width, 300);
63
65
  }
64
- constructor(notificationService, storageService, contextMenuService, layoutService, keybindingService, instantiationService, themeService, viewDescriptorService, contextKeyService, extensionService, commandService, menuService, configurationService) {
66
+ constructor(notificationService, storageService, contextMenuService, layoutService, keybindingService, hoverService, instantiationService, themeService, viewDescriptorService, contextKeyService, extensionService, commandService, menuService, configurationService) {
65
67
  super("workbench.parts.auxiliarybar" , {
66
68
  hasTitle: true,
67
69
  borderWidth: () => (this.getColor(SIDE_BAR_BORDER) || this.getColor(contrastBorder)) ? 1 : 0,
68
- }, AuxiliaryBarPart_1.activePanelSettingsKey, ActiveAuxiliaryContext.bindTo(contextKeyService), AuxiliaryBarFocusContext.bindTo(contextKeyService), 'auxiliarybar', 'auxiliarybar', undefined, notificationService, storageService, contextMenuService, layoutService, keybindingService, instantiationService, themeService, viewDescriptorService, contextKeyService, extensionService, menuService);
70
+ }, AuxiliaryBarPart_1.activePanelSettingsKey, ActiveAuxiliaryContext.bindTo(contextKeyService), AuxiliaryBarFocusContext.bindTo(contextKeyService), 'auxiliarybar', 'auxiliarybar', undefined, notificationService, storageService, contextMenuService, layoutService, keybindingService, hoverService, instantiationService, themeService, viewDescriptorService, contextKeyService, extensionService, menuService);
69
71
  this.commandService = commandService;
70
72
  this.configurationService = configurationService;
71
73
  this.minimumWidth = 170;
@@ -134,7 +136,7 @@ let AuxiliaryBarPart = class AuxiliaryBarPart extends AbstractPaneCompositePart
134
136
  const currentPositionRight = this.layoutService.getSideBarPosition() === 0 ;
135
137
  const viewsSubmenuAction = this.getViewsSubmenuAction();
136
138
  if (viewsSubmenuAction) {
137
- actions.push(( new Separator()));
139
+ actions.push(( (new Separator())));
138
140
  actions.push(viewsSubmenuAction);
139
141
  }
140
142
  const activityBarPositionMenu = this.menuService.createMenu(MenuId.ActivityBarPositionMenu, this.contextKeyService);
@@ -142,26 +144,10 @@ let AuxiliaryBarPart = class AuxiliaryBarPart extends AbstractPaneCompositePart
142
144
  createAndFillInContextMenuActions(activityBarPositionMenu, { shouldForwardArgs: true, renderShortTitle: true }, { primary: [], secondary: positionActions });
143
145
  activityBarPositionMenu.dispose();
144
146
  actions.push(...[
145
- ( new Separator()),
146
- ( new SubmenuAction('workbench.action.panel.position', ( localizeWithPath(
147
- 'vs/workbench/browser/parts/auxiliarybar/auxiliaryBarPart',
148
- 'activity bar position',
149
- "Activity Bar Position"
150
- )), positionActions)),
151
- toAction({ id: ToggleSidebarPositionAction.ID, label: currentPositionRight ? ( localizeWithPath(
152
- 'vs/workbench/browser/parts/auxiliarybar/auxiliaryBarPart',
153
- 'move second side bar left',
154
- "Move Secondary Side Bar Left"
155
- )) : ( localizeWithPath(
156
- 'vs/workbench/browser/parts/auxiliarybar/auxiliaryBarPart',
157
- 'move second side bar right',
158
- "Move Secondary Side Bar Right"
159
- )), run: () => this.commandService.executeCommand(ToggleSidebarPositionAction.ID) }),
160
- toAction({ id: ToggleAuxiliaryBarAction.ID, label: ( localizeWithPath(
161
- 'vs/workbench/browser/parts/auxiliarybar/auxiliaryBarPart',
162
- 'hide second side bar',
163
- "Hide Secondary Side Bar"
164
- )), run: () => this.commandService.executeCommand(ToggleAuxiliaryBarAction.ID) })
147
+ ( (new Separator())),
148
+ ( (new SubmenuAction('workbench.action.panel.position', ( localizeWithPath(_moduleId, 0, "Activity Bar Position")), positionActions))),
149
+ toAction({ id: ToggleSidebarPositionAction.ID, label: currentPositionRight ? ( localizeWithPath(_moduleId, 1, "Move Secondary Side Bar Left")) : ( localizeWithPath(_moduleId, 2, "Move Secondary Side Bar Right")), run: () => this.commandService.executeCommand(ToggleSidebarPositionAction.ID) }),
150
+ toAction({ id: ToggleAuxiliaryBarAction.ID, label: ( localizeWithPath(_moduleId, 3, "Hide Secondary Side Bar")), run: () => this.commandService.executeCommand(ToggleAuxiliaryBarAction.ID) })
165
151
  ]);
166
152
  }
167
153
  shouldShowCompositeBar() {
@@ -210,20 +196,21 @@ let AuxiliaryBarPart = class AuxiliaryBarPart extends AbstractPaneCompositePart
210
196
  };
211
197
  }
212
198
  };
213
- AuxiliaryBarPart = AuxiliaryBarPart_1 = ( __decorate([
214
- ( __param(0, INotificationService)),
215
- ( __param(1, IStorageService)),
216
- ( __param(2, IContextMenuService)),
217
- ( __param(3, IWorkbenchLayoutService)),
218
- ( __param(4, IKeybindingService)),
219
- ( __param(5, IInstantiationService)),
220
- ( __param(6, IThemeService)),
221
- ( __param(7, IViewDescriptorService)),
222
- ( __param(8, IContextKeyService)),
223
- ( __param(9, IExtensionService)),
224
- ( __param(10, ICommandService)),
225
- ( __param(11, IMenuService)),
226
- ( __param(12, IConfigurationService))
227
- ], AuxiliaryBarPart));
199
+ AuxiliaryBarPart = AuxiliaryBarPart_1 = ( (__decorate([
200
+ ( (__param(0, INotificationService))),
201
+ ( (__param(1, IStorageService))),
202
+ ( (__param(2, IContextMenuService))),
203
+ ( (__param(3, IWorkbenchLayoutService))),
204
+ ( (__param(4, IKeybindingService))),
205
+ ( (__param(5, IHoverService))),
206
+ ( (__param(6, IInstantiationService))),
207
+ ( (__param(7, IThemeService))),
208
+ ( (__param(8, IViewDescriptorService))),
209
+ ( (__param(9, IContextKeyService))),
210
+ ( (__param(10, IExtensionService))),
211
+ ( (__param(11, ICommandService))),
212
+ ( (__param(12, IMenuService))),
213
+ ( (__param(13, IConfigurationService)))
214
+ ], AuxiliaryBarPart)));
228
215
 
229
216
  export { AuxiliaryBarPart };
@@ -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.noauxiliarybar .part.auxiliarybar{display:none!important;visibility:hidden!important}.monaco-workbench .part.auxiliarybar>.content .monaco-editor,.monaco-workbench .part.auxiliarybar>.content .monaco-editor .margin,.monaco-workbench .part.auxiliarybar>.content .monaco-editor .monaco-editor-background{background-color:var(--vscode-sideBar-background)}.monaco-workbench .part.auxiliarybar .title-actions .actions-container{justify-content:flex-end}.monaco-workbench .part.auxiliarybar .title-actions .action-item{margin-right:4px}.monaco-workbench .part.auxiliarybar>.title>.title-label{flex:1}.monaco-workbench .part.auxiliarybar>.title>.title-label h2{text-transform:uppercase}.monaco-workbench .part.auxiliarybar>.title>.composite-bar-container{flex:1}.monaco-workbench .part.auxiliarybar>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:focus,.monaco-workbench .part.auxiliarybar>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:focus{outline:0!important}.monaco-workbench .part.auxiliarybar>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item .action-label,.monaco-workbench .part.auxiliarybar>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item .action-label{border-radius:0;outline-offset:2px}.monaco-workbench .part.auxiliarybar>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item .action-label:before,.monaco-workbench .part.auxiliarybar>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item .action-label:before{left:6px;position:absolute}.monaco-workbench .part.auxiliarybar>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.checked.clicked:focus .active-item-indicator:before,.monaco-workbench .part.auxiliarybar>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.checked:not(:focus) .active-item-indicator:before{border-top-color:var(--vscode-panelTitle-activeBorder)!important}.monaco-workbench .part.auxiliarybar>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.checked.clicked:focus .active-item-indicator:before,.monaco-workbench .part.auxiliarybar>.header-or-footer>.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.auxiliarybar>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:focus .action-label,.monaco-workbench .part.auxiliarybar>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:hover .action-label{color:var(--vscode-sideBarTitle-foreground)!important}.monaco-workbench .part.auxiliarybar>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:focus .action-label,.monaco-workbench .part.auxiliarybar>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:hover .action-label{color:var(--vscode-activityBarTop-foreground)!important}.monaco-workbench .part.auxiliarybar>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.checked .action-label,.monaco-workbench .part.auxiliarybar>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:hover .action-label,.monaco-workbench .part.auxiliarybar>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.checked .action-label,.monaco-workbench .part.auxiliarybar>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:hover .action-label{outline:var(--vscode-contrastActiveBorder,unset) solid 1px!important}.monaco-workbench .part.auxiliarybar>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:not(.checked):hover .action-label,.monaco-workbench .part.auxiliarybar>.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 .auxiliarybar.part.pane-composite-part>.composite.title>.title-actions{flex:inherit}.monaco-workbench .auxiliarybar.pane-composite-part>.title.has-composite-bar>.title-actions .monaco-action-bar .action-item{max-width:150px}";
3
+ var css = ".monaco-workbench.noauxiliarybar .part.auxiliarybar{display:none!important;visibility:hidden!important}.monaco-workbench .part.auxiliarybar>.content .monaco-editor,.monaco-workbench .part.auxiliarybar>.content .monaco-editor .margin,.monaco-workbench .part.auxiliarybar>.content .monaco-editor .monaco-editor-background{background-color:var(--vscode-sideBar-background)}.monaco-workbench .part.auxiliarybar .title-actions .actions-container{justify-content:flex-end}.monaco-workbench .part.auxiliarybar .title-actions .action-item{margin-right:4px}.monaco-workbench .part.auxiliarybar>.title{background-color:var(--vscode-sideBarTitle-background)}.monaco-workbench .part.auxiliarybar>.title>.title-label{flex:1}.monaco-workbench .part.auxiliarybar>.title>.title-label h2{text-transform:uppercase}.monaco-workbench .part.auxiliarybar>.title>.composite-bar-container{flex:1}.monaco-workbench .part.auxiliarybar>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:focus,.monaco-workbench .part.auxiliarybar>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:focus{outline:0!important}.monaco-workbench .part.auxiliarybar>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item .action-label,.monaco-workbench .part.auxiliarybar>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item .action-label{border-radius:0;outline-offset:2px}.monaco-workbench .part.auxiliarybar>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item .action-label:before,.monaco-workbench .part.auxiliarybar>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item .action-label:before{left:6px;position:absolute}.monaco-workbench .part.auxiliarybar>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.checked.clicked:focus .active-item-indicator:before,.monaco-workbench .part.auxiliarybar>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.checked:not(:focus) .active-item-indicator:before{border-top-color:var(--vscode-panelTitle-activeBorder)!important}.monaco-workbench .part.auxiliarybar>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.checked.clicked:focus .active-item-indicator:before,.monaco-workbench .part.auxiliarybar>.header-or-footer>.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.auxiliarybar>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:focus .action-label,.monaco-workbench .part.auxiliarybar>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:hover .action-label{color:var(--vscode-sideBarTitle-foreground)!important}.monaco-workbench .part.auxiliarybar>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:focus .action-label,.monaco-workbench .part.auxiliarybar>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:hover .action-label{color:var(--vscode-activityBarTop-foreground)!important}.monaco-workbench .part.auxiliarybar>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.checked .action-label,.monaco-workbench .part.auxiliarybar>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:hover .action-label,.monaco-workbench .part.auxiliarybar>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.checked .action-label,.monaco-workbench .part.auxiliarybar>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:hover .action-label{outline:var(--vscode-contrastActiveBorder,unset) solid 1px!important}.monaco-workbench .part.auxiliarybar>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:not(.checked):hover .action-label,.monaco-workbench .part.auxiliarybar>.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 .auxiliarybar.part.pane-composite-part>.composite.title>.title-actions{flex:inherit}.monaco-workbench .auxiliarybar.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 };