Skip to content

Commit 6cd4792

Browse files
committed
SNAPSHOT.2
1 parent cec8d85 commit 6cd4792

File tree

5 files changed

+404
-60
lines changed

5 files changed

+404
-60
lines changed

package-lock.json

Lines changed: 149 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "servermanager",
33
"displayName": "InterSystems Server Manager",
4-
"version": "2.0.0-SNAPSHOT.1",
4+
"version": "2.0.0-SNAPSHOT.2",
55
"publisher": "intersystems-community",
66
"description": "Helper extension for defining connections to InterSystems servers.",
77
"repository": {
@@ -41,7 +41,10 @@
4141
},
4242
"dependencies": {
4343
"@types/vscode": "^1.55.0",
44-
"node-cmd": "^4.0.0"
44+
"axios": "^0.21.1",
45+
"axios-cookiejar-support": "^1.0.1",
46+
"node-cmd": "^4.0.0",
47+
"tough-cookie": "^4.0.0"
4548
},
4649
"devDependencies": {
4750
"@types/glob": "^7.1.1",
@@ -289,7 +292,7 @@
289292
"command": "intersystems-community.servermanager.resetIconColor",
290293
"title": "default"
291294
}
292-
],
295+
],
293296
"submenus": [
294297
{
295298
"id": "intersystems-community.servermanager.iconColor",
@@ -388,6 +391,7 @@
388391
},
389392
{
390393
"submenu": "intersystems-community.servermanager.iconColor",
394+
"when": "view == intersystems-community_servermanager && viewItem =~ /\\.server\\./",
391395
"group": "color"
392396
},
393397
{

src/extension.ts

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -191,15 +191,7 @@ export function activate(context: vscode.ExtensionContext) {
191191
// Expose our API
192192
let api = {
193193
async pickServer(scope?: vscode.ConfigurationScope, options: vscode.QuickPickOptions = {}): Promise<string | undefined> {
194-
const name = await pickServer(scope, options);
195-
196-
/*
197-
if (name) {
198-
view.addToRecents(name);
199-
}
200-
*/
201-
202-
return name;
194+
return await pickServer(scope, options);
203195
},
204196
getServerNames(scope?: vscode.ConfigurationScope): ServerName[] {
205197
return getServerNames(scope);
@@ -209,10 +201,10 @@ export function activate(context: vscode.ExtensionContext) {
209201
return getServerSummary(name, scope);
210202
},
211203

212-
async getServerSpec(name: string, scope?: vscode.ConfigurationScope, flushCredentialCache: boolean = false): Promise<ServerSpec | undefined> {
204+
async getServerSpec(name: string, scope?: vscode.ConfigurationScope, flushCredentialCache: boolean = false, options?: { hideFromRecents?: boolean}): Promise<ServerSpec | undefined> {
213205
const spec = await getServerSpec(name, scope, flushCredentialCache);
214-
if (spec) {
215-
view.addToRecents(name);
206+
if (spec && !options?.hideFromRecents) {
207+
await view.addToRecents(name);
216208
}
217209
return spec;
218210
},

0 commit comments

Comments
 (0)