소스 검색

more lazyload

christianchiarulli 4 년 전
부모
커밋
be87f71c20
2개의 변경된 파일22개의 추가작업 그리고 25개의 파일을 삭제
  1. 20 24
      lua/lv-autopairs/init.lua
  2. 2 1
      lua/plugins.lua

+ 20 - 24
lua/lv-autopairs/init.lua

@@ -1,51 +1,47 @@
 -- if not package.loaded['nvim-autopairs'] then
 --   return
 -- end
-
 local npairs = require('nvim-autopairs')
 local Rule = require('nvim-autopairs.rule')
 
 -- skip it, if you use another global object
-_G.MUtils= {}
+_G.MUtils = {}
 
 vim.g.completion_confirm_key = ""
-MUtils.completion_confirm=function()
-  if vim.fn.pumvisible() ~= 0  then
-    if vim.fn.complete_info()["selected"] ~= -1 then
-      return vim.fn["compe#confirm"](npairs.esc("<cr>"))
+MUtils.completion_confirm = function()
+    if vim.fn.pumvisible() ~= 0 then
+        if vim.fn.complete_info()["selected"] ~= -1 then
+            return vim.fn["compe#confirm"](npairs.esc("<cr>"))
+        else
+            return npairs.esc("<cr>")
+        end
     else
-      return npairs.esc("<cr>")
+        return npairs.autopairs_cr()
     end
-  else
-    return npairs.autopairs_cr()
-  end
 end
 
-
-require("nvim-autopairs.completion.compe").setup({
-  map_cr = true, --  map <CR> on insert mode
-  map_complete = true -- it will auto insert `(` after select function or method item
-})
+if package.loaded['compe'] then
+    require("nvim-autopairs.completion.compe").setup({
+        map_cr = true, --  map <CR> on insert mode
+        map_complete = true -- it will auto insert `(` after select function or method item
+    })
+end
 
 npairs.setup({
     check_ts = true,
     ts_config = {
-        lua = {'string'},-- it will not add pair on that treesitter node
+        lua = {'string'}, -- it will not add pair on that treesitter node
         javascript = {'template_string'},
-        java = false,-- don't check treesitter on java
+        java = false -- don't check treesitter on java
     }
 })
 
-require('nvim-treesitter.configs').setup {
-    autopairs = {enable = true}
-}
+require('nvim-treesitter.configs').setup {autopairs = {enable = true}}
 
 local ts_conds = require('nvim-autopairs.ts-conds')
 
 -- press % => %% is only inside comment or string
 npairs.add_rules({
-  Rule("%", "%", "lua")
-    :with_pair(ts_conds.is_ts_node({'string','comment'})),
-  Rule("$", "$", "lua")
-    :with_pair(ts_conds.is_not_ts_node({'function'}))
+    Rule("%", "%", "lua"):with_pair(ts_conds.is_ts_node({'string', 'comment'})),
+    Rule("$", "$", "lua"):with_pair(ts_conds.is_not_ts_node({'function'}))
 })

+ 2 - 1
lua/plugins.lua

@@ -90,8 +90,9 @@ return require("packer").startup(function(use)
 
     -- Autopairs
     use {
-        -- event = "InsertEnter",
         "windwp/nvim-autopairs",
+        event = "InsertEnter",
+        after = {"telescope.nvim", "nvim-compe"},
         config = function()
             require 'lv-autopairs'
         end