feat: menus, menu doc, keyhint doc

justinpombrio · Apr 13, 2024 · 235f6e7 · 235f6e7
1 parent 3491219
commit 235f6e7
Show file tree

Hide file tree

Showing 8 changed files with 475 additions and 239 deletions.
diff --git a/data/keyhints_lang.ron b/data/keyhints_lang.ron
@@ -0,0 +1,41 @@
+LanguageSpec(
+    name: "Keyhints",
+    grammar: GrammarSpec(
+        constructs: [
+            ConstructSpec(
+                name: "Root",
+                arity: Listy(SortSpec(["Entry"])),
+            ),
+            ConstructSpec(
+                name: "Entry",
+                arity: Fixed([SortSpec(["Key"]), SortSpec(["Hint"])]),
+            ),
+            ConstructSpec(
+                name: "Key",
+                arity: Texty,
+            ),
+            ConstructSpec(
+                name: "Hint",
+                arity: Texty,
+            ),
+        ],
+        sorts: [],
+        root_construct: "Root",
+    ),
+    default_display_notation: NotationSetSpec(
+        name: "DefaultDisplay",
+        notations: [
+            ("Root", Fold(
+                first: Child(0),
+                join: Concat(Left, Concat(Choice(Literal("   "), Newline), Right)),
+            )),
+            ("Entry", Concat(
+                Child(0), Concat(
+                Style(Properties(fg_color: Some(Base04)), Literal(": ")),
+                Child(1))
+            )),
+            ("Key", Text),
+            ("Hint", Text),
+        ]
+    ),
+)
diff --git a/data/selection_lang.ron b/data/selection_lang.ron
@@ -1,17 +1,19 @@
-// TODO: styles
-
 LanguageSpec(
     name: "SelectionMenu",
     grammar: GrammarSpec(
         constructs: [
             ConstructSpec(
                 name: "Root",
-                arity: Listy(SortSpec(["element"])),
+                arity: Listy(SortSpec(["entry"])),
             ),
             ConstructSpec(
                 name: "Input",
                 arity: Texty,
             ),
+            ConstructSpec(
+                name: "Selected",
+                arity: Fixed([SortSpec(["candidate"])]),
+            ),
             ConstructSpec(
                 name: "Custom",
                 arity: Texty,
@@ -26,7 +28,8 @@ LanguageSpec(
             ),
         ],
         sorts: [
-            ("element", SortSpec(["Input", "Custom", "Literal", "NonLiteral"]))
+            ("entry", SortSpec(["Input", "Selected", "candidate"])),
+            ("candidate", SortSpec(["Custom", "Literal", "NonLiteral"]))
         ],
         root_construct: "Root",
     ),
@@ -37,8 +40,18 @@ LanguageSpec(
                 first: Child(0),
                 join: Concat(Left, Concat(Newline, Right)),
             )),
-            ("Input", Concat(Literal("> "), Text)),
-            ("Custom", Concat(Literal("[+] "), Text)),
+            ("Input", Concat(
+                Style(Properties(bold: Some(true), fg_color: Some(Base0C)), Literal("> ")),
+                Style(Properties(bold: Some(true)), Text))),
+            ("Selected", Style(Properties(
+                bold: Some(true),
+                fg_color: Some(Base01),
+                bg_color: Some(Base0A),
+                priority: High,
+            ), Child(0))),
+            ("Custom", Concat(
+                Style(Properties(fg_color: Some(Base0B)), Literal("[+] ")),
+                Text)),
             ("Literal", Text),
             ("NonLiteral", Text),
         ]