Merge remote-tracking branch 'origin/show-spec'

auxoncorp · Aug 12, 2024 · 99073b3 · 99073b3
2 parents 789041e + c42ecc5
commit 99073b3
Show file tree

Hide file tree

Showing 4 changed files with 53 additions and 2 deletions.
diff --git a/vscode/package.json b/vscode/package.json
@@ -281,7 +281,7 @@
                 },
                 {
                     "command": "auxon.specs.showVersion",
-                    "when": "view == auxon.specs && viewItem == specVersion && !listMultiSelection && false",
+                    "when": "view == auxon.specs && viewItem == specVersion && !listMultiSelection",
                     "group": "1_context@1"
                 },
                 {

diff --git a/vscode/src/main.ts b/vscode/src/main.ts
@@ -88,7 +88,10 @@ export async function activate(context: vscode.ExtensionContext) {
         eventsProvider.setSelectedTimelines(selection);
     });
 
-    new specs.SpecsTreeDataProvider(apiClient, specCoverageProvider, wss, context);
+    const specsProvider = new specs.SpecsTreeDataProvider(apiClient, specCoverageProvider, wss, context);
+    // Pre-load specs provided so that the deviant panel can reveal spec tree items without having the user
+    // explicitly load the specs panel first
+    const _ignored = specsProvider.getChildren();
 
     new mutators.MutatorsTreeDataProvider(apiClient, wss, context);
     new mutations.MutationsTreeDataProvider(apiClient, wss, context);

diff --git a/vscode/src/specFileCommands.ts b/vscode/src/specFileCommands.ts
@@ -228,3 +228,26 @@ export function runConformEvalCommand(args: SpecEvalCommandArgs): Thenable<vscod
 
     return vscode.tasks.executeTask(task);
 }
+
+export async function inspectSpecSpeqtr(specNameOrVersion: string): Promise<string | undefined> {
+    const conform = config.toolPath("conform");
+
+    try {
+        const res = await execFile(
+            conform,
+            ["spec", "inspect", "--with-speqtr", "--format", "json", specNameOrVersion],
+            {
+                encoding: "utf8",
+            }
+        );
+        const data = JSON.parse(res.stdout);
+        return data.target_version.content.speqtr;
+    } catch (e: any /* eslint-disable-line @typescript-eslint/no-explicit-any */) {
+        if (Object.prototype.hasOwnProperty.call(e, "stderr")) {
+            vscode.window.showErrorMessage(e.stderr.trim());
+        } else {
+            vscode.window.showErrorMessage(e.toString());
+        }
+        return undefined;
+    }
+}
diff --git a/vscode/src/specs.ts b/vscode/src/specs.ts
@@ -72,6 +72,12 @@ export class SpecsTreeDataProvider implements vscode.TreeDataProvider<SpecsTreeI
             vscode.commands.registerCommand("auxon.specs.evalVersion.dryRun", (item: SpecVersionTreeItemData) =>
                 this.evalVersionDryRun(item)
             ),
+            vscode.commands.registerCommand("auxon.specs.showLatest", (item: NamedSpecTreeItemData) =>
+                this.showLatest(item)
+            ),
+            vscode.commands.registerCommand("auxon.specs.showVersion", (item: SpecVersionTreeItemData) =>
+                this.showVersion(item)
+            ),
             vscode.commands.registerCommand("auxon.specs.delete", (item: NamedSpecTreeItemData) =>
                 this.deleteSpec(item)
             ),
@@ -203,6 +209,14 @@ export class SpecsTreeDataProvider implements vscode.TreeDataProvider<SpecsTreeI
         this.conformEval({ spec_version: spec.specVersion, dry_run: true });
     }
 
+    async showLatest(spec: NamedSpecTreeItemData) {
+        await this.showSpec(spec.specMetadata.name);
+    }
+
+    async showVersion(spec: SpecVersionTreeItemData) {
+        await this.showSpec(spec.specVersion);
+    }
+
     async deleteSpec(spec: NamedSpecTreeItemData) {
         const answer = await vscode.window.showInformationMessage(
             `Really delete spec '${spec.specMetadata.name}'? This will delete all spec versions and stored results.`,
@@ -309,6 +323,17 @@ export class SpecsTreeDataProvider implements vscode.TreeDataProvider<SpecsTreeI
     conformEval(args: specFileCommands.SpecEvalCommandArgs) {
         specFileCommands.runConformEvalCommand(args);
     }
+
+    async showSpec(specNameOrVersion: string) {
+        const speqtr = await specFileCommands.inspectSpecSpeqtr(specNameOrVersion);
+        if (speqtr) {
+            const doc = await vscode.workspace.openTextDocument({
+                language: "speqtr",
+                content: speqtr,
+            });
+            await vscode.window.showTextDocument(doc);
+        }
+    }
 }
 
 // This is the base of all the tree item data classes