simpler (fake) hat shapes and colors

Author: josharian

packages/cursorless-engine/src/core/hatStats.test.ts

@@ -19,62 +19,33 @@ import {
   getRankedTokens,
 } from "../util/allocateHats/getRankedTokens";
 
-// TODO: dedup with vscode
-
-export const HAT_COLORS = [
-  "default",
-  "blue",
-  "green",
-  "red",
-  "pink",
-  "yellow",
-  "userColor1",
-  "userColor2",
-] as const;
-
-export const HAT_NON_DEFAULT_SHAPES = [
-  "ex",
-  "fox",
-  "wing",
-  "hole",
-  "frame",
-  "curve",
-  "eye",
-  "play",
-  "bolt",
-  "crosshairs",
-] as const;
-
-export const HAT_SHAPES = ["default", ...HAT_NON_DEFAULT_SHAPES] as const;
-
-const charForShape: Map<string, string> = new Map(
-  Object.entries({
-    default: "*",
-    ex: "x",
-    fox: "v",
-    wing: "w", // TODO: this is the only one that looks nothing like its shape
-    hole: "o",
-    frame: "#",
-    curve: "^",
-    eye: "0",
-    play: ">",
-    bolt: "~",
-    crosshairs: "+",
-  }),
-);
-
-const charForColor: Map<string, string> = new Map(
-  Object.entries({
-    default: "*",
-    blue: "b",
-    green: "g",
-    red: "r",
-    pink: "p",
-    yellow: "y",
-    userColor1: "1",
-    userColor2: "2",
-  }),
-);
+// We use special hat "colors"/"shapes" for nice ASCII art output.
+const HAT_COLORS = ["default", ..."ABCDEF"];
+const HAT_NON_DEFAULT_SHAPES = [..."123456"];
+const allHatStyles: HatStyleMap = {
+  ...Object.fromEntries(
+    HAT_COLORS.map((color) => [
+      color,
+      {
+        color,
+        shape: "default",
+        penalty: penaltyForColorShape(color, "default"),
+      },
+    ]),
+  ),
+  ...Object.fromEntries(
+    HAT_COLORS.flatMap((color) =>
+      HAT_NON_DEFAULT_SHAPES.map((shape) => [
+        `${color}-${shape}`,
+        {
+          color,
+          shape,
+          penalty: penaltyForColorShape(color, shape),
+        },
+      ]),
+    ),
+  ),
+};
 
 const tokenHatSplittingDefaults: TokenHatSplittingMode = {
   preserveCase: false,
@@ -101,31 +72,6 @@ suite("hatStats", () => {
       ...tokenHatSplittingDefaults,
     });
   });
-  // Set up hat styles, mimicking the real thing.
-  const allHatStyles: HatStyleMap = {
-    ...Object.fromEntries(
-      HAT_COLORS.map((color) => [
-        color,
-        {
-          color,
-          shape: "default",
-          penalty: penaltyForColorShape(color, "default"),
-        },
-      ]),
-    ),
-    ...Object.fromEntries(
-      HAT_COLORS.flatMap((color) =>
-        HAT_NON_DEFAULT_SHAPES.map((shape) => [
-          `${color}-${shape}`,
-          {
-            color,
-            shape,
-            penalty: penaltyForColorShape(color, shape),
-          },
-        ]),
-      ),
-    ),
-  };
 
   const fixturePath = path.join(
     getCursorlessRepoRoot(),
@@ -328,17 +274,14 @@ function goldenHatFile(
         line1 += " ".repeat(hatRange.start.character - line1.length);
         line1 += "_";
       } else if (penalty === 1) {
-        const char =
-          color === "default"
-            ? charForShape.get(shape)
-            : charForColor.get(color);
+        const char = color === "default" ? shape : color;
         line1 += " ".repeat(hatRange.start.character - line1.length);
         line1 += char;
       } else if (penalty === 2) {
         line1 += " ".repeat(hatRange.start.character - line1.length);
-        line1 += charForShape.get(shape);
+        line1 += shape;
         line2 += " ".repeat(hatRange.start.character - line2.length);
-        line2 += charForColor.get(color);
+        line2 += color;
       } else {
         throw new Error(`unexpected penalty: ${penalty}`);
       }

packages/cursorless-engine/src/test/fixtures/hat-stats/intern.go.golden

@@ -2,153 +2,158 @@ _  _       _            _      _ _
 // Package intern interns strings.
 [] [-----] [----] [-----] [-----]|
 
-b     _       b _     _       _ b
+A     _       A _     _       _ A
 // Interning is best effort only.
 [] [-------] [] [--] [----] [--]|
 
-g         _  _      _   b      _    _
+B         _  _      _   A      _    _
 // Interned strings may be removed automatically
 [] [------] [-----] [-] [] [-----] [-----------]
 
-r  _   _     b _             _     g
+C  _   _     A _             _     B
 // at any time without notification.
 [] [] [-] [--] [-----] [----------]|
 
-p   b        _     _ g       b      _
+D   A        _     _ B       A      _
 // All functions may be called concurrently
 [] [-] [-------] [-] [] [----] [----------]
 
-y     _        b   b     b  b    r
+E     _        A   A     A  A    C
 // with themselves and each other.
 [] [--] [--------] [-] [--] [---]|
 
-   _    b
+   _    A
 package intern
 [-----] [----]
 
- b     _ b  b
+ A     _ A  A
 import "sync"
 [----] |[--]|
 
-g      g g   pb    _ r   yg   _
+B      B B   DA    _ C   EB   _
 var pool sync.Pool = sync.Pool{
 [-] [--] [--]|[--] | [--]|[--]|
 
-   b_ b   __ g        b_ g
+   A_ A   __ B        A_ B
 ␉New: func() interface{} {
  [-]| [--]|| [-------]|| |
 
-     b     b b  r_     b_p     b
+     A     A A  C_     A_D     A
 ␉␉return make(map[string]string)
   [----] [--]|[-]|[----]|[----]|
 
- b_
+ A_
 ␉},
  ||
 
-g
+B
 }
 |
 
-1  y         g    1b        g1
+F  E         B    FA        BF
 // String returns s, interned.
 [] [----] [-----] || [------]|
 
-g         gg2  b    g x      r
+B         BB1  A    B 2      C
 func String(s string) string {
 [--] [----]|| [----]| [----] |
 
- g bb  g  2 g rrxp g bv     bw     p
+ B AA  B  1 B CC2D B A3     A4     D
 ␉m := pool.Get().(map[string]string)
  | || [--]|[-]||||[-]|[----]|[----]|
 
- gg  g gg rgog
+ BB  B BB CB5B
 ␉c, ok := m[s]
  || [] || ||||
 
-  r r  p
+  C C  D
 ␉if ok {
  [] [] |
 
-     rv r ypy
+     C3 C EDE
 ␉␉pool.Put(m)
   [--]|[-]|||
 
-   r     r
+   C     C
 ␉␉return c
   [----] |
 
- r
+ C
 ␉}
  |
 
- yr#r r ^
+        A
+ EC6C C 1
 ␉m[s] = s
  |||| | |
 
-  p  w p 111
+  D  4 D FFF
 ␉pool.Put(m)
  [--]|[-]|||
 
- b      0
+        A
+ A      2
 ␉return s
  [----] |
 
-p
+D
 }
 |
 
-2  r     g       p    r      g  r      rr    p    o
+1  C     B       D    C      B  C      CC    D    5
 // Bytes returns b converted to a string, interned.
 [] [---] [-----] | [-------] [] | [----]| [------]|
 
-p     g   2y pp r  2      p y
+D     B   1E DD C  1      D E
 func Bytes(b []byte) string {
 [--] [---]|| ||[--]| [----] |
 
- 2 rp    p# y xx^v p y>     y~     v
+                A
+ 1 CD    D6 E 2213 D E  C   E C    3
 ␉m := pool.Get().(map[string]string)
  | || [--]|[-]||||[-]|[----]|[----]|
 
- pp  r py x1+     w1w1
+ DD  C DE 2F D    4F4F
 ␉c, ok := m[string(b)]
  || [] || ||[----]||||
 
-  y y  1
+  E E  F
 ␉if ok {
  [] [] |
 
-     y0 y ovo
+      A
+     E2 E 535
 ␉␉pool.Put(m)
   [--]|[-]|||
 
-   1     y
+   F     E
 ␉␉return c
   [----] |
 
- y
+ E
 ␉}
  |
 
- b
- x y1      y#2#
+ A
+ 3 EF      E616
 ␉s := string(b)
  | || [----]|||
 
-   b    b
- w2v2 2 w
+   A    A
+ 4141 1 5
 ␉m[s] = s
  |||| | |
 
-  1  > 1 ^o^
+     A   A A
+  F  3 F 151
 ␉pool.Put(m)
  [--]|[-]|||
 
-        b
-  2     o
+        A
+  1     6
 ␉return s
  [----] |
 
-1
+F
 }
 |

packages/cursorless-engine/src/test/fixtures/hat-stats/intern.go.stats

@@ -15,15 +15,15 @@ nPenalty0:
 	spark: 0        █     25               50               75               100
 
 nPenalty1:
-	mean: 84%
+	mean: 81%
 	std: 1%
-	min: 83%
-	max: 85%
-	spark: 0              25               50               75    ▅█         100
+	min: 80%
+	max: 82%
+	spark: 0              25               50               75  ▂█▆          100
 
 nPenalty2:
-	mean: 1%
+	mean: 4%
 	std: 1%
-	min: 0%
-	max: 2%
-	spark: 0 █            25               50               75               100
+	min: 3%
+	max: 5%
+	spark: 0  █▅          25               50               75               100