Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-26 11:38:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

Change portsAttributes others to be its own setting

Browse Source
This commit is contained in:
Alex Ross
2021-03-12 12:56:43 +01:00
parent 61fe79db65
commit 0b4915dcea
2 changed files with 47 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/vs/workbench/services/remote/common/remoteExplorerService.ts
View File

@@ -154,10 +154,10 @@ interface PortAttributes extends Attributes {
export class PortsAttributes extends Disposable {
private static SETTING = 'remote.portsAttributes';
private static DEFAULTS = 'remote.portsAttributes.defaults';
private static RANGE = /^(\d+)\-(\d+)$/;
private static OTHERS = 'others';
private portsAttributes: PortAttributes[] = [];
private otherPortAttributes: Attributes | undefined;
private defaultPortAttributes: Attributes | undefined;
private _onDidChangeAttributes = new Emitter<void>();
public readonly onDidChangeAttributes = this._onDidChangeAttributes.event;
@@ -241,12 +241,6 @@ export class PortsAttributes extends Disposable {
let key: number | { start: number, end: number } | RegExp | undefined = undefined;
if (Number(attributesKey)) {
key = Number(attributesKey);
} else if (attributesKey === PortsAttributes.OTHERS) {
this.otherPortAttributes = {
elevateIfNeeded: setting.elevateIfPrivileged,
onAutoForward: setting.onAutoForward,
label: setting.label
};
} else if (isString(attributesKey)) {
if (PortsAttributes.RANGE.test(attributesKey)) {
const match = (<string>attributesKey).match(PortsAttributes.RANGE);
@@ -269,6 +263,15 @@ export class PortsAttributes extends Disposable {
});
}
const defaults = <any>this.configurationService.getValue(PortsAttributes.DEFAULTS);
if (defaults) {
this.defaultPortAttributes = {
elevateIfNeeded: defaults.elevateIfNeeded,
label: defaults.label,
onAutoForward: defaults.onAutoForward
};
}
return this.sortAttributes(attributes);
}
@@ -289,7 +292,7 @@ export class PortsAttributes extends Disposable {
}
private getOtherAttributes() {
return this.otherPortAttributes;
return this.defaultPortAttributes;
}
static providedActionToAction(providedAction: ProvidedOnAutoForward | undefined) {