Merge branch 'intersystems-community:master' into colorize-output

Author: a-boertien

docs/Configuration.md

@@ -6,7 +6,10 @@ nav_order: 4
 ---
 # Configuration 
 
-VS Code settings enable you to customize various aspects of its function. The InterSystems extensions provide settings used to configure VS Code for ObjectScript development.
+VS Code settings enable you to customize various aspects of its function. The InterSystems extensions provide settings used to configure VS Code for ObjectScript development. You may find these videos from InterSystems Learning Services useful for creating a configuration that works best for you:
+
+- [Working with ObjectScript Classes in VS Code for Client-Side Editing](https://learning.intersystems.com/course/view.php?id=1778&ssoPass=1)
+- [Configuring VS Code Workspaces for Multiple ObjectScript Connections](https://learning.intersystems.com/course/view.php?id=1783&ssoPass=1)
 
 {: #code-workspaces}
 ## VS Code Workspaces 

docs/RunDebug.md

@@ -11,6 +11,8 @@ The InterSystems ObjectScript Extension provides support for ObjectScript debugg
 - [Debugging Intro Video](https://code.visualstudio.com/docs/introvideos/debugging)
 - [Debugging User Guide](https://code.visualstudio.com/docs/editor/debugging)
 
+Also, InterSystems Learning Services has produced [a short video](https://learning.intersystems.com/course/view.php?id=1795&ssoPass=1) which walks through the steps in this documentation page that you may find useful.
+
 ## Debug Configurations
 
 In order to run or debug an ObjectScript class or routine or attach to a running process, you must create a debug configuration. Some other languages default to running the currently active file, but to run ObjectScript, you must specify the routine or ClassMethod to use or the running process to attach to.

package-lock.json

@@ -1194,7 +1194,7 @@
     "glob": "^7.1.6",
     "iconv-lite": "^0.6.0",
     "mkdirp": "^1.0.4",
-    "node-fetch": "3.0.0",
+    "node-fetch": "3.1.1",
     "vscode-cache": "^0.3.0",
     "vscode-debugadapter": "^1.41.0",
     "vscode-debugprotocol": "^1.41.0",

package.json

@@ -192,7 +192,7 @@ export class FileSystemProvider implements vscode.FileSystemProvider {
         // Instead we simply return as though we wrote it successfully.
         // The actual writing is done by our workspace.onDidSaveTextDocument handler.
         // But first check cases for which we should fail the write and leave the document dirty if changed.
-        if (fileName.split(".").pop().toLowerCase() === "cls") {
+        if (!csp && fileName.split(".").pop().toLowerCase() === "cls") {
           // Check if the class is deployed
           api.actionIndex([fileName]).then((result) => {
             if (result.result.content[0].content.depl) {

src/providers/FileSystemProvider/FileSystemProvider.ts

@@ -382,7 +382,8 @@ export async function portFromDockerCompose(): Promise<{ port: number; docker: b
   }
 
   const envFileParam = envFile ? `--env-file ${envFile}` : "";
-  const cmd = `docker-compose -f ${file} ${envFileParam} `;
+  const exe = process.platform === "win32" ? "docker-compose.exe" : "docker-compose";
+  const cmd = `${exe} -f ${file} ${envFileParam} `;
 
   return new Promise((resolve, reject) => {
     exec(`${cmd} ps --services --filter status=running`, { cwd }, (error, stdout) => {
@@ -415,7 +416,8 @@ export async function terminalWithDocker(): Promise<vscode.Terminal> {
   const terminalName = `ObjectScript:${workspace}`;
   let terminal = terminals.find((t) => t.name == terminalName && t.exitStatus == undefined);
   if (!terminal) {
-    terminal = vscode.window.createTerminal(terminalName, "docker-compose", [
+    const exe = process.platform === "win32" ? "docker-compose.exe" : "docker-compose";
+    terminal = vscode.window.createTerminal(terminalName, exe, [
       "-f",
       file,
       "exec",
@@ -439,7 +441,8 @@ export async function shellWithDocker(): Promise<vscode.Terminal> {
   const terminalName = `Shell:${workspace}`;
   let terminal = terminals.find((t) => t.name == terminalName && t.exitStatus == undefined);
   if (!terminal) {
-    terminal = vscode.window.createTerminal(terminalName, "docker-compose", ["-f", file, "exec", service, "/bin/bash"]);
+    const exe = process.platform === "win32" ? "docker-compose.exe" : "docker-compose";
+    terminal = vscode.window.createTerminal(terminalName, exe, ["-f", file, "exec", service, "/bin/bash"]);
     terminals.push(terminal);
   }
   terminal.show(true);