try different visuals, height = penalty

Author: josharian

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

@@ -188,8 +188,8 @@ suite("hatStats", () => {
             const lineTokens = allTokens.filter(
               (token) => token.token.range.end.line === lineno,
             );
-            let shapeLine = "";
-            let colorLine = "";
+            let line1 = "";
+            let line2 = "";
             let rangeLine = "";
             lineTokens.forEach((token) => {
               const tokenRange = token.token.range;
@@ -209,15 +209,24 @@ suite("hatStats", () => {
               }
               const hatRange = hat.hatRange;
               const [color, shape] = colorShapeForHatStyle(hat.hatStyle);
-              shapeLine += " ".repeat(
-                hatRange.start.character - shapeLine.length,
-              );
-              shapeLine += charForShape.get(shape);
-              if (color !== "default") {
-                colorLine += " ".repeat(
-                  hatRange.start.character - colorLine.length,
-                );
-                colorLine += charForColor.get(color);
+              const penalty = penaltyForHatStyle(hat.hatStyle);
+              if (penalty == 0) {
+                line1 += " ".repeat(hatRange.start.character - line1.length);
+                line1 += "_";
+              } else if (penalty == 1) {
+                const char =
+                  color == "default"
+                    ? charForShape.get(shape)
+                    : charForColor.get(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);
+                line2 += " ".repeat(hatRange.start.character - line2.length);
+                line2 += charForColor.get(color);
+              } else {
+                throw new Error(`unexpected penalty: ${penalty}`);
               }
               const width =
                 tokenRange.end.character - tokenRange.start.character;
@@ -236,11 +245,11 @@ suite("hatStats", () => {
               );
               rangeLine += rangeStr;
             });
-            if (colorLine.length !== 0) {
-              w.write(colorLine + "\n");
+            if (line2.length !== 0) {
+              w.write(line2 + "\n");
             }
-            if (colorLine.length !== 0 || shapeLine.length !== 0) {
-              w.write(shapeLine + "\n");
+            if (line1.length !== 0) {
+              w.write(line1 + "\n");
             }
             if (line.length !== 0) {
               // TODO: tabs, emoji, sigh

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

@@ -1,179 +1,144 @@
-*   *       *           *      * *
+_   _       _           _      _ _
 // Package intern interns strings.
 [] [-----] [----] [-----] [-----]|
 
-b                               b
-*     *      *     *  *       * *
+b     _      _     _  _       _ b
 // Interning is best effort only.
 [] [-------] [] [--] [----] [--]|
 
-g
-*         *   *       * *      *    *
+g         _   _       _ _      _    _
 // Interned strings may be removed automatically
 [] [------] [-----] [-] [] [-----] [-----------]
 
-r   b  b                           g
-*   *  *    *     *          *     *
+r   b  b    _     _          _     g
 // at any time without notification.
 [] [] [-] [--] [-----] [----------]|
 
-p   b              b  b      b      b
-*   *        *     *  *      *      *
+p   b        _     b  b      b      b
 // All functions may be called concurrently
 [] [-] [-------] [-] [] [----] [----------]
 
-y              b     g   b      gr
-*  *           *     *   *      **
+y  _           b     g   b      gr
 // with themselves and each other.
 [] [--] [--------] [-] [--] [---]|
 
-         g
-   *     *
+   _     g
 package intern
 [-----] [----]
 
-         g  b
-  *    * *  *
+  _    _ g  b
 import "sync"
 [----] |[--]|
 
- b     g  r  p b      p  y g
- *     *  *  * *   *  *  * *  *
+ b     g  r  p b   _  p  y g  _
 var pool sync.Pool = sync.Pool{
 [-] [--] [--]|[--] | [--]|[--]|
 
-   b   b       g      b  g
-   **  *  **   *      ** *
+   b_  b  __   g      b_ g
 ␉New: func() interface{} {
  [-]| [--]|| [-------]|| |
 
-     g     b b  b      b  r    b
-     *     * *  **     ** *    *
+     g     b b  b_     b_ r    b
 ␉␉return make(map[string]string)
   [----] [--]|[-]|[----]|[----]|
 
- b
- **
+ b_
 ␉},
  ||
 
 g
-*
 }
 |
 
 1   p        r    bb        r1
-*   *        *    **        **
 // String returns s, interned.
 [] [----] [-----] || [------]|
 
    g      ggg  y    g  1     r
-   *      ***  *    *  *     *
 func String(s string) string {
 [--] [----]|| [----]| [----] |
 
- b bb  r  2 g rr p g b  r   b 2    p
- * **  *  * * **x* * *  *   * *    *
+ b bb  r  2 g rrxp g b  r   b 2    p
 ␉m := pool.Get().(map[string]string)
  | || [--]|[-]||||[-]|[----]|[----]|
 
  rg  g gg ggrg
- **  * ** ****
 ␉c, ok := m[s]
  || [] || ||||
 
   b  r p
-  *  * *
 ␉if ok {
  [] [] |
 
-     r  p yry
-     *v * ***
+     rv p yry
 ␉␉pool.Put(m)
   [--]|[-]|||
 
    r     p
-   *     *
 ␉␉return c
   [----] |
 
  r
- *
 ␉}
  |
 
  prpr r y
- **** * *
 ␉m[s] = s
  |||| | |
 
-  p    y 1y1
-  *  w * ***
+  p  w y 1y1
 ␉pool.Put(m)
  [--]|[-]|||
 
   p     1
-  *     *
 ␉return s
  [----] |
 
 p
-*
 }
 |
 
-2   y       1    b    g       y r      rr    y
-*   *       *    *    *       * *      **    *    o
+2   y       1    b    g       y r      rr    y    o
 // Bytes returns b converted to a string, interned.
 [] [---] [-----] | [-------] [] | [----]| [------]|
 
  2    1   2g pp 2  2      p y
- *    *   ** ** *  *      * *
 func Bytes(b []byte) string {
 [--] [---]|| ||[--]| [----] |
 
- 1 rp    p  1      p y  p   y
- * **    *# * xx^v * *  *   * x    v
+ 1 rp    p# 1 xx^v p y  p   y x    v
 ␉m := pool.Get().(map[string]string)
  | || [--]|[-]||||[-]|[----]|[----]|
 
- yp  p py 21       r 1
- **  * ** ** v    w*w*
+ yp  p py 21 v    wrw1
 ␉c, ok := m[string(b)]
  || [] || ||[----]||||
 
   g  y 1
-  *  * *
 ␉if ok {
  [] [] |
 
-     y
-     *0 x oxo
+     y0 x oxo
 ␉␉pool.Put(m)
   [--]|[-]|||
 
    2     1
-   *     *
 ␉␉return c
   [----] |
 
  y
- *
 ␉}
  |
 
- 2 y1      y p
- * **      *#*#
+ 2 y1      y#p#
 ␉s := string(b)
  | || [----]|||
 
-  2 2 2
- v*x* * v
+ v2x2 2 v
 ␉m[s] = s
  |||| | |
 
-  1
-  *  > v ^w^
+  1  > v ^w^
 ␉pool.Put(m)
  [--]|[-]|||
 
@@ -182,7 +147,6 @@ func Bytes(b []byte) string {
  [----] |
 
 1
-*
 }
 |