Merge 4d289d16b3f619e12b62b8971db6818c420e39eb into 2af616bb0d58f596acd5e73f8d69f3e52a574b45

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

lua/config/gitsigns.lua

@@ -2,11 +2,11 @@ local gs = require("gitsigns")
 
 gs.setup {
   signs = {
-    add = { hl = "GitSignsAdd", text = "+", numhl = "GitSignsAddNr", linehl = "GitSignsAddLn" },
-    change = { hl = "GitSignsChange", text = "~", numhl = "GitSignsChangeNr", linehl = "GitSignsChangeLn" },
-    delete = { hl = "GitSignsDelete", text = "_", numhl = "GitSignsDeleteNr", linehl = "GitSignsDeleteLn" },
-    topdelete = { hl = "GitSignsDelete", text = "‾", numhl = "GitSignsDeleteNr", linehl = "GitSignsDeleteLn" },
-    changedelete = { hl = "GitSignsChange", text = "│", numhl = "GitSignsChangeNr", linehl = "GitSignsChangeLn" },
+    add = { text = "+" },
+    change = { text = "~" },
+    delete = { text = "_" },
+    topdelete = { text = "‾" },
+    changedelete = { text = "│" },
   },
   word_diff = true,
   on_attach = function(bufnr)

lua/config/nvim_hop.lua

@@ -4,6 +4,7 @@ hop.setup {
   case_insensitive = true,
   char2_fallback_key = "<CR>",
   quit_key = "<Esc>",
+  match_mappings = { "zh_sc" }
 }
 
 keymap.set({ "n", "v", "o" }, "f", "", {
@@ -17,7 +18,7 @@ keymap.set({ "n", "v", "o" }, "f", "", {
 
 vim.api.nvim_create_autocmd("ColorScheme", {
   pattern = "*",
-  callback = function ()
+  callback = function()
     vim.cmd([[
       hi HopNextKey cterm=bold ctermfg=176 gui=bold guibg=#ff00ff guifg=#ffffff
       hi HopNextKey1 cterm=bold ctermfg=176 gui=bold guibg=#ff00ff guifg=#ffffff

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
@@ -488,6 +488,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.