20595: Support newlines in eval command expression (#15)

package.json

@@ -1,6 +1,6 @@
 {
     "name": "amalgam-lang",
-    "version": "1.3.0",
+    "version": "1.3.1",
     "type": "commonjs",
     "publisher": "howso",
     "displayName": "Amalgam Language",

src/debugger/runtime.ts

@@ -4,7 +4,7 @@ import { platform } from "os";
 import { queue, QueueObject } from "async";
 import { logger } from "../logging";
 import { InvalidRuntimeResponse, RuntimeCommandCancelled, RuntimeNotStarted } from "./errors";
-import { NotifySubject } from "./utils";
+import { NotifySubject, collapseWhitespace, prepareExpression } from "./utils";
 
 export type DataSource = "stdout" | "stderr" | "stdin";
 
@@ -399,14 +399,7 @@ export class AmalgamRuntime extends EventEmitter {
           let { value } = await this.sendCommand("pp", signal, v);
           if (value != null) {
             // Get rid of excess whitespace and newlines
-            value = value.split("\n").reduce((accumulator, line) => {
-              const trimmedLine = line.trim();
-              if (trimmedLine) {
-                if (accumulator) accumulator += " ";
-                accumulator += trimmedLine;
-              }
-              return accumulator;
-            }, "");
+            value = collapseWhitespace(value);
           }
           return new RuntimeVariable(v, value);
         })
@@ -481,7 +474,7 @@ export class AmalgamRuntime extends EventEmitter {
         break;
     }
     if (command !== "") {
-      await this.sendCommand("eval", command);
+      await this.sendCommand("eval", prepareExpression(command));
     }
   }
 
@@ -525,7 +518,7 @@ export class AmalgamRuntime extends EventEmitter {
    * @returns The expression result.
    */
   public async evaluate(expression: string): Promise<RuntimeVariable> {
-    const { value } = await this.sendCommand("eval", expression);
+    const { value } = await this.sendCommand("eval", prepareExpression(expression));
     return new RuntimeVariable("eval", value);
   }
 

src/debugger/utils/index.ts

@@ -2,6 +2,11 @@ import { homedir } from "os";
 export * from "./execute";
 export * from "./notify";
 
+/**
+ * Expand user home in filepath to absolute filepath.
+ * @param filePath The filepath to expand.
+ * @returns The expanded filepath.
+ */
 export function expandUserHome(filePath: string): string {
   if (!filePath || typeof filePath !== "string") {
     return "";
@@ -13,3 +18,40 @@ export function expandUserHome(filePath: string): string {
 
   return filePath;
 }
+
+/**
+ * Collapse newlines and excess whitespace from value.
+ * @param value The value to collapse.
+ * @returns The modified value.
+ */
+export function collapseWhitespace(value: string): string {
+  return value.split("\n").reduce((accumulator, line) => {
+    const trimmedLine = line.trim();
+    if (trimmedLine) {
+      if (accumulator) accumulator += " ";
+      accumulator += trimmedLine;
+    }
+    return accumulator;
+  }, "");
+}
+
+/**
+ * Prepare an expression before evaluation.
+ * @param expression The expression to prepare.
+ * @returns The modified expression.
+ */
+export function prepareExpression(expression: string): string {
+  return expression.split("\n").reduce((accumulator, line) => {
+    let trimmedLine = line.trim();
+    const commentIndex = trimmedLine.indexOf(";");
+    if (commentIndex != -1) {
+      // Remove comments
+      trimmedLine = trimmedLine.substring(0, commentIndex);
+    }
+    if (trimmedLine) {
+      if (accumulator) accumulator += " ";
+      accumulator += trimmedLine;
+    }
+    return accumulator;
+  }, "");
+}