feat: build commands added to document header (#757)

Dotneteer · Apr 21, 2024 · 97e3c00 · 97e3c00
1 parent ef66dc8
commit 97e3c00
Show file tree

Hide file tree

Showing 21 changed files with 1,487 additions and 214 deletions.
diff --git a/src/common/ksx/eval-tree-async.ts b/src/common/ksx/eval-tree-async.ts
diff --git a/src/common/ksx/process-statement-async.ts b/src/common/ksx/process-statement-async.ts
@@ -60,8 +60,7 @@ export type OnStatementCompletedCallback =
 export async function processStatementQueueAsync (
   statements: Statement[],
   evalContext: EvaluationContext,
-  thread?: LogicalThread,
-  onStatementCompleted?: OnStatementCompletedCallback
+  thread?: LogicalThread
 ): Promise<QueueInfo> {
   if (!thread) {
     // --- Create the main thread for the queue
@@ -103,8 +102,7 @@ export async function processStatementQueueAsync (
       outcome = await processStatementAsync(
         queueItem!.statement,
         evalContext,
-        thread,
-        onStatementCompleted
+        thread
       );
     } catch (err) {
       if (thread.tryBlocks && thread.tryBlocks.length > 0) {
@@ -150,8 +148,6 @@ export async function processStatementQueueAsync (
       }
     }
 
-    await onStatementCompleted?.(evalContext, queueItem!.statement);
-
     // --- Provide diagnostics
     if (queue.length > diagInfo.maxQueueLength) {
       diagInfo.maxQueueLength = queue.length;
@@ -180,8 +176,7 @@ export async function processStatementQueueAsync (
 async function processStatementAsync (
   statement: Statement,
   evalContext: EvaluationContext,
-  thread: LogicalThread,
-  onStatementCompleted: OnStatementCompletedCallback
+  thread: LogicalThread
 ): Promise<ProcessOutcome> {
   // --- These items should be put in the statement queue after return
   let toUnshift: StatementQueueItem[] = [];
@@ -259,7 +254,6 @@ async function processStatementAsync (
         statement.expression,
         evalContext,
         thread,
-        onStatementCompleted
       );
       if (thread.blocks && thread.blocks.length !== 0) {
         thread.blocks[thread.blocks.length - 1].returnValue = statementValue;
@@ -271,7 +265,6 @@ async function processStatementAsync (
       const arrowFuncValue = await executeArrowExpression(
         statement.expression,
         evalContext,
-        onStatementCompleted,
         thread,
         ...(evalContext.eventArgs ?? [])
       );
@@ -290,7 +283,6 @@ async function processStatementAsync (
         block,
         evalContext,
         thread,
-        onStatementCompleted,
         statement.declarations
       );
       break;
@@ -306,7 +298,6 @@ async function processStatementAsync (
         block,
         evalContext,
         thread,
-        onStatementCompleted,
         statement.declarations,
         true
       );
@@ -319,7 +310,6 @@ async function processStatementAsync (
         statement.condition,
         evalContext,
         thread,
-        onStatementCompleted
       ));
       if (condition) {
         toUnshift = mapToItem(statement.thenBranch);
@@ -341,7 +331,6 @@ async function processStatementAsync (
             statement.expression,
             evalContext,
             thread,
-            onStatementCompleted
           )
         : undefined;
 
@@ -377,7 +366,6 @@ async function processStatementAsync (
         statement.condition,
         evalContext,
         thread,
-        onStatementCompleted
       ));
       if (condition) {
         toUnshift = provideLoopBody(
@@ -408,7 +396,6 @@ async function processStatementAsync (
         statement.condition,
         evalContext,
         thread,
-        onStatementCompleted
       ));
       if (condition) {
         toUnshift = provideLoopBody(
@@ -531,7 +518,6 @@ async function processStatementAsync (
             statement.condition,
             evalContext,
             thread,
-            onStatementCompleted
           ))
         ) {
           // --- Stay in the loop, inject the body, the update expression, and the loop guard
@@ -749,7 +735,6 @@ async function processStatementAsync (
           statement.expression,
           evalContext,
           thread,
-          onStatementCompleted
         )
       );
     }
@@ -941,7 +926,6 @@ export async function processDeclarationsAsync (
   block: BlockScope,
   evalContext: EvaluationContext,
   thread: LogicalThread,
-  onStatementCompleted: OnStatementCompletedCallback,
   declarations: VarDeclaration[],
   addConst = false,
   useValue = false,
@@ -957,7 +941,6 @@ export async function processDeclarationsAsync (
         decl.expression,
         evalContext,
         thread,
-        onStatementCompleted
       );
     }
     visitDeclaration(block, decl, value, addConst);

diff --git a/src/common/messaging/MainToIdeMessenger.ts b/src/common/messaging/MainToIdeMessenger.ts
@@ -12,6 +12,7 @@ class MainToIdeMessenger extends MessengerBase {
    */
   constructor (public readonly window: BrowserWindow) {
     super();
+    this._requestSeqNo = 1000;
     ipcMain?.on(
       this.responseChannel,
       (_ev: IpcMainEvent, response: ResponseMessage) =>

diff --git a/src/common/messaging/MessengerBase.ts b/src/common/messaging/MessengerBase.ts
@@ -11,7 +11,7 @@ import { Channel, RequestMessage, ResponseMessage } from "./messages-core";
  */
 export abstract class MessengerBase {
   // Sequential number of the next request
-  private _requestSeqNo = 0;
+  protected _requestSeqNo = 1;
 
   /**
    * Stores resolvers to correlate incoming messages with outcoming ones
@@ -44,7 +44,7 @@ export abstract class MessengerBase {
     // --- Create a promise and store the resolver function with the message ID.
     const promise = new Promise<TResp>((resolve, reject) => {
       this._messageResolvers.set(
-        message.correlationId ?? 0,
+        message.correlationId,
         resolve as (
           value: ResponseMessage | PromiseLike<ResponseMessage>
         ) => void

diff --git a/src/common/messaging/any-to-ide.ts b/src/common/messaging/any-to-ide.ts
@@ -54,6 +54,7 @@ export interface IdeShowDialogRequest extends MessageBase {
 export interface IdeExecuteCommandRequest extends MessageBase {
   type: "IdeExecuteCommand";
   commandText: string;
+  scriptId?: number;
 }
 
 // --- Ask the IDE to save all files before quitting

diff --git a/src/main/app-menu.ts b/src/main/app-menu.ts
@@ -243,6 +243,21 @@ export function setupMenu (
           await saveKliveProject();
         }
       },
+      ...(!kliveProject
+        ? []
+        : ([
+            { type: "separator" },
+            {
+              id: EXCLUDED_PROJECT_ITEMS,
+              label: "\nManage Excluded Items",
+              enabled: true,
+              click: () => {
+                mainStore.dispatch(
+                  displayDialogAction(EXCLUDED_PROJECT_ITEMS_DIALOG)
+                );
+              }
+            }
+          ] as MenuItemConstructorOptions[])),
       ...(__DARWIN__
         ? []
         : ([
@@ -757,86 +772,6 @@ export function setupMenu (
   // Project Menu
 
   if (kliveProject) {
-    // --- Machine-specific view menu items
-    let specificProjectMenus: MenuItemConstructorOptions[] = [];
-    if (machineMenus && machineMenus.projectItems) {
-      specificProjectMenus = machineMenus.projectItems(
-        {
-          emuWindow,
-          ideWindow
-        },
-        currentMachine,
-        currentModel
-      );
-    }
-
-    template.push({
-      label: "Project",
-      submenu: [
-        {
-          id: COMPILE_CODE,
-          label: "Compile code",
-          enabled: !!buildRoot,
-          click: async () => {
-            await executeIdeCommand(ideWindow, "outp build", undefined, true);
-            await executeIdeCommand(ideWindow, "compile", "Compile Code");
-          }
-        },
-        {
-          id: INJECT_CODE,
-          label: "Inject code",
-          enabled: !!buildRoot && execState === MachineControllerState.Paused,
-          click: async () => {
-            await executeIdeCommand(ideWindow, "outp build", undefined, true);
-            await executeIdeCommand(ideWindow, "inject", "Inject Code", true);
-          }
-        },
-        { type: "separator" },
-        {
-          id: RUN_CODE,
-          label: "Run",
-          enabled: !!buildRoot,
-          click: async () => {
-            mainStore.dispatch(setRestartTarget("project"));
-            await executeIdeCommand(ideWindow, "outp build", undefined, true);
-            await executeIdeCommand(ideWindow, "run", "Run Code", true);
-          }
-        },
-        {
-          id: DEBUG_CODE,
-          label: "Debug",
-          enabled: !!buildRoot,
-          click: async () => {
-            mainStore.dispatch(setRestartTarget("project"));
-            await executeIdeCommand(ideWindow, "outp build", undefined, true);
-            await executeIdeCommand(ideWindow, "debug", "Debug Code", true);
-          }
-        },
-        { type: "separator" },
-        {
-          id: EXPORT_CODE,
-          label: "Export code...",
-          enabled: !!buildRoot,
-          click: () => {
-            mainStore.dispatch(displayDialogAction(EXPORT_CODE_DIALOG));
-          }
-        },
-        { type: "separator" },
-        {
-          id: EXCLUDED_PROJECT_ITEMS,
-          label: "\nManage Excluded Items",
-          enabled: true,
-          click: () => {
-            mainStore.dispatch(
-              displayDialogAction(EXCLUDED_PROJECT_ITEMS_DIALOG)
-            );
-          }
-        },
-        { type: "separator" },
-        ...specificProjectMenus
-      ]
-    });
-
     if (hasBuildFile) {
       let buildTasks: MenuItemConstructorOptions[] = [];
       for (const task of collectedBuildTasks) {
@@ -1134,7 +1069,7 @@ function visitMenu (
   }
 }
 
-async function executeIdeCommand (
+export async function executeIdeCommand (
   window: BrowserWindow,
   commandText: string,
   title?: string,

diff --git a/src/main/build.ts b/src/main/build.ts
@@ -119,7 +119,7 @@ const predefinedTasks: Record<string, PredefinedBuildTaskDescriptor> = {
     ideCommand: "debug"
   },
   exportCode: {
-    displayName: "Export artifacts",
+    displayName: "Export code...",
     separatorBefore: true,
     ideCommand: "export"
   }