@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
@@ -32,6 +32,7 @@ import { ILogService } from 'vscode/vscode/vs/platform/log/common/log.service';
32
32
  import { mainWindow } from 'vscode/vscode/vs/base/browser/window';
33
33
 
34
34
  var HistoryService_1, EditorNavigationStack_1;
35
+ const _moduleId = "vs/workbench/services/history/browser/historyService";
35
36
  let HistoryService = class HistoryService extends Disposable {
36
37
  static { HistoryService_1 = this; }
37
38
  static { this.MOUSE_NAVIGATION_SETTING = 'workbench.editor.mouseBackForwardToNavigate'; }
@@ -49,59 +50,51 @@ let HistoryService = class HistoryService extends Disposable {
49
50
  this.layoutService = layoutService;
50
51
  this.contextKeyService = contextKeyService;
51
52
  this.logService = logService;
52
- this.activeEditorListeners = this._register(( new DisposableStore()));
53
+ this.activeEditorListeners = this._register(( (new DisposableStore())));
53
54
  this.lastActiveEditor = undefined;
54
55
  this.editorHelper = this.instantiationService.createInstance(EditorHelper);
55
- this.canNavigateBackContextKey = (( new RawContextKey('canNavigateBack', false, ( localizeWithPath(
56
- 'vs/workbench/services/history/browser/historyService',
57
- 'canNavigateBack',
58
- "Whether it is possible to navigate back in editor history"
59
- ))))).bindTo(this.contextKeyService);
60
- this.canNavigateForwardContextKey = (( new RawContextKey('canNavigateForward', false, ( localizeWithPath(
61
- 'vs/workbench/services/history/browser/historyService',
62
- 'canNavigateForward',
56
+ this.canNavigateBackContextKey = (( (new RawContextKey('canNavigateBack', false, ( localizeWithPath(_moduleId, 0, "Whether it is possible to navigate back in editor history")))))).bindTo(this.contextKeyService);
57
+ this.canNavigateForwardContextKey = (( (new RawContextKey('canNavigateForward', false, ( localizeWithPath(
58
+ _moduleId,
59
+ 1,
63
60
  "Whether it is possible to navigate forward in editor history"
64
- ))))).bindTo(this.contextKeyService);
65
- this.canNavigateBackInNavigationsContextKey = (( new RawContextKey('canNavigateBackInNavigationLocations', false, ( localizeWithPath(
66
- 'vs/workbench/services/history/browser/historyService',
67
- 'canNavigateBackInNavigationLocations',
61
+ )))))).bindTo(this.contextKeyService);
62
+ this.canNavigateBackInNavigationsContextKey = (( (new RawContextKey('canNavigateBackInNavigationLocations', false, ( localizeWithPath(
63
+ _moduleId,
64
+ 2,
68
65
  "Whether it is possible to navigate back in editor navigation locations history"
69
- ))))).bindTo(this.contextKeyService);
70
- this.canNavigateForwardInNavigationsContextKey = (( new RawContextKey('canNavigateForwardInNavigationLocations', false, ( localizeWithPath(
71
- 'vs/workbench/services/history/browser/historyService',
72
- 'canNavigateForwardInNavigationLocations',
66
+ )))))).bindTo(this.contextKeyService);
67
+ this.canNavigateForwardInNavigationsContextKey = (( (new RawContextKey('canNavigateForwardInNavigationLocations', false, ( localizeWithPath(
68
+ _moduleId,
69
+ 3,
73
70
  "Whether it is possible to navigate forward in editor navigation locations history"
74
- ))))).bindTo(this.contextKeyService);
75
- this.canNavigateToLastNavigationLocationContextKey = (( new RawContextKey('canNavigateToLastNavigationLocation', false, ( localizeWithPath(
76
- 'vs/workbench/services/history/browser/historyService',
77
- 'canNavigateToLastNavigationLocation',
71
+ )))))).bindTo(this.contextKeyService);
72
+ this.canNavigateToLastNavigationLocationContextKey = (( (new RawContextKey('canNavigateToLastNavigationLocation', false, ( localizeWithPath(
73
+ _moduleId,
74
+ 4,
78
75
  "Whether it is possible to navigate to the last editor navigation location"
79
- ))))).bindTo(this.contextKeyService);
80
- this.canNavigateBackInEditsContextKey = (( new RawContextKey('canNavigateBackInEditLocations', false, ( localizeWithPath(
81
- 'vs/workbench/services/history/browser/historyService',
82
- 'canNavigateBackInEditLocations',
76
+ )))))).bindTo(this.contextKeyService);
77
+ this.canNavigateBackInEditsContextKey = (( (new RawContextKey('canNavigateBackInEditLocations', false, ( localizeWithPath(
78
+ _moduleId,
79
+ 5,
83
80
  "Whether it is possible to navigate back in editor edit locations history"
84
- ))))).bindTo(this.contextKeyService);
85
- this.canNavigateForwardInEditsContextKey = (( new RawContextKey('canNavigateForwardInEditLocations', false, ( localizeWithPath(
86
- 'vs/workbench/services/history/browser/historyService',
87
- 'canNavigateForwardInEditLocations',
81
+ )))))).bindTo(this.contextKeyService);
82
+ this.canNavigateForwardInEditsContextKey = (( (new RawContextKey('canNavigateForwardInEditLocations', false, ( localizeWithPath(
83
+ _moduleId,
84
+ 6,
88
85
  "Whether it is possible to navigate forward in editor edit locations history"
89
- ))))).bindTo(this.contextKeyService);
90
- this.canNavigateToLastEditLocationContextKey = (( new RawContextKey('canNavigateToLastEditLocation', false, ( localizeWithPath(
91
- 'vs/workbench/services/history/browser/historyService',
92
- 'canNavigateToLastEditLocation',
86
+ )))))).bindTo(this.contextKeyService);
87
+ this.canNavigateToLastEditLocationContextKey = (( (new RawContextKey('canNavigateToLastEditLocation', false, ( localizeWithPath(
88
+ _moduleId,
89
+ 7,
93
90
  "Whether it is possible to navigate to the last editor edit location"
94
- ))))).bindTo(this.contextKeyService);
95
- this.canReopenClosedEditorContextKey = (( new RawContextKey('canReopenClosedEditor', false, ( localizeWithPath(
96
- 'vs/workbench/services/history/browser/historyService',
97
- 'canReopenClosedEditor',
98
- "Whether it is possible to reopen the last closed editor"
99
- ))))).bindTo(this.contextKeyService);
100
- this._onDidChangeEditorNavigationStack = this._register(( new Emitter()));
91
+ )))))).bindTo(this.contextKeyService);
92
+ this.canReopenClosedEditorContextKey = (( (new RawContextKey('canReopenClosedEditor', false, ( localizeWithPath(_moduleId, 8, "Whether it is possible to reopen the last closed editor")))))).bindTo(this.contextKeyService);
93
+ this._onDidChangeEditorNavigationStack = this._register(( (new Emitter())));
101
94
  this.onDidChangeEditorNavigationStack = this._onDidChangeEditorNavigationStack.event;
102
95
  this.defaultScopedEditorNavigationStack = undefined;
103
- this.editorGroupScopedNavigationStacks = ( new Map());
104
- this.editorScopedNavigationStacks = ( new Map());
96
+ this.editorGroupScopedNavigationStacks = ( (new Map()));
97
+ this.editorScopedNavigationStacks = ( (new Map()));
105
98
  this.editorNavigationScope = 0 ;
106
99
  this.recentlyUsedEditorsStack = undefined;
107
100
  this.recentlyUsedEditorsStackIndex = 0;
@@ -112,12 +105,12 @@ let HistoryService = class HistoryService extends Disposable {
112
105
  this.recentlyClosedEditors = [];
113
106
  this.ignoreEditorCloseEvent = false;
114
107
  this.history = undefined;
115
- this.editorHistoryListeners = ( new Map());
116
- this.resourceExcludeMatcher = this._register(( new WindowIdleValue(mainWindow, () => {
108
+ this.editorHistoryListeners = ( (new Map()));
109
+ this.resourceExcludeMatcher = this._register(( (new WindowIdleValue(mainWindow, () => {
117
110
  const matcher = this._register(this.instantiationService.createInstance(ResourceGlobMatcher, root => getExcludes(root ? this.configurationService.getValue({ resource: root }) : this.configurationService.getValue()) || Object.create(null), event => event.affectsConfiguration(FILES_EXCLUDE_CONFIG) || event.affectsConfiguration(SEARCH_EXCLUDE_CONFIG)));
118
111
  this._register(matcher.onExpressionChange(() => this.removeExcludedFromHistory()));
119
112
  return matcher;
120
- })));
113
+ }))));
121
114
  this.registerListeners();
122
115
  if (this.editorService.activeEditorPane) {
123
116
  this.onDidActiveEditorChange();
@@ -142,12 +135,12 @@ let HistoryService = class HistoryService extends Disposable {
142
135
  this.handleEditorCloseEventInReopen(e);
143
136
  }
144
137
  registerMouseNavigationListener() {
145
- const mouseBackForwardSupportListener = this._register(( new DisposableStore()));
138
+ const mouseBackForwardSupportListener = this._register(( (new DisposableStore())));
146
139
  const handleMouseBackForwardSupport = () => {
147
140
  mouseBackForwardSupportListener.clear();
148
141
  if (this.configurationService.getValue(HistoryService_1.MOUSE_NAVIGATION_SETTING)) {
149
142
  this._register(Event.runAndSubscribe(this.layoutService.onDidAddContainer, ({ container, disposables }) => {
150
- const eventDisposables = disposables.add(( new DisposableStore()));
143
+ const eventDisposables = disposables.add(( (new DisposableStore())));
151
144
  eventDisposables.add(addDisposableListener(container, EventType.MOUSE_DOWN, e => this.onMouseDownOrUp(e, true)));
152
145
  eventDisposables.add(addDisposableListener(container, EventType.MOUSE_UP, e => this.onMouseDownOrUp(e, false)));
153
146
  mouseBackForwardSupportListener.add(eventDisposables);
@@ -296,16 +289,18 @@ let HistoryService = class HistoryService extends Disposable {
296
289
  switch (this.editorNavigationScope) {
297
290
  case 2 : {
298
291
  if (!editor) {
299
- return ( new NoOpEditorNavigationStacks());
292
+ return (
293
+ (new NoOpEditorNavigationStacks())
294
+ );
300
295
  }
301
296
  let stacksForGroup = this.editorScopedNavigationStacks.get(group.id);
302
297
  if (!stacksForGroup) {
303
- stacksForGroup = ( new Map());
298
+ stacksForGroup = ( (new Map()));
304
299
  this.editorScopedNavigationStacks.set(group.id, stacksForGroup);
305
300
  }
306
301
  let stack = stacksForGroup.get(editor)?.stack;
307
302
  if (!stack) {
308
- const disposable = ( new DisposableStore());
303
+ const disposable = ( (new DisposableStore()));
309
304
  stack = disposable.add(this.instantiationService.createInstance(EditorNavigationStacks, 2 ));
310
305
  disposable.add(stack.onDidChange(() => this._onDidChangeEditorNavigationStack.fire()));
311
306
  stacksForGroup.set(editor, { stack, disposable });
@@ -315,7 +310,7 @@ let HistoryService = class HistoryService extends Disposable {
315
310
  case 1 : {
316
311
  let stack = this.editorGroupScopedNavigationStacks.get(group.id)?.stack;
317
312
  if (!stack) {
318
- const disposable = ( new DisposableStore());
313
+ const disposable = ( (new DisposableStore()));
319
314
  stack = disposable.add(this.instantiationService.createInstance(EditorNavigationStacks, 1 ));
320
315
  disposable.add(stack.onDidChange(() => this._onDidChangeEditorNavigationStack.fire()));
321
316
  this.editorGroupScopedNavigationStacks.set(group.id, { stack, disposable });
@@ -446,7 +441,7 @@ let HistoryService = class HistoryService extends Disposable {
446
441
  index = this.recentlyUsedEditorsStackIndex;
447
442
  }
448
443
  else {
449
- editors = this.recentlyUsedEditorsInGroupStack || ( group.getEditors(0 ).map(editor => ({ groupId: group.id, editor })));
444
+ editors = this.recentlyUsedEditorsInGroupStack || ( (group.getEditors(0 ).map(editor => ({ groupId: group.id, editor }))));
450
445
  index = this.recentlyUsedEditorsInGroupStackIndex;
451
446
  }
452
447
  let newIndex = indexModifier(index);
@@ -555,9 +550,9 @@ let HistoryService = class HistoryService extends Disposable {
555
550
  if (recentlyClosedEditor.resource && this.editorHelper.matchesFile(recentlyClosedEditor.resource, arg1)) {
556
551
  return false;
557
552
  }
558
- if (( recentlyClosedEditor.associatedResources.some(
553
+ if (( (recentlyClosedEditor.associatedResources.some(
559
554
  associatedResource => this.editorHelper.matchesFile(associatedResource, arg1)
560
- ))) {
555
+ )))) {
561
556
  return false;
562
557
  }
563
558
  return true;
@@ -665,7 +660,7 @@ let HistoryService = class HistoryService extends Disposable {
665
660
  replaced = true;
666
661
  }
667
662
  }
668
- else if (!( replacements.some(replacement => this.editorHelper.matchesEditor(replacement, entry)))) {
663
+ else if (!( (replacements.some(replacement => this.editorHelper.matchesEditor(replacement, entry))))) {
669
664
  newHistory.push(entry);
670
665
  }
671
666
  }
@@ -703,18 +698,20 @@ let HistoryService = class HistoryService extends Disposable {
703
698
  this.history = [];
704
699
  const storedEditorHistory = this.loadHistoryFromStorage();
705
700
  const openedEditorsLru = [...this.editorService.getEditors(0 )].reverse();
706
- const handledEditors = ( new Set());
701
+ const handledEditors = ( (new Set()));
707
702
  for (const { editor } of openedEditorsLru) {
708
703
  if (!this.includeInHistory(editor)) {
709
704
  continue;
710
705
  }
711
706
  this.addToHistory(editor);
712
707
  if (editor.resource) {
713
- handledEditors.add(`${( editor.resource.toString())}/${editor.editorId}`);
708
+ handledEditors.add(`${( (editor.resource.toString()))}/${editor.editorId}`);
714
709
  }
715
710
  }
716
711
  for (const editor of storedEditorHistory) {
717
- if (!( handledEditors.has(`${( editor.resource.toString())}/${editor.options?.override}`)) &&
712
+ if (!( (handledEditors.has(
713
+ `${( (editor.resource.toString()))}/${editor.options?.override}`
714
+ ))) &&
718
715
  this.includeInHistory(editor)) {
719
716
  this.addToHistory(editor, false );
720
717
  }
@@ -735,8 +732,8 @@ let HistoryService = class HistoryService extends Disposable {
735
732
  ...entryParsed.editor,
736
733
  resource: typeof entryParsed.editor.resource === 'string' ?
737
734
  (
738
- URI.parse(entryParsed.editor.resource)) :
739
- ( URI.from(entryParsed.editor.resource))
735
+ (URI.parse(entryParsed.editor.resource))) :
736
+ ( (URI.from(entryParsed.editor.resource)))
740
737
  });
741
738
  }
742
739
  catch (error) {
@@ -762,7 +759,7 @@ let HistoryService = class HistoryService extends Disposable {
762
759
  entries.push({
763
760
  editor: {
764
761
  ...editor,
765
- resource: ( editor.resource.toString())
762
+ resource: ( (editor.resource.toString()))
766
763
  }
767
764
  });
768
765
  }
@@ -833,20 +830,20 @@ let HistoryService = class HistoryService extends Disposable {
833
830
  }
834
831
  }
835
832
  };
836
- HistoryService = HistoryService_1 = ( __decorate([
837
- ( __param(0, IEditorService)),
838
- ( __param(1, IEditorGroupsService)),
839
- ( __param(2, IWorkspaceContextService)),
840
- ( __param(3, IStorageService)),
841
- ( __param(4, IConfigurationService)),
842
- ( __param(5, IFileService)),
843
- ( __param(6, IWorkspacesService)),
844
- ( __param(7, IInstantiationService)),
845
- ( __param(8, IWorkbenchLayoutService)),
846
- ( __param(9, IContextKeyService)),
847
- ( __param(10, ILogService))
848
- ], HistoryService));
849
- ( registerSingleton(IHistoryService, HistoryService, 0 ));
833
+ HistoryService = HistoryService_1 = ( (__decorate([
834
+ ( (__param(0, IEditorService))),
835
+ ( (__param(1, IEditorGroupsService))),
836
+ ( (__param(2, IWorkspaceContextService))),
837
+ ( (__param(3, IStorageService))),
838
+ ( (__param(4, IConfigurationService))),
839
+ ( (__param(5, IFileService))),
840
+ ( (__param(6, IWorkspacesService))),
841
+ ( (__param(7, IInstantiationService))),
842
+ ( (__param(8, IWorkbenchLayoutService))),
843
+ ( (__param(9, IContextKeyService))),
844
+ ( (__param(10, ILogService)))
845
+ ], HistoryService)));
846
+ ( (registerSingleton(IHistoryService, HistoryService, 0 )));
850
847
  class EditorSelectionState {
851
848
  constructor(editorIdentifier, selection, reason) {
852
849
  this.editorIdentifier = editorIdentifier;
@@ -948,9 +945,9 @@ let EditorNavigationStacks = class EditorNavigationStacks extends Disposable {
948
945
  }
949
946
  }
950
947
  };
951
- EditorNavigationStacks = ( __decorate([
952
- ( __param(1, IInstantiationService))
953
- ], EditorNavigationStacks));
948
+ EditorNavigationStacks = ( (__decorate([
949
+ ( (__param(1, IInstantiationService)))
950
+ ], EditorNavigationStacks)));
954
951
  class NoOpEditorNavigationStacks {
955
952
  constructor() {
956
953
  this.onDidChange = Event.None;
@@ -988,10 +985,10 @@ let EditorNavigationStack = class EditorNavigationStack extends Disposable {
988
985
  this.editorService = editorService;
989
986
  this.editorGroupService = editorGroupService;
990
987
  this.logService = logService;
991
- this._onDidChange = this._register(( new Emitter()));
988
+ this._onDidChange = this._register(( (new Emitter())));
992
989
  this.onDidChange = this._onDidChange.event;
993
- this.mapEditorToDisposable = ( new Map());
994
- this.mapGroupToDisposable = ( new Map());
990
+ this.mapEditorToDisposable = ( (new Map()));
991
+ this.mapGroupToDisposable = ( (new Map()));
995
992
  this.editorHelper = this.instantiationService.createInstance(EditorHelper);
996
993
  this.stack = [];
997
994
  this.index = -1;
@@ -1074,7 +1071,7 @@ ${entryLabels.join('\n')}
1074
1071
  }
1075
1072
  }
1076
1073
  registerGroupListeners(groupId) {
1077
- if (!( this.mapGroupToDisposable.has(groupId))) {
1074
+ if (!( (this.mapGroupToDisposable.has(groupId)))) {
1078
1075
  const group = this.editorGroupService.getGroup(groupId);
1079
1076
  if (group) {
1080
1077
  this.mapGroupToDisposable.set(groupId, group.onWillMoveEditor(e => this.onWillMoveEditor(e)));
@@ -1104,11 +1101,11 @@ ${entryLabels.join('\n')}
1104
1101
  this.trace(`notifyNavigation() ignoring (navigating)`, editorPane?.input, event);
1105
1102
  if (isSelectionAwareEditorPane && hasValidEditor) {
1106
1103
  this.trace('notifyNavigation() updating current selection state', editorPane?.input, event);
1107
- this.currentSelectionState = ( new EditorSelectionState(
1104
+ this.currentSelectionState = ( (new EditorSelectionState(
1108
1105
  { groupId: editorPane.group.id, editor: editorPane.input },
1109
1106
  editorPane.getSelection(),
1110
1107
  event?.reason
1111
- ));
1108
+ )));
1112
1109
  }
1113
1110
  else {
1114
1111
  this.trace('notifyNavigation() dropping current selection state', editorPane?.input, event);
@@ -1133,7 +1130,7 @@ ${entryLabels.join('\n')}
1133
1130
  return;
1134
1131
  }
1135
1132
  this.trace('onSelectionAwareEditorNavigation()', editor, event);
1136
- const stateCandidate = ( new EditorSelectionState({ groupId, editor }, selection, event?.reason));
1133
+ const stateCandidate = ( (new EditorSelectionState({ groupId, editor }, selection, event?.reason)));
1137
1134
  if (!this.currentSelectionState || this.currentSelectionState.justifiesNewNavigationEntry(stateCandidate)) {
1138
1135
  this.doAdd(groupId, editor, stateCandidate.selection);
1139
1136
  }
@@ -1405,12 +1402,12 @@ ${entryLabels.join('\n')}
1405
1402
  return this.navigating;
1406
1403
  }
1407
1404
  };
1408
- EditorNavigationStack = EditorNavigationStack_1 = ( __decorate([
1409
- ( __param(2, IInstantiationService)),
1410
- ( __param(3, IEditorService)),
1411
- ( __param(4, IEditorGroupsService)),
1412
- ( __param(5, ILogService))
1413
- ], EditorNavigationStack));
1405
+ EditorNavigationStack = EditorNavigationStack_1 = ( (__decorate([
1406
+ ( (__param(2, IInstantiationService))),
1407
+ ( (__param(3, IEditorService))),
1408
+ ( (__param(4, IEditorGroupsService))),
1409
+ ( (__param(5, ILogService)))
1410
+ ], EditorNavigationStack)));
1414
1411
  let EditorHelper = class EditorHelper {
1415
1412
  constructor(uriIdentityService, lifecycleService, fileService, pathService) {
1416
1413
  this.uriIdentityService = uriIdentityService;
@@ -1490,7 +1487,7 @@ let EditorHelper = class EditorHelper {
1490
1487
  const toDispose = Event.once(editor.onWillDispose)(() => listener());
1491
1488
  let disposables = mapEditorToDispose.get(editor);
1492
1489
  if (!disposables) {
1493
- disposables = ( new DisposableStore());
1490
+ disposables = ( (new DisposableStore()));
1494
1491
  mapEditorToDispose.set(editor, disposables);
1495
1492
  }
1496
1493
  disposables.add(toDispose);
@@ -1506,11 +1503,11 @@ let EditorHelper = class EditorHelper {
1506
1503
  }
1507
1504
  }
1508
1505
  };
1509
- EditorHelper = ( __decorate([
1510
- ( __param(0, IUriIdentityService)),
1511
- ( __param(1, ILifecycleService)),
1512
- ( __param(2, IFileService)),
1513
- ( __param(3, IPathService))
1514
- ], EditorHelper));
1506
+ EditorHelper = ( (__decorate([
1507
+ ( (__param(0, IUriIdentityService))),
1508
+ ( (__param(1, ILifecycleService))),
1509
+ ( (__param(2, IFileService))),
1510
+ ( (__param(3, IPathService)))
1511
+ ], EditorHelper)));
1515
1512
 
1516
1513
  export { EditorNavigationStack, HistoryService };
@@ -24,6 +24,7 @@ import { stripIcons } from 'vscode/vscode/vs/base/common/iconLabels';
24
24
  import { defaultButtonStyles, defaultCheckboxStyles, defaultInputBoxStyles, defaultDialogStyles } from 'vscode/vscode/vs/platform/theme/browser/defaultStyles';
25
25
  import Severity$1 from 'vscode/vscode/vs/base/common/severity';
26
26
 
27
+ const _moduleId = "vs/workbench/services/progress/browser/progressService";
27
28
  let ProgressService = class ProgressService extends Disposable {
28
29
  constructor(activityService, paneCompositeService, viewDescriptorService, viewsService, notificationService, statusbarService, layoutService, keybindingService) {
29
30
  super();
@@ -51,7 +52,7 @@ let ProgressService = class ProgressService extends Disposable {
51
52
  if (this.viewDescriptorService.getViewDescriptorById(location) !== null) {
52
53
  return this.withViewProgress(location, task, { ...options, location });
53
54
  }
54
- throw new Error(`Bad progress location: ${location}`);
55
+ throw ( (new Error(`Bad progress location: ${location}`)));
55
56
  };
56
57
  if (typeof location === 'string') {
57
58
  return handleStringLocation(location);
@@ -85,11 +86,11 @@ let ProgressService = class ProgressService extends Disposable {
85
86
  case 20 :
86
87
  return this.withDialogProgress(options, task, onDidCancel);
87
88
  default:
88
- throw new Error(`Bad progress location: ${location}`);
89
+ throw ( (new Error(`Bad progress location: ${location}`)));
89
90
  }
90
91
  }
91
92
  withWindowProgress(options, callback) {
92
- const task = [options, ( new Progress(() => this.updateWindowProgress()))];
93
+ const task = [options, ( (new Progress(() => this.updateWindowProgress())))];
93
94
  const promise = callback(task[1]);
94
95
  let delayHandle = setTimeout(() => {
95
96
  delayHandle = undefined;
@@ -116,52 +117,23 @@ let ProgressService = class ProgressService extends Disposable {
116
117
  let title;
117
118
  const source = options.source && typeof options.source !== 'string' ? options.source.label : options.source;
118
119
  if (progressTitle && progressMessage) {
119
- text = ( localizeWithPath(
120
- 'vs/workbench/services/progress/browser/progressService',
121
- 'progress.text2',
122
- "{0}: {1}",
123
- progressTitle,
124
- progressMessage
125
- ));
126
- title = source ? ( localizeWithPath(
127
- 'vs/workbench/services/progress/browser/progressService',
128
- 'progress.title3',
129
- "[{0}] {1}: {2}",
130
- source,
131
- progressTitle,
132
- progressMessage
133
- )) : text;
120
+ text = ( localizeWithPath(_moduleId, 0, "{0}: {1}", progressTitle, progressMessage));
121
+ title = source ? ( localizeWithPath(_moduleId, 1, "[{0}] {1}: {2}", source, progressTitle, progressMessage)) : text;
134
122
  }
135
123
  else if (progressTitle) {
136
124
  text = progressTitle;
137
- title = source ? ( localizeWithPath(
138
- 'vs/workbench/services/progress/browser/progressService',
139
- 'progress.title2',
140
- "[{0}]: {1}",
141
- source,
142
- progressTitle
143
- )) : text;
125
+ title = source ? ( localizeWithPath(_moduleId, 2, "[{0}]: {1}", source, progressTitle)) : text;
144
126
  }
145
127
  else if (progressMessage) {
146
128
  text = progressMessage;
147
- title = source ? ( localizeWithPath(
148
- 'vs/workbench/services/progress/browser/progressService',
149
- 'progress.title2',
150
- "[{0}]: {1}",
151
- source,
152
- progressMessage
153
- )) : text;
129
+ title = source ? ( localizeWithPath(_moduleId, 2, "[{0}]: {1}", source, progressMessage)) : text;
154
130
  }
155
131
  else {
156
132
  this.updateWindowProgress(idx + 1);
157
133
  return;
158
134
  }
159
135
  const statusEntryProperties = {
160
- name: ( localizeWithPath(
161
- 'vs/workbench/services/progress/browser/progressService',
162
- 'status.progress',
163
- "Progress Message"
164
- )),
136
+ name: ( localizeWithPath(_moduleId, 3, "Progress Message")),
165
137
  text,
166
138
  showProgress: options.type || true,
167
139
  ariaLabel: text,
@@ -186,9 +158,9 @@ let ProgressService = class ProgressService extends Disposable {
186
158
  get done() { return this._done; }
187
159
  constructor() {
188
160
  super();
189
- this._onDidReport = this._register(( new Emitter()));
161
+ this._onDidReport = this._register(( (new Emitter())));
190
162
  this.onDidReport = this._onDidReport.event;
191
- this._onWillDispose = this._register(( new Emitter()));
163
+ this._onWillDispose = this._register(( (new Emitter())));
192
164
  this.onWillDispose = this._onWillDispose.event;
193
165
  this._step = undefined;
194
166
  this._done = false;
@@ -212,17 +184,17 @@ let ProgressService = class ProgressService extends Disposable {
212
184
  }
213
185
  });
214
186
  const createWindowProgress = () => {
215
- const promise = ( new DeferredPromise());
187
+ const promise = ( (new DeferredPromise()));
216
188
  this.withWindowProgress({
217
189
  location: 10 ,
218
- title: options.title ? ( parseLinkedText(options.title).toString()) : undefined,
190
+ title: options.title ? ( (parseLinkedText(options.title).toString())) : undefined,
219
191
  command: 'notifications.showList',
220
192
  type: options.type
221
193
  }, progress => {
222
194
  function reportProgress(step) {
223
195
  if (step.message) {
224
196
  progress.report({
225
- message: ( parseLinkedText(step.message).toString())
197
+ message: ( (parseLinkedText(step.message).toString()))
226
198
  });
227
199
  }
228
200
  }
@@ -237,7 +209,7 @@ let ProgressService = class ProgressService extends Disposable {
237
209
  return toDisposable(() => promise.complete());
238
210
  };
239
211
  const createNotification = (message, priority, increment) => {
240
- const notificationDisposables = ( new DisposableStore());
212
+ const notificationDisposables = ( (new DisposableStore()));
241
213
  const primaryActions = options.primaryActions ? Array.from(options.primaryActions) : [];
242
214
  const secondaryActions = options.secondaryActions ? Array.from(options.secondaryActions) : [];
243
215
  if (options.buttons) {
@@ -257,11 +229,7 @@ let ProgressService = class ProgressService extends Disposable {
257
229
  if (options.cancellable) {
258
230
  const cancelAction = new (class extends Action {
259
231
  constructor() {
260
- super('progress.cancel', ( localizeWithPath(
261
- 'vs/workbench/services/progress/browser/progressService',
262
- 'cancel',
263
- "Cancel"
264
- )), undefined, true);
232
+ super('progress.cancel', ( localizeWithPath(_moduleId, 4, "Cancel")), undefined, true);
265
233
  }
266
234
  async run() {
267
235
  progressStateModel.cancel();
@@ -375,7 +343,7 @@ let ProgressService = class ProgressService extends Disposable {
375
343
  let activityProgress;
376
344
  let delayHandle = setTimeout(() => {
377
345
  delayHandle = undefined;
378
- const handle = this.activityService.showViewContainerActivity(viewletId, { badge: ( new ProgressBadge(() => '')), priority: 100 });
346
+ const handle = this.activityService.showViewContainerActivity(viewletId, { badge: ( (new ProgressBadge(() => ''))), priority: 100 });
379
347
  const startTimeVisible = Date.now();
380
348
  const minTimeVisible = 300;
381
349
  activityProgress = {
@@ -433,7 +401,7 @@ let ProgressService = class ProgressService extends Disposable {
433
401
  return promise;
434
402
  }
435
403
  withDialogProgress(options, task, onDidCancel) {
436
- const disposables = ( new DisposableStore());
404
+ const disposables = ( (new DisposableStore()));
437
405
  const allowableCommands = [
438
406
  'workbench.action.quit',
439
407
  'workbench.action.reloadWindow',
@@ -446,17 +414,9 @@ let ProgressService = class ProgressService extends Disposable {
446
414
  const createDialog = (message) => {
447
415
  const buttons = options.buttons || [];
448
416
  if (!options.sticky) {
449
- buttons.push(options.cancellable ? ( localizeWithPath(
450
- 'vs/workbench/services/progress/browser/progressService',
451
- 'cancel',
452
- "Cancel"
453
- )) : ( localizeWithPath(
454
- 'vs/workbench/services/progress/browser/progressService',
455
- 'dismiss',
456
- "Dismiss"
457
- )));
458
- }
459
- dialog = ( new Dialog(this.layoutService.activeContainer, message, buttons, {
417
+ buttons.push(options.cancellable ? ( localizeWithPath(_moduleId, 4, "Cancel")) : ( localizeWithPath(_moduleId, 5, "Dismiss")));
418
+ }
419
+ dialog = ( (new Dialog(this.layoutService.activeContainer, message, buttons, {
460
420
  type: 'pending',
461
421
  detail: options.detail,
462
422
  cancelId: buttons.length - 1,
@@ -474,7 +434,7 @@ let ProgressService = class ProgressService extends Disposable {
474
434
  checkboxStyles: defaultCheckboxStyles,
475
435
  inputBoxStyles: defaultInputBoxStyles,
476
436
  dialogStyles: defaultDialogStyles
477
- }));
437
+ })));
478
438
  disposables.add(dialog);
479
439
  dialog.show().then(dialogResult => {
480
440
  onDidCancel?.(dialogResult.button);
@@ -484,7 +444,7 @@ let ProgressService = class ProgressService extends Disposable {
484
444
  };
485
445
  let delay = options.delay ?? 0;
486
446
  let latestMessage = undefined;
487
- const scheduler = disposables.add(( new RunOnceScheduler(() => {
447
+ const scheduler = disposables.add(( (new RunOnceScheduler(() => {
488
448
  delay = 0;
489
449
  if (latestMessage && !dialog) {
490
450
  dialog = createDialog(latestMessage);
@@ -492,7 +452,7 @@ let ProgressService = class ProgressService extends Disposable {
492
452
  else if (latestMessage) {
493
453
  dialog.updateMessage(latestMessage);
494
454
  }
495
- }, 0)));
455
+ }, 0))));
496
456
  const updateDialog = function (message) {
497
457
  latestMessage = message;
498
458
  if (!scheduler.isScheduled()) {
@@ -513,15 +473,15 @@ let ProgressService = class ProgressService extends Disposable {
513
473
  return promise;
514
474
  }
515
475
  };
516
- ProgressService = ( __decorate([
517
- ( __param(0, IActivityService)),
518
- ( __param(1, IPaneCompositePartService)),
519
- ( __param(2, IViewDescriptorService)),
520
- ( __param(3, IViewsService)),
521
- ( __param(4, INotificationService)),
522
- ( __param(5, IStatusbarService)),
523
- ( __param(6, ILayoutService)),
524
- ( __param(7, IKeybindingService))
525
- ], ProgressService));
476
+ ProgressService = ( (__decorate([
477
+ ( (__param(0, IActivityService))),
478
+ ( (__param(1, IPaneCompositePartService))),
479
+ ( (__param(2, IViewDescriptorService))),
480
+ ( (__param(3, IViewsService))),
481
+ ( (__param(4, INotificationService))),
482
+ ( (__param(5, IStatusbarService))),
483
+ ( (__param(6, ILayoutService))),
484
+ ( (__param(7, IKeybindingService)))
485
+ ], ProgressService)));
526
486
 
527
487
  export { ProgressService };