@codingame/monaco-vscode-views-service-override 1.83.1 → 1.83.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/package.json +2 -2
- package/vscode/src/vs/workbench/browser/parts/editor/breadcrumbsPicker.js +44 -52
- package/vscode/src/vs/workbench/contrib/codeEditor/browser/outline/documentSymbolsOutline.js +1 -1
- package/vscode/src/vs/workbench/contrib/customEditor/common/customEditorModelManager.js +3 -3
- package/vscode/src/vs/workbench/contrib/files/browser/editors/textFileSaveErrorHandler.js +57 -57
- package/vscode/src/vs/workbench/contrib/files/browser/fileCommands.js +1 -1
- package/vscode/src/vs/workbench/contrib/remote/browser/tunnelView.js +229 -244
- package/vscode/src/vs/workbench/contrib/webview/browser/webviewElement.js +47 -47
- package/vscode/src/vs/workbench/services/history/browser/historyService.js +75 -77
- package/vscode/src/vs/workbench/services/hover/browser/hoverService.js +14 -14
- package/vscode/src/vs/workbench/services/views/common/viewContainerModel.js +41 -49
|
@@ -30,11 +30,11 @@ import { decodeAuthority, webviewRootResourceAuthority, webviewGenericCspSource
|
|
|
30
30
|
import { IWorkbenchEnvironmentService } from 'vscode/vscode/vs/workbench/services/environment/common/environmentService';
|
|
31
31
|
|
|
32
32
|
var WebviewState;
|
|
33
|
-
( (
|
|
34
|
-
( (
|
|
33
|
+
( (function(WebviewState) {
|
|
34
|
+
( (function(Type) {
|
|
35
35
|
Type[Type["Initializing"] = 0] = "Initializing";
|
|
36
36
|
Type[Type["Ready"] = 1] = "Ready";
|
|
37
|
-
})(WebviewState.Type || (WebviewState.Type = {})))
|
|
37
|
+
})(WebviewState.Type || (WebviewState.Type = {})));
|
|
38
38
|
class Initializing {
|
|
39
39
|
constructor(pendingMessages) {
|
|
40
40
|
this.pendingMessages = pendingMessages;
|
|
@@ -43,7 +43,7 @@ var WebviewState;
|
|
|
43
43
|
}
|
|
44
44
|
WebviewState.Initializing = Initializing;
|
|
45
45
|
WebviewState.Ready = { type: 1 };
|
|
46
|
-
})(WebviewState || (WebviewState = {})))
|
|
46
|
+
})(WebviewState || (WebviewState = {})));
|
|
47
47
|
const webviewIdContext = 'webviewId';
|
|
48
48
|
let WebviewElement = class WebviewElement extends Disposable {
|
|
49
49
|
get platform() { return 'browser'; }
|
|
@@ -70,39 +70,39 @@ let WebviewElement = class WebviewElement extends Disposable {
|
|
|
70
70
|
this.id = generateUuid();
|
|
71
71
|
this._expectedServiceWorkerVersion = 4;
|
|
72
72
|
this._state = new WebviewState.Initializing([]);
|
|
73
|
-
this._resourceLoadingCts = this._register((
|
|
74
|
-
this._focusDelayer = this._register((
|
|
75
|
-
this._onDidHtmlChange = this._register((
|
|
73
|
+
this._resourceLoadingCts = this._register(( new CancellationTokenSource()));
|
|
74
|
+
this._focusDelayer = this._register(( new ThrottledDelayer(50)));
|
|
75
|
+
this._onDidHtmlChange = this._register(( new Emitter()));
|
|
76
76
|
this.onDidHtmlChange = this._onDidHtmlChange.event;
|
|
77
|
-
this._messageHandlers = (
|
|
77
|
+
this._messageHandlers = ( new Map());
|
|
78
78
|
this.checkImeCompletionState = true;
|
|
79
79
|
this._disposed = false;
|
|
80
|
-
this._onMissingCsp = this._register((
|
|
80
|
+
this._onMissingCsp = this._register(( new Emitter()));
|
|
81
81
|
this.onMissingCsp = this._onMissingCsp.event;
|
|
82
|
-
this._onDidClickLink = this._register((
|
|
82
|
+
this._onDidClickLink = this._register(( new Emitter()));
|
|
83
83
|
this.onDidClickLink = this._onDidClickLink.event;
|
|
84
|
-
this._onDidReload = this._register((
|
|
84
|
+
this._onDidReload = this._register(( new Emitter()));
|
|
85
85
|
this.onDidReload = this._onDidReload.event;
|
|
86
|
-
this._onMessage = this._register((
|
|
86
|
+
this._onMessage = this._register(( new Emitter()));
|
|
87
87
|
this.onMessage = this._onMessage.event;
|
|
88
|
-
this._onDidScroll = this._register((
|
|
88
|
+
this._onDidScroll = this._register(( new Emitter()));
|
|
89
89
|
this.onDidScroll = this._onDidScroll.event;
|
|
90
|
-
this._onDidWheel = this._register((
|
|
90
|
+
this._onDidWheel = this._register(( new Emitter()));
|
|
91
91
|
this.onDidWheel = this._onDidWheel.event;
|
|
92
|
-
this._onDidUpdateState = this._register((
|
|
92
|
+
this._onDidUpdateState = this._register(( new Emitter()));
|
|
93
93
|
this.onDidUpdateState = this._onDidUpdateState.event;
|
|
94
|
-
this._onDidFocus = this._register((
|
|
94
|
+
this._onDidFocus = this._register(( new Emitter()));
|
|
95
95
|
this.onDidFocus = this._onDidFocus.event;
|
|
96
|
-
this._onDidBlur = this._register((
|
|
96
|
+
this._onDidBlur = this._register(( new Emitter()));
|
|
97
97
|
this.onDidBlur = this._onDidBlur.event;
|
|
98
|
-
this._onFatalError = this._register((
|
|
98
|
+
this._onFatalError = this._register(( new Emitter()));
|
|
99
99
|
this.onFatalError = this._onFatalError.event;
|
|
100
|
-
this._onDidDispose = this._register((
|
|
100
|
+
this._onDidDispose = this._register(( new Emitter()));
|
|
101
101
|
this.onDidDispose = this._onDidDispose.event;
|
|
102
102
|
this._hasAlertedAboutMissingCsp = false;
|
|
103
|
-
this._hasFindResult = this._register((
|
|
103
|
+
this._hasFindResult = this._register(( new Emitter()));
|
|
104
104
|
this.hasFindResult = this._hasFindResult.event;
|
|
105
|
-
this._onDidStopFind = this._register((
|
|
105
|
+
this._onDidStopFind = this._register(( new Emitter()));
|
|
106
106
|
this.onDidStopFind = this._onDidStopFind.event;
|
|
107
107
|
this.providedViewType = initInfo.providedViewType;
|
|
108
108
|
this.origin = initInfo.origin ?? this.id;
|
|
@@ -115,11 +115,11 @@ let WebviewElement = class WebviewElement extends Disposable {
|
|
|
115
115
|
options: initInfo.contentOptions,
|
|
116
116
|
state: undefined
|
|
117
117
|
};
|
|
118
|
-
this._portMappingManager = this._register((
|
|
118
|
+
this._portMappingManager = this._register(( new WebviewPortMappingManager(
|
|
119
119
|
() => this.extension?.location,
|
|
120
120
|
() => this._content.options.portMapping || [],
|
|
121
121
|
this._tunnelService
|
|
122
|
-
)))
|
|
122
|
+
)));
|
|
123
123
|
this._element = this._createElement(initInfo.options, initInfo.contentOptions);
|
|
124
124
|
const subscription = this._register(addDisposableListener(window, 'message', (e) => {
|
|
125
125
|
if (!this._encodedWebviewOrigin || e?.data?.target !== this.id) {
|
|
@@ -179,7 +179,7 @@ let WebviewElement = class WebviewElement extends Disposable {
|
|
|
179
179
|
this._hasFindResult.fire(didFind);
|
|
180
180
|
}));
|
|
181
181
|
this._register(this.on('fatal-error', (e) => {
|
|
182
|
-
notificationService.error((
|
|
182
|
+
notificationService.error(( localize('fatalErrorMessage', "Error loading webview: {0}", e.message)));
|
|
183
183
|
this._onFatalError.fire({ message: e.message });
|
|
184
184
|
}));
|
|
185
185
|
this._register(this.on('did-keydown', (data) => {
|
|
@@ -214,12 +214,12 @@ let WebviewElement = class WebviewElement extends Disposable {
|
|
|
214
214
|
this._register(this.on('load-resource', async (entry) => {
|
|
215
215
|
try {
|
|
216
216
|
const authority = decodeAuthority(entry.authority);
|
|
217
|
-
const uri = (
|
|
217
|
+
const uri = ( URI.from({
|
|
218
218
|
scheme: entry.scheme,
|
|
219
219
|
authority: authority,
|
|
220
220
|
path: decodeURIComponent(entry.path),
|
|
221
221
|
query: entry.query ? decodeURIComponent(entry.query) : entry.query,
|
|
222
|
-
}))
|
|
222
|
+
}));
|
|
223
223
|
this.loadResource(entry.id, uri, entry.ifNoneMatch);
|
|
224
224
|
}
|
|
225
225
|
catch (e) {
|
|
@@ -281,7 +281,7 @@ let WebviewElement = class WebviewElement extends Disposable {
|
|
|
281
281
|
async _send(channel, data, _createElement = []) {
|
|
282
282
|
if (this._state.type === 0 ) {
|
|
283
283
|
let resolve;
|
|
284
|
-
const promise = (
|
|
284
|
+
const promise = ( new Promise(r => resolve = r));
|
|
285
285
|
this._state.pendingMessages.push({ channel, data, transferable: _createElement, resolve: resolve });
|
|
286
286
|
return promise;
|
|
287
287
|
}
|
|
@@ -326,13 +326,13 @@ let WebviewElement = class WebviewElement extends Disposable {
|
|
|
326
326
|
if (options.purpose) {
|
|
327
327
|
params.purpose = options.purpose;
|
|
328
328
|
}
|
|
329
|
-
params.serviceWorkerUri = ( (
|
|
330
|
-
params.fakeHtmlUri = ( (
|
|
329
|
+
params.serviceWorkerUri = ( ( FileAccess.asBrowserUri('vs/workbench/contrib/webview/browser/pre/service-worker.js')).toString(true));
|
|
330
|
+
params.fakeHtmlUri = ( ( FileAccess.asBrowserUri('vs/workbench/contrib/webview/browser/pre/fake.html')).toString(true));
|
|
331
331
|
COI.addSearchParam(params, true, true);
|
|
332
|
-
const queryString = ( (
|
|
332
|
+
const queryString = ( ( new URLSearchParams(params)).toString());
|
|
333
333
|
const fileName = isFirefox ? 'index-no-csp.html' : 'index.html';
|
|
334
|
-
const relativeIframeSrc = (
|
|
335
|
-
this.element.setAttribute('src', `${(
|
|
334
|
+
const relativeIframeSrc = ( FileAccess.asBrowserUri(`vs/workbench/contrib/webview/browser/pre/${fileName}`));
|
|
335
|
+
this.element.setAttribute('src', `${( relativeIframeSrc.toString(true))}?${queryString}`);
|
|
336
336
|
}
|
|
337
337
|
mountTo(element) {
|
|
338
338
|
if (!this.element) {
|
|
@@ -385,7 +385,7 @@ let WebviewElement = class WebviewElement extends Disposable {
|
|
|
385
385
|
on(channel, handler) {
|
|
386
386
|
let handlers = this._messageHandlers.get(channel);
|
|
387
387
|
if (!handlers) {
|
|
388
|
-
handlers = (
|
|
388
|
+
handlers = ( new Set());
|
|
389
389
|
this._messageHandlers.set(channel, handlers);
|
|
390
390
|
}
|
|
391
391
|
handlers.add(handler);
|
|
@@ -479,7 +479,7 @@ let WebviewElement = class WebviewElement extends Disposable {
|
|
|
479
479
|
}
|
|
480
480
|
}
|
|
481
481
|
handleKeyEvent(type, event) {
|
|
482
|
-
const emulatedKeyboardEvent = (
|
|
482
|
+
const emulatedKeyboardEvent = ( new KeyboardEvent(type, event));
|
|
483
483
|
Object.defineProperty(emulatedKeyboardEvent, 'target', {
|
|
484
484
|
get: () => this.element,
|
|
485
485
|
});
|
|
@@ -625,18 +625,18 @@ let WebviewElement = class WebviewElement extends Disposable {
|
|
|
625
625
|
this._webviewFindWidget?.find(previous);
|
|
626
626
|
}
|
|
627
627
|
};
|
|
628
|
-
WebviewElement = (
|
|
629
|
-
(
|
|
630
|
-
(
|
|
631
|
-
(
|
|
632
|
-
(
|
|
633
|
-
(
|
|
634
|
-
(
|
|
635
|
-
(
|
|
636
|
-
(
|
|
637
|
-
(
|
|
638
|
-
(
|
|
639
|
-
(
|
|
640
|
-
], WebviewElement))
|
|
628
|
+
WebviewElement = ( __decorate([
|
|
629
|
+
( __param(2, IConfigurationService)),
|
|
630
|
+
( __param(3, IContextMenuService)),
|
|
631
|
+
( __param(4, INotificationService)),
|
|
632
|
+
( __param(5, IWorkbenchEnvironmentService)),
|
|
633
|
+
( __param(6, IFileService)),
|
|
634
|
+
( __param(7, ILogService)),
|
|
635
|
+
( __param(8, IRemoteAuthorityResolverService)),
|
|
636
|
+
( __param(9, ITelemetryService)),
|
|
637
|
+
( __param(10, ITunnelService)),
|
|
638
|
+
( __param(11, IInstantiationService)),
|
|
639
|
+
( __param(12, IAccessibilityService))
|
|
640
|
+
], WebviewElement));
|
|
641
641
|
|
|
642
642
|
export { WebviewElement };
|
|
@@ -43,50 +43,50 @@ let HistoryService = class HistoryService extends Disposable {
|
|
|
43
43
|
this.instantiationService = instantiationService;
|
|
44
44
|
this.layoutService = layoutService;
|
|
45
45
|
this.contextKeyService = contextKeyService;
|
|
46
|
-
this.activeEditorListeners = this._register((
|
|
46
|
+
this.activeEditorListeners = this._register(( new DisposableStore()));
|
|
47
47
|
this.lastActiveEditor = undefined;
|
|
48
48
|
this.editorHelper = this.instantiationService.createInstance(EditorHelper);
|
|
49
|
-
this.canNavigateBackContextKey = ((
|
|
49
|
+
this.canNavigateBackContextKey = (( new RawContextKey('canNavigateBack', false, ( localize(
|
|
50
50
|
'canNavigateBack',
|
|
51
51
|
"Whether it is possible to navigate back in editor history"
|
|
52
|
-
)))))
|
|
53
|
-
this.canNavigateForwardContextKey = ((
|
|
52
|
+
))))).bindTo(this.contextKeyService);
|
|
53
|
+
this.canNavigateForwardContextKey = (( new RawContextKey('canNavigateForward', false, ( localize(
|
|
54
54
|
'canNavigateForward',
|
|
55
55
|
"Whether it is possible to navigate forward in editor history"
|
|
56
|
-
)))))
|
|
57
|
-
this.canNavigateBackInNavigationsContextKey = ((
|
|
56
|
+
))))).bindTo(this.contextKeyService);
|
|
57
|
+
this.canNavigateBackInNavigationsContextKey = (( new RawContextKey('canNavigateBackInNavigationLocations', false, ( localize(
|
|
58
58
|
'canNavigateBackInNavigationLocations',
|
|
59
59
|
"Whether it is possible to navigate back in editor navigation locations history"
|
|
60
|
-
)))))
|
|
61
|
-
this.canNavigateForwardInNavigationsContextKey = ((
|
|
60
|
+
))))).bindTo(this.contextKeyService);
|
|
61
|
+
this.canNavigateForwardInNavigationsContextKey = (( new RawContextKey('canNavigateForwardInNavigationLocations', false, ( localize(
|
|
62
62
|
'canNavigateForwardInNavigationLocations',
|
|
63
63
|
"Whether it is possible to navigate forward in editor navigation locations history"
|
|
64
|
-
)))))
|
|
65
|
-
this.canNavigateToLastNavigationLocationContextKey = ((
|
|
64
|
+
))))).bindTo(this.contextKeyService);
|
|
65
|
+
this.canNavigateToLastNavigationLocationContextKey = (( new RawContextKey('canNavigateToLastNavigationLocation', false, ( localize(
|
|
66
66
|
'canNavigateToLastNavigationLocation',
|
|
67
67
|
"Whether it is possible to navigate to the last editor navigation location"
|
|
68
|
-
)))))
|
|
69
|
-
this.canNavigateBackInEditsContextKey = ((
|
|
68
|
+
))))).bindTo(this.contextKeyService);
|
|
69
|
+
this.canNavigateBackInEditsContextKey = (( new RawContextKey('canNavigateBackInEditLocations', false, ( localize(
|
|
70
70
|
'canNavigateBackInEditLocations',
|
|
71
71
|
"Whether it is possible to navigate back in editor edit locations history"
|
|
72
|
-
)))))
|
|
73
|
-
this.canNavigateForwardInEditsContextKey = ((
|
|
72
|
+
))))).bindTo(this.contextKeyService);
|
|
73
|
+
this.canNavigateForwardInEditsContextKey = (( new RawContextKey('canNavigateForwardInEditLocations', false, ( localize(
|
|
74
74
|
'canNavigateForwardInEditLocations',
|
|
75
75
|
"Whether it is possible to navigate forward in editor edit locations history"
|
|
76
|
-
)))))
|
|
77
|
-
this.canNavigateToLastEditLocationContextKey = ((
|
|
76
|
+
))))).bindTo(this.contextKeyService);
|
|
77
|
+
this.canNavigateToLastEditLocationContextKey = (( new RawContextKey('canNavigateToLastEditLocation', false, ( localize(
|
|
78
78
|
'canNavigateToLastEditLocation',
|
|
79
79
|
"Whether it is possible to navigate to the last editor edit location"
|
|
80
|
-
)))))
|
|
81
|
-
this.canReopenClosedEditorContextKey = ((
|
|
80
|
+
))))).bindTo(this.contextKeyService);
|
|
81
|
+
this.canReopenClosedEditorContextKey = (( new RawContextKey('canReopenClosedEditor', false, ( localize(
|
|
82
82
|
'canReopenClosedEditor',
|
|
83
83
|
"Whether it is possible to reopen the last closed editor"
|
|
84
|
-
)))))
|
|
85
|
-
this._onDidChangeEditorNavigationStack = this._register((
|
|
84
|
+
))))).bindTo(this.contextKeyService);
|
|
85
|
+
this._onDidChangeEditorNavigationStack = this._register(( new Emitter()));
|
|
86
86
|
this.onDidChangeEditorNavigationStack = this._onDidChangeEditorNavigationStack.event;
|
|
87
87
|
this.defaultScopedEditorNavigationStack = undefined;
|
|
88
|
-
this.editorGroupScopedNavigationStacks = (
|
|
89
|
-
this.editorScopedNavigationStacks = (
|
|
88
|
+
this.editorGroupScopedNavigationStacks = ( new Map());
|
|
89
|
+
this.editorScopedNavigationStacks = ( new Map());
|
|
90
90
|
this.editorNavigationScope = 0 ;
|
|
91
91
|
this.recentlyUsedEditorsStack = undefined;
|
|
92
92
|
this.recentlyUsedEditorsStackIndex = 0;
|
|
@@ -97,12 +97,12 @@ let HistoryService = class HistoryService extends Disposable {
|
|
|
97
97
|
this.recentlyClosedEditors = [];
|
|
98
98
|
this.ignoreEditorCloseEvent = false;
|
|
99
99
|
this.history = undefined;
|
|
100
|
-
this.editorHistoryListeners = (
|
|
101
|
-
this.resourceExcludeMatcher = this._register((
|
|
100
|
+
this.editorHistoryListeners = ( new Map());
|
|
101
|
+
this.resourceExcludeMatcher = this._register(( new IdleValue(() => {
|
|
102
102
|
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)));
|
|
103
103
|
this._register(matcher.onExpressionChange(() => this.removeExcludedFromHistory()));
|
|
104
104
|
return matcher;
|
|
105
|
-
})))
|
|
105
|
+
})));
|
|
106
106
|
this.registerListeners();
|
|
107
107
|
if (this.editorService.activeEditorPane) {
|
|
108
108
|
this.onDidActiveEditorChange();
|
|
@@ -127,7 +127,7 @@ let HistoryService = class HistoryService extends Disposable {
|
|
|
127
127
|
this.handleEditorCloseEventInReopen(e);
|
|
128
128
|
}
|
|
129
129
|
registerMouseNavigationListener() {
|
|
130
|
-
const mouseBackForwardSupportListener = this._register((
|
|
130
|
+
const mouseBackForwardSupportListener = this._register(( new DisposableStore()));
|
|
131
131
|
const handleMouseBackForwardSupport = () => {
|
|
132
132
|
mouseBackForwardSupportListener.clear();
|
|
133
133
|
if (this.configurationService.getValue(HistoryService_1.MOUSE_NAVIGATION_SETTING)) {
|
|
@@ -265,18 +265,16 @@ let HistoryService = class HistoryService extends Disposable {
|
|
|
265
265
|
switch (this.editorNavigationScope) {
|
|
266
266
|
case 2 : {
|
|
267
267
|
if (!editor) {
|
|
268
|
-
return (
|
|
269
|
-
(new NoOpEditorNavigationStacks())
|
|
270
|
-
);
|
|
268
|
+
return ( new NoOpEditorNavigationStacks());
|
|
271
269
|
}
|
|
272
270
|
let stacksForGroup = this.editorScopedNavigationStacks.get(group.id);
|
|
273
271
|
if (!stacksForGroup) {
|
|
274
|
-
stacksForGroup = (
|
|
272
|
+
stacksForGroup = ( new Map());
|
|
275
273
|
this.editorScopedNavigationStacks.set(group.id, stacksForGroup);
|
|
276
274
|
}
|
|
277
275
|
let stack = stacksForGroup.get(editor)?.stack;
|
|
278
276
|
if (!stack) {
|
|
279
|
-
const disposable = (
|
|
277
|
+
const disposable = ( new DisposableStore());
|
|
280
278
|
stack = disposable.add(this.instantiationService.createInstance(EditorNavigationStacks, 2 ));
|
|
281
279
|
disposable.add(stack.onDidChange(() => this._onDidChangeEditorNavigationStack.fire()));
|
|
282
280
|
stacksForGroup.set(editor, { stack, disposable });
|
|
@@ -286,7 +284,7 @@ let HistoryService = class HistoryService extends Disposable {
|
|
|
286
284
|
case 1 : {
|
|
287
285
|
let stack = this.editorGroupScopedNavigationStacks.get(group.id)?.stack;
|
|
288
286
|
if (!stack) {
|
|
289
|
-
const disposable = (
|
|
287
|
+
const disposable = ( new DisposableStore());
|
|
290
288
|
stack = disposable.add(this.instantiationService.createInstance(EditorNavigationStacks, 1 ));
|
|
291
289
|
disposable.add(stack.onDidChange(() => this._onDidChangeEditorNavigationStack.fire()));
|
|
292
290
|
this.editorGroupScopedNavigationStacks.set(group.id, { stack, disposable });
|
|
@@ -417,7 +415,7 @@ let HistoryService = class HistoryService extends Disposable {
|
|
|
417
415
|
index = this.recentlyUsedEditorsStackIndex;
|
|
418
416
|
}
|
|
419
417
|
else {
|
|
420
|
-
editors = this.recentlyUsedEditorsInGroupStack || (
|
|
418
|
+
editors = this.recentlyUsedEditorsInGroupStack || ( group.getEditors(0 ).map(editor => ({ groupId: group.id, editor })));
|
|
421
419
|
index = this.recentlyUsedEditorsInGroupStackIndex;
|
|
422
420
|
}
|
|
423
421
|
let newIndex = indexModifier(index);
|
|
@@ -526,9 +524,9 @@ let HistoryService = class HistoryService extends Disposable {
|
|
|
526
524
|
if (recentlyClosedEditor.resource && this.editorHelper.matchesFile(recentlyClosedEditor.resource, arg1)) {
|
|
527
525
|
return false;
|
|
528
526
|
}
|
|
529
|
-
if ((
|
|
527
|
+
if (( recentlyClosedEditor.associatedResources.some(
|
|
530
528
|
associatedResource => this.editorHelper.matchesFile(associatedResource, arg1)
|
|
531
|
-
)))
|
|
529
|
+
))) {
|
|
532
530
|
return false;
|
|
533
531
|
}
|
|
534
532
|
return true;
|
|
@@ -629,7 +627,7 @@ let HistoryService = class HistoryService extends Disposable {
|
|
|
629
627
|
replaced = true;
|
|
630
628
|
}
|
|
631
629
|
}
|
|
632
|
-
else if (!(
|
|
630
|
+
else if (!( replacements.some(replacement => this.editorHelper.matchesEditor(replacement, entry)))) {
|
|
633
631
|
newHistory.push(entry);
|
|
634
632
|
}
|
|
635
633
|
}
|
|
@@ -667,18 +665,18 @@ let HistoryService = class HistoryService extends Disposable {
|
|
|
667
665
|
this.history = [];
|
|
668
666
|
const storedEditorHistory = this.loadHistoryFromStorage();
|
|
669
667
|
const openedEditorsLru = [...this.editorService.getEditors(0 )].reverse();
|
|
670
|
-
const handledEditors = (
|
|
668
|
+
const handledEditors = ( new Set());
|
|
671
669
|
for (const { editor } of openedEditorsLru) {
|
|
672
670
|
if (!this.includeInHistory(editor)) {
|
|
673
671
|
continue;
|
|
674
672
|
}
|
|
675
673
|
this.addToHistory(editor);
|
|
676
674
|
if (editor.resource) {
|
|
677
|
-
handledEditors.add(`${(
|
|
675
|
+
handledEditors.add(`${( editor.resource.toString())}/${editor.editorId}`);
|
|
678
676
|
}
|
|
679
677
|
}
|
|
680
678
|
for (const editor of storedEditorHistory) {
|
|
681
|
-
if (!(
|
|
679
|
+
if (!( handledEditors.has(`${( editor.resource.toString())}/${editor.options?.override}`))) {
|
|
682
680
|
this.addToHistory(editor, false );
|
|
683
681
|
}
|
|
684
682
|
}
|
|
@@ -698,8 +696,8 @@ let HistoryService = class HistoryService extends Disposable {
|
|
|
698
696
|
...entryParsed.editor,
|
|
699
697
|
resource: typeof entryParsed.editor.resource === 'string' ?
|
|
700
698
|
(
|
|
701
|
-
|
|
702
|
-
(
|
|
699
|
+
URI.parse(entryParsed.editor.resource)) :
|
|
700
|
+
( URI.from(entryParsed.editor.resource))
|
|
703
701
|
});
|
|
704
702
|
}
|
|
705
703
|
catch (error) {
|
|
@@ -725,7 +723,7 @@ let HistoryService = class HistoryService extends Disposable {
|
|
|
725
723
|
entries.push({
|
|
726
724
|
editor: {
|
|
727
725
|
...editor,
|
|
728
|
-
resource: (
|
|
726
|
+
resource: ( editor.resource.toString())
|
|
729
727
|
}
|
|
730
728
|
});
|
|
731
729
|
}
|
|
@@ -790,18 +788,18 @@ let HistoryService = class HistoryService extends Disposable {
|
|
|
790
788
|
}
|
|
791
789
|
}
|
|
792
790
|
};
|
|
793
|
-
HistoryService = HistoryService_1 = (
|
|
794
|
-
(
|
|
795
|
-
(
|
|
796
|
-
(
|
|
797
|
-
(
|
|
798
|
-
(
|
|
799
|
-
(
|
|
800
|
-
(
|
|
801
|
-
(
|
|
802
|
-
(
|
|
803
|
-
(
|
|
804
|
-
], HistoryService))
|
|
791
|
+
HistoryService = HistoryService_1 = ( __decorate([
|
|
792
|
+
( __param(0, IEditorService)),
|
|
793
|
+
( __param(1, IEditorGroupsService)),
|
|
794
|
+
( __param(2, IWorkspaceContextService)),
|
|
795
|
+
( __param(3, IStorageService)),
|
|
796
|
+
( __param(4, IConfigurationService)),
|
|
797
|
+
( __param(5, IFileService)),
|
|
798
|
+
( __param(6, IWorkspacesService)),
|
|
799
|
+
( __param(7, IInstantiationService)),
|
|
800
|
+
( __param(8, IWorkbenchLayoutService)),
|
|
801
|
+
( __param(9, IContextKeyService))
|
|
802
|
+
], HistoryService));
|
|
805
803
|
class EditorSelectionState {
|
|
806
804
|
constructor(editorIdentifier, selection, reason) {
|
|
807
805
|
this.editorIdentifier = editorIdentifier;
|
|
@@ -903,9 +901,9 @@ let EditorNavigationStacks = class EditorNavigationStacks extends Disposable {
|
|
|
903
901
|
}
|
|
904
902
|
}
|
|
905
903
|
};
|
|
906
|
-
EditorNavigationStacks = (
|
|
907
|
-
(
|
|
908
|
-
], EditorNavigationStacks))
|
|
904
|
+
EditorNavigationStacks = ( __decorate([
|
|
905
|
+
( __param(1, IInstantiationService))
|
|
906
|
+
], EditorNavigationStacks));
|
|
909
907
|
class NoOpEditorNavigationStacks {
|
|
910
908
|
constructor() {
|
|
911
909
|
this.onDidChange = Event.None;
|
|
@@ -943,10 +941,10 @@ let EditorNavigationStack = class EditorNavigationStack extends Disposable {
|
|
|
943
941
|
this.editorService = editorService;
|
|
944
942
|
this.editorGroupService = editorGroupService;
|
|
945
943
|
this.logService = logService;
|
|
946
|
-
this._onDidChange = this._register((
|
|
944
|
+
this._onDidChange = this._register(( new Emitter()));
|
|
947
945
|
this.onDidChange = this._onDidChange.event;
|
|
948
|
-
this.mapEditorToDisposable = (
|
|
949
|
-
this.mapGroupToDisposable = (
|
|
946
|
+
this.mapEditorToDisposable = ( new Map());
|
|
947
|
+
this.mapGroupToDisposable = ( new Map());
|
|
950
948
|
this.editorHelper = this.instantiationService.createInstance(EditorHelper);
|
|
951
949
|
this.stack = [];
|
|
952
950
|
this.index = -1;
|
|
@@ -1029,7 +1027,7 @@ ${entryLabels.join('\n')}
|
|
|
1029
1027
|
}
|
|
1030
1028
|
}
|
|
1031
1029
|
registerGroupListeners(groupId) {
|
|
1032
|
-
if (!(
|
|
1030
|
+
if (!( this.mapGroupToDisposable.has(groupId))) {
|
|
1033
1031
|
const group = this.editorGroupService.getGroup(groupId);
|
|
1034
1032
|
if (group) {
|
|
1035
1033
|
this.mapGroupToDisposable.set(groupId, group.onWillMoveEditor(e => this.onWillMoveEditor(e)));
|
|
@@ -1059,11 +1057,11 @@ ${entryLabels.join('\n')}
|
|
|
1059
1057
|
this.trace(`notifyNavigation() ignoring (navigating)`, editorPane?.input, event);
|
|
1060
1058
|
if (isSelectionAwareEditorPane && hasValidEditor) {
|
|
1061
1059
|
this.trace('notifyNavigation() updating current selection state', editorPane?.input, event);
|
|
1062
|
-
this.currentSelectionState = (
|
|
1060
|
+
this.currentSelectionState = ( new EditorSelectionState(
|
|
1063
1061
|
{ groupId: editorPane.group.id, editor: editorPane.input },
|
|
1064
1062
|
editorPane.getSelection(),
|
|
1065
1063
|
event?.reason
|
|
1066
|
-
))
|
|
1064
|
+
));
|
|
1067
1065
|
}
|
|
1068
1066
|
else {
|
|
1069
1067
|
this.trace('notifyNavigation() dropping current selection state', editorPane?.input, event);
|
|
@@ -1088,7 +1086,7 @@ ${entryLabels.join('\n')}
|
|
|
1088
1086
|
return;
|
|
1089
1087
|
}
|
|
1090
1088
|
this.trace('onSelectionAwareEditorNavigation()', editor, event);
|
|
1091
|
-
const stateCandidate = (
|
|
1089
|
+
const stateCandidate = ( new EditorSelectionState({ groupId, editor }, selection, event?.reason));
|
|
1092
1090
|
if (!this.currentSelectionState || this.currentSelectionState.justifiesNewNavigationEntry(stateCandidate)) {
|
|
1093
1091
|
this.doAdd(groupId, editor, stateCandidate.selection);
|
|
1094
1092
|
}
|
|
@@ -1356,12 +1354,12 @@ ${entryLabels.join('\n')}
|
|
|
1356
1354
|
return this.navigating;
|
|
1357
1355
|
}
|
|
1358
1356
|
};
|
|
1359
|
-
EditorNavigationStack = EditorNavigationStack_1 = (
|
|
1360
|
-
(
|
|
1361
|
-
(
|
|
1362
|
-
(
|
|
1363
|
-
(
|
|
1364
|
-
], EditorNavigationStack))
|
|
1357
|
+
EditorNavigationStack = EditorNavigationStack_1 = ( __decorate([
|
|
1358
|
+
( __param(2, IInstantiationService)),
|
|
1359
|
+
( __param(3, IEditorService)),
|
|
1360
|
+
( __param(4, IEditorGroupsService)),
|
|
1361
|
+
( __param(5, ILogService))
|
|
1362
|
+
], EditorNavigationStack));
|
|
1365
1363
|
let EditorHelper = class EditorHelper {
|
|
1366
1364
|
constructor(uriIdentityService, lifecycleService, fileService, pathService) {
|
|
1367
1365
|
this.uriIdentityService = uriIdentityService;
|
|
@@ -1441,7 +1439,7 @@ let EditorHelper = class EditorHelper {
|
|
|
1441
1439
|
const toDispose = Event.once(editor.onWillDispose)(() => listener());
|
|
1442
1440
|
let disposables = mapEditorToDispose.get(editor);
|
|
1443
1441
|
if (!disposables) {
|
|
1444
|
-
disposables = (
|
|
1442
|
+
disposables = ( new DisposableStore());
|
|
1445
1443
|
mapEditorToDispose.set(editor, disposables);
|
|
1446
1444
|
}
|
|
1447
1445
|
disposables.add(toDispose);
|
|
@@ -1457,11 +1455,11 @@ let EditorHelper = class EditorHelper {
|
|
|
1457
1455
|
}
|
|
1458
1456
|
}
|
|
1459
1457
|
};
|
|
1460
|
-
EditorHelper = (
|
|
1461
|
-
(
|
|
1462
|
-
(
|
|
1463
|
-
(
|
|
1464
|
-
(
|
|
1465
|
-
], EditorHelper))
|
|
1458
|
+
EditorHelper = ( __decorate([
|
|
1459
|
+
( __param(0, IUriIdentityService)),
|
|
1460
|
+
( __param(1, ILifecycleService)),
|
|
1461
|
+
( __param(2, IFileService)),
|
|
1462
|
+
( __param(3, IPathService))
|
|
1463
|
+
], EditorHelper));
|
|
1466
1464
|
|
|
1467
1465
|
export { EditorNavigationStack, HistoryService };
|
|
@@ -34,7 +34,7 @@ let HoverService = class HoverService {
|
|
|
34
34
|
this._lastFocusedElementBeforeOpen = undefined;
|
|
35
35
|
}
|
|
36
36
|
}
|
|
37
|
-
const hoverDisposables = (
|
|
37
|
+
const hoverDisposables = ( new DisposableStore());
|
|
38
38
|
const hover = this._instantiationService.createInstance(HoverWidget, options);
|
|
39
39
|
hover.onDispose(() => {
|
|
40
40
|
this._lastFocusedElementBeforeOpen?.focus();
|
|
@@ -44,7 +44,7 @@ let HoverService = class HoverService {
|
|
|
44
44
|
hoverDisposables.dispose();
|
|
45
45
|
});
|
|
46
46
|
const provider = this._contextViewService;
|
|
47
|
-
provider.showContextView((
|
|
47
|
+
provider.showContextView(( new HoverContextViewDelegate(hover, focus)), options.container);
|
|
48
48
|
hover.onRequestLayout(() => provider.layout());
|
|
49
49
|
if ('targetElements' in options.target) {
|
|
50
50
|
for (const element of options.target.targetElements) {
|
|
@@ -62,7 +62,7 @@ let HoverService = class HoverService {
|
|
|
62
62
|
hoverDisposables.add(addDisposableListener(document, EventType.KEY_UP, e => this._keyUp(e, hover)));
|
|
63
63
|
}
|
|
64
64
|
if ('IntersectionObserver' in window) {
|
|
65
|
-
const observer = (
|
|
65
|
+
const observer = ( new IntersectionObserver(e => this._intersectionChange(e, hover), { threshold: 0 }));
|
|
66
66
|
const firstTargetElement = 'targetElements' in options.target ? options.target.targetElements[0] : options.target;
|
|
67
67
|
observer.observe(firstTargetElement);
|
|
68
68
|
hoverDisposables.add(toDisposable(() => observer.disconnect()));
|
|
@@ -95,9 +95,9 @@ let HoverService = class HoverService {
|
|
|
95
95
|
hover.isLocked = true;
|
|
96
96
|
return;
|
|
97
97
|
}
|
|
98
|
-
const event = (
|
|
98
|
+
const event = ( new StandardKeyboardEvent(e));
|
|
99
99
|
const keybinding = this._keybindingService.resolveKeyboardEvent(event);
|
|
100
|
-
if ((
|
|
100
|
+
if (( keybinding.getSingleModifierDispatchChords().some(value => !!value)) || this._keybindingService.softDispatch(event, event.target).kind !== 0 ) {
|
|
101
101
|
return;
|
|
102
102
|
}
|
|
103
103
|
if (hideOnKeyDown && (!this._currentHoverOptions?.trapFocus || e.key !== 'Tab')) {
|
|
@@ -115,13 +115,13 @@ let HoverService = class HoverService {
|
|
|
115
115
|
}
|
|
116
116
|
}
|
|
117
117
|
};
|
|
118
|
-
HoverService = (
|
|
119
|
-
(
|
|
120
|
-
(
|
|
121
|
-
(
|
|
122
|
-
(
|
|
123
|
-
(
|
|
124
|
-
], HoverService))
|
|
118
|
+
HoverService = ( __decorate([
|
|
119
|
+
( __param(0, IInstantiationService)),
|
|
120
|
+
( __param(1, IContextViewService)),
|
|
121
|
+
( __param(2, IContextMenuService)),
|
|
122
|
+
( __param(3, IKeybindingService)),
|
|
123
|
+
( __param(4, IAccessibilityService))
|
|
124
|
+
], HoverService));
|
|
125
125
|
function getHoverOptionsIdentity(options) {
|
|
126
126
|
if (options === undefined) {
|
|
127
127
|
return undefined;
|
|
@@ -156,8 +156,8 @@ class HoverContextViewDelegate {
|
|
|
156
156
|
registerThemingParticipant((theme, collector) => {
|
|
157
157
|
const hoverBorder = theme.getColor(editorHoverBorder);
|
|
158
158
|
if (hoverBorder) {
|
|
159
|
-
collector.addRule(`.monaco-workbench .workbench-hover .hover-row:not(:first-child):not(:empty) { border-top: 1px solid ${(
|
|
160
|
-
collector.addRule(`.monaco-workbench .workbench-hover hr { border-top: 1px solid ${(
|
|
159
|
+
collector.addRule(`.monaco-workbench .workbench-hover .hover-row:not(:first-child):not(:empty) { border-top: 1px solid ${( hoverBorder.transparent(0.5))}; }`);
|
|
160
|
+
collector.addRule(`.monaco-workbench .workbench-hover hr { border-top: 1px solid ${( hoverBorder.transparent(0.5))}; }`);
|
|
161
161
|
}
|
|
162
162
|
});
|
|
163
163
|
|