Merge 4d289d16b3f619e12b62b8971db6818c420e39eb into ce1e13e2c9782dc4c11478092744e49e3459b77a

delimitMate is not updated for a long time.

README.md

@@ -64,7 +64,7 @@ and how to set up on different platforms (Linux, macOS, and Windows).
 + Better escaping from insert mode via [better-escape.vim](https://github.com/nvim-zh/better-escape.vim).
 + Ultra-fast project-wide fuzzy searching via [LeaderF](https://github.com/Yggdroot/LeaderF).
 + Faster code commenting via [vim-commentary](https://github.com/tpope/vim-commentary).
-+ Faster matching pair insertion and jump via [delimitMate](https://github.com/Raimondi/delimitMate).
++ Faster matching pair insertion and jump via [nvim-autopairs](https://github.com/windwp/nvim-autopairs).
 + Smarter and faster matching pair management (add, replace or delete) via [vim-sandwich](https://github.com/machakann/vim-sandwich).
 + Fast buffer jump via [hop.nvim](https://github.com/phaazon/hop.nvim).
 + Powerful snippet insertion via [Ultisnips](https://github.com/SirVer/ultisnips).

after/ftplugin/cpp.vim

@@ -34,6 +34,3 @@ function s:create_term_buf(_type, size) abort
   endif
   execute 'resize ' . a:size
 endfunction
-
-" For delimitMate
-let b:delimitMate_matchpairs = "(:),[:],{:}"

after/ftplugin/json.vim

@@ -1,6 +1,2 @@
 " let the initial folding state be that all folds are closed.
-set foldlevel=0
-
-" Use nvim-treesitter for folding
-set foldmethod=expr
-set foldexpr=nvim_treesitter#foldexpr()
+setlocal foldlevel=0

after/ftplugin/lua.vim

@@ -4,9 +4,6 @@ set formatoptions-=r
 
 nnoremap <buffer><silent> <F9> :luafile %<CR>
 
-" For delimitMate
-let b:delimitMate_matchpairs = "(:),[:],{:}"
-
 " Use nvim-treesitter for folding
 set foldmethod=expr
 set foldexpr=nvim_treesitter#foldexpr()

after/ftplugin/python.vim

@@ -13,9 +13,6 @@ set softtabstop=4   " number of spaces in tab when editing
 set shiftwidth=4    " number of spaces to use for autoindent
 set expandtab       " expand tab to spaces so that tabs are spaces
 
-" For delimitMate
-let b:delimitMate_matchpairs = "(:),[:],{:}"
-
 " Use nvim-treesitter for folding
 set foldmethod=expr
 set foldexpr=nvim_treesitter#foldexpr()

lua/config/ufo.lua

@@ -0,0 +1,22 @@
+local keymap = vim.keymap
+
+-- disable foldcolumn, see https://github.com/kevinhwang91/nvim-ufo/issues/4
+vim.o.foldcolumn = '0'
+vim.o.foldlevel = 99 -- Using ufo provider need a large value, feel free to decrease the value
+vim.o.foldlevelstart = 99
+vim.o.foldenable = true -- Don't set nofoldenable in ftplugin
+
+-- treesitter as a main provider instead
+-- Only depend on `nvim-treesitter/queries/filetype/folds.scm`,
+-- performance and stability are better than `foldmethod=nvim_treesitter#foldexpr()`
+require('ufo').setup({
+    provider_selector = function(bufnr, filetype, buftype)
+        return {'treesitter', 'indent'}
+    end
+})
+
+local ufo = require('ufo')
+keymap.set('n', 'zR', ufo.openAllFolds, { desc = 'Open all folds' })
+keymap.set('n', 'zM', ufo.closeAllFolds, { desc = 'Close all folds' })
+keymap.set('n', 'zr', ufo.openFoldsExceptKinds, { desc = 'Fold less' })
+keymap.set('n', 'zm', ufo.closeFoldsWith, { desc = 'Fold more' })

lua/plugin_specs.lua

@@ -50,7 +50,7 @@ local plugin_specs = {
   {
     "nvim-treesitter/nvim-treesitter",
     enabled = function()
-      if vim.g.is_mac then
+      if vim.g.is_mac or vim.g.is_linux then
         return true
       end
       return false
@@ -221,7 +221,11 @@ local plugin_specs = {
   }, event = "InsertEnter" },
 
   -- Automatic insertion and deletion of a pair of characters
-  { "Raimondi/delimitMate", event = "InsertEnter" },
+  {
+      'windwp/nvim-autopairs',
+      event = "InsertEnter",
+      config = true
+  },
 
   -- Comment plugin
   { "tpope/vim-commentary", event = "VeryLazy" },
@@ -488,6 +492,14 @@ local plugin_specs = {
       require("config.fidget-nvim")
     end,
   },
+  {
+    'kevinhwang91/nvim-ufo',
+    dependencies = {'kevinhwang91/promise-async'},
+    event = { "VeryLazy" },
+    config = function()
+      require("config.ufo")
+    end
+  }
 }
 
 -- configuration for lazy itself.