Support choosing settings scope for Add Server command (#274)

Author: isc-bsaviano

src/api/addServer.ts

@@ -4,6 +4,7 @@ import { getServerNames } from "./getServerNames";
 
 export async function addServer(
 	scope?: vscode.ConfigurationScope,
+	target: vscode.ConfigurationTarget = vscode.ConfigurationTarget.Global
 ): Promise<string | undefined> {
 	const serverNames = getServerNames(scope);
 	const spec: IJSONServerSpec = { webServer: { scheme: "", host: "", port: 0 } };
@@ -112,21 +113,28 @@ export async function addServer(
 									});
 									if (scheme) {
 										spec.webServer.scheme = scheme;
+										const levelStr =
+											target == vscode.ConfigurationTarget.WorkspaceFolder ? "workspace-folder" :
+												target == vscode.ConfigurationTarget.Workspace ? "workspace" :
+													"user";
 										try {
 											const config = vscode.workspace.getConfiguration(
 												"intersystems",
 												scope,
 											);
-											// For simplicity we always add to the user-level (aka Global) settings
-											const servers: any =
-												config.inspect("servers")?.globalValue || {};
+											const serversInspection = config.inspect("servers");
+											const servers = (
+												target == vscode.ConfigurationTarget.WorkspaceFolder ? serversInspection?.workspaceFolderValue :
+													target == vscode.ConfigurationTarget.Workspace ? serversInspection?.workspaceValue :
+														serversInspection?.globalValue
+											) ?? {};
 											servers[name] = spec;
-											await config.update("servers", servers, true);
-											vscode.window.showInformationMessage(`Server '${name}' stored in user-level settings.`);
+											await config.update("servers", servers, target);
+											vscode.window.showInformationMessage(`Server '${name}' stored in ${levelStr}-level settings.`);
 											return name;
 										} catch (error) {
 											vscode.window.showErrorMessage(
-												`Failed to store server '${name}' definition. Does your settings.json file contain a JSON syntax error?`,
+												`Failed to store server '${name}' definition. Does your ${levelStr}-level settings file contain a JSON syntax error?`,
 											);
 											return undefined;
 										}

src/commonActivate.ts

@@ -112,7 +112,41 @@ export function commonActivate(context: vscode.ExtensionContext, view: ServerMan
             view.refreshTree();
         }),
         vscode.commands.registerCommand(`${extensionId}.addServer`, async () => {
-            const name = await addServer();
+            let scope: vscode.ConfigurationScope | undefined;
+            let target: vscode.ConfigurationTarget | undefined;
+            if (vscode.workspace.workspaceFolders) {
+                interface SettingsScope extends vscode.QuickPickItem {
+                    scope?: vscode.ConfigurationScope;
+                    target: vscode.ConfigurationTarget;
+                }
+                const options: SettingsScope[] = [{ label: "Global", detail: "User Settings", target: vscode.ConfigurationTarget.Global }];
+                if (vscode.workspace.workspaceFile) {
+                    // The workspace is a file, so each folder may be its own option
+                    options.push(
+                        { label: "Workspace", detail: vscode.workspace.workspaceFile.toString(true), target: vscode.ConfigurationTarget.Workspace },
+                        ...vscode.workspace.workspaceFolders
+                            .filter(f => !["isfs", "isfs-readonly"].includes(f.uri.scheme))
+                            .map(f => {
+                                return { label: f.name, detail: f.uri.toString(true), scope: f, target: vscode.ConfigurationTarget.WorkspaceFolder };
+                            })
+                    );
+                } else {
+                    // The workspace is a single local folder, so that is the only other option
+                    options.push({ label: "Workspace", detail: vscode.workspace.workspaceFolders[0]?.uri.toString(true) ?? "Current folder", target: vscode.ConfigurationTarget.Workspace });
+                }
+                const choice = await vscode.window.showQuickPick(options, {
+                    ignoreFocusOut: true,
+                    title: "Pick a settngs scope in which to add the server definition"
+                });
+                if (!choice) return;
+                scope = choice.scope;
+                target = choice.target;
+            } else {
+                // No workspace is open, so global is the only option
+                scope = undefined;
+                target = vscode.ConfigurationTarget.Global;
+            }
+            const name = await addServer(scope, target);
             if (name) {
                 await view.addToRecents(name);
             }