@codingame/monaco-vscode-remote-agent-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 +2 -1
- package/package.json +3 -3
- package/vscode/src/vs/platform/download/common/downloadIpc.js +2 -2
- package/vscode/src/vs/platform/remote/common/remoteSocketFactoryService.js +1 -1
- package/vscode/src/vs/workbench/contrib/remote/browser/explorerViewItems.js +14 -17
- package/vscode/src/vs/workbench/contrib/remote/browser/remote.js +117 -172
- package/vscode/src/vs/workbench/contrib/remote/browser/remoteConnectionHealth.js +20 -35
- package/vscode/src/vs/workbench/contrib/remote/browser/remoteIndicator.js +71 -140
- package/vscode/src/vs/workbench/contrib/remote/browser/remoteStartEntry.js +12 -19
- package/vscode/src/vs/workbench/contrib/remote/browser/tunnelFactory.js +14 -19
- package/vscode/src/vs/workbench/contrib/remote/common/remote.contribution.js +98 -161
- package/vscode/src/vs/workbench/services/remote/browser/remoteAgentService.js +20 -23
- package/remoteAgent.d.ts +0 -12
package/index.d.ts
CHANGED
|
@@ -1 +1,2 @@
|
|
|
1
|
-
export
|
|
1
|
+
export * from 'vscode/service-override/remoteAgent';
|
|
2
|
+
export { default } from 'vscode/service-override/remoteAgent';
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@codingame/monaco-vscode-remote-agent-service-override",
|
|
3
|
-
"version": "4.5.
|
|
3
|
+
"version": "4.5.2",
|
|
4
4
|
"keywords": [],
|
|
5
5
|
"author": {
|
|
6
6
|
"name": "CodinGame",
|
|
@@ -26,7 +26,7 @@
|
|
|
26
26
|
}
|
|
27
27
|
},
|
|
28
28
|
"dependencies": {
|
|
29
|
-
"vscode": "npm:@codingame/monaco-vscode-api@4.5.
|
|
30
|
-
"@codingame/monaco-vscode-environment-service-override": "4.5.
|
|
29
|
+
"vscode": "npm:@codingame/monaco-vscode-api@4.5.2",
|
|
30
|
+
"@codingame/monaco-vscode-environment-service-override": "4.5.2"
|
|
31
31
|
}
|
|
32
32
|
}
|
|
@@ -5,13 +5,13 @@ class DownloadServiceChannel {
|
|
|
5
5
|
this.service = service;
|
|
6
6
|
}
|
|
7
7
|
listen(_, event, arg) {
|
|
8
|
-
throw new Error('Invalid listen');
|
|
8
|
+
throw ( new Error('Invalid listen'));
|
|
9
9
|
}
|
|
10
10
|
call(context, command, args) {
|
|
11
11
|
switch (command) {
|
|
12
12
|
case 'download': return this.service.download(URI.revive(args[0]), URI.revive(args[1]));
|
|
13
13
|
}
|
|
14
|
-
throw new Error('Invalid call');
|
|
14
|
+
throw ( new Error('Invalid call'));
|
|
15
15
|
}
|
|
16
16
|
}
|
|
17
17
|
|
|
@@ -21,7 +21,7 @@ class RemoteSocketFactoryService {
|
|
|
21
21
|
connect(connectTo, path, query, debugLabel) {
|
|
22
22
|
const socketFactory = this.getSocketFactory(connectTo);
|
|
23
23
|
if (!socketFactory) {
|
|
24
|
-
throw new Error(`No socket factory found for ${connectTo}`);
|
|
24
|
+
throw ( new Error(`No socket factory found for ${connectTo}`));
|
|
25
25
|
}
|
|
26
26
|
return socketFactory.connect(connectTo, path, query, debugLabel);
|
|
27
27
|
}
|
|
@@ -13,7 +13,8 @@ import { getVirtualWorkspaceLocation } from 'vscode/vscode/vs/platform/workspace
|
|
|
13
13
|
import { IWorkspaceContextService } from 'vscode/vscode/vs/platform/workspace/common/workspace.service';
|
|
14
14
|
import { Disposable, DisposableMap } from 'vscode/vscode/vs/base/common/lifecycle';
|
|
15
15
|
|
|
16
|
-
const
|
|
16
|
+
const _moduleId = "vs/workbench/contrib/remote/browser/explorerViewItems";
|
|
17
|
+
const SELECTED_REMOTE_IN_EXPLORER = ( (new RawContextKey('selectedRemoteInExplorer', '')));
|
|
17
18
|
let SwitchRemoteViewItem = class SwitchRemoteViewItem extends Disposable {
|
|
18
19
|
constructor(contextKeyService, remoteExplorerService, environmentService, storageService, workspaceContextService) {
|
|
19
20
|
super();
|
|
@@ -22,18 +23,14 @@ let SwitchRemoteViewItem = class SwitchRemoteViewItem extends Disposable {
|
|
|
22
23
|
this.environmentService = environmentService;
|
|
23
24
|
this.storageService = storageService;
|
|
24
25
|
this.workspaceContextService = workspaceContextService;
|
|
25
|
-
this.completedRemotes = this._register(( new DisposableMap()));
|
|
26
|
+
this.completedRemotes = this._register(( (new DisposableMap())));
|
|
26
27
|
this.selectedRemoteContext = SELECTED_REMOTE_IN_EXPLORER.bindTo(contextKeyService);
|
|
27
28
|
this.switchRemoteMenu = MenuId.for('workbench.remote.menu.switchRemoteMenu');
|
|
28
29
|
this._register(MenuRegistry.appendMenuItem(MenuId.ViewContainerTitle, {
|
|
29
30
|
submenu: this.switchRemoteMenu,
|
|
30
|
-
title: ( localizeWithPath(
|
|
31
|
-
'vs/workbench/contrib/remote/browser/explorerViewItems',
|
|
32
|
-
'switchRemote.label',
|
|
33
|
-
"Switch Remote"
|
|
34
|
-
)),
|
|
31
|
+
title: ( localizeWithPath(_moduleId, 0, "Switch Remote")),
|
|
35
32
|
group: 'navigation',
|
|
36
|
-
when: ( ContextKeyExpr.equals('viewContainer', VIEWLET_ID)),
|
|
33
|
+
when: ( (ContextKeyExpr.equals('viewContainer', VIEWLET_ID))),
|
|
37
34
|
order: 1,
|
|
38
35
|
isSelection: true
|
|
39
36
|
}));
|
|
@@ -99,7 +96,7 @@ let SwitchRemoteViewItem = class SwitchRemoteViewItem extends Disposable {
|
|
|
99
96
|
if (view.group && view.group.startsWith('targets') && view.remoteAuthority && (!view.when || this.contextKeyService.contextMatchesRules(view.when))) {
|
|
100
97
|
const text = view.name;
|
|
101
98
|
const authority = isStringArray(view.remoteAuthority) ? view.remoteAuthority : [view.remoteAuthority];
|
|
102
|
-
if (( this.completedRemotes.has(authority[0]))) {
|
|
99
|
+
if (( (this.completedRemotes.has(authority[0])))) {
|
|
103
100
|
continue;
|
|
104
101
|
}
|
|
105
102
|
const thisCapture = this;
|
|
@@ -108,7 +105,7 @@ let SwitchRemoteViewItem = class SwitchRemoteViewItem extends Disposable {
|
|
|
108
105
|
super({
|
|
109
106
|
id: `workbench.action.remoteExplorer.show.${authority[0]}`,
|
|
110
107
|
title: text,
|
|
111
|
-
toggled: ( SELECTED_REMOTE_IN_EXPLORER.isEqualTo(authority[0])),
|
|
108
|
+
toggled: ( (SELECTED_REMOTE_IN_EXPLORER.isEqualTo(authority[0]))),
|
|
112
109
|
menu: {
|
|
113
110
|
id: thisCapture.switchRemoteMenu
|
|
114
111
|
}
|
|
@@ -126,12 +123,12 @@ let SwitchRemoteViewItem = class SwitchRemoteViewItem extends Disposable {
|
|
|
126
123
|
}
|
|
127
124
|
}
|
|
128
125
|
};
|
|
129
|
-
SwitchRemoteViewItem = ( __decorate([
|
|
130
|
-
( __param(0, IContextKeyService)),
|
|
131
|
-
( __param(1, IRemoteExplorerService)),
|
|
132
|
-
( __param(2, IWorkbenchEnvironmentService)),
|
|
133
|
-
( __param(3, IStorageService)),
|
|
134
|
-
( __param(4, IWorkspaceContextService))
|
|
135
|
-
], SwitchRemoteViewItem));
|
|
126
|
+
SwitchRemoteViewItem = ( (__decorate([
|
|
127
|
+
( (__param(0, IContextKeyService))),
|
|
128
|
+
( (__param(1, IRemoteExplorerService))),
|
|
129
|
+
( (__param(2, IWorkbenchEnvironmentService))),
|
|
130
|
+
( (__param(3, IStorageService))),
|
|
131
|
+
( (__param(4, IWorkspaceContextService)))
|
|
132
|
+
], SwitchRemoteViewItem)));
|
|
136
133
|
|
|
137
134
|
export { SELECTED_REMOTE_IN_EXPLORER, SwitchRemoteViewItem };
|
|
@@ -47,6 +47,7 @@ import { IWalkthroughsService } from 'vscode/vscode/vs/workbench/contrib/welcome
|
|
|
47
47
|
import { Schemas } from 'vscode/vscode/vs/base/common/network';
|
|
48
48
|
import { mainWindow } from 'vscode/vscode/vs/base/browser/window';
|
|
49
49
|
|
|
50
|
+
const _moduleId = "vs/workbench/contrib/remote/browser/remote";
|
|
50
51
|
class HelpTreeVirtualDelegate {
|
|
51
52
|
getHeight(element) {
|
|
52
53
|
return 22;
|
|
@@ -100,57 +101,43 @@ class HelpModel {
|
|
|
100
101
|
viewModel.onDidChangeHelpInformation(() => this.updateItems());
|
|
101
102
|
}
|
|
102
103
|
createHelpItemValue(info, infoKey) {
|
|
103
|
-
return (
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
104
|
+
return (
|
|
105
|
+
(new HelpItemValue(
|
|
106
|
+
this.commandService,
|
|
107
|
+
this.walkthroughsService,
|
|
108
|
+
info.extensionDescription,
|
|
109
|
+
(typeof info.remoteName === 'string') ? [info.remoteName] : info.remoteName,
|
|
110
|
+
info.virtualWorkspace,
|
|
111
|
+
info[infoKey]
|
|
112
|
+
))
|
|
113
|
+
);
|
|
111
114
|
}
|
|
112
115
|
updateItems() {
|
|
113
116
|
const helpItems = [];
|
|
114
117
|
const getStarted = this.viewModel.helpInformation.filter(info => info.getStarted);
|
|
115
118
|
if (getStarted.length) {
|
|
116
|
-
const helpItemValues = ( getStarted.map((info) => this.createHelpItemValue(info, 'getStarted')));
|
|
117
|
-
const getStartedHelpItem = this.items?.find(item => item.icon === getStartedIcon) ?? ( new GetStartedHelpItem(getStartedIcon, ( localizeWithPath(
|
|
118
|
-
'vs/workbench/contrib/remote/browser/remote',
|
|
119
|
-
'remote.help.getStarted',
|
|
120
|
-
"Get Started"
|
|
121
|
-
)), helpItemValues, this.quickInputService, this.environmentService, this.openerService, this.remoteExplorerService, this.workspaceContextService, this.commandService));
|
|
119
|
+
const helpItemValues = ( (getStarted.map((info) => this.createHelpItemValue(info, 'getStarted'))));
|
|
120
|
+
const getStartedHelpItem = this.items?.find(item => item.icon === getStartedIcon) ?? ( (new GetStartedHelpItem(getStartedIcon, ( localizeWithPath(_moduleId, 0, "Get Started")), helpItemValues, this.quickInputService, this.environmentService, this.openerService, this.remoteExplorerService, this.workspaceContextService, this.commandService)));
|
|
122
121
|
getStartedHelpItem.values = helpItemValues;
|
|
123
122
|
helpItems.push(getStartedHelpItem);
|
|
124
123
|
}
|
|
125
124
|
const documentation = this.viewModel.helpInformation.filter(info => info.documentation);
|
|
126
125
|
if (documentation.length) {
|
|
127
|
-
const helpItemValues = ( documentation.map((info) => this.createHelpItemValue(info, 'documentation')));
|
|
128
|
-
const documentationHelpItem = this.items?.find(item => item.icon === documentationIcon) ?? ( new HelpItem(documentationIcon, ( localizeWithPath(
|
|
129
|
-
'vs/workbench/contrib/remote/browser/remote',
|
|
130
|
-
'remote.help.documentation',
|
|
131
|
-
"Read Documentation"
|
|
132
|
-
)), helpItemValues, this.quickInputService, this.environmentService, this.openerService, this.remoteExplorerService, this.workspaceContextService));
|
|
126
|
+
const helpItemValues = ( (documentation.map((info) => this.createHelpItemValue(info, 'documentation'))));
|
|
127
|
+
const documentationHelpItem = this.items?.find(item => item.icon === documentationIcon) ?? ( (new HelpItem(documentationIcon, ( localizeWithPath(_moduleId, 1, "Read Documentation")), helpItemValues, this.quickInputService, this.environmentService, this.openerService, this.remoteExplorerService, this.workspaceContextService)));
|
|
133
128
|
documentationHelpItem.values = helpItemValues;
|
|
134
129
|
helpItems.push(documentationHelpItem);
|
|
135
130
|
}
|
|
136
131
|
const issues = this.viewModel.helpInformation.filter(info => info.issues);
|
|
137
132
|
if (issues.length) {
|
|
138
|
-
const helpItemValues = ( issues.map((info) => this.createHelpItemValue(info, 'issues')));
|
|
139
|
-
const reviewIssuesHelpItem = this.items?.find(item => item.icon === reviewIssuesIcon) ?? ( new HelpItem(reviewIssuesIcon, ( localizeWithPath(
|
|
140
|
-
'vs/workbench/contrib/remote/browser/remote',
|
|
141
|
-
'remote.help.issues',
|
|
142
|
-
"Review Issues"
|
|
143
|
-
)), helpItemValues, this.quickInputService, this.environmentService, this.openerService, this.remoteExplorerService, this.workspaceContextService));
|
|
133
|
+
const helpItemValues = ( (issues.map((info) => this.createHelpItemValue(info, 'issues'))));
|
|
134
|
+
const reviewIssuesHelpItem = this.items?.find(item => item.icon === reviewIssuesIcon) ?? ( (new HelpItem(reviewIssuesIcon, ( localizeWithPath(_moduleId, 2, "Review Issues")), helpItemValues, this.quickInputService, this.environmentService, this.openerService, this.remoteExplorerService, this.workspaceContextService)));
|
|
144
135
|
reviewIssuesHelpItem.values = helpItemValues;
|
|
145
136
|
helpItems.push(reviewIssuesHelpItem);
|
|
146
137
|
}
|
|
147
138
|
if (helpItems.length) {
|
|
148
|
-
const helpItemValues = ( this.viewModel.helpInformation.map(info => this.createHelpItemValue(info, 'reportIssue')));
|
|
149
|
-
const issueReporterItem = this.items?.find(item => item.icon === reportIssuesIcon) ?? ( new IssueReporterItem(reportIssuesIcon, ( localizeWithPath(
|
|
150
|
-
'vs/workbench/contrib/remote/browser/remote',
|
|
151
|
-
'remote.help.report',
|
|
152
|
-
"Report Issue"
|
|
153
|
-
)), helpItemValues, this.quickInputService, this.environmentService, this.commandService, this.openerService, this.remoteExplorerService, this.workspaceContextService));
|
|
139
|
+
const helpItemValues = ( (this.viewModel.helpInformation.map(info => this.createHelpItemValue(info, 'reportIssue'))));
|
|
140
|
+
const issueReporterItem = this.items?.find(item => item.icon === reportIssuesIcon) ?? ( (new IssueReporterItem(reportIssuesIcon, ( localizeWithPath(_moduleId, 3, "Report Issue")), helpItemValues, this.quickInputService, this.environmentService, this.commandService, this.openerService, this.remoteExplorerService, this.workspaceContextService)));
|
|
154
141
|
issueReporterItem.values = helpItemValues;
|
|
155
142
|
helpItems.push(issueReporterItem);
|
|
156
143
|
}
|
|
@@ -177,7 +164,7 @@ class HelpItemValue {
|
|
|
177
164
|
async getUrl() {
|
|
178
165
|
if (this._url === undefined) {
|
|
179
166
|
if (typeof this.urlOrCommandOrId === 'string') {
|
|
180
|
-
const url = ( URI.parse(this.urlOrCommandOrId));
|
|
167
|
+
const url = ( (URI.parse(this.urlOrCommandOrId)));
|
|
181
168
|
if (url.authority) {
|
|
182
169
|
this._url = this.urlOrCommandOrId;
|
|
183
170
|
}
|
|
@@ -186,7 +173,7 @@ class HelpItemValue {
|
|
|
186
173
|
this._url = result;
|
|
187
174
|
return this._url;
|
|
188
175
|
});
|
|
189
|
-
const emptyString = ( new Promise(resolve => setTimeout(() => resolve(''), 500)));
|
|
176
|
+
const emptyString = ( (new Promise(resolve => setTimeout(() => resolve(''), 500))));
|
|
190
177
|
this._url = await Promise.race([urlCommand, emptyString]);
|
|
191
178
|
}
|
|
192
179
|
}
|
|
@@ -220,14 +207,14 @@ class HelpItemBase {
|
|
|
220
207
|
this.iconClasses.push('remote-help-tree-node-item-icon');
|
|
221
208
|
}
|
|
222
209
|
async getActions() {
|
|
223
|
-
return (await Promise.all(( this.values.map(async (value) => {
|
|
210
|
+
return (await Promise.all(( (this.values.map(async (value) => {
|
|
224
211
|
return {
|
|
225
212
|
label: value.extensionDescription.displayName || value.extensionDescription.identifier.value,
|
|
226
213
|
description: (await value.description) ?? (await value.url),
|
|
227
214
|
url: await value.url,
|
|
228
215
|
extensionDescription: value.extensionDescription
|
|
229
216
|
};
|
|
230
|
-
})))).filter(item => item.description);
|
|
217
|
+
}))))).filter(item => item.description);
|
|
231
218
|
}
|
|
232
219
|
async handleClick() {
|
|
233
220
|
const remoteAuthority = this.environmentService.remoteAuthority;
|
|
@@ -267,11 +254,7 @@ class HelpItemBase {
|
|
|
267
254
|
if (this.values.length > 1) {
|
|
268
255
|
const actions = await this.getActions();
|
|
269
256
|
if (actions.length) {
|
|
270
|
-
const action = await this.quickInputService.pick(actions, { placeHolder: ( localizeWithPath(
|
|
271
|
-
'vs/workbench/contrib/remote/browser/remote',
|
|
272
|
-
'pickRemoteExtension',
|
|
273
|
-
"Select url to open"
|
|
274
|
-
)) });
|
|
257
|
+
const action = await this.quickInputService.pick(actions, { placeHolder: ( localizeWithPath(_moduleId, 4, "Select url to open")) });
|
|
275
258
|
if (action) {
|
|
276
259
|
await this.takeAction(action.extensionDescription, action.url);
|
|
277
260
|
}
|
|
@@ -289,7 +272,7 @@ class GetStartedHelpItem extends HelpItemBase {
|
|
|
289
272
|
this.commandService = commandService;
|
|
290
273
|
}
|
|
291
274
|
async takeAction(extensionDescription, urlOrWalkthroughId) {
|
|
292
|
-
if ([Schemas.http, Schemas.https].includes(( URI.parse(urlOrWalkthroughId)).scheme)) {
|
|
275
|
+
if ([Schemas.http, Schemas.https].includes(( (URI.parse(urlOrWalkthroughId))).scheme)) {
|
|
293
276
|
this.openerService.open(urlOrWalkthroughId, { allowCommands: true });
|
|
294
277
|
return;
|
|
295
278
|
}
|
|
@@ -302,7 +285,7 @@ class HelpItem extends HelpItemBase {
|
|
|
302
285
|
this.openerService = openerService;
|
|
303
286
|
}
|
|
304
287
|
async takeAction(extensionDescription, url) {
|
|
305
|
-
await this.openerService.open(( URI.parse(url)), { allowCommands: true });
|
|
288
|
+
await this.openerService.open(( (URI.parse(url))), { allowCommands: true });
|
|
306
289
|
}
|
|
307
290
|
}
|
|
308
291
|
class IssueReporterItem extends HelpItemBase {
|
|
@@ -312,31 +295,27 @@ class IssueReporterItem extends HelpItemBase {
|
|
|
312
295
|
this.openerService = openerService;
|
|
313
296
|
}
|
|
314
297
|
async getActions() {
|
|
315
|
-
return Promise.all(( this.values.map(async (value) => {
|
|
298
|
+
return Promise.all(( (this.values.map(async (value) => {
|
|
316
299
|
return {
|
|
317
300
|
label: value.extensionDescription.displayName || value.extensionDescription.identifier.value,
|
|
318
301
|
description: '',
|
|
319
302
|
url: await value.url,
|
|
320
303
|
extensionDescription: value.extensionDescription
|
|
321
304
|
};
|
|
322
|
-
})));
|
|
305
|
+
}))));
|
|
323
306
|
}
|
|
324
307
|
async takeAction(extensionDescription, url) {
|
|
325
308
|
if (!url) {
|
|
326
309
|
await this.commandService.executeCommand('workbench.action.openIssueReporter', [extensionDescription.identifier.value]);
|
|
327
310
|
}
|
|
328
311
|
else {
|
|
329
|
-
await this.openerService.open(( URI.parse(url)));
|
|
312
|
+
await this.openerService.open(( (URI.parse(url))));
|
|
330
313
|
}
|
|
331
314
|
}
|
|
332
315
|
}
|
|
333
316
|
let HelpPanel = class HelpPanel extends ViewPane {
|
|
334
317
|
static { this.ID = '~remote.helpPanel'; }
|
|
335
|
-
static { this.TITLE = ( localize2WithPath(
|
|
336
|
-
'vs/workbench/contrib/remote/browser/remote',
|
|
337
|
-
'remote.help',
|
|
338
|
-
"Help and feedback"
|
|
339
|
-
)); }
|
|
318
|
+
static { this.TITLE = ( localize2WithPath(_moduleId, 5, "Help and feedback")); }
|
|
340
319
|
constructor(viewModel, options, keybindingService, contextMenuService, contextKeyService, configurationService, instantiationService, viewDescriptorService, openerService, quickInputService, commandService, remoteExplorerService, environmentService, themeService, telemetryService, workspaceContextService, walkthroughsService) {
|
|
341
320
|
super(options, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, telemetryService);
|
|
342
321
|
this.viewModel = viewModel;
|
|
@@ -353,15 +332,15 @@ let HelpPanel = class HelpPanel extends ViewPane {
|
|
|
353
332
|
const treeContainer = document.createElement('div');
|
|
354
333
|
treeContainer.classList.add('remote-help-content');
|
|
355
334
|
container.appendChild(treeContainer);
|
|
356
|
-
this.tree = this.instantiationService.createInstance(WorkbenchAsyncDataTree, 'RemoteHelp', treeContainer, ( new HelpTreeVirtualDelegate()), [( new HelpTreeRenderer())], ( new HelpDataSource()), {
|
|
335
|
+
this.tree = this.instantiationService.createInstance(WorkbenchAsyncDataTree, 'RemoteHelp', treeContainer, ( (new HelpTreeVirtualDelegate())), [( (new HelpTreeRenderer()))], ( (new HelpDataSource())), {
|
|
357
336
|
accessibilityProvider: {
|
|
358
337
|
getAriaLabel: (item) => {
|
|
359
338
|
return item.label;
|
|
360
339
|
},
|
|
361
|
-
getWidgetAriaLabel: () => ( localizeWithPath(
|
|
340
|
+
getWidgetAriaLabel: () => ( localizeWithPath(_moduleId, 6, "Remote Help"))
|
|
362
341
|
}
|
|
363
342
|
});
|
|
364
|
-
const model = ( new HelpModel(
|
|
343
|
+
const model = ( (new HelpModel(
|
|
365
344
|
this.viewModel,
|
|
366
345
|
this.openerService,
|
|
367
346
|
this.quickInputService,
|
|
@@ -370,7 +349,7 @@ let HelpPanel = class HelpPanel extends ViewPane {
|
|
|
370
349
|
this.environmentService,
|
|
371
350
|
this.workspaceContextService,
|
|
372
351
|
this.walkthroughsService
|
|
373
|
-
));
|
|
352
|
+
)));
|
|
374
353
|
this.tree.setInput(model);
|
|
375
354
|
this._register(Event.debounce(this.tree.onDidOpen, (last, event) => event, 75, true)(e => {
|
|
376
355
|
e.element?.handleClick();
|
|
@@ -381,23 +360,23 @@ let HelpPanel = class HelpPanel extends ViewPane {
|
|
|
381
360
|
this.tree.layout(height, width);
|
|
382
361
|
}
|
|
383
362
|
};
|
|
384
|
-
HelpPanel = ( __decorate([
|
|
385
|
-
( __param(2, IKeybindingService)),
|
|
386
|
-
( __param(3, IContextMenuService)),
|
|
387
|
-
( __param(4, IContextKeyService)),
|
|
388
|
-
( __param(5, IConfigurationService)),
|
|
389
|
-
( __param(6, IInstantiationService)),
|
|
390
|
-
( __param(7, IViewDescriptorService)),
|
|
391
|
-
( __param(8, IOpenerService)),
|
|
392
|
-
( __param(9, IQuickInputService)),
|
|
393
|
-
( __param(10, ICommandService)),
|
|
394
|
-
( __param(11, IRemoteExplorerService)),
|
|
395
|
-
( __param(12, IWorkbenchEnvironmentService)),
|
|
396
|
-
( __param(13, IThemeService)),
|
|
397
|
-
( __param(14, ITelemetryService)),
|
|
398
|
-
( __param(15, IWorkspaceContextService)),
|
|
399
|
-
( __param(16, IWalkthroughsService))
|
|
400
|
-
], HelpPanel));
|
|
363
|
+
HelpPanel = ( (__decorate([
|
|
364
|
+
( (__param(2, IKeybindingService))),
|
|
365
|
+
( (__param(3, IContextMenuService))),
|
|
366
|
+
( (__param(4, IContextKeyService))),
|
|
367
|
+
( (__param(5, IConfigurationService))),
|
|
368
|
+
( (__param(6, IInstantiationService))),
|
|
369
|
+
( (__param(7, IViewDescriptorService))),
|
|
370
|
+
( (__param(8, IOpenerService))),
|
|
371
|
+
( (__param(9, IQuickInputService))),
|
|
372
|
+
( (__param(10, ICommandService))),
|
|
373
|
+
( (__param(11, IRemoteExplorerService))),
|
|
374
|
+
( (__param(12, IWorkbenchEnvironmentService))),
|
|
375
|
+
( (__param(13, IThemeService))),
|
|
376
|
+
( (__param(14, ITelemetryService))),
|
|
377
|
+
( (__param(15, IWorkspaceContextService))),
|
|
378
|
+
( (__param(16, IWalkthroughsService)))
|
|
379
|
+
], HelpPanel)));
|
|
401
380
|
class HelpPanelDescriptor {
|
|
402
381
|
constructor(viewModel) {
|
|
403
382
|
this.id = HelpPanel.ID;
|
|
@@ -406,16 +385,16 @@ class HelpPanelDescriptor {
|
|
|
406
385
|
this.hideByDefault = false;
|
|
407
386
|
this.group = 'help@50';
|
|
408
387
|
this.order = -10;
|
|
409
|
-
this.ctorDescriptor = ( new SyncDescriptor(HelpPanel, [viewModel]));
|
|
388
|
+
this.ctorDescriptor = ( (new SyncDescriptor(HelpPanel, [viewModel])));
|
|
410
389
|
}
|
|
411
390
|
}
|
|
412
391
|
let RemoteViewPaneContainer = class RemoteViewPaneContainer extends FilterViewPaneContainer {
|
|
413
392
|
constructor(layoutService, telemetryService, contextService, storageService, configurationService, instantiationService, themeService, contextMenuService, extensionService, remoteExplorerService, viewDescriptorService) {
|
|
414
393
|
super(VIEWLET_ID, remoteExplorerService.onDidChangeTargetType, configurationService, layoutService, telemetryService, storageService, instantiationService, themeService, contextMenuService, extensionService, contextService, viewDescriptorService);
|
|
415
394
|
this.remoteExplorerService = remoteExplorerService;
|
|
416
|
-
this.helpPanelDescriptor = ( new HelpPanelDescriptor(this));
|
|
395
|
+
this.helpPanelDescriptor = ( (new HelpPanelDescriptor(this)));
|
|
417
396
|
this.helpInformation = [];
|
|
418
|
-
this._onDidChangeHelpInformation = ( new Emitter());
|
|
397
|
+
this._onDidChangeHelpInformation = ( (new Emitter()));
|
|
419
398
|
this.onDidChangeHelpInformation = this._onDidChangeHelpInformation.event;
|
|
420
399
|
this.hasRegisteredHelpView = false;
|
|
421
400
|
this.addConstantViewDescriptors([this.helpPanelDescriptor]);
|
|
@@ -424,7 +403,7 @@ let RemoteViewPaneContainer = class RemoteViewPaneContainer extends FilterViewPa
|
|
|
424
403
|
this._setHelpInformation(extensions);
|
|
425
404
|
});
|
|
426
405
|
this._setHelpInformation(this.remoteExplorerService.helpInformation);
|
|
427
|
-
const viewsRegistry = ( Registry.as(Extensions.ViewsRegistry));
|
|
406
|
+
const viewsRegistry = ( (Registry.as(Extensions.ViewsRegistry)));
|
|
428
407
|
this.remoteSwitcher.createOptionItems(viewsRegistry.getViews(this.viewContainer));
|
|
429
408
|
this._register(viewsRegistry.onViewsRegistered(e => {
|
|
430
409
|
const remoteViews = [];
|
|
@@ -450,7 +429,7 @@ let RemoteViewPaneContainer = class RemoteViewPaneContainer extends FilterViewPa
|
|
|
450
429
|
}
|
|
451
430
|
this.helpInformation = helpInformation;
|
|
452
431
|
this._onDidChangeHelpInformation.fire();
|
|
453
|
-
const viewsRegistry = ( Registry.as(Extensions.ViewsRegistry));
|
|
432
|
+
const viewsRegistry = ( (Registry.as(Extensions.ViewsRegistry)));
|
|
454
433
|
if (this.helpInformation.length && !this.hasRegisteredHelpView) {
|
|
455
434
|
const view = viewsRegistry.getView(this.helpPanelDescriptor.id);
|
|
456
435
|
if (!view) {
|
|
@@ -487,35 +466,27 @@ let RemoteViewPaneContainer = class RemoteViewPaneContainer extends FilterViewPa
|
|
|
487
466
|
this.remoteExplorerService.targetType = isStringArray(viewDescriptor.remoteAuthority) ? viewDescriptor.remoteAuthority : [viewDescriptor.remoteAuthority];
|
|
488
467
|
}
|
|
489
468
|
getTitle() {
|
|
490
|
-
const title = ( localizeWithPath(
|
|
491
|
-
'vs/workbench/contrib/remote/browser/remote',
|
|
492
|
-
'remote.explorer',
|
|
493
|
-
"Remote Explorer"
|
|
494
|
-
));
|
|
469
|
+
const title = ( localizeWithPath(_moduleId, 7, "Remote Explorer"));
|
|
495
470
|
return title;
|
|
496
471
|
}
|
|
497
472
|
};
|
|
498
|
-
RemoteViewPaneContainer = ( __decorate([
|
|
499
|
-
( __param(0, IWorkbenchLayoutService)),
|
|
500
|
-
( __param(1, ITelemetryService)),
|
|
501
|
-
( __param(2, IWorkspaceContextService)),
|
|
502
|
-
( __param(3, IStorageService)),
|
|
503
|
-
( __param(4, IConfigurationService)),
|
|
504
|
-
( __param(5, IInstantiationService)),
|
|
505
|
-
( __param(6, IThemeService)),
|
|
506
|
-
( __param(7, IContextMenuService)),
|
|
507
|
-
( __param(8, IExtensionService)),
|
|
508
|
-
( __param(9, IRemoteExplorerService)),
|
|
509
|
-
( __param(10, IViewDescriptorService))
|
|
510
|
-
], RemoteViewPaneContainer));
|
|
511
|
-
( Registry.as(Extensions.ViewContainersRegistry)).registerViewContainer({
|
|
473
|
+
RemoteViewPaneContainer = ( (__decorate([
|
|
474
|
+
( (__param(0, IWorkbenchLayoutService))),
|
|
475
|
+
( (__param(1, ITelemetryService))),
|
|
476
|
+
( (__param(2, IWorkspaceContextService))),
|
|
477
|
+
( (__param(3, IStorageService))),
|
|
478
|
+
( (__param(4, IConfigurationService))),
|
|
479
|
+
( (__param(5, IInstantiationService))),
|
|
480
|
+
( (__param(6, IThemeService))),
|
|
481
|
+
( (__param(7, IContextMenuService))),
|
|
482
|
+
( (__param(8, IExtensionService))),
|
|
483
|
+
( (__param(9, IRemoteExplorerService))),
|
|
484
|
+
( (__param(10, IViewDescriptorService)))
|
|
485
|
+
], RemoteViewPaneContainer)));
|
|
486
|
+
( (Registry.as(Extensions.ViewContainersRegistry))).registerViewContainer({
|
|
512
487
|
id: VIEWLET_ID,
|
|
513
|
-
title: ( localize2WithPath(
|
|
514
|
-
|
|
515
|
-
'remote.explorer',
|
|
516
|
-
"Remote Explorer"
|
|
517
|
-
)),
|
|
518
|
-
ctorDescriptor: ( new SyncDescriptor(RemoteViewPaneContainer)),
|
|
488
|
+
title: ( localize2WithPath(_moduleId, 7, "Remote Explorer")),
|
|
489
|
+
ctorDescriptor: ( (new SyncDescriptor(RemoteViewPaneContainer))),
|
|
519
490
|
hideIfEmpty: true,
|
|
520
491
|
viewOrderDelegate: {
|
|
521
492
|
getOrder: (group) => {
|
|
@@ -549,10 +520,10 @@ let RemoteMarkers = class RemoteMarkers {
|
|
|
549
520
|
});
|
|
550
521
|
}
|
|
551
522
|
};
|
|
552
|
-
RemoteMarkers = ( __decorate([
|
|
553
|
-
( __param(0, IRemoteAgentService)),
|
|
554
|
-
( __param(1, ITimerService))
|
|
555
|
-
], RemoteMarkers));
|
|
523
|
+
RemoteMarkers = ( (__decorate([
|
|
524
|
+
( (__param(0, IRemoteAgentService))),
|
|
525
|
+
( (__param(1, ITimerService)))
|
|
526
|
+
], RemoteMarkers)));
|
|
556
527
|
class VisibleProgress {
|
|
557
528
|
get lastReport() {
|
|
558
529
|
return this._lastReport;
|
|
@@ -564,7 +535,7 @@ class VisibleProgress {
|
|
|
564
535
|
this._currentProgressPromiseResolve = null;
|
|
565
536
|
this._currentProgress = null;
|
|
566
537
|
this._currentTimer = null;
|
|
567
|
-
const promise = ( new Promise((resolve) => this._currentProgressPromiseResolve = resolve));
|
|
538
|
+
const promise = ( (new Promise((resolve) => this._currentProgressPromiseResolve = resolve)));
|
|
568
539
|
progressService.withProgress({ location: location, buttons: buttons }, (progress) => { if (!this._isDisposed) {
|
|
569
540
|
this._currentProgress = progress;
|
|
570
541
|
} return promise; }, (choice) => onDidCancel(choice, this._lastReport));
|
|
@@ -594,7 +565,7 @@ class VisibleProgress {
|
|
|
594
565
|
}
|
|
595
566
|
startTimer(completionTime) {
|
|
596
567
|
this.stopTimer();
|
|
597
|
-
this._currentTimer = ( new ReconnectionTimer(this, completionTime));
|
|
568
|
+
this._currentTimer = ( (new ReconnectionTimer(this, completionTime)));
|
|
598
569
|
}
|
|
599
570
|
stopTimer() {
|
|
600
571
|
if (this._currentTimer) {
|
|
@@ -620,20 +591,10 @@ class ReconnectionTimer {
|
|
|
620
591
|
}
|
|
621
592
|
const remainingTime = Math.ceil(remainingTimeMs / 1000);
|
|
622
593
|
if (remainingTime === 1) {
|
|
623
|
-
this._parent.report(( localizeWithPath(
|
|
624
|
-
'vs/workbench/contrib/remote/browser/remote',
|
|
625
|
-
'reconnectionWaitOne',
|
|
626
|
-
"Attempting to reconnect in {0} second...",
|
|
627
|
-
remainingTime
|
|
628
|
-
)));
|
|
594
|
+
this._parent.report(( localizeWithPath(_moduleId, 8, "Attempting to reconnect in {0} second...", remainingTime)));
|
|
629
595
|
}
|
|
630
596
|
else {
|
|
631
|
-
this._parent.report(( localizeWithPath(
|
|
632
|
-
'vs/workbench/contrib/remote/browser/remote',
|
|
633
|
-
'reconnectionWaitMany',
|
|
634
|
-
"Attempting to reconnect in {0} seconds...",
|
|
635
|
-
remainingTime
|
|
636
|
-
)));
|
|
597
|
+
this._parent.report(( localizeWithPath(_moduleId, 9, "Attempting to reconnect in {0} seconds...", remainingTime)));
|
|
637
598
|
}
|
|
638
599
|
}
|
|
639
600
|
}
|
|
@@ -658,19 +619,27 @@ let RemoteAgentConnectionStatusListener = class RemoteAgentConnectionStatusListe
|
|
|
658
619
|
if (!location) {
|
|
659
620
|
location = quickInputVisible ? 15 : 20 ;
|
|
660
621
|
}
|
|
661
|
-
return (
|
|
662
|
-
|
|
663
|
-
|
|
664
|
-
|
|
665
|
-
|
|
666
|
-
|
|
667
|
-
|
|
668
|
-
|
|
669
|
-
|
|
670
|
-
|
|
622
|
+
return (
|
|
623
|
+
(new VisibleProgress(
|
|
624
|
+
progressService,
|
|
625
|
+
location,
|
|
626
|
+
initialReport,
|
|
627
|
+
(buttons.map(button => button.label)),
|
|
628
|
+
(choice, lastReport) => {
|
|
629
|
+
if (typeof choice !== 'undefined' && buttons[choice]) {
|
|
630
|
+
buttons[choice].callback();
|
|
631
|
+
}
|
|
632
|
+
else {
|
|
633
|
+
if (location === 20 ) {
|
|
634
|
+
visibleProgress = showProgress(15 , buttons, lastReport);
|
|
635
|
+
}
|
|
636
|
+
else {
|
|
637
|
+
hideProgress();
|
|
638
|
+
}
|
|
639
|
+
}
|
|
671
640
|
}
|
|
672
|
-
|
|
673
|
-
|
|
641
|
+
))
|
|
642
|
+
);
|
|
674
643
|
}
|
|
675
644
|
function hideProgress() {
|
|
676
645
|
if (visibleProgress) {
|
|
@@ -682,21 +651,13 @@ let RemoteAgentConnectionStatusListener = class RemoteAgentConnectionStatusListe
|
|
|
682
651
|
let lastIncomingDataTime = 0;
|
|
683
652
|
let reconnectionAttempts = 0;
|
|
684
653
|
const reconnectButton = {
|
|
685
|
-
label: ( localizeWithPath(
|
|
686
|
-
'vs/workbench/contrib/remote/browser/remote',
|
|
687
|
-
'reconnectNow',
|
|
688
|
-
"Reconnect Now"
|
|
689
|
-
)),
|
|
654
|
+
label: ( localizeWithPath(_moduleId, 10, "Reconnect Now")),
|
|
690
655
|
callback: () => {
|
|
691
656
|
reconnectWaitEvent?.skipWait();
|
|
692
657
|
}
|
|
693
658
|
};
|
|
694
659
|
const reloadButton = {
|
|
695
|
-
label: ( localizeWithPath(
|
|
696
|
-
'vs/workbench/contrib/remote/browser/remote',
|
|
697
|
-
'reloadWindow',
|
|
698
|
-
"Reload Window"
|
|
699
|
-
)),
|
|
660
|
+
label: ( localizeWithPath(_moduleId, 11, "Reload Window")),
|
|
700
661
|
callback: () => {
|
|
701
662
|
telemetryService.publicLog2('remoteReconnectionReload', {
|
|
702
663
|
remoteName: getRemoteName(environmentService.remoteAuthority),
|
|
@@ -726,11 +687,7 @@ let RemoteAgentConnectionStatusListener = class RemoteAgentConnectionStatusListe
|
|
|
726
687
|
if (!visibleProgress) {
|
|
727
688
|
visibleProgress = showProgress(null, [reconnectButton, reloadButton]);
|
|
728
689
|
}
|
|
729
|
-
visibleProgress.report(( localizeWithPath(
|
|
730
|
-
'vs/workbench/contrib/remote/browser/remote',
|
|
731
|
-
'connectionLost',
|
|
732
|
-
"Connection Lost"
|
|
733
|
-
)));
|
|
690
|
+
visibleProgress.report(( localizeWithPath(_moduleId, 12, "Connection Lost")));
|
|
734
691
|
}
|
|
735
692
|
break;
|
|
736
693
|
case 1 :
|
|
@@ -752,11 +709,7 @@ let RemoteAgentConnectionStatusListener = class RemoteAgentConnectionStatusListe
|
|
|
752
709
|
});
|
|
753
710
|
if (visibleProgress || e.millisSinceLastIncomingData > DISCONNECT_PROMPT_TIME) {
|
|
754
711
|
visibleProgress = showProgress(null, [reloadButton]);
|
|
755
|
-
visibleProgress.report(( localizeWithPath(
|
|
756
|
-
'vs/workbench/contrib/remote/browser/remote',
|
|
757
|
-
'reconnectionRunning',
|
|
758
|
-
"Disconnected. Attempting to reconnect..."
|
|
759
|
-
)));
|
|
712
|
+
visibleProgress.report(( localizeWithPath(_moduleId, 13, "Disconnected. Attempting to reconnect...")));
|
|
760
713
|
disposableListener = quickInputService.onShow(() => {
|
|
761
714
|
if (visibleProgress && visibleProgress.location === 20 ) {
|
|
762
715
|
visibleProgress = showProgress(15 , [reloadButton], visibleProgress.lastReport);
|
|
@@ -784,16 +737,8 @@ let RemoteAgentConnectionStatusListener = class RemoteAgentConnectionStatusListe
|
|
|
784
737
|
this._reloadWindowShown = true;
|
|
785
738
|
dialogService.confirm({
|
|
786
739
|
type: Severity$1.Error,
|
|
787
|
-
message: ( localizeWithPath(
|
|
788
|
-
|
|
789
|
-
'reconnectionPermanentFailure',
|
|
790
|
-
"Cannot reconnect. Please reload the window."
|
|
791
|
-
)),
|
|
792
|
-
primaryButton: ( localizeWithPath(
|
|
793
|
-
'vs/workbench/contrib/remote/browser/remote',
|
|
794
|
-
{ key: 'reloadWindow.dialog', comment: ['&& denotes a mnemonic'] },
|
|
795
|
-
"&&Reload Window"
|
|
796
|
-
))
|
|
740
|
+
message: ( localizeWithPath(_moduleId, 14, "Cannot reconnect. Please reload the window.")),
|
|
741
|
+
primaryButton: ( localizeWithPath(_moduleId, 15, "&&Reload Window"))
|
|
797
742
|
}).then(result => {
|
|
798
743
|
if (result.confirmed) {
|
|
799
744
|
commandService.executeCommand(ReloadWindowAction.ID);
|
|
@@ -818,15 +763,15 @@ let RemoteAgentConnectionStatusListener = class RemoteAgentConnectionStatusListe
|
|
|
818
763
|
}
|
|
819
764
|
}
|
|
820
765
|
};
|
|
821
|
-
RemoteAgentConnectionStatusListener = ( __decorate([
|
|
822
|
-
( __param(0, IRemoteAgentService)),
|
|
823
|
-
( __param(1, IProgressService)),
|
|
824
|
-
( __param(2, IDialogService)),
|
|
825
|
-
( __param(3, ICommandService)),
|
|
826
|
-
( __param(4, IQuickInputService)),
|
|
827
|
-
( __param(5, ILogService)),
|
|
828
|
-
( __param(6, IWorkbenchEnvironmentService)),
|
|
829
|
-
( __param(7, ITelemetryService))
|
|
830
|
-
], RemoteAgentConnectionStatusListener));
|
|
766
|
+
RemoteAgentConnectionStatusListener = ( (__decorate([
|
|
767
|
+
( (__param(0, IRemoteAgentService))),
|
|
768
|
+
( (__param(1, IProgressService))),
|
|
769
|
+
( (__param(2, IDialogService))),
|
|
770
|
+
( (__param(3, ICommandService))),
|
|
771
|
+
( (__param(4, IQuickInputService))),
|
|
772
|
+
( (__param(5, ILogService))),
|
|
773
|
+
( (__param(6, IWorkbenchEnvironmentService))),
|
|
774
|
+
( (__param(7, ITelemetryService)))
|
|
775
|
+
], RemoteAgentConnectionStatusListener)));
|
|
831
776
|
|
|
832
777
|
export { RemoteAgentConnectionStatusListener, RemoteMarkers };
|