コミット: c7a47fbd091d5294bef249c9c7b32abf1d5f5aee - nvim (git)

コミットメタ情報

• リビジョン: c7a47fbd091d5294bef249c9c7b32abf1d5f5aee (tree)
• 日時: 2023-01-31 03:39:39
• 作者: Markus Prepens <markus.prepens@gmai...>
• コミッター: Markus Prepens

ログメッセージ

updates

変更サマリ

• modified: after/ftplugin/lua.vim
• modified: init.vim
• modified: lua/utils/run.lua
• modified: plugin/rg.lua

差分

--- a/after/ftplugin/lua.vim
+++ b/after/ftplugin/lua.vim
@@ -14,6 +14,12 @@ nnoremap <buffer> K :help <C-r><C-w><CR>
 nnoremap <buffer> <LocalLeader>f :call FormatLua()<CR>
 vnoremap <buffer> <LocalLeader>f :call FormatLua()<CR>
 
+" abbrev for lengthy API calls
+iabbrev xcmd vim.api.nvim_create_user_command({name}, {command}, {*opts})<C-o>T(
+iabbrev xmap vim.api.nvim_set_keymap({mode}, {lhs}, {rhs}, {*opts})<C-o>T(
+iabbrev xaug gid = vim.api.nvim_create_augroup({name}, {*opts})<C-o>T(
+iabbrev xauc vim.api.nvim_create_autocmd({name}, {*opts})<C-o>T(
+
 if !executable("stylua")
   finish
 endif

--- a/init.vim
+++ b/init.vim
@@ -106,12 +106,6 @@ if &diff
 endif
 command! ShowChanges vert new | set bt=nofile | r ++edit # | 0d_ | diffthis | wincmd p | diffthis
 
-" Living with QWERTZ keyboards
-execute "set langmap+=\<Char-246>["
-execute "set langmap+=\<Char-228>]"
-execute "set langmap+=\<Char-214>{"
-execute "set langmap+=\<Char-196>}"
-
 " Switch to normal mode with special keys
 inoremap <k0> <Esc>
 imap <C-l> <Esc><C-l>
@@ -183,6 +177,9 @@ nnoremap <A-h> :colder<CR>
 nnoremap <A-l> :cnewer<CR>
 nnoremap <A-j> <cmd>cnext<CR>
 nnoremap <A-k> <cmd>cprevious<CR>
+" Living with QWERTZ keyboards
+nnoremap <Char-228> <cmd>cnext<CR>
+nnoremap <Char-246> <cmd>cprevious<CR>
 
 " Window movement {{{
 noremap <S-Right> <C-w>l
@@ -231,13 +228,13 @@ let g:ft2glob = #{ c:'*.[ch]$', vim:'*.vim', py:'*.py$', lua: '*.lua', cmake:'*c
 nnoremap <expr> <Leader>v ':silent vimgrep /' .. expand("<cword>") .. '/ ' .. expand("%:h") .. g:slash .. LsFilter(&ft)
 
 """ :buffer, :edit and :find
+nnoremap <Leader>d <Cmd>bdelete<CR>
 nnoremap <Leader>t <cmd>tab split<CR>
 nnoremap <Leader>e :edit<space>
 nnoremap <Leader>, :edit <C-r>=stdpath("config") .. g:slash<CR>
 nnoremap <Leader>. :edit <C-r>=expand("%:h")=="." ? ".\\" : expand("%:h") .. g:slash<CR>
 nnoremap <Leader>b :buffer<space>
 nnoremap <Leader>f :find<Space>
-nnoremap <Leader>x <Cmd>bdelete<CR>
 
 """ Call Wordnik
 nnoremap <silent> <Leader>W :silent !start https://www.wordnik.com/words/<C-r>=tolower(expand("<cword>"))<CR><CR>
@@ -271,7 +268,7 @@ function! s:ToggleQuickfix()
         endif
     endif
 endfunction
-nnoremap <Leader>c <cmd>call <SID>ToggleQuickfix()<CR>
+nnoremap <Char-252> <cmd>call <SID>ToggleQuickfix()<CR>
 nnoremap <Leader>G <cmd>clast<CR>
 
 command! -nargs=0 IC :set   ignorecase nosmartcase
@@ -284,12 +281,12 @@ augroup init " {{{
     autocmd VimEnter * execute "colorscheme " .. (exists("g:GuiLoaded") ? "twotone" : "apollo")
     autocmd FocusLost * silent wall
     autocmd BufEnter * if &pvw | setlocal nonu nornu | endif
-    autocmd TextYankPost * silent! lua vim.highlight.on_yank {higroup="Visual", timeout=150}
+    autocmd TextYankPost * silent! lua vim.highlight.on_yank {higroup="Visual", timeout=300}
     autocmd TermOpen * setlocal winhighlight=Normal:CursorLine,NormalNC:CursorLine nonumber norelativenumber
 augroup END
 " }}}
 
-nnoremap <silent> <C-Space> <Cmd>lua MeltWhitespace()<CR>
+nnoremap <silent> <Leader><Space> <Cmd>lua MeltWhitespace()<CR>
 inoremap <silent> <C-Space> <Cmd>lua MeltWhitespace()<CR>
 
 nnoremap <Leader>h <Cmd>ToggleHlWord<CR>
@@ -339,8 +336,11 @@ endfunction
 " }}}
 
 " Compact mouse menu {{{
-aunmenu PopUp.How-to\ disable\ mouse
-"aunmenu PopUp.-1-
+try
+    aunmenu PopUp.How-to\ disable\ mouse
+    "aunmenu PopUp.-1-
+catch /.*/
+endtry
 " }}}
 
 let g:term = &term

--- a/lua/utils/run.lua
+++ b/lua/utils/run.lua
@@ -51,24 +51,23 @@ function RunAsync.start(args)
                 efm = self.regexp,
             })
             local qflist =
-                vim.fn.getqflist({ id = self.qflist_id, all = 0 }).items
-            if #qflist > 0 then
-                local errors = vim.fn.filter(qflist, function(k, v)
-                    return v["type"] == "e"
-                end)
-                local warnings = vim.fn.filter(qflist, function(k, v)
-                    return v["type"] == "w"
-                end)
-                self.infotext.update(
-                    "["
-                        .. #qflist
-                        .. " lines | "
-                        .. #warnings
-                        .. " warnings | "
-                        .. #errors
-                        .. " errors]"
-                )
-            end
+            vim.fn.getqflist({ id = self.qflist_id, all = 0 }).items
+            -- vim.notity(vim.inspect(qflist))
+            local errors = vim.fn.filter(qflist, function(k, v)
+                return v["type"] == "e"
+            end)
+            local warnings = vim.fn.filter(qflist, function(k, v)
+                return v["type"] == "w"
+            end)
+            self.infotext.update(
+            "["
+            .. #qflist
+            .. " lines | "
+            .. #warnings
+            .. " warnings | "
+            .. #errors
+            .. " errors]"
+            )
         end
     end
 

--- a/plugin/rg.lua
+++ b/plugin/rg.lua
@@ -46,7 +46,7 @@ function rg_find_files(str)
     local matches = {}
     handle:close()
 
-    vim.cmd("tabnew")
+    vim.cmd("enew")
     for token in string.gmatch(result, "[^%s]+") do
         table.insert( matches, token)
     end