@codingame/monaco-vscode-view-common-service-override 4.5.0 → 4.5.2
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.
- package/index.d.ts +1 -1
- package/package.json +3 -3
- package/vscode/src/vs/base/browser/ui/grid/grid.js +12 -12
- package/vscode/src/vs/base/browser/ui/grid/gridview.js +26 -26
- package/vscode/src/vs/platform/languagePacks/common/localizedStrings.js +4 -3
- package/vscode/src/vs/workbench/api/browser/viewsExtensionPoint.js +127 -220
- package/vscode/src/vs/workbench/browser/actions/listCommands.js +43 -44
- package/vscode/src/vs/workbench/browser/actions/navigationActions.js +7 -30
- package/vscode/src/vs/workbench/browser/parts/activitybar/activitybarPart.js +67 -138
- package/vscode/src/vs/workbench/browser/parts/auxiliarybar/auxiliaryBarPart.js +21 -36
- package/vscode/src/vs/workbench/browser/parts/compositeBar.js +26 -27
- package/vscode/src/vs/workbench/browser/parts/compositePart.js +17 -31
- package/vscode/src/vs/workbench/browser/parts/editor/editor.contribution.js +215 -764
- package/vscode/src/vs/workbench/browser/parts/editor/editorConfiguration.js +27 -42
- package/vscode/src/vs/workbench/browser/parts/editor/editorDropTarget.js +24 -23
- package/vscode/src/vs/workbench/browser/parts/editor/editorPart.js +3 -3
- package/vscode/src/vs/workbench/browser/parts/editor/editorParts.js +31 -33
- package/vscode/src/vs/workbench/browser/parts/paneCompositeBar.js +51 -54
- package/vscode/src/vs/workbench/browser/parts/paneCompositePart.js +38 -41
- package/vscode/src/vs/workbench/browser/parts/panel/panelPart.js +21 -24
- package/vscode/src/vs/workbench/browser/parts/sidebar/sidebarActions.js +2 -5
- package/vscode/src/vs/workbench/browser/parts/sidebar/sidebarPart.js +17 -20
- package/vscode/src/vs/workbench/browser/window.js +41 -92
- package/vscode/src/vs/workbench/contrib/callHierarchy/browser/callHierarchy.contribution.js +41 -78
- package/vscode/src/vs/workbench/contrib/callHierarchy/browser/callHierarchyPeek.js +23 -46
- package/vscode/src/vs/workbench/contrib/callHierarchy/browser/callHierarchyTree.js +36 -27
- package/vscode/src/vs/workbench/contrib/customEditor/browser/customEditorInputFactory.js +1 -1
- package/vscode/src/vs/workbench/contrib/customEditor/browser/customEditors.js +1 -1
- package/vscode/src/vs/workbench/contrib/customEditor/common/contributedCustomEditors.js +14 -15
- package/vscode/src/vs/workbench/contrib/customEditor/common/customEditor.js +10 -11
- package/vscode/src/vs/workbench/contrib/customEditor/common/customEditorModelManager.js +1 -1
- package/vscode/src/vs/workbench/contrib/customEditor/common/extensionPoint.js +25 -52
- package/vscode/src/vs/workbench/contrib/languageStatus/browser/languageStatus.contribution.js +55 -87
- package/vscode/src/vs/workbench/contrib/limitIndicator/browser/limitIndicator.contribution.js +18 -48
- package/vscode/src/vs/workbench/contrib/mergeEditor/browser/commands/commands.js +61 -150
- package/vscode/src/vs/workbench/contrib/mergeEditor/browser/commands/devCommands.js +15 -70
- package/vscode/src/vs/workbench/contrib/mergeEditor/browser/mergeEditor.contribution.js +9 -20
- package/vscode/src/vs/workbench/contrib/mergeEditor/browser/view/colors.js +14 -65
- package/vscode/src/vs/workbench/contrib/mergeEditor/browser/view/conflictActions.js +38 -113
- package/vscode/src/vs/workbench/contrib/mergeEditor/browser/view/editors/baseCodeEditorView.js +12 -19
- package/vscode/src/vs/workbench/contrib/mergeEditor/browser/view/editors/inputCodeEditorView.js +34 -75
- package/vscode/src/vs/workbench/contrib/mergeEditor/browser/view/editors/resultCodeEditorView.js +16 -37
- package/vscode/src/vs/workbench/contrib/mergeEditor/browser/view/mergeEditor.js +40 -43
- package/vscode/src/vs/workbench/contrib/mergeEditor/browser/view/viewModel.js +12 -11
- package/vscode/src/vs/workbench/contrib/preferences/browser/keyboardLayoutPicker.js +24 -61
- package/vscode/src/vs/workbench/contrib/sash/browser/sash.contribution.js +7 -6
- package/vscode/src/vs/workbench/contrib/typeHierarchy/browser/typeHierarchy.contribution.js +37 -70
- package/vscode/src/vs/workbench/contrib/typeHierarchy/browser/typeHierarchyPeek.js +23 -46
- package/vscode/src/vs/workbench/contrib/typeHierarchy/browser/typeHierarchyTree.js +26 -27
- package/vscode/src/vs/workbench/contrib/webview/browser/overlayWebview.js +2 -2
- package/vscode/src/vs/workbench/contrib/webview/browser/webviewElement.js +50 -52
- package/vscode/src/vs/workbench/contrib/webviewPanel/browser/webviewCommands.js +18 -34
- package/vscode/src/vs/workbench/contrib/webviewPanel/browser/webviewPanel.contribution.js +7 -10
- package/vscode/src/vs/workbench/contrib/webviewView/browser/webviewViewService.js +2 -2
- package/vscode/src/vs/workbench/services/auxiliaryWindow/browser/auxiliaryWindowService.js +45 -46
- package/vscode/src/vs/workbench/services/driver/browser/driver.js +8 -6
- package/vscode/src/vs/workbench/services/editor/browser/editorResolverService.js +45 -68
- package/vscode/src/vs/workbench/services/history/browser/historyService.js +95 -98
- package/vscode/src/vs/workbench/services/progress/browser/progressService.js +34 -74
- package/vscode/src/vs/workbench/services/views/browser/viewDescriptorService.js +69 -67
- package/vscode/src/vs/workbench/services/views/common/viewContainerModel.js +52 -47
- package/viewCommon.d.ts +0 -5
|
@@ -25,6 +25,7 @@ import { PauseableEmitter } from 'vscode/vscode/vs/base/common/event';
|
|
|
25
25
|
import Severity$1 from 'vscode/vscode/vs/base/common/severity';
|
|
26
26
|
|
|
27
27
|
var EditorResolverService_1;
|
|
28
|
+
const _moduleId = "vs/workbench/services/editor/browser/editorResolverService";
|
|
28
29
|
let EditorResolverService = class EditorResolverService extends Disposable {
|
|
29
30
|
static { EditorResolverService_1 = this; }
|
|
30
31
|
static { this.configureDefaultID = 'promptOpenWith.configureDefault'; }
|
|
@@ -41,14 +42,14 @@ let EditorResolverService = class EditorResolverService extends Disposable {
|
|
|
41
42
|
this.storageService = storageService;
|
|
42
43
|
this.extensionService = extensionService;
|
|
43
44
|
this.logService = logService;
|
|
44
|
-
this._onDidChangeEditorRegistrations = this._register(( new PauseableEmitter()));
|
|
45
|
+
this._onDidChangeEditorRegistrations = this._register(( (new PauseableEmitter())));
|
|
45
46
|
this.onDidChangeEditorRegistrations = this._onDidChangeEditorRegistrations.event;
|
|
46
|
-
this._editors = ( new Map());
|
|
47
|
-
this._flattenedEditors = ( new Map());
|
|
47
|
+
this._editors = ( (new Map()));
|
|
48
|
+
this._flattenedEditors = ( (new Map()));
|
|
48
49
|
this._shouldReFlattenEditors = true;
|
|
49
|
-
this.cache = ( new Set(
|
|
50
|
+
this.cache = ( (new Set(
|
|
50
51
|
JSON.parse(this.storageService.get(EditorResolverService_1.cacheStorageID, 0 , JSON.stringify([])))
|
|
51
|
-
));
|
|
52
|
+
)));
|
|
52
53
|
this.storageService.remove(EditorResolverService_1.cacheStorageID, 0 );
|
|
53
54
|
this._register(this.storageService.onWillSaveState(() => {
|
|
54
55
|
this.cacheEditors();
|
|
@@ -93,7 +94,7 @@ let EditorResolverService = class EditorResolverService extends Disposable {
|
|
|
93
94
|
await this.extensionService.whenInstalledExtensionsRegistered();
|
|
94
95
|
}
|
|
95
96
|
if (resource === undefined) {
|
|
96
|
-
resource = ( URI.from({ scheme: Schemas.untitled }));
|
|
97
|
+
resource = ( (URI.from({ scheme: Schemas.untitled })));
|
|
97
98
|
}
|
|
98
99
|
else if (resource.scheme === undefined || resource === null) {
|
|
99
100
|
return 2 ;
|
|
@@ -120,7 +121,7 @@ let EditorResolverService = class EditorResolverService extends Disposable {
|
|
|
120
121
|
if (isResourceDiffEditorInput(untypedEditor) && untypedEditor.options?.override === undefined) {
|
|
121
122
|
let resource2 = EditorResourceAccessor.getCanonicalUri(untypedEditor, { supportSideBySide: SideBySideEditor.SECONDARY });
|
|
122
123
|
if (!resource2) {
|
|
123
|
-
resource2 = ( URI.from({ scheme: Schemas.untitled }));
|
|
124
|
+
resource2 = ( (URI.from({ scheme: Schemas.untitled })));
|
|
124
125
|
}
|
|
125
126
|
const { editor: selectedEditor2 } = this.getEditor(resource2, undefined);
|
|
126
127
|
if (!selectedEditor2 || selectedEditor.editorInfo.id !== selectedEditor2.editorInfo.id) {
|
|
@@ -176,7 +177,7 @@ let EditorResolverService = class EditorResolverService extends Disposable {
|
|
|
176
177
|
registerEditor(globPattern, editorInfo, options, editorFactoryObject) {
|
|
177
178
|
let registeredEditor = this._editors.get(globPattern);
|
|
178
179
|
if (registeredEditor === undefined) {
|
|
179
|
-
registeredEditor = ( new Map());
|
|
180
|
+
registeredEditor = ( (new Map()));
|
|
180
181
|
this._editors.set(globPattern, registeredEditor);
|
|
181
182
|
}
|
|
182
183
|
let editorsWithId = registeredEditor.get(editorInfo.id);
|
|
@@ -234,10 +235,10 @@ let EditorResolverService = class EditorResolverService extends Disposable {
|
|
|
234
235
|
return this._flattenedEditors;
|
|
235
236
|
}
|
|
236
237
|
this._shouldReFlattenEditors = false;
|
|
237
|
-
const editors = ( new Map());
|
|
238
|
+
const editors = ( (new Map()));
|
|
238
239
|
for (const [glob, value] of this._editors) {
|
|
239
240
|
const registeredEditors = [];
|
|
240
|
-
for (const editors of ( value.values())) {
|
|
241
|
+
for (const editors of ( (value.values()))) {
|
|
241
242
|
let registeredEditor = undefined;
|
|
242
243
|
for (const editor of editors) {
|
|
243
244
|
if (!registeredEditor) {
|
|
@@ -260,7 +261,7 @@ let EditorResolverService = class EditorResolverService extends Disposable {
|
|
|
260
261
|
return editors;
|
|
261
262
|
}
|
|
262
263
|
get _registeredEditors() {
|
|
263
|
-
return flatten(Array.from(( this._flattenedEditors.values())));
|
|
264
|
+
return flatten(Array.from(( (this._flattenedEditors.values()))));
|
|
264
265
|
}
|
|
265
266
|
updateUserAssociations(globPattern, editorID) {
|
|
266
267
|
const newAssociation = { viewType: editorID, filenamePattern: globPattern };
|
|
@@ -298,9 +299,11 @@ let EditorResolverService = class EditorResolverService extends Disposable {
|
|
|
298
299
|
if (editors.find(e => e.editorInfo.priority === RegisteredEditorPriority.exclusive)) {
|
|
299
300
|
return [];
|
|
300
301
|
}
|
|
301
|
-
return (
|
|
302
|
+
return (
|
|
303
|
+
(editors.map(editor => editor.editorInfo))
|
|
304
|
+
);
|
|
302
305
|
}
|
|
303
|
-
return distinct(( this._registeredEditors.map(editor => editor.editorInfo)), editor => editor.id);
|
|
306
|
+
return distinct(( (this._registeredEditors.map(editor => editor.editorInfo))), editor => editor.id);
|
|
304
307
|
}
|
|
305
308
|
getEditor(resource, editorId) {
|
|
306
309
|
const findMatchingEditor = (editors, viewType) => {
|
|
@@ -369,7 +372,7 @@ let EditorResolverService = class EditorResolverService extends Disposable {
|
|
|
369
372
|
return { editor: inputWithOptions.editor, options: inputWithOptions.options ?? options };
|
|
370
373
|
}
|
|
371
374
|
if (isResourceSideBySideEditorInput(editor)) {
|
|
372
|
-
throw new Error(`Untyped side by side editor input not supported here.`);
|
|
375
|
+
throw ( (new Error(`Untyped side by side editor input not supported here.`)));
|
|
373
376
|
}
|
|
374
377
|
if (isUntitledResourceEditorInput(editor)) {
|
|
375
378
|
if (!selectedEditor.editorFactoryObject.createUntitledEditorInput) {
|
|
@@ -379,7 +382,7 @@ let EditorResolverService = class EditorResolverService extends Disposable {
|
|
|
379
382
|
return { editor: inputWithOptions.editor, options: inputWithOptions.options ?? options };
|
|
380
383
|
}
|
|
381
384
|
if (resource === undefined) {
|
|
382
|
-
throw new Error(`Undefined resource on non untitled editor input.`);
|
|
385
|
+
throw ( (new Error(`Undefined resource on non untitled editor input.`)));
|
|
383
386
|
}
|
|
384
387
|
const singleEditorPerResource = typeof selectedEditor.options?.singlePerResource === 'function' ? selectedEditor.options.singlePerResource() : selectedEditor.options?.singlePerResource;
|
|
385
388
|
if (singleEditorPerResource) {
|
|
@@ -447,15 +450,11 @@ let EditorResolverService = class EditorResolverService extends Disposable {
|
|
|
447
450
|
return;
|
|
448
451
|
}
|
|
449
452
|
const handle = this.notificationService.prompt(Severity$1.Warning, ( localizeWithPath(
|
|
450
|
-
|
|
451
|
-
|
|
453
|
+
_moduleId,
|
|
454
|
+
0,
|
|
452
455
|
'There are multiple default editors available for the resource.'
|
|
453
456
|
)), [{
|
|
454
|
-
label: ( localizeWithPath(
|
|
455
|
-
'vs/workbench/services/editor/browser/editorResolverService',
|
|
456
|
-
'editorResolver.configureDefault',
|
|
457
|
-
'Configure Default'
|
|
458
|
-
)),
|
|
457
|
+
label: ( localizeWithPath(_moduleId, 1, 'Configure Default')),
|
|
459
458
|
run: async () => {
|
|
460
459
|
const picked = await this.doPickEditor(untypedInput, true);
|
|
461
460
|
if (!picked) {
|
|
@@ -476,12 +475,7 @@ let EditorResolverService = class EditorResolverService extends Disposable {
|
|
|
476
475
|
}
|
|
477
476
|
},
|
|
478
477
|
{
|
|
479
|
-
label: ( localizeWithPath(
|
|
480
|
-
'vs/workbench/services/editor/browser/editorResolverService',
|
|
481
|
-
'editorResolver.keepDefault',
|
|
482
|
-
'Keep {0}',
|
|
483
|
-
editorName
|
|
484
|
-
)),
|
|
478
|
+
label: ( localizeWithPath(_moduleId, 2, 'Keep {0}', editorName)),
|
|
485
479
|
run: writeCurrentEditorsToStorage
|
|
486
480
|
}
|
|
487
481
|
]);
|
|
@@ -507,21 +501,9 @@ let EditorResolverService = class EditorResolverService extends Disposable {
|
|
|
507
501
|
}
|
|
508
502
|
});
|
|
509
503
|
const quickPickEntries = [];
|
|
510
|
-
const currentlyActiveLabel = ( localizeWithPath(
|
|
511
|
-
|
|
512
|
-
|
|
513
|
-
"Active"
|
|
514
|
-
));
|
|
515
|
-
const currentDefaultLabel = ( localizeWithPath(
|
|
516
|
-
'vs/workbench/services/editor/browser/editorResolverService',
|
|
517
|
-
'promptOpenWith.currentDefault',
|
|
518
|
-
"Default"
|
|
519
|
-
));
|
|
520
|
-
const currentDefaultAndActiveLabel = ( localizeWithPath(
|
|
521
|
-
'vs/workbench/services/editor/browser/editorResolverService',
|
|
522
|
-
'promptOpenWith.currentDefaultAndActive',
|
|
523
|
-
"Active and Default"
|
|
524
|
-
));
|
|
504
|
+
const currentlyActiveLabel = ( localizeWithPath(_moduleId, 3, "Active"));
|
|
505
|
+
const currentDefaultLabel = ( localizeWithPath(_moduleId, 4, "Default"));
|
|
506
|
+
const currentDefaultAndActiveLabel = ( localizeWithPath(_moduleId, 5, "Active and Default"));
|
|
525
507
|
let defaultViewType = defaultSetting;
|
|
526
508
|
if (!defaultViewType && registeredEditors.length > 2 && registeredEditors[1]?.editorInfo.priority !== RegisteredEditorPriority.option) {
|
|
527
509
|
defaultViewType = registeredEditors[1]?.editorInfo.id;
|
|
@@ -547,8 +529,8 @@ let EditorResolverService = class EditorResolverService extends Disposable {
|
|
|
547
529
|
const configureDefaultEntry = {
|
|
548
530
|
id: EditorResolverService_1.configureDefaultID,
|
|
549
531
|
label: ( localizeWithPath(
|
|
550
|
-
|
|
551
|
-
|
|
532
|
+
_moduleId,
|
|
533
|
+
6,
|
|
552
534
|
"Configure default editor for '{0}'...",
|
|
553
535
|
`*${extname(resource)}`
|
|
554
536
|
)),
|
|
@@ -560,23 +542,18 @@ let EditorResolverService = class EditorResolverService extends Disposable {
|
|
|
560
542
|
async doPickEditor(editor, showDefaultPicker) {
|
|
561
543
|
let resource = EditorResourceAccessor.getOriginalUri(editor, { supportSideBySide: SideBySideEditor.PRIMARY });
|
|
562
544
|
if (resource === undefined) {
|
|
563
|
-
resource = ( URI.from({ scheme: Schemas.untitled }));
|
|
545
|
+
resource = ( (URI.from({ scheme: Schemas.untitled })));
|
|
564
546
|
}
|
|
565
547
|
const editorPicks = this.mapEditorsToQuickPickEntry(resource, showDefaultPicker);
|
|
566
548
|
const editorPicker = this.quickInputService.createQuickPick();
|
|
567
549
|
const placeHolderMessage = showDefaultPicker ?
|
|
568
550
|
( localizeWithPath(
|
|
569
|
-
|
|
570
|
-
|
|
551
|
+
_moduleId,
|
|
552
|
+
7,
|
|
571
553
|
"Select new default editor for '{0}'",
|
|
572
554
|
`*${extname(resource)}`
|
|
573
555
|
)) :
|
|
574
|
-
( localizeWithPath(
|
|
575
|
-
'vs/workbench/services/editor/browser/editorResolverService',
|
|
576
|
-
'promptOpenWith.placeHolder',
|
|
577
|
-
"Select editor for '{0}'",
|
|
578
|
-
basename(resource)
|
|
579
|
-
));
|
|
556
|
+
( localizeWithPath(_moduleId, 8, "Select editor for '{0}'", basename(resource)));
|
|
580
557
|
editorPicker.placeholder = placeHolderMessage;
|
|
581
558
|
editorPicker.canAcceptInBackground = true;
|
|
582
559
|
editorPicker.items = editorPicks;
|
|
@@ -584,7 +561,7 @@ let EditorResolverService = class EditorResolverService extends Disposable {
|
|
|
584
561
|
if (firstItem) {
|
|
585
562
|
editorPicker.selectedItems = [firstItem];
|
|
586
563
|
}
|
|
587
|
-
const picked = await ( new Promise(resolve => {
|
|
564
|
+
const picked = await ( (new Promise(resolve => {
|
|
588
565
|
editorPicker.onDidAccept(e => {
|
|
589
566
|
let result = undefined;
|
|
590
567
|
if (editorPicker.selectedItems.length === 1) {
|
|
@@ -607,7 +584,7 @@ let EditorResolverService = class EditorResolverService extends Disposable {
|
|
|
607
584
|
}
|
|
608
585
|
});
|
|
609
586
|
editorPicker.show();
|
|
610
|
-
}));
|
|
587
|
+
})));
|
|
611
588
|
editorPicker.dispose();
|
|
612
589
|
if (picked) {
|
|
613
590
|
if (picked.item.id === EditorResolverService_1.configureDefaultID) {
|
|
@@ -628,7 +605,7 @@ let EditorResolverService = class EditorResolverService extends Disposable {
|
|
|
628
605
|
}
|
|
629
606
|
}
|
|
630
607
|
cacheEditors() {
|
|
631
|
-
const cacheStorage = ( new Set());
|
|
608
|
+
const cacheStorage = ( (new Set()));
|
|
632
609
|
for (const [globPattern, contribPoint] of this._flattenedEditors) {
|
|
633
610
|
const nonOptional = !!contribPoint.find(c => c.editorInfo.priority !== RegisteredEditorPriority.option && c.editorInfo.id !== DEFAULT_EDITOR_ASSOCIATION.id);
|
|
634
611
|
if (!nonOptional) {
|
|
@@ -661,16 +638,16 @@ let EditorResolverService = class EditorResolverService extends Disposable {
|
|
|
661
638
|
return false;
|
|
662
639
|
}
|
|
663
640
|
};
|
|
664
|
-
EditorResolverService = EditorResolverService_1 = ( __decorate([
|
|
665
|
-
( __param(0, IEditorGroupsService)),
|
|
666
|
-
( __param(1, IInstantiationService)),
|
|
667
|
-
( __param(2, IConfigurationService)),
|
|
668
|
-
( __param(3, IQuickInputService)),
|
|
669
|
-
( __param(4, INotificationService)),
|
|
670
|
-
( __param(5, ITelemetryService)),
|
|
671
|
-
( __param(6, IStorageService)),
|
|
672
|
-
( __param(7, IExtensionService)),
|
|
673
|
-
( __param(8, ILogService))
|
|
674
|
-
], EditorResolverService));
|
|
641
|
+
EditorResolverService = EditorResolverService_1 = ( (__decorate([
|
|
642
|
+
( (__param(0, IEditorGroupsService))),
|
|
643
|
+
( (__param(1, IInstantiationService))),
|
|
644
|
+
( (__param(2, IConfigurationService))),
|
|
645
|
+
( (__param(3, IQuickInputService))),
|
|
646
|
+
( (__param(4, INotificationService))),
|
|
647
|
+
( (__param(5, ITelemetryService))),
|
|
648
|
+
( (__param(6, IStorageService))),
|
|
649
|
+
( (__param(7, IExtensionService))),
|
|
650
|
+
( (__param(8, ILogService)))
|
|
651
|
+
], EditorResolverService)));
|
|
675
652
|
|
|
676
653
|
export { EditorResolverService };
|
|
@@ -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
|
-
|
|
57
|
-
|
|
58
|
-
|
|
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
|
-
|
|
67
|
-
|
|
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
|
-
|
|
72
|
-
|
|
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
|
-
|
|
77
|
-
|
|
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
|
-
|
|
82
|
-
|
|
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
|
-
|
|
87
|
-
|
|
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
|
-
|
|
92
|
-
|
|
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
|
-
|
|
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 (
|
|
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(
|
|
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 };
|