fix #460 don't copy user-lever conn values into folder's settings.json

gjsjohnmurray · gjsjohnmurray · commit 40fb9e8932f0 · 2020-10-31T01:09:56.000Z
diff --git a/src/commands/connectFolderToServerNamespace.ts b/src/commands/connectFolderToServerNamespace.ts
@@ -84,11 +84,8 @@ export async function connectFolderToServerNamespace(): Promise<void> {
   }
   // Update folder's config object
   const config = vscode.workspace.getConfiguration("objectscript", folder);
-  const conn: ConnSettings = config.get("conn");
-  conn.server = serverName;
-  conn.ns = namespace;
-  conn.active = true;
-  await config.update("conn", conn);
+  const conn: any = config.inspect("conn").workspaceFolderValue;
+  await config.update("conn", { ...conn, server: serverName, ns: namespace, active: true });
 }
 
 async function getServerManagerApi(): Promise<any> {

Original file line number	Diff line number	Diff line change
`@@ -84,11 +84,8 @@ export async function connectFolderToServerNamespace(): Promise<void> {`
`84`	`84`	`}`
`85`	`85`	`// Update folder's config object`
`86`	`86`	`const config = vscode.workspace.getConfiguration("objectscript", folder);`
`87`		`- const conn: ConnSettings = config.get("conn");`
`88`		`- conn.server = serverName;`
`89`		`- conn.ns = namespace;`
`90`		`- conn.active = true;`
`91`		`- await config.update("conn", conn);`
	`87`	`+ const conn: any = config.inspect("conn").workspaceFolderValue;`
	`88`	`+ await config.update("conn", { ...conn, server: serverName, ns: namespace, active: true });`
`92`	`89`	`}`
`93`	`90`
`94`	`91`	`async function getServerManagerApi(): Promise<any> {`