diff --git a/src/vs/workbench/contrib/remote/browser/remoteExplorer.ts b/src/vs/workbench/contrib/remote/browser/remoteExplorer.ts index 34099db8509..a41b38ef4db 100644 --- a/src/vs/workbench/contrib/remote/browser/remoteExplorer.ts +++ b/src/vs/workbench/contrib/remote/browser/remoteExplorer.ts @@ -293,7 +293,7 @@ class OnAutoForwardedAction extends Disposable { } private basicMessage(tunnel: RemoteTunnel) { - return nls.localize('remote.tunnelsView.automaticForward', "Your service running on port {0} is available. ", + return nls.localize('remote.tunnelsView.automaticForward', "Your application running on port {0} is available. ", tunnel.tunnelRemotePort); } diff --git a/src/vs/workbench/contrib/remote/common/remote.contribution.ts b/src/vs/workbench/contrib/remote/common/remote.contribution.ts index 707332a5ec5..c702058db01 100644 --- a/src/vs/workbench/contrib/remote/common/remote.contribution.ts +++ b/src/vs/workbench/contrib/remote/common/remote.contribution.ts @@ -175,21 +175,21 @@ Registry.as(ConfigurationExtensions.Configuration) 'label': { type: 'string', description: localize('remote.portsAttributes.label', "Label that will be shown in the UI for this port."), - default: localize('remote.portsAttributes.labelDefault', "Labeled Port") + default: localize('remote.portsAttributes.labelDefault', "Application") } }, default: { - 'label': localize('remote.portsAttributes.labelDefault', "Labeled Port"), + 'label': localize('remote.portsAttributes.labelDefault', "Application"), 'onAutoForward': 'notify' } } }, - markdownDescription: localize('remote.portsAttributes', "Set properties that are applied when a specific port number is forwarded. For example:\n\n```\n\"3000\": {\n \"label\": \"Labeled Port\"\n},\n\"40000-55000\": {\n \"onAutoForward\": \"ignore\"\n},\n\".+\\\\/server.js\": {\n \"onAutoForward\": \"openPreview\"\n}\n```"), - defaultSnippets: [{ body: { '${1:3000}': { label: '${2:My Port}', onAutoForward: 'openPreview' } } }], + markdownDescription: localize('remote.portsAttributes', "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```"), + defaultSnippets: [{ body: { '${1:3000}': { label: '${2:Application}', onAutoForward: 'openPreview' } } }], errorMessage: localize('remote.portsAttributes.patternError', "Must be a port number, range of port numbers, or regular expression."), additionalProperties: false }, - 'remote.portsAttributes.defaults': { + 'remote.portsAttributes.unconfigured': { type: 'object', properties: { 'onAutoForward': { @@ -213,13 +213,11 @@ Registry.as(ConfigurationExtensions.Configuration) 'label': { type: 'string', description: localize('remote.portsAttributes.label', "Label that will be shown in the UI for this port."), - default: localize('remote.portsAttributes.labelDefault', "Labeled Port") + default: localize('remote.portsAttributes.labelDefault', "Application") } }, - default: { - 'onAutoForward': 'notify' - }, - markdownDescription: localize('remote.portsAttributes.defaults', "Set default properties that are applied to all ports that don't get properties from the setting `remote.portsAttributes`. For example:\n\n```\n{\n \"onAutoForward\": \"notify\"\n}\n```"), + defaultSnippets: [{ body: { onAutoForward: 'ignore' } }], + markdownDescription: localize('remote.portsAttributes.defaults', "Set default properties that are applied to all ports that don't get properties from the setting `remote.portsAttributes`. For example:\n\n```\n{\n \"onAutoForward\": \"ignore\"\n}\n```"), additionalProperties: false } } diff --git a/src/vs/workbench/services/remote/common/remoteExplorerService.ts b/src/vs/workbench/services/remote/common/remoteExplorerService.ts index 4bb2f960c50..6b2af5bcdb5 100644 --- a/src/vs/workbench/services/remote/common/remoteExplorerService.ts +++ b/src/vs/workbench/services/remote/common/remoteExplorerService.ts @@ -154,7 +154,7 @@ interface PortAttributes extends Attributes { export class PortsAttributes extends Disposable { private static SETTING = 'remote.portsAttributes'; - private static DEFAULTS = 'remote.portsAttributes.defaults'; + private static DEFAULTS = 'remote.portsAttributes.unconfigured'; private static RANGE = /^(\d+)\-(\d+)$/; private portsAttributes: PortAttributes[] = []; private defaultPortAttributes: Attributes | undefined;