Merge branch 'main' into fix/extra-lang-angular-treesitter

lua/lazyvim/config/init.lua

@@ -33,6 +33,9 @@ local defaults = {
     misc = {
       dots = "󰇘",
     },
+    ft = {
+      octo = "",
+    },
     dap = {
       Stopped             = { "󰁕 ", "DiagnosticWarn", "DapStoppedLine" },
       Breakpoint          = " ",

lua/lazyvim/config/keymaps.lua

@@ -134,6 +134,7 @@ map("n", "<leader>ub", function() LazyVim.toggle("background", false, {"light",
 map("n", "<leader>gg", function() LazyVim.lazygit( { cwd = LazyVim.root.git() }) end, { desc = "Lazygit (Root Dir)" })
 map("n", "<leader>gG", function() LazyVim.lazygit() end, { desc = "Lazygit (cwd)" })
 map("n", "<leader>gb", LazyVim.lazygit.blame_line, { desc = "Git Blame Line" })
+map("n", "<leader>gB", LazyVim.lazygit.browse, { desc = "Git Browse" })
 
 map("n", "<leader>gf", function()
   local git_path = vim.api.nvim_buf_get_name(0)

lua/lazyvim/plugins/extras/coding/copilot-chat.lua

@@ -22,6 +22,7 @@ return {
       }
     end,
     keys = {
+      { "<leader>a", "", desc = "+ai" },
       {
         "<leader>aa",
         function()
@@ -66,16 +67,6 @@ return {
     end,
   },
 
-  {
-    "folke/which-key.nvim",
-    optional = true,
-    opts = {
-      defaults = {
-        ["<leader>a"] = { name = "+ai" },
-      },
-    },
-  },
-
   -- Telescope integration
   {
     "nvim-telescope/telescope.nvim",

lua/lazyvim/plugins/extras/coding/yanky.lua

@@ -9,7 +9,7 @@ return {
   },
   keys = {
         -- stylua: ignore
-      { "<leader>p", function() require("telescope").extensions.yank_history.yank_history({ }) end, desc = "Open Yank History" },
+    { "<leader>p", function() require("telescope").extensions.yank_history.yank_history({ }) end, desc = "Open Yank History" },
     { "y", "<Plug>(YankyYank)", mode = { "n", "x" }, desc = "Yank Text" },
     { "p", "<Plug>(YankyPutAfter)", mode = { "n", "x" }, desc = "Put Yanked Text After Cursor" },
     { "P", "<Plug>(YankyPutBefore)", mode = { "n", "x" }, desc = "Put Yanked Text Before Cursor" },

lua/lazyvim/plugins/extras/dap/core.lua

@@ -49,17 +49,6 @@ return {
       opts = {},
     },
 
-    -- which key integration
-    {
-      "folke/which-key.nvim",
-      optional = true,
-      opts = {
-        defaults = {
-          ["<leader>d"] = { name = "+debug" },
-        },
-      },
-    },
-
     -- mason.nvim integration
     {
       "jay-babu/mason-nvim-dap.nvim",
@@ -85,6 +74,7 @@ return {
 
   -- stylua: ignore
   keys = {
+    { "<leader>d", "", desc = "+debug" },
     { "<leader>dB", function() require("dap").set_breakpoint(vim.fn.input('Breakpoint condition: ')) end, desc = "Breakpoint Condition" },
     { "<leader>db", function() require("dap").toggle_breakpoint() end, desc = "Toggle Breakpoint" },
     { "<leader>dc", function() require("dap").continue() end, desc = "Continue" },

lua/lazyvim/plugins/extras/editor/leap.lua

@@ -50,14 +50,8 @@ return {
         update_n_lines = "gzn", -- Update `n_lines`
       },
     },
-  },
-  {
-    "folke/which-key.nvim",
-    optional = true,
-    opts = {
-      defaults = {
-        ["gz"] = { name = "+surround" },
-      },
+    keys = {
+      { "gz", "", desc = "+surround" },
     },
   },
 

lua/lazyvim/plugins/extras/editor/refactoring.lua

@@ -7,6 +7,7 @@ return {
       "nvim-treesitter/nvim-treesitter",
     },
     keys = {
+      { "<leader>r", "", desc = "+refactor" },
       {
         "<leader>rs",
         function()
@@ -124,15 +125,4 @@ return {
       end
     end,
   },
-
-  -- which key integration
-  {
-    "folke/which-key.nvim",
-    optional = true,
-    opts = {
-      defaults = {
-        ["<leader>r"] = { name = "+refactor" },
-      },
-    },
-  },
 }

lua/lazyvim/plugins/extras/lang/kotlin.lua

@@ -16,7 +16,7 @@ return {
   {
     "williamboman/mason.nvim",
     opts = function(_, opts)
-      vim.list_extend(opts.ensure_installed or {}, { "ktlint", "kotlin-debug-adapter" })
+      vim.list_extend(opts.ensure_installed or {}, { "ktlint" })
     end,
   },
   -- Add syntax highlighting
@@ -35,7 +35,7 @@ return {
       },
     },
   },
-  -- Add linting as optional
+  -- Add linting
   {
     "mfussenegger/nvim-lint",
     optional = true,
@@ -44,7 +44,7 @@ return {
       linters_by_ft = { kotlin = { "ktlint" } },
     },
   },
-  -- Add formatting as optional
+  -- Add formatting
   {
     "stevearc/conform.nvim",
     optional = true,
@@ -52,7 +52,7 @@ return {
       formatters_by_ft = { kotlin = { "ktlint" } },
     },
   },
-  -- Add formatting and linting as optional
+  -- Add formatting and linting
   {
     "nvimtools/none-ls.nvim",
     optional = true,
@@ -72,7 +72,7 @@ return {
     opts = function()
       local dap = require("dap")
       if not dap.adapters.kotlin then
-        require("dap").adapters.kotlin = {
+        dap.adapters.kotlin = {
           type = "executable",
           command = "kotlin-debug-adapter",
           options = { auto_continue_if_many_stopped = false },

lua/lazyvim/plugins/extras/lang/tex.lua

@@ -5,15 +5,6 @@ return {
       root = { ".latexmkrc", ".texlabroot", "texlabroot", "Tectonic.toml" },
     })
   end,
-  {
-    "folke/which-key.nvim",
-    optional = true,
-    opts = {
-      defaults = {
-        ["<localLeader>l"] = { name = "+vimtex" },
-      },
-    },
-  },
 
   -- Add BibTeX/LaTeX to treesitter
   {
@@ -38,6 +29,9 @@ return {
       vim.g.vimtex_mappings_disable = { ["n"] = { "K" } } -- disable `K` as it conflicts with LSP hover
       vim.g.vimtex_quickfix_method = vim.fn.executable("pplatex") == 1 and "pplatex" or "latexlog"
     end,
+    keys = {
+      { "<localLeader>l", "", desc = "+vimtext" },
+    },
   },
 
   -- Correctly setup lspconfig for LaTeX 🚀

lua/lazyvim/plugins/extras/test/core.lua

@@ -1,15 +1,6 @@
 return {
   recommended = true,
   desc = "Neotest support. Requires language specific adapters to be configured. (see lang extras)",
-  {
-    "folke/which-key.nvim",
-    optional = true,
-    opts = {
-      defaults = {
-        ["<leader>t"] = { name = "+test" },
-      },
-    },
-  },
   {
     "nvim-neotest/neotest",
     dependencies = { "nvim-neotest/nvim-nio" },
@@ -110,6 +101,7 @@ return {
     end,
     -- stylua: ignore
     keys = {
+      {"<leader>t", "", desc = "+test"},
       { "<leader>tt", function() require("neotest").run.run(vim.fn.expand("%")) end, desc = "Run File" },
       { "<leader>tT", function() require("neotest").run.run(vim.uv.cwd()) end, desc = "Run All Test Files" },
       { "<leader>tr", function() require("neotest").run.run() end, desc = "Run Nearest" },

lua/lazyvim/plugins/ui.lua

@@ -92,6 +92,10 @@ return {
             text_align = "left",
           },
         },
+        ---@param opts bufferline.IconFetcherOpts
+        get_element_icon = function(opts)
+          return LazyVim.config.icons.ft[opts.filetype]
+        end,
       },
     },
     config = function(_, opts)
@@ -133,7 +137,7 @@ return {
       local opts = {
         options = {
           theme = "auto",
-          globalstatus = true,
+          globalstatus = vim.o.laststatus == 3,
           disabled_filetypes = { statusline = { "dashboard", "alpha", "starter" } },
         },
         sections = {
@@ -262,16 +266,6 @@ return {
     main = "ibl",
   },
 
-  -- Displays a popup with possible key bindings of the command you started typing
-  {
-    "folke/which-key.nvim",
-    opts = function(_, opts)
-      if LazyVim.has("noice.nvim") then
-        opts.defaults["<leader>sn"] = { name = "+noice" }
-      end
-    end,
-  },
-
   -- Highly experimental plugin that completely replaces the UI for messages, cmdline and the popupmenu.
   {
     "folke/noice.nvim",
@@ -305,6 +299,7 @@ return {
     },
     -- stylua: ignore
     keys = {
+      { "<leader>sn", "", desc = "+noice"},
       { "<S-Enter>", function() require("noice").redirect(vim.fn.getcmdline()) end, mode = "c", desc = "Redirect Cmdline" },
       { "<leader>snl", function() require("noice").cmd("last") end, desc = "Noice Last Message" },
       { "<leader>snh", function() require("noice").cmd("history") end, desc = "Noice History" },

lua/lazyvim/util/lazygit.lua

@@ -159,4 +159,36 @@ function M.blame_line(opts)
   return require("lazy.util").float_cmd(cmd, opts)
 end
 
+function M.browse()
+  local config = require("lazy.manage.git").get_config(LazyVim.root.detectors.pattern(0, { ".git" })[1])
+  local remotes = {} ---@type {name:string, url:string}[]
+  for name, url in pairs(config) do
+    name = name:match("^remote%.(.-)%.url$")
+    if name then
+      url = url:gsub("git@github.com:", "https://github.com/"):gsub("%.git$", "") --[[@as string]]
+      table.insert(remotes, { name = name, url = url })
+    end
+  end
+
+  local function open(remote)
+    if remote then
+      LazyVim.info(("Opening [%s](%s)"):format(remote.name, remote.url))
+      vim.ui.open(remote.url)
+    end
+  end
+
+  if #remotes == 0 then
+    return LazyVim.error("No git remotes found")
+  elseif #remotes == 1 then
+    return open(remotes[1])
+  end
+
+  vim.ui.select(remotes, {
+    prompt = "Select remote to browse",
+    format_item = function(item)
+      return item.name .. (" "):rep(8 - #item.name) .. " 🔗 " .. item.url
+    end,
+  }, open)
+end
+
 return M