Merge scope types in cheatsheet

cursorless-dev · Dec 10, 2021 · 25ac141 · 25ac141
1 parent cee86cc
commit 25ac141
Showing 1 changed file with 6 additions and 10 deletions.
diff --git a/src/cheat_sheet.py b/src/cheat_sheet.py
@@ -151,8 +151,12 @@ def draw(self, canvas):
         self.draw_items(canvas, actions_2)
         self.next_column(canvas)
 
-        all_scopes = get_list("scope_type", {"argumentOrParameter": "Argument"})
-        scopes_limit = len(all_scopes) - 3
+        all_scopes = {
+            **get_list("scope_type", {"argumentOrParameter": "Argument"}),
+            **get_list("selection_type"),
+            **get_list("subtoken_scope_type"),
+        }
+        scopes_limit = 24
         scopes_1 = slice_dict(all_scopes, 0, scopes_limit)
         scopes_2 = slice_dict(all_scopes, scopes_limit)
 
@@ -164,14 +168,6 @@ def draw(self, canvas):
         self.draw_header(canvas, "More scopes")
         self.draw_items(canvas, scopes_2)
 
-        self.next_row()
-        self.draw_header(canvas, "Selection types")
-        self.draw_items(canvas, get_list("selection_type"))
-
-        self.next_row()
-        self.draw_header(canvas, "Subtokens")
-        self.draw_items(canvas, get_list("subtoken_scope_type"))
-
         self.next_row()
         self.draw_header(canvas, "Positions")
         self.draw_items(canvas, get_list("position"))