Pārlūkot izejas kodu

chore: update ui plugins (#4555)

* chore: update nvim-tree

* chore: update lualine

* chore: update bufferline

* feat(nvim-tree): set highlight_git to name

* fix(lsp): pass bufnr to codelens.refresh
kylo252 1 gadu atpakaļ
vecāks
revīzija
4b60b5db8c

+ 9 - 0
lua/lvim/core/bufferline.lua

@@ -56,6 +56,14 @@ M.config = function()
       },
     },
     options = {
+      themable = true, -- whether or not bufferline highlights can be overridden externally
+      -- style_preset = preset,
+      get_element_icon = nil,
+      show_duplicate_prefix = true,
+      duplicates_across_groups = true,
+      auto_toggle_bufferline = true,
+      move_wraps_at_ends = false,
+      groups = { items = {}, options = { toggle_hidden_on_enter = true } },
       mode = "buffers", -- set to "tabs" to only show tabpages instead
       numbers = "none", -- can be "none" | "ordinal" | "buffer_id" | "both" | function
       close_command = function(bufnr) -- can be a string | function, see "Mouse actions"
@@ -140,6 +148,7 @@ M.config = function()
         reveal = { "close" },
       },
       sort_by = "id",
+      debug = { logging = false },
     },
   }
 end

+ 64 - 12
lua/lvim/core/nvimtree.lua

@@ -6,12 +6,17 @@ function M.config()
     active = true,
     on_config_done = nil,
     setup = {
+      experimental = {},
       auto_reload_on_write = false,
       disable_netrw = false,
       hijack_cursor = false,
       hijack_netrw = true,
       hijack_unnamed_buffer_when_opening = false,
-      sort_by = "name",
+      sort = {
+        sorter = "name",
+        folders_first = true,
+        files_first = false,
+      },
       root_dirs = {},
       prefer_startup_root = false,
       sync_root_with_cwd = true,
@@ -23,6 +28,8 @@ function M.config()
         adaptive_size = false,
         centralize_selection = true,
         width = 30,
+        cursorline = true,
+        debounce_delay = 15,
         side = "left",
         preserve_window_proportions = false,
         number = false,
@@ -44,11 +51,17 @@ function M.config()
       renderer = {
         add_trailing = false,
         group_empty = false,
-        highlight_git = true,
-        full_name = false,
+        highlight_git = "name",
         highlight_opened_files = "none",
         root_folder_label = ":t",
+        full_name = false,
         indent_width = 2,
+        special_files = { "Cargo.toml", "Makefile", "README.md", "readme.md" },
+        symlink_destination = true,
+        highlight_diagnostics = "none",
+        highlight_modified = "none",
+        highlight_bookmarks = "none",
+        highlight_clipboard = "name",
         indent_markers = {
           enable = false,
           inline_arrows = true,
@@ -56,24 +69,43 @@ function M.config()
             corner = "└",
             edge = "│",
             item = "│",
+            bottom = "─",
             none = " ",
           },
         },
         icons = {
           webdev_colors = lvim.use_icons,
+
+          web_devicons = {
+            file = {
+              enable = lvim.use_icons,
+              color = lvim.use_icons,
+            },
+            folder = {
+              enable = false,
+              color = lvim.use_icons,
+            },
+          },
           git_placement = "before",
           padding = " ",
           symlink_arrow = " ➛ ",
+          modified_placement = "after",
+          diagnostics_placement = "signcolumn",
+          bookmarks_placement = "signcolumn",
           show = {
             file = lvim.use_icons,
             folder = lvim.use_icons,
             folder_arrow = lvim.use_icons,
             git = lvim.use_icons,
+            modified = lvim.use_icons,
+            diagnostics = lvim.use_icons,
+            bookmarks = lvim.use_icons,
           },
           glyphs = {
             default = lvim.icons.ui.Text,
             symlink = lvim.icons.ui.FileSymlink,
             bookmark = lvim.icons.ui.BookMark,
+            modified = lvim.icons.ui.Circle,
             folder = {
               arrow_closed = lvim.icons.ui.TriangleShortArrowRight,
               arrow_open = lvim.icons.ui.TriangleShortArrowDown,
@@ -95,8 +127,6 @@ function M.config()
             },
           },
         },
-        special_files = { "Cargo.toml", "Makefile", "README.md", "readme.md" },
-        symlink_destination = true,
       },
       hijack_directories = {
         enable = false,
@@ -104,9 +134,11 @@ function M.config()
       },
       update_focused_file = {
         enable = true,
-        debounce_delay = 15,
-        update_root = true,
-        ignore_list = {},
+        update_root = {
+          enable = true,
+          ignore_list = {},
+        },
+        exclude = false,
       },
       diagnostics = {
         enable = lvim.use_icons,
@@ -125,8 +157,11 @@ function M.config()
         },
       },
       filters = {
+        enable = true,
         dotfiles = false,
         git_clean = false,
+        git_ignored = false,
+        no_bookmark = false,
         no_buffer = false,
         custom = { "node_modules", "\\.cache" },
         exclude = {},
@@ -138,10 +173,11 @@ function M.config()
       },
       git = {
         enable = true,
-        ignore = false,
         show_on_dirs = true,
         show_on_open_dirs = true,
-        timeout = 200,
+        disable_for_dirs = {},
+        timeout = 400,
+        cygwin_support = false,
       },
       actions = {
         use_system_clipboard = true,
@@ -165,6 +201,7 @@ function M.config()
         },
         open_file = {
           quit_on_open = false,
+          eject = true,
           resize_window = false,
           window_picker = {
             enable = true,
@@ -181,8 +218,7 @@ function M.config()
         },
       },
       trash = {
-        cmd = "trash",
-        require_confirm = true,
+        cmd = "gio trash",
       },
       live_filter = {
         prefix = "[FILTER]: ",
@@ -197,6 +233,22 @@ function M.config()
       },
       notify = {
         threshold = vim.log.levels.INFO,
+        absolute_path = true,
+      },
+      ui = {
+        confirm = {
+          remove = true,
+          trash = true,
+          default_yes = false,
+        },
+      },
+      modified = {
+        enable = false,
+        show_on_dirs = true,
+        show_on_open_dirs = true,
+      },
+      help = {
+        sort_by = "key",
       },
       log = {
         enable = false,

+ 3 - 1
lua/lvim/lsp/utils.lua

@@ -147,7 +147,9 @@ function M.setup_codelens_refresh(client, bufnr)
   vim.api.nvim_create_autocmd(cl_events, {
     group = group,
     buffer = bufnr,
-    callback = vim.lsp.codelens.refresh,
+    callback = function()
+      vim.lsp.codelens.refresh { bufnr = bufnr }
+    end,
   })
 end
 

+ 6 - 6
snapshots/default.json

@@ -12,7 +12,7 @@
     "commit": "33eb067"
   },
   "bufferline.nvim": {
-    "commit": "1a33975"
+    "commit": "73540cb"
   },
   "cmp-buffer": {
     "commit": "3022dbc"
@@ -42,10 +42,10 @@
     "commit": "bef521a"
   },
   "lir.nvim": {
-    "commit": "969e95b"
+    "commit": "7a9d45d"
   },
   "lualine.nvim": {
-    "commit": "2248ef2"
+    "commit": "0a5a668"
   },
   "lunar.nvim": {
     "commit": "08bbc93"
@@ -84,7 +84,7 @@
     "commit": "8649f69"
   },
   "nvim-tree.lua": {
-    "commit": "05f55c1"
+    "commit": "64f61e4"
   },
   "nvim-treesitter": {
     "commit": "1e64838"
@@ -93,7 +93,7 @@
     "commit": "b8ff464"
   },
   "nvim-web-devicons": {
-    "commit": "5efb8bd"
+    "commit": "475fbcf"
   },
   "onedarker.nvim": {
     "commit": "b00dd21"
@@ -120,7 +120,7 @@
     "commit": "6b334b9"
   },
   "tokyonight.nvim": {
-    "commit": "f247ee7"
+    "commit": "67afeaf"
   },
   "vim-illuminate": {
     "commit": "3bd2ab6"