From 2144efdcb5466e7f395aaac2d714aba9a51164b6 Mon Sep 17 00:00:00 2001
From: woon <woonsunkan@gmail.com>
Date: Fri, 17 Nov 2023 16:56:49 +0800
Subject: [PATCH] update

---
 lua/keymaps.lua            |   5 +-
 lua/options-plugins.lua    |  33 +++++++-
 lua/plugins.lua            |   3 +-
 plugin/packer_compiled.lua | 159 +++++++++++++++++++++++++++++++++++++
 4 files changed, 196 insertions(+), 4 deletions(-)
 create mode 100644 plugin/packer_compiled.lua

diff --git a/lua/keymaps.lua b/lua/keymaps.lua
index bf76b18..732c7a8 100644
--- a/lua/keymaps.lua
+++ b/lua/keymaps.lua
@@ -8,7 +8,7 @@ local map = vim.api.nvim_set_keymap
 vim.g.mapleader = "z"
 -- vim.g.maplocalleader = "\\"
 
-map('n', '<F5>', '<Esc>:tabnew<CR>', opt)
+--map('n', '<F5>', '<Esc>:tabnew<CR>', opt)
 map('n', 'ff', '<Esc>:FloatermToggle<CR>', opt)
 map('t', 'ff', ':FloatermToggle<CR>', opt)
 map('n', '<leader>g', '<Esc>:CocCommand git.showBlameDoc<CR>', opt)
@@ -68,6 +68,7 @@ map("n", "qq", ":q!<CR>", opt)
 map("n", "Q", ":qa!<CR>", opt)
 
 map("n", "ww", ":w!<CR>", opt)
+map("n", "W", ":w!<CR>", opt)
 
 -- insert 模式下，跳到行首行尾
 map("i", "<C-h>", "<ESC>I", opt)
@@ -90,7 +91,7 @@ pluginKeys.nvimTreeList = {
   { key = "i", action = "toggle_custom" }, -- 对应 filters 中的 custom (node_modules)
   { key = ".", action = "toggle_dotfiles" }, -- Hide (dotfiles)
   -- 文件操作
-  { key = "s", action = "refresh" },
+  { key = "<F5>", action = "refresh" },
   { key = "a", action = "create" },
   { key = "d", action = "remove" },
   { key = "r", action = "rename" },
diff --git a/lua/options-plugins.lua b/lua/options-plugins.lua
index 36020ad..3e483fa 100644
--- a/lua/options-plugins.lua
+++ b/lua/options-plugins.lua
@@ -1,7 +1,7 @@
 require'nvim-treesitter.configs'.setup {
   -- 安装 language parser
   -- :TSInstallInfo 命令查看支持的语言
-  ensure_installed = {"vim", "lua", "javascript", "go"},
+  ensure_installed = {"vim", "lua", "javascript", "go", "php"},
   -- 启用代码高亮功能
   highlight = {
     enable = true,
@@ -56,6 +56,7 @@ end
 local opts = {silent = true, noremap = true, expr = true, replace_keycodes = false}
 keyset("i", "<TAB>", 'coc#pum#visible() ? coc#pum#next(1) : v:lua.check_back_space() ? "<TAB>" : coc#refresh()', opts)
 keyset("i", "<S-TAB>", [[coc#pum#visible() ? coc#pum#prev(1) : "\<C-h>"]], opts)
+keyset("i", "<cr>", [[coc#pum#visible() ? coc#pum#confirm() : "\<C-g>u\<CR>\<c-r>=coc#on_enter()\<CR>"]], opts)
 
 -- GoTo code navigation
 keyset("n", "<c-]>", "<Plug>(coc-definition)", {silent = true})
@@ -79,3 +80,33 @@ keyset("n", "K", '<CMD>lua _G.show_docs()<CR>', {silent = true})
 keyset("i", "<c-j>", "<Plug>(coc-snippets-expand-jump)")
 -- Use <c-space> to trigger completion
 keyset("i", "<c-space>", "coc#refresh()", {silent = true, expr = true})
+
+
+require("formatter").setup({
+  filetype = {
+    php = {
+      function()
+        return {
+		  exe = "php-cs-fixer",
+    	  args = {
+            "fix",
+            "--config=/home/www/php/php-cs-fixer/config.php --allow-risky=yes"
+    	  },
+    	  stdin = false,
+          ignore_exitcode = true,
+        }
+      end,
+    }
+  },
+})
+
+-- format on save
+vim.api.nvim_exec(
+  [[
+    augroup FormatAutogroup
+    autocmd!
+    autocmd BufWritePost *.php FormatWrite
+    augroup END
+]],
+  true
+)
diff --git a/lua/plugins.lua b/lua/plugins.lua
index a9dfb91..7c7b4a9 100644
--- a/lua/plugins.lua
+++ b/lua/plugins.lua
@@ -63,7 +63,8 @@ return require('packer').startup(function(use)
         })
         use 'fatih/vim-go'
         use 'mhinz/vim-startify'
-
+        
+        use 'mhartington/formatter.nvim'
         -- Automatically set up your configuration after cloning packer.nvim
         -- Put this at the end after all plugins
         if packer_bootstrap then
diff --git a/plugin/packer_compiled.lua b/plugin/packer_compiled.lua
new file mode 100644
index 0000000..d9b8b1c
--- /dev/null
+++ b/plugin/packer_compiled.lua
@@ -0,0 +1,159 @@
+-- Automatically generated packer.nvim plugin loader code
+
+if vim.api.nvim_call_function('has', {'nvim-0.5'}) ~= 1 then
+  vim.api.nvim_command('echohl WarningMsg | echom "Invalid Neovim version for packer.nvim! | echohl None"')
+  return
+end
+
+vim.api.nvim_command('packadd packer.nvim')
+
+local no_errors, error_msg = pcall(function()
+
+_G._packer = _G._packer or {}
+_G._packer.inside_compile = true
+
+local time
+local profile_info
+local should_profile = false
+if should_profile then
+  local hrtime = vim.loop.hrtime
+  profile_info = {}
+  time = function(chunk, start)
+    if start then
+      profile_info[chunk] = hrtime()
+    else
+      profile_info[chunk] = (hrtime() - profile_info[chunk]) / 1e6
+    end
+  end
+else
+  time = function(chunk, start) end
+end
+
+local function save_profiles(threshold)
+  local sorted_times = {}
+  for chunk_name, time_taken in pairs(profile_info) do
+    sorted_times[#sorted_times + 1] = {chunk_name, time_taken}
+  end
+  table.sort(sorted_times, function(a, b) return a[2] > b[2] end)
+  local results = {}
+  for i, elem in ipairs(sorted_times) do
+    if not threshold or threshold and elem[2] > threshold then
+      results[i] = elem[1] .. ' took ' .. elem[2] .. 'ms'
+    end
+  end
+  if threshold then
+    table.insert(results, '(Only showing plugins that took longer than ' .. threshold .. ' ms ' .. 'to load)')
+  end
+
+  _G._packer.profile_output = results
+end
+
+time([[Luarocks path setup]], true)
+local package_path_str = "/home/woon/.cache/nvim/packer_hererocks/2.1.1699801871/share/lua/5.1/?.lua;/home/woon/.cache/nvim/packer_hererocks/2.1.1699801871/share/lua/5.1/?/init.lua;/home/woon/.cache/nvim/packer_hererocks/2.1.1699801871/lib/luarocks/rocks-5.1/?.lua;/home/woon/.cache/nvim/packer_hererocks/2.1.1699801871/lib/luarocks/rocks-5.1/?/init.lua"
+local install_cpath_pattern = "/home/woon/.cache/nvim/packer_hererocks/2.1.1699801871/lib/lua/5.1/?.so"
+if not string.find(package.path, package_path_str, 1, true) then
+  package.path = package.path .. ';' .. package_path_str
+end
+
+if not string.find(package.cpath, install_cpath_pattern, 1, true) then
+  package.cpath = package.cpath .. ';' .. install_cpath_pattern
+end
+
+time([[Luarocks path setup]], false)
+time([[try_loadstring definition]], true)
+local function try_loadstring(s, component, name)
+  local success, result = pcall(loadstring(s), name, _G.packer_plugins[name])
+  if not success then
+    vim.schedule(function()
+      vim.api.nvim_notify('packer.nvim: Error running ' .. component .. ' for ' .. name .. ': ' .. result, vim.log.levels.ERROR, {})
+    end)
+  end
+  return result
+end
+
+time([[try_loadstring definition]], false)
+time([[Defining packer_plugins]], true)
+_G.packer_plugins = {
+  ["auto-pairs"] = {
+    loaded = true,
+    path = "/home/woon/.local/share/nvim/site/pack/packer/start/auto-pairs",
+    url = "https://github.com/jiangmiao/auto-pairs"
+  },
+  ["coc.nvim"] = {
+    loaded = true,
+    path = "/home/woon/.local/share/nvim/site/pack/packer/start/coc.nvim",
+    url = "https://github.com/neoclide/coc.nvim"
+  },
+  ["formatter.nvim"] = {
+    loaded = true,
+    path = "/home/woon/.local/share/nvim/site/pack/packer/start/formatter.nvim",
+    url = "https://github.com/mhartington/formatter.nvim"
+  },
+  ["gruvbox.nvim"] = {
+    loaded = true,
+    path = "/home/woon/.local/share/nvim/site/pack/packer/start/gruvbox.nvim",
+    url = "https://github.com/ellisonleao/gruvbox.nvim"
+  },
+  ["markdown-preview.nvim"] = {
+    loaded = true,
+    path = "/home/woon/.local/share/nvim/site/pack/packer/start/markdown-preview.nvim",
+    url = "https://github.com/iamcco/markdown-preview.nvim"
+  },
+  ["nvim-tree.lua"] = {
+    loaded = true,
+    path = "/home/woon/.local/share/nvim/site/pack/packer/start/nvim-tree.lua",
+    url = "https://github.com/nvim-tree/nvim-tree.lua"
+  },
+  ["nvim-treesitter"] = {
+    loaded = true,
+    path = "/home/woon/.local/share/nvim/site/pack/packer/start/nvim-treesitter",
+    url = "https://github.com/nvim-treesitter/nvim-treesitter"
+  },
+  ["nvim-web-devicons"] = {
+    loaded = true,
+    path = "/home/woon/.local/share/nvim/site/pack/packer/start/nvim-web-devicons",
+    url = "https://github.com/nvim-tree/nvim-web-devicons"
+  },
+  ["packer.nvim"] = {
+    loaded = true,
+    path = "/home/woon/.local/share/nvim/site/pack/packer/start/packer.nvim",
+    url = "https://github.com/wbthomason/packer.nvim"
+  },
+  ["vim-airline"] = {
+    loaded = true,
+    path = "/home/woon/.local/share/nvim/site/pack/packer/start/vim-airline",
+    url = "https://github.com/vim-airline/vim-airline"
+  },
+  ["vim-airline-themes"] = {
+    loaded = true,
+    path = "/home/woon/.local/share/nvim/site/pack/packer/start/vim-airline-themes",
+    url = "https://github.com/vim-airline/vim-airline-themes"
+  },
+  ["vim-go"] = {
+    loaded = true,
+    path = "/home/woon/.local/share/nvim/site/pack/packer/start/vim-go",
+    url = "https://github.com/fatih/vim-go"
+  },
+  ["vim-startify"] = {
+    loaded = true,
+    path = "/home/woon/.local/share/nvim/site/pack/packer/start/vim-startify",
+    url = "https://github.com/mhinz/vim-startify"
+  }
+}
+
+time([[Defining packer_plugins]], false)
+
+_G._packer.inside_compile = false
+if _G._packer.needs_bufread == true then
+  vim.cmd("doautocmd BufRead")
+end
+_G._packer.needs_bufread = false
+
+if should_profile then save_profiles() end
+
+end)
+
+if not no_errors then
+  error_msg = error_msg:gsub('"', '\\"')
+  vim.api.nvim_command('echohl ErrorMsg | echom "Error in packer_compiled: '..error_msg..'" | echom "Please check your config for correctness" | echohl None')
+end