@codingame/monaco-vscode-remote-agent-service-override 1.83.4 → 1.83.6
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/missing-services.js
CHANGED
|
@@ -28,7 +28,7 @@ import { IPreferencesService } from 'vscode/vscode/vs/workbench/services/prefere
|
|
|
28
28
|
import { IContextKeyService } from 'monaco-editor/esm/vs/platform/contextkey/common/contextkey.js';
|
|
29
29
|
import { StandaloneServices } from 'monaco-editor/esm/vs/editor/standalone/browser/standaloneServices.js';
|
|
30
30
|
import { ICodeEditorService } from 'monaco-editor/esm/vs/editor/browser/services/codeEditorService.js';
|
|
31
|
-
import { IUserDataProfilesService } from 'monaco-editor/esm/vs/platform/userDataProfile/common/userDataProfile.js';
|
|
31
|
+
import { IUserDataProfilesService, toUserDataProfile } from 'monaco-editor/esm/vs/platform/userDataProfile/common/userDataProfile.js';
|
|
32
32
|
import { IPolicyService } from 'monaco-editor/esm/vs/platform/policy/common/policy.js';
|
|
33
33
|
import { IUserDataProfileService, IUserDataProfileImportExportService } from 'vscode/vscode/vs/workbench/services/userDataProfile/common/userDataProfile';
|
|
34
34
|
import { UserDataProfileService } from 'vscode/vscode/vs/workbench/services/userDataProfile/common/userDataProfileService';
|
|
@@ -170,6 +170,7 @@ import { BrowserHostService } from 'vscode/vscode/vs/workbench/services/host/bro
|
|
|
170
170
|
import { IBannerService } from 'vscode/vscode/vs/workbench/services/banner/browser/bannerService';
|
|
171
171
|
import { ITitleService } from 'vscode/vscode/vs/workbench/services/title/common/titleService';
|
|
172
172
|
import { IChatAgentService } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatAgents';
|
|
173
|
+
import { joinPath } from 'monaco-editor/esm/vs/base/common/resources.js';
|
|
173
174
|
import { unsupported } from './tools.js';
|
|
174
175
|
import { getBuiltInExtensionTranslationsUris } from './l10n.js';
|
|
175
176
|
import { IFileDialogService } from 'vscode/vscode/vs/platform/dialogs/common/dialogs';
|
|
@@ -480,9 +481,10 @@ registerSingleton(IUserDataInitializationService, class NullUserDataInitializati
|
|
|
480
481
|
async initializeOtherResources() { }
|
|
481
482
|
}, 0 );
|
|
482
483
|
registerSingleton(IHostColorSchemeService, BrowserHostColorSchemeService, 0 );
|
|
483
|
-
|
|
484
|
-
constructor() {
|
|
485
|
-
this.
|
|
484
|
+
let PreferencesService = class PreferencesService {
|
|
485
|
+
constructor(profileService) {
|
|
486
|
+
this.profileService = profileService;
|
|
487
|
+
this.userSettingsResource = this.profileService.currentProfile.settingsResource;
|
|
486
488
|
this.workspaceSettingsResource = null;
|
|
487
489
|
this.getFolderSettingsResource = unsupported;
|
|
488
490
|
this.createPreferencesEditorModel = unsupported;
|
|
@@ -501,7 +503,11 @@ registerSingleton(IPreferencesService, class PreferencesService {
|
|
|
501
503
|
this.openApplicationSettings = unsupported;
|
|
502
504
|
this.openLanguageSpecificSettings = unsupported;
|
|
503
505
|
}
|
|
504
|
-
}
|
|
506
|
+
};
|
|
507
|
+
PreferencesService = __decorate([
|
|
508
|
+
( __param(0, IUserDataProfileService))
|
|
509
|
+
], PreferencesService);
|
|
510
|
+
registerSingleton(IPreferencesService, PreferencesService, 0 );
|
|
505
511
|
registerSingleton(ITextMateTokenizationService, class NullTextMateService {
|
|
506
512
|
constructor() {
|
|
507
513
|
this.onDidEncounterLanguage = Event.None;
|
|
@@ -510,21 +516,9 @@ registerSingleton(ITextMateTokenizationService, class NullTextMateService {
|
|
|
510
516
|
this.createTokenizer = unsupported;
|
|
511
517
|
}
|
|
512
518
|
}, 0 );
|
|
513
|
-
|
|
514
|
-
|
|
515
|
-
|
|
516
|
-
name: 'default',
|
|
517
|
-
location: ( URI.from({ scheme: 'user', path: '/profile.json' })),
|
|
518
|
-
globalStorageHome: ( URI.from({ scheme: 'user', path: '/globalStorage' })),
|
|
519
|
-
settingsResource: ( URI.from({ scheme: 'user', path: '/settings.json' })),
|
|
520
|
-
keybindingsResource: ( URI.from({ scheme: 'user', path: '/keybindings.json' })),
|
|
521
|
-
tasksResource: ( URI.from({ scheme: 'user', path: '/tasks.json' })),
|
|
522
|
-
snippetsHome: ( URI.from({ scheme: 'user', path: '/snippets' })),
|
|
523
|
-
extensionsResource: ( URI.from({ scheme: 'user', path: '/extensions.json' })),
|
|
524
|
-
cacheHome: ( URI.from({ scheme: 'cache', path: '/' }))
|
|
525
|
-
};
|
|
526
|
-
registerSingleton(IUserDataProfilesService, class UserDataProfilesService {
|
|
527
|
-
constructor() {
|
|
519
|
+
let UserDataProfilesService = class UserDataProfilesService {
|
|
520
|
+
constructor(profileService) {
|
|
521
|
+
this.profileService = profileService;
|
|
528
522
|
this.onDidResetWorkspaces = Event.None;
|
|
529
523
|
this.isEnabled = () => false;
|
|
530
524
|
this.createNamedProfile = unsupported;
|
|
@@ -532,22 +526,32 @@ registerSingleton(IUserDataProfilesService, class UserDataProfilesService {
|
|
|
532
526
|
this.resetWorkspaces = unsupported;
|
|
533
527
|
this.cleanUp = unsupported;
|
|
534
528
|
this.cleanUpTransientProfiles = unsupported;
|
|
535
|
-
this.defaultProfile =
|
|
529
|
+
this.defaultProfile = this.profileService.currentProfile;
|
|
536
530
|
this.onDidChangeProfiles = Event.None;
|
|
537
|
-
this.profiles = [
|
|
531
|
+
this.profiles = [this.profileService.currentProfile];
|
|
538
532
|
this.createProfile = unsupported;
|
|
539
533
|
this.updateProfile = unsupported;
|
|
540
534
|
this.setProfileForWorkspace = unsupported;
|
|
541
|
-
this.getProfile = () =>
|
|
535
|
+
this.getProfile = () => this.profileService.currentProfile;
|
|
542
536
|
this.removeProfile = unsupported;
|
|
543
537
|
}
|
|
544
538
|
get profilesHome() { return unsupported(); }
|
|
545
|
-
}
|
|
546
|
-
|
|
547
|
-
|
|
548
|
-
|
|
539
|
+
};
|
|
540
|
+
UserDataProfilesService = __decorate([
|
|
541
|
+
( __param(0, IUserDataProfileService))
|
|
542
|
+
], UserDataProfilesService);
|
|
543
|
+
registerSingleton(IUserDataProfilesService, UserDataProfilesService, 0 );
|
|
544
|
+
let InjectedUserDataProfileService = class InjectedUserDataProfileService extends UserDataProfileService {
|
|
545
|
+
constructor(environmentService) {
|
|
546
|
+
super({
|
|
547
|
+
...toUserDataProfile('__default__profile__', 'Default', environmentService.userRoamingDataHome, joinPath(environmentService.cacheHome, 'CachedProfilesData')),
|
|
548
|
+
isDefault: true
|
|
549
|
+
});
|
|
549
550
|
}
|
|
550
|
-
}
|
|
551
|
+
};
|
|
552
|
+
InjectedUserDataProfileService = __decorate([
|
|
553
|
+
( __param(0, IEnvironmentService))
|
|
554
|
+
], InjectedUserDataProfileService);
|
|
551
555
|
registerSingleton(IUserDataProfileService, InjectedUserDataProfileService, 0 );
|
|
552
556
|
registerSingleton(IPolicyService, class PolicyService {
|
|
553
557
|
constructor() {
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@codingame/monaco-vscode-remote-agent-service-override",
|
|
3
|
-
"version": "1.83.
|
|
3
|
+
"version": "1.83.6",
|
|
4
4
|
"keywords": [],
|
|
5
5
|
"author": {
|
|
6
6
|
"name": "CodinGame",
|
|
@@ -18,7 +18,7 @@
|
|
|
18
18
|
"module": "index.js",
|
|
19
19
|
"types": "index.d.ts",
|
|
20
20
|
"dependencies": {
|
|
21
|
-
"vscode": "npm:@codingame/monaco-vscode-api@1.83.
|
|
21
|
+
"vscode": "npm:@codingame/monaco-vscode-api@1.83.6",
|
|
22
22
|
"monaco-editor": "0.44.0"
|
|
23
23
|
}
|
|
24
24
|
}
|
package/services.js
CHANGED
|
@@ -3,6 +3,7 @@ export { default as Severity } from 'monaco-editor/esm/vs/base/common/severity.j
|
|
|
3
3
|
export { StorageScope, StorageTarget } from 'vscode/vscode/vs/platform/storage/common/storage';
|
|
4
4
|
import { StandaloneServices } from 'monaco-editor/esm/vs/editor/standalone/browser/standaloneServices.js';
|
|
5
5
|
export { StandaloneServices } from 'monaco-editor/esm/vs/editor/standalone/browser/standaloneServices.js';
|
|
6
|
+
export { IInstantiationService } from 'monaco-editor/esm/vs/platform/instantiation/common/instantiation.js';
|
|
6
7
|
import { Disposable } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
|
|
7
8
|
import 'vscode/service-override/layout';
|
|
8
9
|
import 'vscode/service-override/environment';
|
|
@@ -24,7 +25,6 @@ export { ITextModelService } from 'monaco-editor/esm/vs/editor/common/services/r
|
|
|
24
25
|
export { IClipboardService } from 'monaco-editor/esm/vs/platform/clipboard/common/clipboardService.js';
|
|
25
26
|
import './override/vs/platform/dialogs/common/dialogs.js';
|
|
26
27
|
export { IFileService } from 'monaco-editor/esm/vs/platform/files/common/files.js';
|
|
27
|
-
export { IInstantiationService } from 'monaco-editor/esm/vs/platform/instantiation/common/instantiation.js';
|
|
28
28
|
export { IMarkerService } from 'monaco-editor/esm/vs/platform/markers/common/markers.js';
|
|
29
29
|
export { IOpenerService } from 'monaco-editor/esm/vs/platform/opener/common/opener.js';
|
|
30
30
|
export { IProductService } from 'monaco-editor/esm/vs/platform/product/common/productService.js';
|
|
@@ -65,6 +65,8 @@ export { IRemoteAgentService } from 'vscode/vscode/vs/workbench/services/remote/
|
|
|
65
65
|
export { IRemoteAuthorityResolverService } from 'vscode/vscode/vs/platform/remote/common/remoteAuthorityResolver';
|
|
66
66
|
export { IRemoteSocketFactoryService } from 'vscode/vscode/vs/platform/remote/common/remoteSocketFactoryService';
|
|
67
67
|
export { ITerminalInstanceService, ITerminalService } from 'vscode/vscode/vs/workbench/contrib/terminal/browser/terminal';
|
|
68
|
+
export { IFilesConfigurationService } from 'vscode/vscode/vs/workbench/services/filesConfiguration/common/filesConfigurationService';
|
|
69
|
+
export { ILabelService } from 'monaco-editor/esm/vs/platform/label/common/label.js';
|
|
68
70
|
export { IActivityService } from 'vscode/vscode/vs/workbench/services/activity/common/activity';
|
|
69
71
|
export { IHoverService } from 'vscode/vscode/vs/workbench/services/hover/browser/hover';
|
|
70
72
|
export { IExplorerService } from 'vscode/vscode/vs/workbench/contrib/files/browser/files';
|
|
@@ -100,9 +100,21 @@ let RemoteInvalidWorkspaceDetector = class RemoteInvalidWorkspaceDetector extend
|
|
|
100
100
|
}
|
|
101
101
|
const res = await this.dialogService.confirm({
|
|
102
102
|
type: 'warning',
|
|
103
|
-
message: localizeWithPath(
|
|
104
|
-
|
|
105
|
-
|
|
103
|
+
message: ( localizeWithPath(
|
|
104
|
+
'vs/workbench/contrib/remote/common/remote.contribution',
|
|
105
|
+
'invalidWorkspaceMessage',
|
|
106
|
+
"Workspace does not exist"
|
|
107
|
+
)),
|
|
108
|
+
detail: ( localizeWithPath(
|
|
109
|
+
'vs/workbench/contrib/remote/common/remote.contribution',
|
|
110
|
+
'invalidWorkspaceDetail',
|
|
111
|
+
"Please select another workspace to open."
|
|
112
|
+
)),
|
|
113
|
+
primaryButton: ( localizeWithPath(
|
|
114
|
+
'vs/workbench/contrib/remote/common/remote.contribution',
|
|
115
|
+
{ key: 'invalidWorkspacePrimary', comment: ['&& denotes a mnemonic'] },
|
|
116
|
+
"&&Open Workspace..."
|
|
117
|
+
))
|
|
106
118
|
});
|
|
107
119
|
if (res.confirmed) {
|
|
108
120
|
if (workspace.configuration) {
|
|
@@ -175,7 +187,11 @@ workbenchContributionsRegistry.registerWorkbenchContribution(InitialRemoteConnec
|
|
|
175
187
|
constructor() {
|
|
176
188
|
super({
|
|
177
189
|
id: 'workbench.action.triggerReconnect',
|
|
178
|
-
title: { value: localizeWithPath(
|
|
190
|
+
title: { value: ( localizeWithPath(
|
|
191
|
+
'vs/workbench/contrib/remote/common/remote.contribution',
|
|
192
|
+
'triggerReconnect',
|
|
193
|
+
"Connection: Trigger Reconnect"
|
|
194
|
+
)), original: 'Connection: Trigger Reconnect' },
|
|
179
195
|
category: Categories.Developer,
|
|
180
196
|
f1: true,
|
|
181
197
|
});
|
|
@@ -188,7 +204,11 @@ workbenchContributionsRegistry.registerWorkbenchContribution(InitialRemoteConnec
|
|
|
188
204
|
constructor() {
|
|
189
205
|
super({
|
|
190
206
|
id: 'workbench.action.pauseSocketWriting',
|
|
191
|
-
title: { value: localizeWithPath(
|
|
207
|
+
title: { value: ( localizeWithPath(
|
|
208
|
+
'vs/workbench/contrib/remote/common/remote.contribution',
|
|
209
|
+
'pauseSocketWriting',
|
|
210
|
+
"Connection: Pause socket writing"
|
|
211
|
+
)), original: 'Connection: Pause socket writing' },
|
|
192
212
|
category: Categories.Developer,
|
|
193
213
|
f1: true,
|
|
194
214
|
});
|
|
@@ -207,19 +227,35 @@ const extensionKindSchema = {
|
|
|
207
227
|
'workspace'
|
|
208
228
|
],
|
|
209
229
|
enumDescriptions: [
|
|
210
|
-
localizeWithPath(
|
|
211
|
-
|
|
230
|
+
( localizeWithPath(
|
|
231
|
+
'vs/workbench/contrib/remote/common/remote.contribution',
|
|
232
|
+
'ui',
|
|
233
|
+
"UI extension kind. In a remote window, such extensions are enabled only when available on the local machine."
|
|
234
|
+
)),
|
|
235
|
+
( localizeWithPath(
|
|
236
|
+
'vs/workbench/contrib/remote/common/remote.contribution',
|
|
237
|
+
'workspace',
|
|
238
|
+
"Workspace extension kind. In a remote window, such extensions are enabled only when available on the remote."
|
|
239
|
+
))
|
|
212
240
|
],
|
|
213
241
|
};
|
|
214
242
|
( Registry.as(Extensions$1.Configuration))
|
|
215
243
|
.registerConfiguration({
|
|
216
244
|
id: 'remote',
|
|
217
|
-
title: localizeWithPath(
|
|
245
|
+
title: ( localizeWithPath(
|
|
246
|
+
'vs/workbench/contrib/remote/common/remote.contribution',
|
|
247
|
+
'remote',
|
|
248
|
+
"Remote"
|
|
249
|
+
)),
|
|
218
250
|
type: 'object',
|
|
219
251
|
properties: {
|
|
220
252
|
'remote.extensionKind': {
|
|
221
253
|
type: 'object',
|
|
222
|
-
markdownDescription: localizeWithPath(
|
|
254
|
+
markdownDescription: ( localizeWithPath(
|
|
255
|
+
'vs/workbench/contrib/remote/common/remote.contribution',
|
|
256
|
+
'remote.extensionKind',
|
|
257
|
+
"Override the kind of an extension. `ui` extensions are installed and run on the local machine while `workspace` extensions are run on the remote. By overriding an extension's default kind using this setting, you specify if that extension should be installed and enabled locally or remotely."
|
|
258
|
+
)),
|
|
223
259
|
patternProperties: {
|
|
224
260
|
'([a-z0-9A-Z][a-z0-9-A-Z]*)\\.([a-z0-9A-Z][a-z0-9-A-Z]*)$': {
|
|
225
261
|
oneOf: [{ type: 'array', items: extensionKindSchema }, extensionKindSchema],
|
|
@@ -232,28 +268,57 @@ const extensionKindSchema = {
|
|
|
232
268
|
},
|
|
233
269
|
'remote.restoreForwardedPorts': {
|
|
234
270
|
type: 'boolean',
|
|
235
|
-
markdownDescription: localizeWithPath(
|
|
271
|
+
markdownDescription: ( localizeWithPath(
|
|
272
|
+
'vs/workbench/contrib/remote/common/remote.contribution',
|
|
273
|
+
'remote.restoreForwardedPorts',
|
|
274
|
+
"Restores the ports you forwarded in a workspace."
|
|
275
|
+
)),
|
|
236
276
|
default: true
|
|
237
277
|
},
|
|
238
278
|
'remote.autoForwardPorts': {
|
|
239
279
|
type: 'boolean',
|
|
240
|
-
markdownDescription: localizeWithPath(
|
|
280
|
+
markdownDescription: ( localizeWithPath(
|
|
281
|
+
'vs/workbench/contrib/remote/common/remote.contribution',
|
|
282
|
+
'remote.autoForwardPorts',
|
|
283
|
+
"When enabled, new running processes are detected and ports that they listen on are automatically forwarded. Disabling this setting will not prevent all ports from being forwarded. Even when disabled, extensions will still be able to cause ports to be forwarded, and opening some URLs will still cause ports to forwarded."
|
|
284
|
+
)),
|
|
241
285
|
default: true
|
|
242
286
|
},
|
|
243
287
|
'remote.autoForwardPortsSource': {
|
|
244
288
|
type: 'string',
|
|
245
|
-
markdownDescription: localizeWithPath(
|
|
289
|
+
markdownDescription: ( localizeWithPath(
|
|
290
|
+
'vs/workbench/contrib/remote/common/remote.contribution',
|
|
291
|
+
'remote.autoForwardPortsSource',
|
|
292
|
+
"Sets the source from which ports are automatically forwarded when {0} is true. On Windows and Mac remotes, the `process` and `hybrid` options have no effect and `output` will be used. Requires a reload to take effect.",
|
|
293
|
+
'`#remote.autoForwardPorts#`'
|
|
294
|
+
)),
|
|
246
295
|
enum: ['process', 'output', 'hybrid'],
|
|
247
296
|
enumDescriptions: [
|
|
248
|
-
localizeWithPath(
|
|
249
|
-
|
|
250
|
-
|
|
297
|
+
( localizeWithPath(
|
|
298
|
+
'vs/workbench/contrib/remote/common/remote.contribution',
|
|
299
|
+
'remote.autoForwardPortsSource.process',
|
|
300
|
+
"Ports will be automatically forwarded when discovered by watching for processes that are started and include a port."
|
|
301
|
+
)),
|
|
302
|
+
( localizeWithPath(
|
|
303
|
+
'vs/workbench/contrib/remote/common/remote.contribution',
|
|
304
|
+
'remote.autoForwardPortsSource.output',
|
|
305
|
+
"Ports will be automatically forwarded when discovered by reading terminal and debug output. Not all processes that use ports will print to the integrated terminal or debug console, so some ports will be missed. Ports forwarded based on output will not be \"un-forwarded\" until reload or until the port is closed by the user in the Ports view."
|
|
306
|
+
)),
|
|
307
|
+
( localizeWithPath(
|
|
308
|
+
'vs/workbench/contrib/remote/common/remote.contribution',
|
|
309
|
+
'remote.autoForwardPortsSource.hybrid',
|
|
310
|
+
"Ports will be automatically forwarded when discovered by reading terminal and debug output. Not all processes that use ports will print to the integrated terminal or debug console, so some ports will be missed. Ports will be \"un-forwarded\" by watching for processes that listen on that port to be terminated."
|
|
311
|
+
))
|
|
251
312
|
],
|
|
252
313
|
default: 'process'
|
|
253
314
|
},
|
|
254
315
|
'remote.forwardOnOpen': {
|
|
255
316
|
type: 'boolean',
|
|
256
|
-
description: localizeWithPath(
|
|
317
|
+
description: ( localizeWithPath(
|
|
318
|
+
'vs/workbench/contrib/remote/common/remote.contribution',
|
|
319
|
+
'remote.forwardOnClick',
|
|
320
|
+
"Controls whether local URLs with a port will be forwarded when opened from the terminal and the debug console."
|
|
321
|
+
)),
|
|
257
322
|
default: true
|
|
258
323
|
},
|
|
259
324
|
'remote.portsAttributes': {
|
|
@@ -261,52 +326,116 @@ const extensionKindSchema = {
|
|
|
261
326
|
patternProperties: {
|
|
262
327
|
'(^\\d+(-\\d+)?$)|(.+)': {
|
|
263
328
|
type: 'object',
|
|
264
|
-
description:
|
|
329
|
+
description: ( localizeWithPath(
|
|
330
|
+
'vs/workbench/contrib/remote/common/remote.contribution',
|
|
331
|
+
'remote.portsAttributes.port',
|
|
332
|
+
"A port, range of ports (ex. \"40000-55000\"), host and port (ex. \"db:1234\"), or regular expression (ex. \".+\\\\/server.js\"). For a port number or range, the attributes will apply to that port number or range of port numbers. Attributes which use a regular expression will apply to ports whose associated process command line matches the expression."
|
|
333
|
+
)),
|
|
265
334
|
properties: {
|
|
266
335
|
'onAutoForward': {
|
|
267
336
|
type: 'string',
|
|
268
337
|
enum: ['notify', 'openBrowser', 'openBrowserOnce', 'openPreview', 'silent', 'ignore'],
|
|
269
338
|
enumDescriptions: [
|
|
270
|
-
localizeWithPath(
|
|
271
|
-
|
|
272
|
-
|
|
273
|
-
|
|
274
|
-
|
|
275
|
-
localizeWithPath(
|
|
339
|
+
( localizeWithPath(
|
|
340
|
+
'vs/workbench/contrib/remote/common/remote.contribution',
|
|
341
|
+
'remote.portsAttributes.notify',
|
|
342
|
+
"Shows a notification when a port is automatically forwarded."
|
|
343
|
+
)),
|
|
344
|
+
( localizeWithPath(
|
|
345
|
+
'vs/workbench/contrib/remote/common/remote.contribution',
|
|
346
|
+
'remote.portsAttributes.openBrowser',
|
|
347
|
+
"Opens the browser when the port is automatically forwarded. Depending on your settings, this could open an embedded browser."
|
|
348
|
+
)),
|
|
349
|
+
( localizeWithPath(
|
|
350
|
+
'vs/workbench/contrib/remote/common/remote.contribution',
|
|
351
|
+
'remote.portsAttributes.openBrowserOnce',
|
|
352
|
+
"Opens the browser when the port is automatically forwarded, but only the first time the port is forward during a session. Depending on your settings, this could open an embedded browser."
|
|
353
|
+
)),
|
|
354
|
+
( localizeWithPath(
|
|
355
|
+
'vs/workbench/contrib/remote/common/remote.contribution',
|
|
356
|
+
'remote.portsAttributes.openPreview',
|
|
357
|
+
"Opens a preview in the same window when the port is automatically forwarded."
|
|
358
|
+
)),
|
|
359
|
+
( localizeWithPath(
|
|
360
|
+
'vs/workbench/contrib/remote/common/remote.contribution',
|
|
361
|
+
'remote.portsAttributes.silent',
|
|
362
|
+
"Shows no notification and takes no action when this port is automatically forwarded."
|
|
363
|
+
)),
|
|
364
|
+
( localizeWithPath(
|
|
365
|
+
'vs/workbench/contrib/remote/common/remote.contribution',
|
|
366
|
+
'remote.portsAttributes.ignore',
|
|
367
|
+
"This port will not be automatically forwarded."
|
|
368
|
+
))
|
|
276
369
|
],
|
|
277
|
-
description: localizeWithPath(
|
|
370
|
+
description: ( localizeWithPath(
|
|
371
|
+
'vs/workbench/contrib/remote/common/remote.contribution',
|
|
372
|
+
'remote.portsAttributes.onForward',
|
|
373
|
+
"Defines the action that occurs when the port is discovered for automatic forwarding"
|
|
374
|
+
)),
|
|
278
375
|
default: 'notify'
|
|
279
376
|
},
|
|
280
377
|
'elevateIfNeeded': {
|
|
281
378
|
type: 'boolean',
|
|
282
|
-
description:
|
|
379
|
+
description: ( localizeWithPath(
|
|
380
|
+
'vs/workbench/contrib/remote/common/remote.contribution',
|
|
381
|
+
'remote.portsAttributes.elevateIfNeeded',
|
|
382
|
+
"Automatically prompt for elevation (if needed) when this port is forwarded. Elevate is required if the local port is a privileged port."
|
|
383
|
+
)),
|
|
283
384
|
default: false
|
|
284
385
|
},
|
|
285
386
|
'label': {
|
|
286
387
|
type: 'string',
|
|
287
|
-
description: localizeWithPath(
|
|
288
|
-
|
|
388
|
+
description: ( localizeWithPath(
|
|
389
|
+
'vs/workbench/contrib/remote/common/remote.contribution',
|
|
390
|
+
'remote.portsAttributes.label',
|
|
391
|
+
"Label that will be shown in the UI for this port."
|
|
392
|
+
)),
|
|
393
|
+
default: ( localizeWithPath(
|
|
394
|
+
'vs/workbench/contrib/remote/common/remote.contribution',
|
|
395
|
+
'remote.portsAttributes.labelDefault',
|
|
396
|
+
"Application"
|
|
397
|
+
))
|
|
289
398
|
},
|
|
290
399
|
'requireLocalPort': {
|
|
291
400
|
type: 'boolean',
|
|
292
|
-
markdownDescription: localizeWithPath(
|
|
401
|
+
markdownDescription: ( localizeWithPath(
|
|
402
|
+
'vs/workbench/contrib/remote/common/remote.contribution',
|
|
403
|
+
'remote.portsAttributes.requireLocalPort',
|
|
404
|
+
"When true, a modal dialog will show if the chosen local port isn't used for forwarding."
|
|
405
|
+
)),
|
|
293
406
|
default: false
|
|
294
407
|
},
|
|
295
408
|
'protocol': {
|
|
296
409
|
type: 'string',
|
|
297
410
|
enum: ['http', 'https'],
|
|
298
|
-
description: localizeWithPath(
|
|
411
|
+
description: ( localizeWithPath(
|
|
412
|
+
'vs/workbench/contrib/remote/common/remote.contribution',
|
|
413
|
+
'remote.portsAttributes.protocol',
|
|
414
|
+
"The protocol to use when forwarding this port."
|
|
415
|
+
))
|
|
299
416
|
}
|
|
300
417
|
},
|
|
301
418
|
default: {
|
|
302
|
-
'label': localizeWithPath(
|
|
419
|
+
'label': ( localizeWithPath(
|
|
420
|
+
'vs/workbench/contrib/remote/common/remote.contribution',
|
|
421
|
+
'remote.portsAttributes.labelDefault',
|
|
422
|
+
"Application"
|
|
423
|
+
)),
|
|
303
424
|
'onAutoForward': 'notify'
|
|
304
425
|
}
|
|
305
426
|
}
|
|
306
427
|
},
|
|
307
|
-
markdownDescription: localizeWithPath(
|
|
428
|
+
markdownDescription: ( localizeWithPath(
|
|
429
|
+
'vs/workbench/contrib/remote/common/remote.contribution',
|
|
430
|
+
'remote.portsAttributes',
|
|
431
|
+
"Set properties that are applied when a specific port number is forwarded. For example:\n\n```\n\"3000\": {\n \"label\": \"Application\"\n},\n\"40000-55000\": {\n \"onAutoForward\": \"ignore\"\n},\n\".+\\\\/server.js\": {\n \"onAutoForward\": \"openPreview\"\n}\n```"
|
|
432
|
+
)),
|
|
308
433
|
defaultSnippets: [{ body: { '${1:3000}': { label: '${2:Application}', onAutoForward: 'openPreview' } } }],
|
|
309
|
-
errorMessage: localizeWithPath(
|
|
434
|
+
errorMessage: ( localizeWithPath(
|
|
435
|
+
'vs/workbench/contrib/remote/common/remote.contribution',
|
|
436
|
+
'remote.portsAttributes.patternError',
|
|
437
|
+
"Must be a port number, range of port numbers, or regular expression."
|
|
438
|
+
)),
|
|
310
439
|
additionalProperties: false,
|
|
311
440
|
default: {
|
|
312
441
|
'443': {
|
|
@@ -324,45 +453,98 @@ const extensionKindSchema = {
|
|
|
324
453
|
type: 'string',
|
|
325
454
|
enum: ['notify', 'openBrowser', 'openPreview', 'silent', 'ignore'],
|
|
326
455
|
enumDescriptions: [
|
|
327
|
-
localizeWithPath(
|
|
328
|
-
|
|
329
|
-
|
|
330
|
-
|
|
331
|
-
|
|
456
|
+
( localizeWithPath(
|
|
457
|
+
'vs/workbench/contrib/remote/common/remote.contribution',
|
|
458
|
+
'remote.portsAttributes.notify',
|
|
459
|
+
"Shows a notification when a port is automatically forwarded."
|
|
460
|
+
)),
|
|
461
|
+
( localizeWithPath(
|
|
462
|
+
'vs/workbench/contrib/remote/common/remote.contribution',
|
|
463
|
+
'remote.portsAttributes.openBrowser',
|
|
464
|
+
"Opens the browser when the port is automatically forwarded. Depending on your settings, this could open an embedded browser."
|
|
465
|
+
)),
|
|
466
|
+
( localizeWithPath(
|
|
467
|
+
'vs/workbench/contrib/remote/common/remote.contribution',
|
|
468
|
+
'remote.portsAttributes.openPreview',
|
|
469
|
+
"Opens a preview in the same window when the port is automatically forwarded."
|
|
470
|
+
)),
|
|
471
|
+
( localizeWithPath(
|
|
472
|
+
'vs/workbench/contrib/remote/common/remote.contribution',
|
|
473
|
+
'remote.portsAttributes.silent',
|
|
474
|
+
"Shows no notification and takes no action when this port is automatically forwarded."
|
|
475
|
+
)),
|
|
476
|
+
( localizeWithPath(
|
|
477
|
+
'vs/workbench/contrib/remote/common/remote.contribution',
|
|
478
|
+
'remote.portsAttributes.ignore',
|
|
479
|
+
"This port will not be automatically forwarded."
|
|
480
|
+
))
|
|
332
481
|
],
|
|
333
|
-
description: localizeWithPath(
|
|
482
|
+
description: ( localizeWithPath(
|
|
483
|
+
'vs/workbench/contrib/remote/common/remote.contribution',
|
|
484
|
+
'remote.portsAttributes.onForward',
|
|
485
|
+
"Defines the action that occurs when the port is discovered for automatic forwarding"
|
|
486
|
+
)),
|
|
334
487
|
default: 'notify'
|
|
335
488
|
},
|
|
336
489
|
'elevateIfNeeded': {
|
|
337
490
|
type: 'boolean',
|
|
338
|
-
description:
|
|
491
|
+
description: ( localizeWithPath(
|
|
492
|
+
'vs/workbench/contrib/remote/common/remote.contribution',
|
|
493
|
+
'remote.portsAttributes.elevateIfNeeded',
|
|
494
|
+
"Automatically prompt for elevation (if needed) when this port is forwarded. Elevate is required if the local port is a privileged port."
|
|
495
|
+
)),
|
|
339
496
|
default: false
|
|
340
497
|
},
|
|
341
498
|
'label': {
|
|
342
499
|
type: 'string',
|
|
343
|
-
description: localizeWithPath(
|
|
344
|
-
|
|
500
|
+
description: ( localizeWithPath(
|
|
501
|
+
'vs/workbench/contrib/remote/common/remote.contribution',
|
|
502
|
+
'remote.portsAttributes.label',
|
|
503
|
+
"Label that will be shown in the UI for this port."
|
|
504
|
+
)),
|
|
505
|
+
default: ( localizeWithPath(
|
|
506
|
+
'vs/workbench/contrib/remote/common/remote.contribution',
|
|
507
|
+
'remote.portsAttributes.labelDefault',
|
|
508
|
+
"Application"
|
|
509
|
+
))
|
|
345
510
|
},
|
|
346
511
|
'requireLocalPort': {
|
|
347
512
|
type: 'boolean',
|
|
348
|
-
markdownDescription: localizeWithPath(
|
|
513
|
+
markdownDescription: ( localizeWithPath(
|
|
514
|
+
'vs/workbench/contrib/remote/common/remote.contribution',
|
|
515
|
+
'remote.portsAttributes.requireLocalPort',
|
|
516
|
+
"When true, a modal dialog will show if the chosen local port isn't used for forwarding."
|
|
517
|
+
)),
|
|
349
518
|
default: false
|
|
350
519
|
},
|
|
351
520
|
'protocol': {
|
|
352
521
|
type: 'string',
|
|
353
522
|
enum: ['http', 'https'],
|
|
354
|
-
description: localizeWithPath(
|
|
523
|
+
description: ( localizeWithPath(
|
|
524
|
+
'vs/workbench/contrib/remote/common/remote.contribution',
|
|
525
|
+
'remote.portsAttributes.protocol',
|
|
526
|
+
"The protocol to use when forwarding this port."
|
|
527
|
+
))
|
|
355
528
|
}
|
|
356
529
|
},
|
|
357
530
|
defaultSnippets: [{ body: { onAutoForward: 'ignore' } }],
|
|
358
|
-
markdownDescription: localizeWithPath(
|
|
531
|
+
markdownDescription: ( localizeWithPath(
|
|
532
|
+
'vs/workbench/contrib/remote/common/remote.contribution',
|
|
533
|
+
'remote.portsAttributes.defaults',
|
|
534
|
+
"Set default properties that are applied to all ports that don't get properties from the setting {0}. For example:\n\n```\n{\n \"onAutoForward\": \"ignore\"\n}\n```",
|
|
535
|
+
'`#remote.portsAttributes#`'
|
|
536
|
+
)),
|
|
359
537
|
additionalProperties: false
|
|
360
538
|
},
|
|
361
539
|
'remote.localPortHost': {
|
|
362
540
|
type: 'string',
|
|
363
541
|
enum: ['localhost', 'allInterfaces'],
|
|
364
542
|
default: 'localhost',
|
|
365
|
-
description: localizeWithPath(
|
|
543
|
+
description: ( localizeWithPath(
|
|
544
|
+
'vs/workbench/contrib/remote/common/remote.contribution',
|
|
545
|
+
'remote.localPortHost',
|
|
546
|
+
"Specifies the local host name that will be used for port forwarding."
|
|
547
|
+
))
|
|
366
548
|
}
|
|
367
549
|
}
|
|
368
550
|
});
|
|
@@ -44,11 +44,24 @@ let RemoteConnectionFailureNotificationContribution = class RemoteConnectionFail
|
|
|
44
44
|
async _presentConnectionError(err) {
|
|
45
45
|
await this._dialogService.prompt({
|
|
46
46
|
type: Severity.Error,
|
|
47
|
-
message: nls.localizeWithPath(
|
|
48
|
-
|
|
47
|
+
message: ( nls.localizeWithPath(
|
|
48
|
+
'vs/workbench/services/remote/browser/remoteAgentService',
|
|
49
|
+
'connectionError',
|
|
50
|
+
"An unexpected error occurred that requires a reload of this page."
|
|
51
|
+
)),
|
|
52
|
+
detail: ( nls.localizeWithPath(
|
|
53
|
+
'vs/workbench/services/remote/browser/remoteAgentService',
|
|
54
|
+
'connectionErrorDetail',
|
|
55
|
+
"The workbench failed to connect to the server (Error: {0})",
|
|
56
|
+
err ? err.message : ''
|
|
57
|
+
)),
|
|
49
58
|
buttons: [
|
|
50
59
|
{
|
|
51
|
-
label: nls.localizeWithPath(
|
|
60
|
+
label: ( nls.localizeWithPath(
|
|
61
|
+
'vs/workbench/services/remote/browser/remoteAgentService',
|
|
62
|
+
{ key: 'reload', comment: ['&& denotes a mnemonic'] },
|
|
63
|
+
"&&Reload"
|
|
64
|
+
)),
|
|
52
65
|
run: () => this._hostService.reload()
|
|
53
66
|
}
|
|
54
67
|
]
|