浏览代码

updated some new fzf commands

Chris 4 年之前
父节点
当前提交
e7c6d7d37d
共有 3 个文件被更改,包括 58 次插入9 次删除
  1. 56 9
      keys/which-key.vim
  2. 1 0
      plug-config/coc/coc-extensions.vim
  3. 1 0
      vim-plug/plugins.vim

+ 56 - 9
keys/which-key.vim

@@ -129,26 +129,58 @@ let g:which_key_map.m = {
       " CoC throws an error
       " \ 'a' : [':CocCommand bookmark.annotate', 'annotate bookmark'],
 
+" " s is for search
+" let g:which_key_map.s = {
+"       \ 'name' : '+search' ,
+"       \ '/' : [':History/'              , 'history'],
+"       \ ';' : [':Commands'              , 'commands'],
+"       \ 'a' : [':Ag'                    , 'text Ag'],
+"       \ 'b' : [':BLines'                , 'current buffer'],
+"       \ 'B' : [':Buffers'               , 'open buffers'],
+"       \ 'c' : [':Commits'               , 'commits'],
+"       \ 'C' : [':BCommits'              , 'buffer commits'],
+"       \ 'f' : [':Files'                 , 'files'],
+"       \ 'g' : [':GFiles'                , 'git files'],
+"       \ 'G' : [':GFiles?'               , 'modified git files'],
+"       \ 'h' : [':History'               , 'file history'],
+"       \ 'H' : [':History:'              , 'command history'],
+"       \ 'l' : [':Lines'                 , 'lines'] ,
+"       \ 'm' : [':Marks'                 , 'marks'] ,
+"       \ 'M' : [':Maps'                  , 'normal maps'] ,
+"       \ 'p' : [':Helptags'              , 'help tags'] ,
+"       \ 'P' : [':Tags'                  , 'project tags'],
+"       \ 's' : [':CocList snippets'      , 'snippets'],
+"       \ 'S' : [':Colors'                , 'color schemes'],
+"       \ 't' : [':Rg'                    , 'text Rg'],
+"       \ 'T' : [':BTags'                 , 'buffer tags'],
+"       \ 'w' : [':Windows'               , 'search windows'],
+"       \ 'y' : [':Filetypes'             , 'file types'],
+"       \ 'z' : [':FZF'                   , 'FZF'],
+"       \ }
+      " \ 's' : [':Snippets'     , 'snippets'],
+
 " s is for search
 let g:which_key_map.s = {
       \ 'name' : '+search' ,
       \ '/' : [':History/'              , 'history'],
-      \ ';' : [':Commands'              , 'commands'],
+      \ ';' : [':FzfPreviewCommandPalette'              , 'commands'],
       \ 'a' : [':Ag'                    , 'text Ag'],
-      \ 'b' : [':BLines'                , 'current buffer'],
-      \ 'B' : [':Buffers'               , 'open buffers'],
+      \ 'b' : [':CocCommand fzf-preview.BufferLines'                , 'current buffer'],
+      \ 'B' : [':CocCommand fzf-preview.Buffers'               , 'open buffers'],
       \ 'c' : [':Commits'               , 'commits'],
       \ 'C' : [':BCommits'              , 'buffer commits'],
-      \ 'f' : [':Files'                 , 'files'],
-      \ 'g' : [':GFiles'                , 'git files'],
+      \ 'd' : [':CocCommand fzf-preview.DirectoryFiles'              , 'directories'],
+      \ 'f' : [':CocCommand fzf-preview.ProjectFiles'                 , 'files'],
+      \ 'g' : [':CocCommand fzf-preview.GitFiles'                , 'git files'],
       \ 'G' : [':GFiles?'               , 'modified git files'],
       \ 'h' : [':History'               , 'file history'],
       \ 'H' : [':History:'              , 'command history'],
       \ 'l' : [':Lines'                 , 'lines'] ,
-      \ 'm' : [':Marks'                 , 'marks'] ,
+      \ 'm' : [':CocCommand fzf-preview.Marks', 'list marks'],
       \ 'M' : [':Maps'                  , 'normal maps'] ,
       \ 'p' : [':Helptags'              , 'help tags'] ,
       \ 'P' : [':Tags'                  , 'project tags'],
+      \ 'q' : [':CocCommand fzf-preview.QuickFix'                  , 'quickfix list'],
       \ 's' : [':CocList snippets'      , 'snippets'],
       \ 'S' : [':Colors'                , 'color schemes'],
       \ 't' : [':Rg'                    , 'text Rg'],
@@ -157,7 +189,17 @@ let g:which_key_map.s = {
       \ 'y' : [':Filetypes'             , 'file types'],
       \ 'z' : [':FZF'                   , 'FZF'],
       \ }
-      " \ 's' : [':Snippets'     , 'snippets'],
+" 
+" :CocCommand fzf-preview.AllBuffers
+" :CocCommand fzf-preview.Changes
+" :CocCommand fzf-preview.Yankround
+" :CocCommand fzf-preview.CocReferences
+" :CocCommand fzf-preview.CocDiagnostics
+" :CocCommand fzf-preview.CocCurrentDiagnostics
+" :CocCommand fzf-preview.CocTypeDefinitions
+" \ 'l' : [':CocCommand fzf-preview.Bookmarks', 'list bookmarks'],
+" $FZF_PREVIEW_PREVIEW_BAT_THEME = 'ansi-dark'
+" 
 
 let g:which_key_map.S = {
       \ 'name' : '+Session' ,
@@ -172,7 +214,7 @@ let g:which_key_map.S = {
 let g:which_key_map.g = {
       \ 'name' : '+git' ,
       \ 'a' : [':Git add .'                        , 'add all'],
-      \ 'A' : [':Git add %'                        , 'add current'],
+      \ 'A' : [':CocCommand fzf-preview.GitStatus' , 'actions'],
       \ 'b' : [':Git blame'                        , 'blame'],
       \ 'B' : [':GBrowse'                          , 'browse'],
       \ 'c' : [':Git commit'                       , 'commit'],
@@ -191,12 +233,17 @@ let g:which_key_map.g = {
       \ 'P' : [':Git pull'                         , 'pull'],
       \ 'r' : [':GRemove'                          , 'remove'],
       \ 's' : ['<Plug>(GitGutterStageHunk)'        , 'stage hunk'],
-      \ 'S' : [':!git status'                      , 'status'],
+      \ 'S' : [':CocCommand fzf-preview.GitStatus' , 'status'],
       \ 't' : [':GitGutterSignsToggle'             , 'toggle signs'],
       \ 'u' : ['<Plug>(GitGutterUndoHunk)'         , 'undo hunk'],
       \ 'v' : [':GV'                               , 'view commits'],
       \ 'V' : [':GV!'                              , 'view buffer commits'],
       \ }
+      " \ 'A' : [':Git add %'                        , 'add current'],
+      " \ 'S' : [':!git status'                      , 'status'],
+" 
+" 
+" 
 
 let g:which_key_map.G = {
       \ 'name' : '+gist' ,

+ 1 - 0
plug-config/coc/coc-extensions.vim

@@ -10,6 +10,7 @@ let g:coc_global_extensions = [
   \ 'coc-pairs',
   \ 'coc-tsserver',
   \ 'coc-floaterm',
+  \ 'coc-fzf-preview',
   \ 'coc-html',
   \ 'coc-css',
   \ 'coc-cssmodules',

+ 1 - 0
vim-plug/plugins.vim

@@ -59,6 +59,7 @@ call plug#begin('~/.config/nvim/autoload/plugged')
     Plug 'kevinhwang91/rnvimr'
     " FZF
     Plug 'junegunn/fzf', { 'do': { -> fzf#install() } }
+    Plug 'yuki-ycino/fzf-preview.vim', { 'branch': 'release', 'do': ':UpdateRemotePlugins' }
     Plug 'junegunn/fzf.vim'
     " Git
     Plug 'airblade/vim-gitgutter'