Move the open interactor button to the title bar

Author: celonymire

CHANGELOG.md

@@ -10,6 +10,7 @@
 
 - Made text expansion editor's title human-friendly
 - Removed non-essential information pop-ups
+- Moved the "Open Interactor" button to the Judge's title section instead
 
 ### Fixed
 

package.json

@@ -55,10 +55,15 @@
           "when": "view == fastolympiccoding.judge"
         },
         {
-          "command": "fastolympiccoding.toggleJudgeSettings",
+          "command": "fastolympiccoding.openInteractorFile",
           "group": "navigation@7",
           "when": "view == fastolympiccoding.judge"
         },
+        {
+          "command": "fastolympiccoding.toggleJudgeSettings",
+          "group": "navigation@8",
+          "when": "view == fastolympiccoding.judge"
+        },
         {
           "command": "fastolympiccoding.startStressTest",
           "group": "navigation@1",
@@ -383,6 +388,12 @@
         "category": "Fast Olympic Coding",
         "icon": "$(gear)"
       },
+      {
+        "command": "fastolympiccoding.openInteractorFile",
+        "title": "Open Interactor File",
+        "category": "Fast Olympic Coding",
+        "icon": "$(go-to-file)"
+      },
       {
         "command": "fastolympiccoding.toggleStressSettings",
         "title": "Toggle Stress Settings",

src/extension/index.ts

@@ -278,6 +278,12 @@ function registerCommands(context: vscode.ExtensionContext): void {
     )
   );
 
+  context.subscriptions.push(
+    vscode.commands.registerTextEditorCommand("fastolympiccoding.openInteractorFile", () =>
+      judgeViewProvider.openInteractorFile()
+    )
+  );
+
   context.subscriptions.push(
     vscode.commands.registerTextEditorCommand(
       "fastolympiccoding.startStressTest",

src/extension/providers/JudgeViewProvider.ts

@@ -966,6 +966,22 @@ export default class extends BaseViewProvider<typeof ProviderMessageSchema, Webv
     super._postMessage({ type: "SETTINGS_TOGGLE" });
   }
 
+  openInteractorFile() {
+    if (!this._currentFile) {
+      return;
+    }
+    const settings = getFileRunSettings(this._currentFile);
+    if (!settings) {
+      return;
+    }
+
+    if (settings.interactorFile) {
+      void openOrCreateFile(settings.interactorFile);
+    } else {
+      void vscode.window.showWarningMessage("Interactor file not specified");
+    }
+  }
+
   // Background task management
   getBackgroundTasksForFile(file: string): string[] {
     const context = this._contexts.get(file);
@@ -1051,9 +1067,6 @@ export default class extends BaseViewProvider<typeof ProviderMessageSchema, Webv
       case "COMPARE":
         this._compare(uuid);
         break;
-      case "OPEN_INTERACTOR":
-        this._openInteractor();
-        break;
       case "TOGGLE_INTERACTIVE":
         this._toggleInteractive(uuid);
         break;
@@ -1645,22 +1658,6 @@ export default class extends BaseViewProvider<typeof ProviderMessageSchema, Webv
     await vscode.env.clipboard.writeText(value);
   }
 
-  private _openInteractor() {
-    if (!this._currentFile) {
-      return;
-    }
-    const settings = getFileRunSettings(this._currentFile);
-    if (!settings) {
-      return;
-    }
-
-    if (settings.interactorFile) {
-      void openOrCreateFile(settings.interactorFile);
-    } else {
-      void vscode.window.showWarningMessage("Interactor file not specified");
-    }
-  }
-
   private _stdin({ uuid, data }: v.InferOutput<typeof StdinMessageSchema>) {
     const testcase = this._findTestcase(uuid);
     if (!testcase) {

src/shared/judge-messages.ts

@@ -13,7 +13,6 @@ export const ActionValues = [
   "COMPARE",
   "DEBUG",
   "REQUEST_DATA",
-  "OPEN_INTERACTOR",
   "TOGGLE_INTERACTIVE",
 ] as const;
 

src/webview/judge/TestcaseToolbar.svelte

@@ -199,17 +199,6 @@
       >
         <div class="codicon codicon-trash"></div>
       </button>
-      {#if testcase.mode === "interactive"}
-        <div class="spacer"></div>
-        <button
-          class="toolbar-icon"
-          data-tooltip="Open Interactor"
-          aria-label="Open Interactor"
-          onclick={() => handleAction("OPEN_INTERACTOR")}
-        >
-          <div class="codicon codicon-go-to-file"></div>
-        </button>
-      {/if}
     </div>
   </div>
 {:else if status === "COMPILING"}
@@ -366,10 +355,6 @@
     flex-grow: 1;
   }
 
-  .spacer {
-    flex-grow: 1;
-  }
-
   .toolbar-icon {
     display: flex;
     align-items: center;