More fixes

Author: pokey

packages/common/src/cursorlessCommandIds.ts

@@ -110,10 +110,10 @@ export const cursorlessCommandDescriptions: Record<
   ["cursorless.keyboard.modal.modeToggle"]: new HiddenCommand(
     "Toggle the cursorless modal mode",
   ),
-  ["cursorless.showScopeVisualizer"]: new HiddenCommand(
+  ["cursorless.showScopeVisualizer"]: new VisibleCommand(
     "Show the scope visualizer",
   ),
-  ["cursorless.hideScopeVisualizer"]: new HiddenCommand(
+  ["cursorless.hideScopeVisualizer"]: new VisibleCommand(
     "Hide the scope visualizer",
   ),
 };

packages/cursorless-engine/src/scopeProviders/ScopeInfoProvider.ts

@@ -73,7 +73,9 @@ export class ScopeInfoProvider {
         // Skip "string" because we use surrounding pair for that
         .filter(
           (scopeTypeType) =>
-            scopeTypeType !== "instance" && scopeTypeType !== "string",
+            scopeTypeType !== "instance" &&
+            scopeTypeType !== "string" &&
+            scopeTypeType !== "switchStatementSubject",
         )
         .map((scopeTypeType) => ({
           type: scopeTypeType,

packages/cursorless-vscode/package.json

@@ -187,8 +187,7 @@
       },
       {
         "command": "cursorless.showScopeVisualizer",
-        "title": "Cursorless: Show the scope visualizer",
-        "enablement": "false"
+        "title": "Cursorless: Show the scope visualizer"
       },
       {
         "command": "cursorless.hideScopeVisualizer",

packages/cursorless-vscode/src/ScopeSupportTreeProvider.ts

@@ -1,10 +1,12 @@
+import { CursorlessCommandId } from "@cursorless/common";
 import {
   ScopeProvider,
   ScopeSupport,
   ScopeSupportLevels,
   ScopeTypeInfo,
 } from "@cursorless/cursorless-engine";
 import * as vscode from "vscode";
+import { VisualizationType } from "./ScopeVisualizerCommandApi";
 
 export class ScopeSupportTreeProvider
   implements vscode.TreeDataProvider<MyTreeItem>
@@ -138,6 +140,24 @@ class ScopeSupportTreeItem extends vscode.TreeItem {
     super(label, vscode.TreeItemCollapsibleState.None);
 
     this.description = description;
+
+    if (
+      scopeTypeInfo.spokenForm.type === "success" &&
+      scopeTypeInfo.spokenForm.alternatives.length > 0
+    ) {
+      this.tooltip = scopeTypeInfo.spokenForm.alternatives
+        .map((spokenForm) => `"${spokenForm}"`)
+        .join("\n");
+    }
+
+    this.command = {
+      command: "cursorless.showScopeVisualizer" satisfies CursorlessCommandId,
+      arguments: [
+        scopeTypeInfo.scopeType,
+        "content" satisfies VisualizationType,
+      ],
+      title: `Visualize ${scopeTypeInfo.humanReadableName}`,
+    };
   }
 }