Skip to content

Commit a3f5428

Browse files
committed
fix #32 only promote /default server to top of quickpick if explicitly set
1 parent 09ace4f commit a3f5428

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

src/api/getServerNames.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,16 @@ export function getServerNames(scope?: vscode.ConfigurationScope): ServerName[]
77
const servers = vscode.workspace.getConfiguration('intersystems', scope).get('servers');
88

99
if (typeof servers === 'object' && servers) {
10-
const defaultName: string = servers['/default'] || '';
11-
if (defaultName.length > 0 && servers[defaultName]) {
10+
const myDefault: string = vscode.workspace.getConfiguration('intersystems.servers', scope).inspect('/default')?.defaultValue ? '' : servers['/default'] || '';
11+
if (myDefault.length > 0 && servers[myDefault]) {
1212
names.push({
13-
name: defaultName,
14-
description: `${servers[defaultName].description || ''} (default)`,
15-
detail: serverDetail(servers[defaultName])
13+
name: myDefault,
14+
description: `${servers[myDefault].description || ''} (default)`,
15+
detail: serverDetail(servers[myDefault])
1616
});
1717
}
1818
for (const key in servers) {
19-
if (!key.startsWith('/') && key !== defaultName) {
19+
if (!key.startsWith('/') && key !== myDefault) {
2020
const inspected = vscode.workspace.getConfiguration('intersystems.servers', scope).inspect(key);
2121

2222
// At least in VS Code 1.49 the defaultValue unexpectedly returns undefined

0 commit comments

Comments
 (0)