Skip to content

Commit 7cc4f2f

Browse files
committed
Fetch keychain-stored password when objectscript.conn.server is specified
1 parent 39a5131 commit 7cc4f2f

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

src/extension.ts

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -388,9 +388,12 @@ export async function activate(context: vscode.ExtensionContext): Promise<void>
388388
});
389389
toCheck.forEach(async function (uri, configName) {
390390
if (serverManagerApi && serverManagerApi.getServerSpec) {
391-
const connSpec = await serverManagerApi.getServerSpec(configName);
392-
if (connSpec) {
393-
resolvedConnSpecs.set(configName, connSpec);
391+
const serverName = uri.scheme === "file" ? config("conn", configName).server : configName;
392+
if (serverName && serverName !== "" && !resolvedConnSpecs.has(serverName)) {
393+
const connSpec = await serverManagerApi.getServerSpec(serverName);
394+
if (connSpec) {
395+
resolvedConnSpecs.set(serverName, connSpec);
396+
}
394397
}
395398
}
396399
checkConnection(true, uri);

0 commit comments

Comments
 (0)