Merge branch 'nvim-lua:master' into master

init.lua

@@ -267,9 +267,8 @@ require('lazy').setup({
   -- which loads which-key before all the UI elements are loaded. Events can be
   -- normal autocommands events (`:help autocmd-events`).
   --
-  -- Then, because we use the `config` key, the configuration only runs
+  -- Then, because we use the `opts` key (recommended), the configuration runs
-  -- after the plugin has been loaded:
+  -- after the plugin has been loaded as `require(MODULE).setup(opts)`.
-  --  config = function() ... end
 
   { -- Useful plugin to show you pending keybinds.
     'folke/which-key.nvim',
@@ -279,7 +278,7 @@ require('lazy').setup({
         -- set icon mappings to true if you have a Nerd Font
         mappings = vim.g.have_nerd_font,
         -- If you are using a Nerd Font: set icons.keys to an empty table which will use the
-        -- default whick-key.nvim defined Nerd Font icons, otherwise define a string table
+        -- default which-key.nvim defined Nerd Font icons, otherwise define a string table
         keys = vim.g.have_nerd_font and {} or {
           Up = '<Up> ',
           Down = '<Down> ',
@@ -595,11 +594,12 @@ require('lazy').setup({
 
       -- Change diagnostic symbols in the sign column (gutter)
       -- if vim.g.have_nerd_font then
-      --   local signs = { Error = '', Warn = '', Hint = '', Info = '' }
+      --   local signs = { ERROR = '', WARN = '', INFO = '', HINT = '' }
+      --   local diagnostic_signs = {}
       --   for type, icon in pairs(signs) do
-      --     local hl = 'DiagnosticSign' .. type
+      --     diagnostic_signs[vim.diagnostic.severity[type]] = icon
-      --     vim.fn.sign_define(hl, { text = icon, texthl = hl, numhl = hl })
       --   end
+      --   vim.diagnostic.config { signs = { text = diagnostic_signs } }
       -- end
 
       -- LSP servers and clients are able to communicate to each other what features they support.
@@ -666,8 +666,8 @@ require('lazy').setup({
         --
 
         lua_ls = {
-          -- cmd = {...},
+          -- cmd = { ... },
-          -- filetypes = { ...},
+          -- filetypes = { ... },
           -- capabilities = {},
           settings = {
             Lua = {

lua/kickstart/plugins/debug.lua

@@ -28,28 +28,59 @@ return {
     -- Add your own debuggers here
     'leoluz/nvim-dap-go',
   },
-  keys = function(_, keys)
+  keys = {
-    local dap = require 'dap'
+    -- Basic debugging keymaps, feel free to change to your liking!
-    local dapui = require 'dapui'
+    {
-    return {
+      '<F5>',
-      -- Basic debugging keymaps, feel free to change to your liking!
+      function()
-      { '<F5>', dap.continue, desc = 'Debug: Start/Continue' },
+        require('dap').continue()
-      { '<F1>', dap.step_into, desc = 'Debug: Step Into' },
+      end,
-      { '<F2>', dap.step_over, desc = 'Debug: Step Over' },
+      desc = 'Debug: Start/Continue',
-      { '<F3>', dap.step_out, desc = 'Debug: Step Out' },
+    },
-      { '<leader>b', dap.toggle_breakpoint, desc = 'Debug: Toggle Breakpoint' },
+    {
-      {
+      '<F1>',
-        '<leader>B',
+      function()
-        function()
+        require('dap').step_into()
-          dap.set_breakpoint(vim.fn.input 'Breakpoint condition: ')
+      end,
-        end,
+      desc = 'Debug: Step Into',
-        desc = 'Debug: Set Breakpoint',
+    },
-      },
+    {
-      -- Toggle to see last session result. Without this, you can't see session output in case of unhandled exception.
+      '<F2>',
-      { '<F7>', dapui.toggle, desc = 'Debug: See last session result.' },
+      function()
-      unpack(keys),
+        require('dap').step_over()
-    }
+      end,
-  end,
+      desc = 'Debug: Step Over',
+    },
+    {
+      '<F3>',
+      function()
+        require('dap').step_out()
+      end,
+      desc = 'Debug: Step Out',
+    },
+    {
+      '<leader>b',
+      function()
+        require('dap').toggle_breakpoint()
+      end,
+      desc = 'Debug: Toggle Breakpoint',
+    },
+    {
+      '<leader>B',
+      function()
+        require('dap').set_breakpoint(vim.fn.input 'Breakpoint condition: ')
+      end,
+      desc = 'Debug: Set Breakpoint',
+    },
+    -- Toggle to see last session result. Without this, you can't see session output in case of unhandled exception.
+    {
+      '<F7>',
+      function()
+        require('dapui').toggle()
+      end,
+      desc = 'Debug: See last session result.',
+    },
+  },
   config = function()
     local dap = require 'dap'
     local dapui = require 'dapui'

lua/kickstart/plugins/gitsigns.lua

@@ -37,10 +37,10 @@ return {
         -- visual mode
         map('v', '<leader>hs', function()
           gitsigns.stage_hunk { vim.fn.line '.', vim.fn.line 'v' }
-        end, { desc = 'stage git hunk' })
+        end, { desc = 'git [s]tage hunk' })
         map('v', '<leader>hr', function()
           gitsigns.reset_hunk { vim.fn.line '.', vim.fn.line 'v' }
-        end, { desc = 'reset git hunk' })
+        end, { desc = 'git [r]eset hunk' })
         -- normal mode
         map('n', '<leader>hs', gitsigns.stage_hunk, { desc = 'git [s]tage hunk' })
         map('n', '<leader>hr', gitsigns.reset_hunk, { desc = 'git [r]eset hunk' })