commands: remap {a-,}space to {a-,}, (#281)

71 · Nov 2, 2022 · 5779d9c · 5779d9c
1 parent 73d32ad
commit 5779d9c
Show file tree

Hide file tree

Showing 7 changed files with 63 additions and 50 deletions.
diff --git a/package.build.ts b/package.build.ts
@@ -714,14 +714,12 @@ export const pkg = (modules: Builder.ParsedModule[]) => ({
     keybindings: (() => {
       const keybindings = modules.flatMap((module) => module.keybindings),
             alphanum = [..."ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"],
+            symbols = [...",'-=", "Space", "NumPad_Add", "NumPad_Subtract"],
             keysToAssign = new Set([
               ...alphanum,
               ...alphanum.map((x) => `Shift+${x}`),
-              ...",'-",
-              "Shift+=",
-              "Shift+Space",
-              "NumPad_Add",
-              "NumPad_Subtract",
+              ...symbols,
+              ...symbols.map((x) => `Shift+${x}`),
             ]);
 
       for (const keybinding of keybindings) {

diff --git a/package.json b/package.json
diff --git a/src/api/data/commands.yaml b/src/api/data/commands.yaml
@@ -1965,7 +1965,7 @@ selections.clear.main:
 
   keys:
     qwerty: |-
-      `a-space` (kakoune: normal)
+      `a-,` (kakoune: normal)
 
 selections.clear.secondary:
   title:
@@ -1976,7 +1976,7 @@ selections.clear.secondary:
 
   keys:
     qwerty: |-
-      `space` (kakoune: normal)
+      `,` (kakoune: normal)
 
 selections.copy:
   title:
@@ -2058,12 +2058,12 @@ selections.filter:
 
       #### Variants
 
-      | Title                      | Identifier              | Keybinding                  | Commands                                                                 |
-      | -------------------------- | ----------------------- | --------------------------- | ------------------------------------------------------------------------ |
-      | Keep matching selections   | `filter.regexp`         | `a-k` (kakoune: normal)     | `[".selections.filter", { defaultExpression: "/"               , ... }]` |
-      | Clear matching selections  | `filter.regexp.inverse` | `s-a-k` (kakoune: normal)   | `[".selections.filter", { defaultExpression: "/", inverse: true, ... }]` |
-      | Clear secondary selections | `clear.secondary`       | `space` (kakoune: normal)   | `[".selections.filter", { expression: "i === count"            , ... }]` |
-      | Clear main selections      | `clear.main`            | `a-space` (kakoune: normal) | `[".selections.filter", { expression: "i !== count"            , ... }]` |
+      | Title                      | Identifier              | Keybinding                | Commands                                                                 |
+      | -------------------------- | ----------------------- | --------------------------| ------------------------------------------------------------------------ |
+      | Keep matching selections   | `filter.regexp`         | `a-k` (kakoune: normal)   | `[".selections.filter", { defaultExpression: "/"               , ... }]` |
+      | Clear matching selections  | `filter.regexp.inverse` | `s-a-k` (kakoune: normal) | `[".selections.filter", { defaultExpression: "/", inverse: true, ... }]` |
+      | Clear secondary selections | `clear.secondary`       | `,` (kakoune: normal)     | `[".selections.filter", { expression: "i === count"            , ... }]` |
+      | Clear main selections      | `clear.main`            | `a-,` (kakoune: normal)   | `[".selections.filter", { expression: "i !== count"            , ... }]` |
 
 selections.filter.regexp:
   title:

diff --git a/src/commands/README.md b/src/commands/README.md
diff --git a/src/commands/layouts/azerty.fr.md b/src/commands/layouts/azerty.fr.md
@@ -172,8 +172,8 @@ selections are empty</td><td></td></tr>
 <tr><td><a href="#selections.save"><code>selections.save</code></a></td><td>Save selections</td><td><code>Shift+Z</code> (<code>editorTextFocus && dance.mode == 'normal'</code>)</td></tr>
 <tr><td><a href="#selections.saveText"><code>selections.saveText</code></a></td><td>Copy selections text</td><td><code>Y</code> (<code>editorTextFocus && dance.mode == 'normal'</code>)</td></tr>
 <tr><td><a href="#selections.select"><code>selections.select</code></a></td><td>Select within selections</td><td></td></tr>
-<tr><td><a href="../selections.ts#L303"><code>selections.clear.main</code></a></td><td>Clear main selections</td><td><code>Alt+Space</code> (<code>editorTextFocus && dance.mode == 'normal'</code>)</td></tr>
-<tr><td><a href="../selections.ts#L302"><code>selections.clear.secondary</code></a></td><td>Clear secondary selections</td><td><code>Space</code> (<code>editorTextFocus && dance.mode == 'normal'</code>)</td></tr>
+<tr><td><a href="../selections.ts#L303"><code>selections.clear.main</code></a></td><td>Clear main selections</td><td><code>Alt+,</code> (<code>editorTextFocus && dance.mode == 'normal'</code>)</td></tr>
+<tr><td><a href="../selections.ts#L302"><code>selections.clear.secondary</code></a></td><td>Clear secondary selections</td><td><code>,</code> (<code>editorTextFocus && dance.mode == 'normal'</code>)</td></tr>
 <tr><td><a href="../selections.ts#L808"><code>selections.copy.above</code></a></td><td>Copy selections above</td><td><code>Shift+Alt+C</code> (<code>editorTextFocus && dance.mode == 'normal'</code>)</td></tr>
 <tr><td><a href="../selections.ts#L660"><code>selections.faceBackward</code></a></td><td>Backward selections</td><td></td></tr>
 <tr><td><a href="../selections.ts#L659"><code>selections.faceForward</code></a></td><td>Forward selections</td><td><code>Shift+Alt+;</code> (<code>editorTextFocus && dance.mode == 'normal'</code>)</td></tr>
@@ -1440,12 +1440,12 @@ Filter selections.
 
 #### Variants
 
-| Title                      | Identifier              | Keybinding                  | Commands                                                                 |
-| -------------------------- | ----------------------- | --------------------------- | ------------------------------------------------------------------------ |
-| Keep matching selections   | `filter.regexp`         | `a-k` (kakoune: normal)     | `[".selections.filter", { defaultExpression: "/"               , ... }]` |
-| Clear matching selections  | `filter.regexp.inverse` | `s-a-k` (kakoune: normal)   | `[".selections.filter", { defaultExpression: "/", inverse: true, ... }]` |
-| Clear secondary selections | `clear.secondary`       | `space` (kakoune: normal)   | `[".selections.filter", { expression: "i === count"            , ... }]` |
-| Clear main selections      | `clear.main`            | `a-space` (kakoune: normal) | `[".selections.filter", { expression: "i !== count"            , ... }]` |
+| Title                      | Identifier              | Keybinding                | Commands                                                                 |
+| -------------------------- | ----------------------- | --------------------------| ------------------------------------------------------------------------ |
+| Keep matching selections   | `filter.regexp`         | `a-k` (kakoune: normal)   | `[".selections.filter", { defaultExpression: "/"               , ... }]` |
+| Clear matching selections  | `filter.regexp.inverse` | `s-a-k` (kakoune: normal) | `[".selections.filter", { defaultExpression: "/", inverse: true, ... }]` |
+| Clear secondary selections | `clear.secondary`       | `,` (kakoune: normal)     | `[".selections.filter", { expression: "i === count"            , ... }]` |
+| Clear main selections      | `clear.main`            | `a-,` (kakoune: normal)   | `[".selections.filter", { expression: "i !== count"            , ... }]` |
 
 This command:
 - accepts an argument of type `{ expression?: string }`.

diff --git a/src/commands/layouts/qwerty.md b/src/commands/layouts/qwerty.md
@@ -172,8 +172,8 @@ selections are empty</td><td></td></tr>
 <tr><td><a href="#selections.save"><code>selections.save</code></a></td><td>Save selections</td><td><code>Shift+Z</code> (<code>editorTextFocus && dance.mode == 'normal'</code>)</td></tr>
 <tr><td><a href="#selections.saveText"><code>selections.saveText</code></a></td><td>Copy selections text</td><td><code>Y</code> (<code>editorTextFocus && dance.mode == 'normal'</code>)</td></tr>
 <tr><td><a href="#selections.select"><code>selections.select</code></a></td><td>Select within selections</td><td></td></tr>
-<tr><td><a href="../selections.ts#L303"><code>selections.clear.main</code></a></td><td>Clear main selections</td><td><code>Alt+Space</code> (<code>editorTextFocus && dance.mode == 'normal'</code>)</td></tr>
-<tr><td><a href="../selections.ts#L302"><code>selections.clear.secondary</code></a></td><td>Clear secondary selections</td><td><code>Space</code> (<code>editorTextFocus && dance.mode == 'normal'</code>)</td></tr>
+<tr><td><a href="../selections.ts#L303"><code>selections.clear.main</code></a></td><td>Clear main selections</td><td><code>Alt+,</code> (<code>editorTextFocus && dance.mode == 'normal'</code>)</td></tr>
+<tr><td><a href="../selections.ts#L302"><code>selections.clear.secondary</code></a></td><td>Clear secondary selections</td><td><code>,</code> (<code>editorTextFocus && dance.mode == 'normal'</code>)</td></tr>
 <tr><td><a href="../selections.ts#L808"><code>selections.copy.above</code></a></td><td>Copy selections above</td><td><code>Shift+Alt+C</code> (<code>editorTextFocus && dance.mode == 'normal'</code>)</td></tr>
 <tr><td><a href="../selections.ts#L660"><code>selections.faceBackward</code></a></td><td>Backward selections</td><td></td></tr>
 <tr><td><a href="../selections.ts#L659"><code>selections.faceForward</code></a></td><td>Forward selections</td><td><code>Shift+Alt+;</code> (<code>editorTextFocus && dance.mode == 'normal'</code>)</td></tr>
@@ -1440,12 +1440,12 @@ Filter selections.
 
 #### Variants
 
-| Title                      | Identifier              | Keybinding                  | Commands                                                                 |
-| -------------------------- | ----------------------- | --------------------------- | ------------------------------------------------------------------------ |
-| Keep matching selections   | `filter.regexp`         | `a-k` (kakoune: normal)     | `[".selections.filter", { defaultExpression: "/"               , ... }]` |
-| Clear matching selections  | `filter.regexp.inverse` | `s-a-k` (kakoune: normal)   | `[".selections.filter", { defaultExpression: "/", inverse: true, ... }]` |
-| Clear secondary selections | `clear.secondary`       | `space` (kakoune: normal)   | `[".selections.filter", { expression: "i === count"            , ... }]` |
-| Clear main selections      | `clear.main`            | `a-space` (kakoune: normal) | `[".selections.filter", { expression: "i !== count"            , ... }]` |
+| Title                      | Identifier              | Keybinding                | Commands                                                                 |
+| -------------------------- | ----------------------- | --------------------------| ------------------------------------------------------------------------ |
+| Keep matching selections   | `filter.regexp`         | `a-k` (kakoune: normal)   | `[".selections.filter", { defaultExpression: "/"               , ... }]` |
+| Clear matching selections  | `filter.regexp.inverse` | `s-a-k` (kakoune: normal) | `[".selections.filter", { defaultExpression: "/", inverse: true, ... }]` |
+| Clear secondary selections | `clear.secondary`       | `,` (kakoune: normal)     | `[".selections.filter", { expression: "i === count"            , ... }]` |
+| Clear main selections      | `clear.main`            | `a-,` (kakoune: normal)   | `[".selections.filter", { expression: "i !== count"            , ... }]` |
 
 This command:
 - accepts an argument of type `{ expression?: string }`.

diff --git a/src/commands/selections.ts b/src/commands/selections.ts
@@ -295,12 +295,12 @@ const filterHistory: string[] = [];
  *
  * #### Variants
  *
- * | Title                      | Identifier              | Keybinding                  | Commands                                                                 |
- * | -------------------------- | ----------------------- | --------------------------- | ------------------------------------------------------------------------ |
- * | Keep matching selections   | `filter.regexp`         | `a-k` (kakoune: normal)     | `[".selections.filter", { defaultExpression: "/"               , ... }]` |
- * | Clear matching selections  | `filter.regexp.inverse` | `s-a-k` (kakoune: normal)   | `[".selections.filter", { defaultExpression: "/", inverse: true, ... }]` |
- * | Clear secondary selections | `clear.secondary`       | `space` (kakoune: normal)   | `[".selections.filter", { expression: "i === count"            , ... }]` |
- * | Clear main selections      | `clear.main`            | `a-space` (kakoune: normal) | `[".selections.filter", { expression: "i !== count"            , ... }]` |
+ * | Title                      | Identifier              | Keybinding                | Commands                                                                 |
+ * | -------------------------- | ----------------------- | --------------------------| ------------------------------------------------------------------------ |
+ * | Keep matching selections   | `filter.regexp`         | `a-k` (kakoune: normal)   | `[".selections.filter", { defaultExpression: "/"               , ... }]` |
+ * | Clear matching selections  | `filter.regexp.inverse` | `s-a-k` (kakoune: normal) | `[".selections.filter", { defaultExpression: "/", inverse: true, ... }]` |
+ * | Clear secondary selections | `clear.secondary`       | `,` (kakoune: normal)     | `[".selections.filter", { expression: "i === count"            , ... }]` |
+ * | Clear main selections      | `clear.main`            | `a-,` (kakoune: normal)   | `[".selections.filter", { expression: "i !== count"            , ... }]` |
  */
 export function filter(
   _: Context,