Fix cheatsheet

Author: pokey

cursorless-talon/src/cheatsheet/sections/scopes.py

@@ -10,16 +10,15 @@ def get_scopes():
             {
                 "argumentOrParameter": "Argument",
                 "boundedNonWhitespaceSequence": "Non whitespace sequence stopped by surrounding pair delimeters",
-                "glyph": "stuff",
             },
         ),
         {
             "id": "glyph",
-            "type": "modifier",
+            "type": "scopeType",
             "variations": [
                 {
-                    "spokenForm": f"{complex_scopes['glyph']} <glyph>",
-                    "description": "First instance of <glyph>",
+                    "spokenForm": f"{complex_scopes['glyph']} <character>",
+                    "description": "Instance of single character <character>",
                 },
             ],
         },

packages/cheatsheet/src/lib/sampleSpokenFormInfos/defaults.json

@@ -14,6 +14,16 @@
             }
           ]
         },
+        {
+          "id": "breakLine",
+          "type": "action",
+          "variations": [
+            {
+              "spokenForm": "break <target>",
+              "description": "Break line"
+            }
+          ]
+        },
         {
           "id": "callAsFunction",
           "type": "action",
@@ -228,6 +238,16 @@
             }
           ]
         },
+        {
+          "id": "joinLines",
+          "type": "action",
+          "variations": [
+            {
+              "spokenForm": "join <target>",
+              "description": "Join lines"
+            }
+          ]
+        },
         {
           "id": "moveToTarget",
           "type": "action",
@@ -905,6 +925,16 @@
               "description": "Trailing delimiter range"
             }
           ]
+        },
+        {
+          "id": "visible",
+          "type": "modifier",
+          "variations": [
+            {
+              "spokenForm": "visible",
+              "description": "Visible"
+            }
+          ]
         }
       ]
     },
@@ -1058,6 +1088,16 @@
             }
           ]
         },
+        {
+          "id": "show_scope_sidebar",
+          "type": "command",
+          "variations": [
+            {
+              "spokenForm": "bar cursorless",
+              "description": "Show cursorless sidebar"
+            }
+          ]
+        },
         {
           "id": "show_scope_visualizer",
           "type": "command",
@@ -1272,6 +1312,16 @@
             }
           ]
         },
+        {
+          "id": "glyph",
+          "type": "scopeType",
+          "variations": [
+            {
+              "spokenForm": "glyph <character>",
+              "description": "Instance of single character <character>"
+            }
+          ]
+        },
         {
           "id": "identifier",
           "type": "scopeType",
@@ -1537,7 +1587,7 @@
           "type": "scopeType",
           "variations": [
             {
-              "spokenForm": "word",
+              "spokenForm": "sub",
               "description": "Word"
             }
           ]

packages/cursorless-engine/src/core/Cheatsheet.ts

@@ -4,6 +4,7 @@ import produce from "immer";
 import { sortBy } from "lodash";
 import { ide } from "../singletons/ide.singleton";
 import path from "path";
+import { getCursorlessRepoRoot } from "@cursorless/common";
 
 /**
  * The argument expected by the cheatsheet command.
@@ -56,27 +57,9 @@ export async function showCheatsheet({
  * @param spokenFormInfo The new value to use for default spoken forms.
  */
 export async function updateDefaults(spokenFormInfo: CheatsheetInfo) {
-  const { runMode, assetsRoot, workspaceFolders } = ide();
-
-  const workspacePath =
-    runMode === "development"
-      ? assetsRoot
-      : workspaceFolders?.[0].uri.path ?? null;
-
-  if (workspacePath == null) {
-    throw new Error(
-      "Please update defaults from Cursorless workspace or running in debug",
-    );
-  }
-
   const defaultsPath = path.join(
-    workspacePath,
-    "packages",
-    "cheatsheet",
-    "src",
-    "lib",
-    "sampleSpokenFormInfos",
-    "defaults.json",
+    getCursorlessRepoRoot(),
+    "packages/cheatsheet/src/lib/sampleSpokenFormInfos/defaults.json",
   );
 
   const outputObject = produce(spokenFormInfo, (draft) => {
@@ -86,7 +69,7 @@ export async function updateDefaults(spokenFormInfo: CheatsheetInfo) {
     });
   });
 
-  await writeFile(defaultsPath, JSON.stringify(outputObject, null, "\t"));
+  await writeFile(defaultsPath, JSON.stringify(outputObject, null, 2) + "\n");
 }
 
 // FIXME: Stop duplicating these types once we have #945