Merge pull request #367 from lambdalisue/add-equal-mapping-on-trash

Add equal mapping on trash

Author: lambdalisue

autoload/vital/_fern/Prompt.vim renamed to autoload/fern/internal/prompt.vim

@@ -1,15 +1,6 @@
-" ___vital___
-" NOTE: lines between '" ___vital___' is generated by :Vitalize.
-" Do not modify the code nor insert new lines before '" ___vital___'
-function! s:_SID() abort
-  return matchstr(expand('<sfile>'), '<SNR>\zs\d\+\ze__SID$')
-endfunction
-execute join(['function! vital#_fern#Prompt#import() abort', printf("return map({'select': '', 'ask': '', 'confirm': '', 'input': ''}, \"vital#_fern#function('<SNR>%s_' . v:key)\")", s:_SID()), 'endfunction'], "\n")
-delfunction s:_SID
-" ___vital___
 let s:ESCAPE_MARKER = sha256(expand('<sfile>'))
 
-function! s:input(prompt, ...) abort
+function! fern#internal#prompt#input(prompt, ...) abort
   let text = a:0 > 0 ? a:1 : ''
   let comp = a:0 > 1
         \ ? type(a:2) is# v:t_func ? 'customlist,' . get(a:2, 'name') : a:2
@@ -28,26 +19,23 @@ function! s:input(prompt, ...) abort
   endtry
 endfunction
 
-function! s:ask(...) abort
-  call inputsave()
+function! fern#internal#prompt#ask(...) abort
   try
     echohl Question
-    return call('s:input', a:000)
+    return call('fern#internal#prompt#input', a:000)
   finally
     echohl None
-    call inputrestore()
     redraw | echo
   endtry
 endfunction
 
-function! s:confirm(prompt, ...) abort
+function! fern#internal#prompt#confirm(prompt, ...) abort
   let default = a:0 ? (a:1 ? 'yes' : 'no') : v:null
-  call inputsave()
   echohl Question
   try
     let r = ''
     while r !~? '^\%(y\%[es]\|n\%[o]\)$'
-      let r = s:input(a:prompt, '', funcref('s:_confirm_complete'))
+      let r = fern#internal#prompt#input(a:prompt, '', funcref('s:_confirm_complete'))
       if r is# v:null
         return v:null
       endif
@@ -56,17 +44,15 @@ function! s:confirm(prompt, ...) abort
     return r =~? 'y\%[es]'
   finally
     echohl None
-    call inputrestore()
     redraw | echo
   endtry
 endfunction
 
-function! s:select(prompt, ...) abort
+function! fern#internal#prompt#select(prompt, ...) abort
   let max = a:0 > 0 ? a:1 : 1
   let min = a:0 > 1 ? a:2 : 1
   let pat = a:0 > 2 ? a:3 : '\d'
   let buffer = ''
-  call inputsave()
   echohl Question
   try
     while len(buffer) < max
@@ -84,7 +70,6 @@ function! s:select(prompt, ...) abort
     return buffer
   finally
     echohl None
-    call inputrestore()
   endtry
 endfunction
 

autoload/fern/scheme/dict/mapping.vim

@@ -1,4 +1,3 @@
-let s:Prompt = vital#fern#import('Prompt')
 let s:Promise = vital#fern#import('Async.Promise')
 
 function! fern#scheme#dict#mapping#init(disable_default_mappings) abort
@@ -153,7 +152,7 @@ function! s:map_remove(helper) abort
     let prompt .= "\n..."
   endif
   let prompt .= "\nAre you sure to continue (Y[es]/no): "
-  if !s:Prompt.confirm(prompt)
+  if !fern#internal#prompt#confirm(prompt)
     return s:Promise.reject('Cancelled')
   endif
 

autoload/fern/scheme/dict/mapping/clipboard.vim

@@ -1,4 +1,3 @@
-let s:Prompt = vital#fern#import('Prompt')
 let s:Promise = vital#fern#import('Async.Promise')
 
 let s:clipboard = {
@@ -65,7 +64,7 @@ function! s:map_clipboard_paste(helper) abort
       let prompt .= "\n..."
     endif
     let prompt .= "\nAre you sure to continue (Y[es]/no): "
-    if !s:Prompt.confirm(prompt)
+    if !fern#internal#prompt#confirm(prompt)
       return s:Promise.reject('Cancelled')
     endif
   endif

autoload/fern/scheme/dict/tree.vim

@@ -1,4 +1,3 @@
-let s:Prompt = vital#fern#import('Prompt')
 let s:Promise = vital#fern#import('Async.Promise')
 
 function! fern#scheme#dict#tree#read(tree, path, ...) abort
@@ -119,7 +118,7 @@ function! s:select_overwrite_method(path) abort
         \ 'Please select an overwrite method (esc to cancel)',
         \ 'f[orce]/r[ename]: ',
         \], "\n")
-  return s:Prompt.select(prompt, 1, 1, '[fr]')
+  return fern#internal#prompt#select(prompt, 1, 1, '[fr]')
 endfunction
 
 function! s:dig(tree, terms, create) abort

autoload/fern/scheme/file/mapping.vim

@@ -1,5 +1,4 @@
 let s:Promise = vital#fern#import('Async.Promise')
-let s:Prompt = vital#fern#import('Prompt')
 
 function! fern#scheme#file#mapping#init(disable_default_mappings) abort
   nnoremap <buffer><silent> <Plug>(fern-action-new-path)  :<C-u>call <SID>call('new_path')<CR>
@@ -11,7 +10,9 @@ function! fern#scheme#file#mapping#init(disable_default_mappings) abort
   nnoremap <buffer><silent> <Plug>(fern-action-copy)      :<C-u>call <SID>call('copy')<CR>
   nnoremap <buffer><silent> <Plug>(fern-action-move)      :<C-u>call <SID>call('move')<CR>
   nnoremap <buffer><silent> <Plug>(fern-action-trash)     :<C-u>call <SID>call('trash')<CR>
+  nnoremap <buffer><silent> <Plug>(fern-action-trash=)    :<C-u>call <SID>call_without_guard('trash')<CR>
   nnoremap <buffer><silent> <Plug>(fern-action-remove)    :<C-u>call <SID>call('remove')<CR>
+  nnoremap <buffer><silent> <Plug>(fern-action-remove=)   :<C-u>call <SID>call_without_guard('remove')<CR>
 
   if !a:disable_default_mappings
     nmap <buffer><nowait> N <Plug>(fern-action-new-file)
@@ -151,7 +152,7 @@ function! s:map_trash(helper) abort
     let prompt .= "\n..."
   endif
   let prompt .= "\nAre you sure to continue (Y[es]/no): "
-  if !s:Prompt.confirm(prompt)
+  if !fern#internal#prompt#confirm(prompt)
     return s:Promise.reject('Cancelled')
   endif
   let token = a:helper.fern.source.token
@@ -183,7 +184,7 @@ function! s:map_remove(helper) abort
     let prompt .= "\n..."
   endif
   let prompt .= "\nAre you sure to continue (Y[es]/no): "
-  if !s:Prompt.confirm(prompt)
+  if !fern#internal#prompt#confirm(prompt)
     return s:Promise.reject('Cancelled')
   endif
   let token = a:helper.fern.source.token

autoload/fern/scheme/file/mapping/clipboard.vim

@@ -1,5 +1,4 @@
 let s:Promise = vital#fern#import('Async.Promise')
-let s:Prompt = vital#fern#import('Prompt')
 
 let s:clipboard = {
       \ 'mode': 'copy',
@@ -65,7 +64,7 @@ function! s:map_clipboard_paste(helper) abort
       let prompt .= "\n..."
     endif
     let prompt .= "\nAre you sure to continue (y[es]/n[o]): "
-    if !s:Prompt.confirm(prompt)
+    if !fern#internal#prompt#confirm(prompt)
       return s:Promise.reject('Cancelled')
     endif
   endif

autoload/fern/scheme/file/shutil.vim

@@ -1,6 +1,5 @@
 let s:File = vital#fern#import('Async.File')
 let s:Promise = vital#fern#import('Async.Promise')
-let s:Prompt = vital#fern#import('Prompt')
 let s:CancellationToken = vital#fern#import('Async.CancellationToken')
 
 function! fern#scheme#file#shutil#open(path, ...) abort
@@ -108,5 +107,5 @@ function! s:select_overwrite_method(path) abort
         \ 'Please select an overwrite method (esc to cancel)',
         \ 'f[orce]/r[ename]: ',
         \], "\n")
-  return s:Prompt.select(prompt, 1, 1, '[fr]')
+  return fern#internal#prompt#select(prompt, 1, 1, '[fr]')
 endfunction

autoload/vital/fern.vital

@@ -12,7 +12,6 @@ Config
 Lambda
 System.Filepath
 Vim.Window.Cursor
-Prompt
 App.Action
 App.WindowSelector
 App.WindowLocator

doc/fern.txt

@@ -1148,6 +1148,7 @@ The following mappings/actions are only available on file:// scheme.
 	The prompt will repeatedly open if multiple nodes has marked.
 
 *<Plug>(fern-action-trash)*
+*<Plug>(fern-action-trash=)*
 	Open a prompt to ask if fern can send the cursor node or marked nodes
 	to the system trash-bin. It uses the following implementations to send
 	the node(s) into system trash-bin.
@@ -1159,11 +1160,26 @@ The following mappings/actions are only available on file:// scheme.
 			https://github.com/b4b4r07/gomi
 	Note that the action fails without removing the files/directories if
 	no requirement exists on Linux.
+	You can use a "=" variant to apply values to the prompt and/or submit
+	a value like:
+>
+	" Immediately delete
+	nmap <buffer>
+	      \ <Plug>(my-trash)
+	      \ <Plug>(fern-action-trash=)y<CR>
 
 *<Plug>(fern-action-remove)*
+*<Plug>(fern-action-remove=)*
 	Open a prompt to ask if fern can DELETE the cursor node or marked
 	nodes. BE CAREFUL with this action while it DELETE the file/direcoty
 	and users cannot restore (like "rm" in terminal.)
+	You can use a "=" variant to apply values to the prompt and/or submit
+	a value like:
+>
+	" Immediately delete
+	nmap <buffer>
+	      \ <Plug>(my-trash)
+	      \ <Plug>(fern-action-trash=)y<CR>
 
 *<Plug>(fern-action-cd:root)*
 *<Plug>(fern-action-lcd:root)*