Ignore objectscript.conn.docker-compose when running in dev container

Author: gjsjohnmurray

src/api/index.ts

@@ -177,10 +177,12 @@ export class AtelierAPI {
     if (config("intersystems.servers").has(serverName)) {
       this.externalServer = true;
     } else if (
-      !conn["docker-compose"] &&
+      !(conn["docker-compose"] && extensionContext.extension.extensionKind !== vscode.ExtensionKind.Workspace) &&
       conn.server &&
       config("intersystems.servers", workspaceFolderName).has(conn.server)
     ) {
+      // Connect to the server named in objectscript.conn
+      // unless a docker-compose conn object exists and this extension isn't running remotely (i.e. within the dev container)
       serverName = conn.server;
     } else {
       serverName = "";

src/utils/index.ts

@@ -4,7 +4,7 @@ import { R_OK } from "constants";
 import * as url from "url";
 import { exec } from "child_process";
 import * as vscode from "vscode";
-import { config, schemas, workspaceState, terminals, extensionId } from "../extension";
+import { config, schemas, workspaceState, terminals, extensionId, extensionContext } from "../extension";
 import { getCategory } from "../commands/export";
 const packageJson = vscode.extensions.getExtension(extensionId).packageJSON;
 
@@ -403,11 +403,18 @@ export function notNull(el: any): boolean {
 }
 
 export async function portFromDockerCompose(): Promise<{ port: number; docker: boolean; service?: string }> {
+  // When running remotely, behave as if there is no docker-compose object within objectscript.conn
+  if (extensionContext.extension.extensionKind === vscode.ExtensionKind.Workspace) {
+    return { docker: false, port: null };
+  }
+
+  // Seek a valid docker-compose object within objectscript.conn
   const { "docker-compose": dockerCompose = {} } = config("conn");
   const { service, file = "docker-compose.yml", internalPort = 52773, envFile } = dockerCompose;
   if (!internalPort || !file || !service || service === "") {
     return { docker: false, port: null };
   }
+
   const result = { port: null, docker: true, service };
   const workspaceFolderPath = uriOfWorkspaceFolder().fsPath;
   const workspaceRootPath = vscode.workspace.workspaceFolders[0].uri.fsPath;