Merge pull request #899 from gjsjohnmurray/fix-898

Give `docker-compose` setting priority over `server` one (fix #898)

Author: gjsjohnmurray

src/api/index.ts

@@ -176,7 +176,11 @@ export class AtelierAPI {
     let serverName = workspaceFolderName.toLowerCase();
     if (config("intersystems.servers").has(serverName)) {
       this.externalServer = true;
-    } else if (conn.server && config("intersystems.servers", workspaceFolderName).has(conn.server)) {
+    } else if (
+      !conn["docker-compose"] &&
+      conn.server &&
+      config("intersystems.servers", workspaceFolderName).has(conn.server)
+    ) {
       serverName = conn.server;
     } else {
       serverName = "";