Merge pull request #27 from vim-fall/fix-default-mappings

Do NOT check if corresponding mappings are already defined to define default mappings

Author: lambdalisue

denops/fall/picker.ts

@@ -21,7 +21,10 @@ import { Scheduler } from "./lib/scheduler.ts";
 import { Cmdliner } from "./util/cmdliner.ts";
 import { isIncrementalMatcher } from "./util/predicate.ts";
 import { buildMappingHelpPages } from "./util/mapping.ts";
-import { emitPickerEnter, emitPickerLeave } from "./util/emitter.ts";
+import {
+  emitPickerEnterSystem,
+  emitPickerLeaveSystem,
+} from "./util/emitter.ts";
 import { CollectProcessor } from "./processor/collect.ts";
 import { MatchProcessor } from "./processor/match.ts";
 import { SortProcessor } from "./processor/sort.ts";
@@ -276,11 +279,11 @@ export class Picker<T extends Detail> implements AsyncDisposable {
       },
     );
 
-    // Emit 'FallPickerEnter/FallPickerLeave' autocmd
+    // Emit 'FallPickerEnterSystem/FallPickerLeaveSystem' autocmd
     stack.defer(async () => {
-      await emitPickerLeave(denops, this.#name);
+      await emitPickerLeaveSystem(denops, this.#name);
     });
-    await emitPickerEnter(denops, this.#name);
+    await emitPickerEnterSystem(denops, this.#name);
 
     return stack.move();
   }

denops/fall/util/emitter.ts

@@ -2,31 +2,33 @@ import type { Denops } from "jsr:@denops/std@^7.3.2";
 import { emit } from "jsr:@denops/std@^7.3.2/autocmd";
 
 /**
- * Save current cmap and emit `User FallPickerEnter:{name}` autocmd.
- *
- * The saved cmap will be restored by `emitPickerLeave`.
+ * Emit `User FallPickerEnterSystem:{name}` autocmd.
  */
-export async function emitPickerEnter(
+export async function emitPickerEnterSystem(
   denops: Denops,
   name: string,
 ): Promise<void> {
   try {
-    await emit(denops, "User", `FallPickerEnter:${name}`, { nomodeline: true });
+    await emit(denops, "User", `FallPickerEnterSystem:${name}`, {
+      nomodeline: true,
+    });
   } catch (err) {
-    console.warn(`[fall] Failed to emit FallPickerEnter:${name}`, err);
+    console.warn(`[fall] Failed to emit FallPickerEnterSystem:${name}`, err);
   }
 }
 
 /**
- * Restore saved cmap and emit `User FallPickerLeave:{name}` autocmd.
+ * Emit `User FallPickerLeaveSystem:{name}` autocmd.
  */
-export async function emitPickerLeave(
+export async function emitPickerLeaveSystem(
   denops: Denops,
   name: string,
 ): Promise<void> {
   try {
-    await emit(denops, "User", `FallPickerLeave:${name}`, { nomodeline: true });
+    await emit(denops, "User", `FallPickerLeaveSystem:${name}`, {
+      nomodeline: true,
+    });
   } catch (err) {
-    console.warn(`[fall] Failed to emit FallPickerLeave:${name}`, err);
+    console.warn(`[fall] Failed to emit FallPickerLeaveSystem:${name}`, err);
   }
 }

denops/fall/util/emitter_test.ts

@@ -1,36 +1,36 @@
 import { assertEquals } from "jsr:@std/assert@^1.0.6";
 import { DenopsStub } from "jsr:@denops/test@^3.0.4/stub";
 
-import { emitPickerEnter, emitPickerLeave } from "./emitter.ts";
+import { emitPickerEnterSystem, emitPickerLeaveSystem } from "./emitter.ts";
 
-Deno.test("emitPickerEnter", async (t) => {
-  await t.step("emit 'User FallPickerEnter:{name}'", async () => {
+Deno.test("emitPickerEnterSystem", async (t) => {
+  await t.step("emit 'User FallPickerEnterSystem:{name}'", async () => {
     const called: [string, Record<PropertyKey, unknown>][] = [];
     const denops = new DenopsStub({
       cmd(name, ctx): Promise<void> {
         called.push([name, ctx]);
         return Promise.resolve();
       },
     });
-    await emitPickerEnter(denops, "test");
+    await emitPickerEnterSystem(denops, "test");
     assertEquals(called, [
-      ["do <nomodeline> User FallPickerEnter:test", {}],
+      ["do <nomodeline> User FallPickerEnterSystem:test", {}],
     ]);
   });
 });
 
-Deno.test("emitPickerLeave", async (t) => {
-  await t.step("emit 'User FallPickerLeave:{name}'", async () => {
+Deno.test("emitPickerLeaveSystem", async (t) => {
+  await t.step("emit 'User FallPickerLeaveSystem:{name}'", async () => {
     const called: [string, Record<PropertyKey, unknown>][] = [];
     const denops = new DenopsStub({
       cmd(name, ctx): Promise<void> {
         called.push([name, ctx]);
         return Promise.resolve();
       },
     });
-    await emitPickerLeave(denops, "test");
+    await emitPickerLeaveSystem(denops, "test");
     assertEquals(called, [
-      ["do <nomodeline> User FallPickerLeave:test", {}],
+      ["do <nomodeline> User FallPickerLeaveSystem:test", {}],
     ]);
   });
 });

plugin/fall.vim

@@ -11,19 +11,24 @@ command! -nargs=0 FallCustom call fall#command#FallCustom#call()
 command! -nargs=0 FallCustomReload call fall#command#FallCustomReload#call()
 command! -nargs=0 FallCustomRecache call fall#command#FallCustomRecache#call()
 
+function! s:bypass(event) abort
+  let l:name = matchstr(expand('<amatch>'), '^.\+:\zs.*$')
+  execute printf('doautocmd <nomodeline> User %s:%s', a:event, l:name)
+endfunction
+
 augroup fall_plugin
   autocmd! *
   autocmd User FallPickerEnter:* :
   autocmd User FallPickerLeave:* :
   autocmd User FallCustomLoaded :
   autocmd User FallCustomRecached :
   autocmd User FallPreviewRendered:* :
+  autocmd User FallPickerEnterSystem:* ++nested call s:bypass('FallPickerEnter')
+  autocmd User FallPickerLeaveSystem:* ++nested call s:bypass('FallPickerLeave')
 augroup END
 
 if !exists('g:fall_custom_path')
   let g:fall_custom_path = has('nvim')
         \ ? expand(join([stdpath('config'), 'fall', 'custom.ts'], s:sep))
         \ : expand(join([$HOME, '.vim', 'fall', 'custom.ts'], s:sep))
 endif
-
-

plugin/fall/mapping.vim

@@ -63,9 +63,7 @@ cnoremap <silent> <Plug>(fall-action-select) <Cmd>call fall#action('@select')<CR
 
 if !get(g:, 'fall_disable_default_mapping')
   function! s:define(lhs, rhs) abort
-    if !hasmapto(a:rhs, 'c') && empty(maparg(a:lhs, 'c'))
-      execute 'cnoremap <silent> <nowait> ' . a:lhs . ' ' . a:rhs
-    endif
+    execute 'cnoremap <silent> <nowait> ' .. a:lhs .. ' ' .. a:rhs
   endfunction
 
   function! s:map_picker() abort
@@ -110,6 +108,6 @@ if !get(g:, 'fall_disable_default_mapping')
 
   augroup fall_mapping_plugin
     autocmd!
-    autocmd User FallPickerEnter:* call s:map_picker()
+    autocmd User FallPickerEnterSystem:* call s:map_picker()
   augroup END
 endif