コミット: 819f77d40f71fe6054e5697646b3650175f0a78d - nvim (git)

コミットメタ情報

• リビジョン: 819f77d40f71fe6054e5697646b3650175f0a78d (tree)
• 日時: 2023-02-03 19:55:27
• 作者: badcoff33 <none@none>
• コミッター: badcoff33

ログメッセージ

minor updates

変更サマリ

• modified: after/ftplugin/lua.vim
• modified: colors/twotone.vim
• modified: init.vim
• modified: lua/utils/files.lua
• modified: plugin/ctags.lua

差分

--- a/after/ftplugin/lua.vim
+++ b/after/ftplugin/lua.vim
@@ -18,7 +18,7 @@ vnoremap <buffer> <LocalLeader>f :call FormatLua()<CR>
 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(
+iabbrev xauc vim.api.nvim_create_autocmd({events}, {*opts})<C-o>T(
 
 if !executable("stylua")
   finish

--- a/colors/twotone.vim
+++ b/colors/twotone.vim
@@ -78,10 +78,10 @@ execute "hi Conditional" s:Fg(s:red)  s:Attr("bold")
 execute "hi Constant" s:Fg(s:blue)
 execute "hi Directory" s:Fg(s:blue) s:Attr("underline") s:Special(s:blue)
 execute "hi Error" s:Fg(s:red) s:Bg("bg") s:Attr("underline")
-execute "hi ErrorMsg" s:Fg(s:red) s:Bg("bg")
+execute "hi ErrorMsg" s:Fg(s:white) s:Bg(s:red)
 execute "hi Function" s:Fg(s:blue)
 execute "hi Identifier" s:Fg(s:blue)
-execute "hi ModeMsg" s:Fg(s:blue) s:Bg("bg") s:Attr("bold")
+execute "hi ModeMsg" s:Fg(s:white) s:Bg(s:blue) s:Attr("NONE")
 execute "hi Number" s:Fg(s:blue)
 execute "hi PreCondit" s:Fg(s:blue)  s:Attr("bold")
 execute "hi PreProc" s:Fg(s:silver4) s:Attr("bold")

--- a/init.vim
+++ b/init.vim
@@ -127,8 +127,6 @@ nnoremap <A-Right> <End>
 xnoremap <A-Left> 0
 xnoremap <A-Right> $
 
-" Replace current inner word with one key press
-nnoremap <BS> ciw
 " Alternative keys to delete words in insert mode
 inoremap <C-BS> <C-o>db
 inoremap <C-Del> <C-o>de
@@ -229,9 +227,8 @@ nnoremap <expr> <Leader>v ':silent vimgrep /' .. expand("<cword>") .. '/ ' .. ex
 
 """ :buffer, :edit and :find
 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>E :edit <C-r>=stdpath("config") .. g:slash<CR>
+nnoremap <Leader>e :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>
@@ -268,7 +265,7 @@ function! s:ToggleQuickfix()
         endif
     endif
 endfunction
-nnoremap <Leader>c <cmd>call <SID>ToggleQuickfix()<CR>
+nnoremap <BS> <cmd>call <SID>ToggleQuickfix()<CR>
 nnoremap <Leader>G <cmd>clast<CR>
 
 command! -nargs=0 IC :set   ignorecase nosmartcase

--- a/lua/utils/files.lua
+++ b/lua/utils/files.lua
@@ -1,44 +1,51 @@
 local files = {}
 local keymap = vim.api.nvim_set_keymap
+local on_windows = vim.loop.os_uname().version:match("Windows")
+
+local function join_paths(...)
+    local path_sep = on_windows and "\\" or "/"
+    local result = table.concat({ ... }, path_sep)
+    return result
+end
 
 split_string = function(s, d)
-	chunks = {}
-	for substring in string.gmatch(s, d) do
-		table.insert(chunks, substring)
-	end
-	return chunks
+    chunks = {}
+    for substring in string.gmatch(s, d) do
+        table.insert(chunks, substring)
+    end
+    return chunks
 end
 
 on_path = function(name)
-	paths = split_string(os.getenv("PATH"), "[^;]+")
-	found = nil
-	for i = 1, #paths do
-		candidate = paths[i] .. "\\" .. name
-		local f = io.open(candidate, "r")
-		if f ~= nil then
-			found = candidate
-			io.close(f)
-			break
-		end
-	end
-	return found
+    paths = split_string(os.getenv("PATH"), "[^;]+")
+    found = nil
+    for i = 1, #paths do
+        candidate = paths[i] .. "\\" .. name
+        local f = io.open(candidate, "r")
+        if f ~= nil then
+            found = candidate
+            io.close(f)
+            break
+        end
+    end
+    return found
 end
 
 exe = on_path("cmd.exe")
 
 LsFilter = function()
-	ft2regex = {
-		c = ".[ch]$",
-		vim = ".vim",
-		lua = ".lua",
-		py = ".py$",
-		cmake = ".cmake CMakeLists.txt",
-	}
-	if ft2regex[vim.bo.ft] ~= nil then
-		return ft2regex[vim.bo.ft]
-	else
-		return ""
-	end
+    ft2regex = {
+        c = ".[ch]$",
+        vim = ".vim",
+        lua = ".lua",
+        py = ".py$",
+        cmake = ".cmake CMakeLists.txt",
+    }
+    if ft2regex[vim.bo.ft] ~= nil then
+        return ft2regex[vim.bo.ft]
+    else
+        return ""
+    end
 end
 
 return files

--- a/plugin/ctags.lua
+++ b/plugin/ctags.lua
@@ -8,7 +8,7 @@ local ctags_locked = true -- disable until completed
 
 function CtagsTriggerUpdate()
     local ctags_options = ""
-    local running = vim.fn.jobwait({ctags_jobid}, 0)[1] == -1
+    local running = vim.fn.jobwait({ ctags_jobid }, 0)[1] == -1
 
     if running then
         return
@@ -31,21 +31,14 @@ end
 
 gid_ctags = vim.api.nvim_create_augroup("Ctags", { clear = true })
 
-vim.api.nvim_create_autocmd(
-    { "BufWritePost" },
-    {
-        group = gid_ctags,
-        pattern = { "*.c", "*.h" },
-        callback = CtagsTriggerUpdate,
-    }
-)
-
-vim.api.nvim_create_autocmd(
-    { "BufWritePost" },
-    {
-        group = gid_ctags,
-        pattern = { "*.cxx", "*.hxx" },
-        callback = CtagsTriggerUpdate,
-    }
-)
-
+vim.api.nvim_create_autocmd({ "BufWritePost" }, {
+    group = gid_ctags,
+    pattern = { "*.c", "*.h" },
+    callback = CtagsTriggerUpdate,
+})
+
+vim.api.nvim_create_autocmd({ "BufWritePost" }, {
+    group = gid_ctags,
+    pattern = { "*.cxx", "*.hxx" },
+    callback = CtagsTriggerUpdate,
+})