Revert "Stable hats (#1225)" (#1251)

This reverts commit 9406cd3.

## Checklist

- [ ] I have added
[tests](https://www.cursorless.org/docs/contributing/test-case-recorder/)
- [ ] I have updated the
[docs](https://github.com/cursorless-dev/cursorless/tree/main/docs) and
[cheatsheet](https://github.com/cursorless-dev/cursorless/tree/main/cursorless-talon/src/cheatsheet)
- [ ] I have not broken the cheatsheet

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

Author: pokey

.vscode/launch.json

@@ -127,18 +127,6 @@
         "!**/node_modules/**"
       ]
     },
-    {
-      "name": "Docusaurus Build (Debug)",
-      "type": "node",
-      "request": "launch",
-      "cwd": "${workspaceFolder}/docs-site",
-      "runtimeExecutable": "npm",
-      "runtimeArgs": ["run", "build"],
-      "resolveSourceMapLocations": [
-        "${workspaceFolder}/**",
-        "!**/node_modules/**"
-      ]
-    },
     {
       "name": "cursorless.org client-side",
       "type": "chrome",

docs-site/docusaurus.config.js

@@ -38,17 +38,6 @@ function remarkPluginFixLinksToRepositoryArtifacts() {
         return;
       }
 
-      // Hack; see https://github.com/cursorless-dev/cursorless/issues/1243
-      let match = link.match(/^(\.\.\/)+docs\//);
-      if (match != null) {
-        link = "/docs/" + link.substring(match[0].length);
-        if (link.endsWith(".md")) {
-          link = link.substring(0, link.length - 3);
-        }
-        node.url = link;
-        return;
-      }
-
       let repoRoot = path.resolve(__dirname, "..");
       let artifact = path.resolve(file.dirname, link);
       let artifactRelative = path.relative(repoRoot, artifact);
@@ -76,7 +65,7 @@ const config = {
   baseUrl: "/docs/",
   favicon: "/docs/favicon.ico",
   onBrokenLinks: "throw",
-  onBrokenMarkdownLinks: "warn",
+  onBrokenMarkdownLinks: "throw",
   trailingSlash: true,
 
   plugins: [

docs/user/hatAssignment.md

@@ -687,21 +687,6 @@
               "url"
             ]
           }
-        },
-        "cursorless.experimental.hatStability": {
-          "markdownDescription": "As you scroll, edit, and move your cursor, this setting determines how much Cursorless will move hats around to ensure that the best hats are near the cursor.  See https://www.cursorless.org/docs/user/hatAssignment/",
-          "type": "string",
-          "default": "balanced",
-          "enum": [
-            "greedy",
-            "balanced",
-            "stable"
-          ],
-          "markdownEnumDescriptions": [
-            "Always put the best hats near the cursor",
-            "Only move hats to avoid having colored shapes near the cursor (eg `\"blue fox\"`); otherwise leave hats where they are",
-            "Only move hats to ensure that the tokens near the cursor have a hat at all, no matter how bad the hat is.  Note that if you have no shapes enabled, then this setting is the same as `balanced`"
-          ]
         }
       }
     },

package.json

@@ -17,7 +17,7 @@ async function runTest() {
 
   editor.selections = [new vscode.Selection(0, 0, 0, 0)];
 
-  await graph.hatTokenMap.allocateHats();
+  await graph.hatTokenMap.addDecorations();
 
   await vscode.commands.executeCommand(
     CURSORLESS_COMMAND_ID,

src/apps/cursorless-vscode-e2e/suite/backwardCompatibility.test.ts

@@ -24,7 +24,7 @@ suite("breakpoints", async function () {
 async function breakpointHarpAdd() {
   const { graph } = (await getCursorlessApi()).testHelpers!;
   await openNewEditor("  hello");
-  await graph.hatTokenMap.allocateHats();
+  await graph.hatTokenMap.addDecorations();
 
   await runCursorlessCommand({
     version: 1,
@@ -51,7 +51,7 @@ async function breakpointHarpAdd() {
 async function breakpointTokenHarpAdd() {
   const { graph } = (await getCursorlessApi()).testHelpers!;
   await openNewEditor("  hello");
-  await graph.hatTokenMap.allocateHats();
+  await graph.hatTokenMap.addDecorations();
 
   await runCursorlessCommand({
     version: 1,
@@ -79,7 +79,7 @@ async function breakpointTokenHarpAdd() {
 async function breakpointHarpRemove() {
   const { graph } = (await getCursorlessApi()).testHelpers!;
   const editor = await openNewEditor("  hello");
-  await graph.hatTokenMap.allocateHats();
+  await graph.hatTokenMap.addDecorations();
 
   vscode.debug.addBreakpoints([
     new vscode.SourceBreakpoint(
@@ -110,7 +110,7 @@ async function breakpointHarpRemove() {
 async function breakpointTokenHarpRemove() {
   const { graph } = (await getCursorlessApi()).testHelpers!;
   const editor = await openNewEditor("  hello");
-  await graph.hatTokenMap.allocateHats();
+  await graph.hatTokenMap.addDecorations();
 
   vscode.debug.addBreakpoints([
     new vscode.SourceBreakpoint(

src/apps/cursorless-vscode-e2e/suite/breakpoints.test.ts

@@ -16,7 +16,7 @@ suite("Take token twice", async function () {
 async function runTest() {
   const { graph } = (await getCursorlessApi()).testHelpers!;
   const editor = await openNewEditor("a)");
-  await graph.hatTokenMap.allocateHats();
+  await graph.hatTokenMap.addDecorations();
 
   for (let i = 0; i < 2; ++i) {
     editor.selection = new vscode.Selection(0, 1, 0, 1);

src/apps/cursorless-vscode-e2e/suite/containingTokenTwice.test.ts

@@ -23,7 +23,7 @@ async function runTest() {
   // editor
   await sleepWithBackoff(1000);
 
-  await graph.hatTokenMap.allocateHats();
+  await graph.hatTokenMap.addDecorations();
 
   await runCursorlessCommand({
     version: 1,

src/apps/cursorless-vscode-e2e/suite/crossCellsSetSelection.test.ts

@@ -32,7 +32,7 @@ async function runTest(
   // editor
   await sleepWithBackoff(1000);
 
-  await graph.hatTokenMap.allocateHats();
+  await graph.hatTokenMap.addDecorations();
 
   assert.equal(notebook.cellCount, 1);
 

src/apps/cursorless-vscode-e2e/suite/editNewCell.test.ts

@@ -27,7 +27,7 @@ async function runTest() {
     vscode.ViewColumn.Beside,
   );
 
-  await graph.hatTokenMap.allocateHats();
+  await graph.hatTokenMap.addDecorations();
   const hatMap = await graph.hatTokenMap.getReadableMap(false);
 
   const hat1 = hatMap