Skip to content

Commit

Permalink
SNAPSHOT.2
Browse files Browse the repository at this point in the history
  • Loading branch information
gjsjohnmurray committed Apr 14, 2021
1 parent cec8d85 commit 6cd4792
Show file tree
Hide file tree
Showing 5 changed files with 404 additions and 60 deletions.
155 changes: 149 additions & 6 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 7 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "servermanager",
"displayName": "InterSystems Server Manager",
"version": "2.0.0-SNAPSHOT.1",
"version": "2.0.0-SNAPSHOT.2",
"publisher": "intersystems-community",
"description": "Helper extension for defining connections to InterSystems servers.",
"repository": {
Expand Down Expand Up @@ -41,7 +41,10 @@
},
"dependencies": {
"@types/vscode": "^1.55.0",
"node-cmd": "^4.0.0"
"axios": "^0.21.1",
"axios-cookiejar-support": "^1.0.1",
"node-cmd": "^4.0.0",
"tough-cookie": "^4.0.0"
},
"devDependencies": {
"@types/glob": "^7.1.1",
Expand Down Expand Up @@ -289,7 +292,7 @@
"command": "intersystems-community.servermanager.resetIconColor",
"title": "default"
}
],
],
"submenus": [
{
"id": "intersystems-community.servermanager.iconColor",
Expand Down Expand Up @@ -388,6 +391,7 @@
},
{
"submenu": "intersystems-community.servermanager.iconColor",
"when": "view == intersystems-community_servermanager && viewItem =~ /\\.server\\./",
"group": "color"
},
{
Expand Down
16 changes: 4 additions & 12 deletions src/extension.ts
Original file line number Diff line number Diff line change
Expand Up @@ -191,15 +191,7 @@ export function activate(context: vscode.ExtensionContext) {
// Expose our API
let api = {
async pickServer(scope?: vscode.ConfigurationScope, options: vscode.QuickPickOptions = {}): Promise<string | undefined> {
const name = await pickServer(scope, options);

/*
if (name) {
view.addToRecents(name);
}
*/

return name;
return await pickServer(scope, options);
},
getServerNames(scope?: vscode.ConfigurationScope): ServerName[] {
return getServerNames(scope);
Expand All @@ -209,10 +201,10 @@ export function activate(context: vscode.ExtensionContext) {
return getServerSummary(name, scope);
},

async getServerSpec(name: string, scope?: vscode.ConfigurationScope, flushCredentialCache: boolean = false): Promise<ServerSpec | undefined> {
async getServerSpec(name: string, scope?: vscode.ConfigurationScope, flushCredentialCache: boolean = false, options?: { hideFromRecents?: boolean}): Promise<ServerSpec | undefined> {
const spec = await getServerSpec(name, scope, flushCredentialCache);
if (spec) {
view.addToRecents(name);
if (spec && !options?.hideFromRecents) {
await view.addToRecents(name);
}
return spec;
},
Expand Down
Loading

0 comments on commit 6cd4792

Please sign in to comment.