fix appler

coc-settings.json

@@ -0,0 +1,5 @@
+{
+  "prettier.singleQuote": true,
+  "prettier.trailingComma": "all",
+  "prettier.bracketSpacing": false
+}

init.lua

@@ -14,4 +14,9 @@ require("plugin-config.nvim-tree")
 require("plugin-config.dashboard")
 require("plugin-config.project")
 require("plugin-config.nvim-treesitter")
-
+require("plugin-config.prettier")
+require("plugin-config.null-ls")
+require("lsp.config.coc")
+-- 内置LSP (新增)
+-- require("lsp.setup")
+-- require("lsp.cmp")

lua/basic.lua

@@ -12,7 +12,7 @@ vim.wo.cursorline = true
 -- 显示左侧图标事例
 vim.wo.signcolumn = "yes"
 -- 右侧参考线，超过表示代码太长，换行
-vim.wo.colorcolumn = "180"
+--  vim.wo.colorcolumn = "180"
 -- 缩进2 个空格等于一个tab
 vim.o.tabstop = 2
 vim.bo.tabstop = 2

lua/keybindings.lua

@@ -43,10 +43,10 @@ map("n", "<leader>wq", ":wqa!<CR>", opt)
 map("n", "qq", ":q!<CR>", opt)
 map("n", "<leader>q", ":qa!<CR>", opt)
 -- 上下滚动浏览
-map("n", "<C-j>", "5j", opt)
-map("n", "<C-k>", "5k", opt)
-map("v", "<C-j>", "5j", opt)
-map("v", "<C-k>", "5k", opt)
+map("n", "<A-j>", "5j", opt)
+map("n", "<A-k>", "5k", opt)
+map("v", "<A-j>", "5j", opt)
+map("v", "<A-k>", "5k", opt)
 
 -- Telescope 查找文件
 -- 文件名查找
@@ -59,6 +59,10 @@ map("n", "<leader>g", ":Telescope git_files<CR>", opt)
 map("n", "<leader>p", ":Telescope projects<CR>", opt)
 -- packer update
 map("n", "<leader>u", ":PackerUpdate<CR>", opt)
+
+-- prettier
+map("n", "<leader>cf", ":Prettier<CR>", opt)
+
 -- 插件快捷键
 local pluginKeys = {}
 
@@ -135,4 +139,59 @@ pluginKeys.nvimTreeList = { -- 打开文件或文件夹
     action = "dir_up"
 }}
 
+-- lsp 快捷键
+pluginKeys.lspList = function(bufnr)
+    -- bufmap(bufnr, "n", "<leader>rn", "<cmd>lua vim.lsp.buf.rename()<CR>", opt)
+    bufmap(bufnr, "n", "<leader>rn", "<cmd>Lspsaga rename<CR>", opt)
+    -- bufmap(bufnr, "n", "<leader>ca", "<cmd>lua vim.lsp.buf.cade_action()<CR>", opt)
+    bufmap(bufnr, "n", "<leader>ca", "<cmd>Lspsaga cade_action<CR>", opt)
+    -- go to
+    -- bufmap(bufnr, "n", "gd", "<Cmd>lua vim.lsp.buf.definition()<CR>", opt)
+    bufmap(bufnr, "n", "gd", "<cmd>Lspsaga goto_definition<CR>", opt)
+    -- bufmap(bufnr, "n", "gd", "<cmd>Lspsaga peek_definition<CR>", opt)
+    bufmap(bufnr, "n", "gt", "<cmd>Lspsaga goto_type_definition<CR>", opt)
+    bufmap(bufnr, "n", "gD", "<cmd>lua vim.lsp.buf.declaration()<CR>", opt)
+    -- bufmap(bufnr, "n", "gh", "<cmd>lua vim.lsp.buf.hover()<CR>", opt)
+    bufmap(bufnr, "n", "gh", "<cmd>Lspsaga hover_doc<CR>", opt)
+    bufmap(bufnr, "n", "gi", "<cmd>lua vim.lsp.buf.implementation()<CR>", opt)
+    -- bufmap(bufnr, "n", "gr", "<cmd>lua vim.lsp.buf.references()<CR>", opt)
+    bufmap(bufnr, "n", "gr", "<cmd>Lspsaga lsp_finder<CR>", opt)
+    -- diagnostic
+    -- bufmap(bufnr, "n", "go", "<cmd>lua vim.diagnostic.open_float()<CR>", opt)
+    bufmap(bufnr, "n", "go", "<cmd>Lspsaga show_line_diagnostics<CR>", opt)
+    -- bufmap(bufnr, "n", "gn", "<cmd>lua vim.diagnostic.goto_next()<CR>", opt)
+    bufmap(bufnr, "n", "gn", "<cmd>Lspsaga diagnostic_jump_next<CR>", opt)
+    -- bufmap(bufnr, "n", "gp", "<cmd>lua vim.diagnostic.goto_prev()<CR>", opt)
+    bufmap(bufnr, "n", "gp", "<cmd>Lspsaga diagnostic_jump_prev<CR>", opt)
+    bufmap(bufnr, "n", "<leader>f", "<cmd>lua vim.lsp.buf.format({ async = true })<CR>", opt)
+    bufmap(bufnr, "n", [[<M-\>]], "<cmd>Lspsaga term_toggle<CR>", opt)
+    bufmap(bufnr, "t", [[<M-\>]], "<cmd>Lspsaga term_toggle<CR>", opt)
+end
+
+-- nvim-cmp 自动补全
+pluginKeys.cmp = function(cmp)
+    return {
+        -- 出现补全
+        ["<A-.>"] = cmp.mapping(cmp.mapping.complete(), {"i", "c"}),
+        -- 取消
+        ["<A-,>"] = cmp.mapping({
+            i = cmp.mapping.abort(),
+            c = cmp.mapping.close()
+        }),
+        -- 上一个
+        ["<C-k>"] = cmp.mapping.select_prev_item(),
+        -- 下一个
+        ["<C-j>"] = cmp.mapping.select_next_item(),
+        -- 确认
+        ["<CR>"] = cmp.mapping.confirm({
+            select = true,
+            behavior = cmp.ConfirmBehavior.Replace
+        }),
+        -- 如果窗口内容太多，可以滚动
+        ["<C-u>"] = cmp.mapping(cmp.mapping.scroll_docs(-4), {"i", "c"}),
+        ["<C-d>"] = cmp.mapping(cmp.mapping.scroll_docs(4), {"i", "c"}),
+    }
+end
+
+
 return pluginKeys

lua/lsp/cmp.lua

@@ -0,0 +1,57 @@
+local cmp = require("cmp")
+
+cmp.setup({
+  -- 指定 snippet 引擎
+  snippet = {
+    expand = function(args)
+      -- For `vsnip` users.
+      vim.fn["vsnip#anonymous"](args.body)
+
+      -- For `luasnip` users.
+      -- require('luasnip').lsp_expand(args.body)
+
+      -- For `ultisnips` users.
+      -- vim.fn["UltiSnips#Anon"](args.body)
+
+      -- For `snippy` users.
+      -- require'snippy'.expand_snippet(args.body)
+    end,
+  },
+  -- 补全源
+  sources = cmp.config.sources({
+    { name = "nvim_lsp" },
+    -- For vsnip users.
+    { name = "vsnip" },
+
+    -- For luasnip users.
+    -- { name = 'luasnip' },
+
+    --For ultisnips users.
+    -- { name = 'ultisnips' },
+
+    -- -- For snippy users.
+    -- { name = 'snippy' },
+  }, { { name = "buffer" }, { name = "path" } }),
+
+  -- 快捷键设置
+  mapping = require("keybindings").cmp(cmp),
+})
+
+-- / 查找模式使用 buffer 源
+cmp.setup.cmdline("/", {
+  mapping = cmp.mapping.preset.cmdline(),
+  sources = {
+    { name = "buffer" },
+  },
+})
+
+-- : 命令行模式中使用 path 和 cmdline 源.
+cmp.setup.cmdline(":", {
+  mapping = cmp.mapping.preset.cmdline(),
+  sources = cmp.config.sources({
+    { name = "path" },
+  }, {
+    { name = "cmdline" },
+  }),
+})
+

lua/lsp/config/coc.lua

@@ -0,0 +1 @@
+print('e')

lua/lsp/config/lua.lua

@@ -0,0 +1,43 @@
+-- https://github.com/neovim/nvim-lspconfig/blob/master/doc/server_configurations.md#sumneko_lua
+local runtime_path = vim.split(package.path, ";")
+table.insert(runtime_path, "lua/?.lua")
+table.insert(runtime_path, "lua/?/init.lua")
+
+return {
+    on_setup = function(server)
+        server.setup({
+            single_file_support = true,
+            settings = {
+                Lua = {
+                    runtime = {
+                        version = "LuaJIT",
+                        path = runtime_path,
+                    },
+                    diagnostics = {
+                        -- Get the language server to recognize the `vim` global
+                        globals = {
+                            "vim",
+                        },
+                    },
+                    workspace = {
+                        -- Make the server aware of Neovim runtime files
+                        library = vim.api.nvim_get_runtime_file("", true),
+                        checkThirdParty = false,
+                    },
+                    -- Do not send telemetry data containing a randomized but unique identifier
+                    telemetry = {
+                        enable = false,
+                    },
+                },
+            },
+            on_attach = function(client, bufnr)
+                -- 禁用格式化功能，交给专门插件插件处理
+                client.server_capabilities.document_formatting = false
+                client.server_capabilities.document_range_formatting = false
+                require("keybindings").lspList(bufnr)
+                -- 保存时自动格式化
+                -- vim.cmd("autocmd BufWritePre <buffer> lua vim.lsp.buf.formatting_sync()")
+            end,
+        })
+    end,
+}

lua/lsp/setup.lua

@@ -0,0 +1,29 @@
+
+local status, mason_lspconfig = pcall(require, "mason-lspconfig")
+if not status then
+    vim.notify("not found mason lspconfig")
+    return
+end
+
+local lsp_status, lspconfig = pcall(require, "lspconfig")
+if not lsp_status then
+    vim.notify("not found lspconfig")
+    return
+end
+
+-- 自动安装 指定的 lsp server
+mason_lspconfig.setup({
+    ensure_installed = { "lua_ls" },
+})
+-- 加载对应的 lsp 的配置
+mason_lspconfig.setup_handlers({
+    function(server_name)
+        -- lspconfig[server_name].setup()
+    end,
+    ["lua_ls"] = function()
+        require("lsp.config.lua").on_setup(lspconfig["lua_ls"])
+    end
+});
+
+-- mason not suooport lsp
+-- use lspconfig

lua/plugin-config/dashboard.lua

@@ -7,50 +7,51 @@ end
 db.setup({
     theme = 'doom',
     config = {
-        header = { [[]], [[]], [[]], [[]], [[]], [[]], [[]], [[]],
-            [[          ▀████▀▄▄              ▄█ ]],
-            [[            █▀    ▀▀▄▄▄▄▄    ▄▄▀▀█ ]],
-            [[    ▄        █          ▀▀▀▀▄  ▄▀  ]],
-            [[   ▄▀ ▀▄      ▀▄              ▀▄▀  ]],
-            [[  ▄▀    █     █▀   ▄█▀▄      ▄█    ]],
-            [[  ▀▄     ▀▄  █     ▀██▀     ██▄█   ]],
-            [[   ▀▄    ▄▀ █   ▄██▄   ▄  ▄  ▀▀ █  ]],
-            [[    █  ▄▀  █    ▀██▀    ▀▀ ▀▀  ▄▀  ]],
-            [[   █   █  █      ▄▄           ▄▀   ]], [[]], [[]], [[]], [[]], [[]], [[]], [[]], [[]] }, -- your header
-        center = { {
-            icon = ' ',
+        header = {[[]], [[]], [[]], [[]], [[]], [[]], [[]], [[]],
+                  [[          ▀████▀▄▄              ▄█ ]],
+                  [[            █▀    ▀▀▄▄▄▄▄    ▄▄▀▀█ ]],
+                  [[    ▄        █          ▀▀▀▀▄  ▄▀  ]],
+                  [[   ▄▀ ▀▄      ▀▄              ▀▄▀  ]],
+                  [[  ▄▀    █     █▀   ▄█▀▄      ▄█    ]],
+                  [[  ▀▄     ▀▄  █     ▀██▀     ██▄█   ]],
+                  [[   ▀▄    ▄▀ █   ▄██▄   ▄  ▄  ▀▀ █  ]],
+                  [[    █  ▄▀  █    ▀██▀    ▀▀ ▀▀  ▄▀  ]],
+                  [[   █   █  █      ▄▄           ▄▀   ]], [[]], [[]], [[]], [[]], [[]], [[]], [[]], [[]]}, -- your header
+        center = {{
+            icon = " ",
             icon_hl = 'Title',
             desc = 'Find File           ',
             desc_hl = 'String',
             key = 'f',
             keymap = 'SPC f',
             key_hl = 'Number',
-            action = 'lua print(2)'
+            action = ''
         }, {
-            icon = ' ',
+            icon = ' ',
             desc = 'Find Word',
             key = 'k',
-            keymap = 'SPC k33',
+            keymap = 'SPC k',
             action = 'lua print(3)'
         }, {
-            icon = ' ',
+            icon = ' ',
             desc = 'Project',
             key = 'p',
             keymap = 'SPC p',
             action = 'lua print(4)'
         }, {
-            icon = ' ',
+            icon = '󰚰 ',
             desc = 'Plugins Update',
             key = 'u',
+            name = "DsStore",
             keymap = 'SPC u',
             action = 'lua print(4)'
-        } },
+        }},
         footer = db.custom_footer -- your footer
     }
 })
 
 db.custom_footer = function()
-    local footer = { '', '🎉 Have fun with neovim' }
+    local footer = {'', ' Have fun with neovim'}
     if packer_plugins ~= nil then
         local count = #vim.tbl_keys(packer_plugins)
         footer[2] = '🎉 Neovim loaded ' .. count .. ' plugins'

lua/plugin-config/mason.lua

@@ -0,0 +1,9 @@
+require("mason").setup({
+    ui = {
+        icons = {
+            package_installed = "✓",
+            package_pending = "➜",
+            package_uninstalled = "✗"
+        }
+    }
+})

lua/plugin-config/null-ls.lua

@@ -0,0 +1,36 @@
+local status, null_ls = pcall(require, "null-ls")
+if not status then
+  vim.notify("没有找到 null-ls")
+  return
+end
+
+local group = vim.api.nvim_create_augroup("lsp_format_on_save", { clear = false })
+local event = "BufWritePre" -- or "BufWritePost"
+local async = event == "BufWritePost"
+
+null_ls.setup({
+  on_attach = function(client, bufnr)
+    if client.supports_method("textDocument/formatting") then
+      vim.keymap.set("n", "<Leader>f", function()
+        vim.lsp.buf.format({ bufnr = vim.api.nvim_get_current_buf() })
+      end, { buffer = bufnr, desc = "[lsp] format" })
+
+      -- format on save
+      vim.api.nvim_clear_autocmds({ buffer = bufnr, group = group })
+      vim.api.nvim_create_autocmd(event, {
+        buffer = bufnr,
+        group = group,
+        callback = function()
+          vim.lsp.buf.format({ bufnr = bufnr, async = async })
+        end,
+        desc = "[lsp] format on save",
+      })
+    end
+
+    if client.supports_method("textDocument/rangeFormatting") then
+      vim.keymap.set("x", "<Leader>f", function()
+        vim.lsp.buf.format({ bufnr = vim.api.nvim_get_current_buf() })
+      end, { buffer = bufnr, desc = "[lsp] format" })
+    end
+  end,
+})

lua/plugin-config/nvim-treesitter.lua

@@ -7,10 +7,22 @@ end
 treesitter.setup({
     -- 安装 language parser
     -- :TSInstallInfo 命令查看支持的语言
-    ensure_installed = { "json", "html", "css", "vim", "lua", "javascript", "typescript", "tsx", "python", "scss", "vue" },
+    ensure_installed = {"json", "html", "css", "vim", "lua", "javascript", "typescript", "tsx", "python", "scss", "vue"},
     -- 启用代码高亮模块
     highlight = {
         enable = true,
         additional_vim_regex_highlighting = false
+    },
+    -- 启用代码缩进模块 (=)
+    indent = {
+        enable = true
     }
+
 })
+
+-- 开启 Folding 模块
+vim.opt.foldmethod = "expr"
+vim.opt.foldexpr = "nvim_treesitter#foldexpr()"
+-- 默认不要折叠
+-- https://stackoverflow.com/questions/8316139/how-to-set-the-default-to-unfolded-when-you-open-a-file
+vim.opt.foldlevel = 99

lua/plugin-config/prettier.lua

@@ -0,0 +1,27 @@
+local prettier = require("prettier")
+
+prettier.setup({
+    bin = 'prettier', -- or `'prettierd'` (v0.23.3+)
+    filetypes = {"css", "graphql", "html", "javascript", "javascriptreact", "json", "less", "markdown", "scss",
+                 "typescript", "typescriptreact", "yaml", "vue"},
+    cli_options = {
+        arrow_parens = "always",
+        bracket_spacing = true,
+        bracket_same_line = false,
+        embedded_language_formatting = "auto",
+        end_of_line = "lf",
+        html_whitespace_sensitivity = "css",
+        -- jsx_bracket_same_line = false,
+        jsx_single_quote = false,
+        print_width = 80,
+        prose_wrap = "preserve",
+        quote_props = "as-needed",
+        semi = true,
+        single_attribute_per_line = false,
+        single_quote = true,
+        tab_width = 2,
+        trailing_comma = "es5",
+        use_tabs = false,
+        vue_indent_script_and_style = false
+    }
+})

lua/plugins.lua

@@ -6,9 +6,9 @@ local install_path = fn.stdpath("data") .. "/site/pack/packer/start/packer.nvim"
 local paccker_bootstrap
 if fn.empty(fn.glob(install_path)) > 0 then
     vim.notify("正在安装Pakcer.nvim，请稍后...")
-    paccker_bootstrap = fn.system({ "git", "clone", "--depth", "1", "https://github.com/wbthomason/packer.nvim",
-        -- "https://gitcode.net/mirrors/wbthomason/packer.nvim",
-        install_path })
+    paccker_bootstrap = fn.system({"git", "clone", "--depth", "1", "https://github.com/wbthomason/packer.nvim",
+    -- "https://gitcode.net/mirrors/wbthomason/packer.nvim",
+                                   install_path})
 
     -- https://github.com/wbthomason/packer.nvim/issues/750
     local rtp_addition = vim.fn.stdpath("data") .. "/site/pack/*/start/*"
@@ -48,12 +48,12 @@ packer.startup({
         -- 文件搜索
         use {
             'nvim-telescope/telescope.nvim',
-            requires = { "nvim-lua/plenary.nvim" }
+            requires = {"nvim-lua/plenary.nvim"}
         }
         -- dashboard-nvim  vim 主页
         use {
             'glepnir/dashboard-nvim',
-            requires = { 'nvim-tree/nvim-web-devicons' }
+            requires = {'nvim-tree/nvim-web-devicons'}
         }
         -- project
         use("ahmedkhalf/project.nvim")
@@ -63,9 +63,36 @@ packer.startup({
             run = ':TSUpdate'
         }
         --------------------- LSP --------------------
-        use("williamboman/nvim-lsp-installer")
+        use {
+            'neoclide/coc.nvim',
+            branch = 'release'
+        }
         -- Lspconfig
-        use({ "neovim/nvim-lspconfig" })
+        use({"neovim/nvim-lspconfig"})
+        -- 括号自动补全
+        use {
+            "windwp/nvim-autopairs",
+            config = function()
+                require("nvim-autopairs").setup {}
+            end
+        }
+        -- 代码格式化
+        use('jose-elias-alvarez/null-ls.nvim')
+        use('MunifTanjim/prettier.nvim')
+        -- 补全引擎
+        -- use("hrsh7th/nvim-cmp")
+        -- snippet 引擎
+        -- use("hrsh7th/vim-vsnip")
+        -- 补全源
+        -- use("hrsh7th/cmp-vsnip")
+        -- use("hrsh7th/cmp-nvim-lsp") -- { name = nvim_lsp }
+        -- use("hrsh7th/cmp-buffer") -- { name = 'buffer' },
+        -- use("hrsh7th/cmp-path") -- { name = 'path' }
+        -- use("hrsh7th/cmp-cmdline") -- { name = 'cmdline' }
+
+        -- 常见编程语言代码段
+        -- use("rafamadriz/friendly-snippets")
+
     end,
     config = {
         -- 并发数限制