chore: merge nvim-lua#1627

Author: theammir

.github/workflows/stylua.yml

@@ -9,11 +9,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           ref: ${{ github.event.pull_request.head.sha }}
       - name: Stylua Check
-        uses: JohnnyMorganz/stylua-action@v3
+        uses: JohnnyMorganz/stylua-action@v4
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           version: latest

.stylua.toml

@@ -4,3 +4,4 @@ indent_type = "Spaces"
 indent_width = 2
 quote_style = "AutoPreferSingle"
 call_parentheses = "None"
+collapse_simple_statement = "FunctionOnly"

lua/custom/plugins/colorschemes.lua

@@ -1,3 +1,5 @@
+---@module 'lazy'
+---@type LazySpec
 return {
   {
     'zaldih/themery.nvim',

lua/custom/plugins/editor.lua

@@ -1,3 +1,5 @@
+---@module 'lazy'
+---@type LazySpec
 return {
   'tpope/vim-repeat',
   'airblade/vim-rooter',
@@ -7,9 +9,7 @@ return {
     opts = {},
     keys = { {
       '<F3>',
-      function()
-        require('maximize').toggle()
-      end,
+      function() require('maximize').toggle() end,
       desc = 'Maximize split toggle',
     } },
   },

lua/custom/plugins/grapple.lua

@@ -1,3 +1,5 @@
+---@module 'lazy'
+---@type LazySpec
 return {
   'cbochs/grapple.nvim',
   dependencies = {

lua/custom/plugins/init.lua

@@ -2,4 +2,6 @@
 --  I promise not to create any merge conflicts in this directory :)
 --
 -- See the kickstart.nvim README for more information
+---@module 'lazy'
+---@type LazySpec
 return {}

lua/custom/plugins/latex.lua

@@ -1,3 +1,5 @@
+---@module 'lazy'
+---@type LazySpec
 return {
   'lervag/vimtex',
   lazy = false,

lua/custom/plugins/pair.lua

@@ -1,12 +1,12 @@
+---@module 'lazy'
+---@type LazySpec
 return {
   'altermo/ultimate-autopair.nvim',
   event = { 'InsertEnter', 'CmdlineEnter' },
   branch = 'v0.6',
   config = function()
     local ua = require 'ultimate-autopair'
-    local prev = function(o)
-      return o.line:sub(o.col - 1, o.col - 1)
-    end
+    local prev = function(o) return o.line:sub(o.col - 1, o.col - 1) end
     ua.init {
       ua.extend_default {
         fastwarp = {
@@ -16,9 +16,7 @@ return {
           {
             "'",
             "'",
-            cond = function(fn, o)
-              return prev(o) == '' or prev(o):match '[^&<\\]'
-            end,
+            cond = function(fn, o) return prev(o) == '' or prev(o):match '[^&<\\]' end,
             suround = true,
             nft = { 'tex' },
             alpha = true,
@@ -28,9 +26,7 @@ return {
         {
           '<',
           '>',
-          cond = function(fn, o)
-            return prev(o) == '' or prev(o):match '[^%s<\\]'
-          end,
+          cond = function(fn, o) return prev(o) == '' or prev(o):match '[^%s<\\]' end,
           dosuround = true,
           space = true,
           multiline = false,

lua/custom/plugins/rust.lua

@@ -1,3 +1,5 @@
+---@module 'lazy'
+---@type LazySpec
 return {
   {
     'mrcjkb/rustaceanvim',
@@ -14,9 +16,7 @@ return {
           vim.keymap.set('n', '<localleader>lt', '<cmd>RustTest<cr>', { desc = 'Run test under cursor' })
 
           local bufnr = vim.api.nvim_get_current_buf()
-          vim.keymap.set('n', 'K', function()
-            vim.cmd.RustLsp { 'hover', 'actions' }
-          end, { silent = true, buffer = bufnr })
+          vim.keymap.set('n', 'K', function() vim.cmd.RustLsp { 'hover', 'actions' } end, { silent = true, buffer = bufnr })
         end,
       })
       vim.g.rustaceanvim = {

lua/custom/plugins/splits.lua

@@ -1,61 +1,47 @@
+---@module 'lazy'
+---@type LazySpec
 return {
   'mrjones2014/smart-splits.nvim',
   opts = {},
   keys = {
     {
       '<C-h>',
-      function()
-        require('smart-splits').move_cursor_left()
-      end,
+      function() require('smart-splits').move_cursor_left() end,
       desc = 'Move to left split',
     },
     {
       '<C-j>',
-      function()
-        require('smart-splits').move_cursor_down()
-      end,
+      function() require('smart-splits').move_cursor_down() end,
       desc = 'Move to below split',
     },
     {
       '<C-k>',
-      function()
-        require('smart-splits').move_cursor_up()
-      end,
+      function() require('smart-splits').move_cursor_up() end,
       desc = 'Move to above split',
     },
     {
       '<C-l>',
-      function()
-        require('smart-splits').move_cursor_right()
-      end,
+      function() require('smart-splits').move_cursor_right() end,
       desc = 'Move to right split',
     },
     {
       '<C-Left>',
-      function()
-        require('smart-splits').resize_left()
-      end,
+      function() require('smart-splits').resize_left() end,
       desc = 'Resize split left',
     },
     {
       '<C-Down>',
-      function()
-        require('smart-splits').resize_down()
-      end,
+      function() require('smart-splits').resize_down() end,
       desc = 'Resize split down',
     },
     {
       '<C-Up>',
-      function()
-        require('smart-splits').resize_up()
-      end,
+      function() require('smart-splits').resize_up() end,
       desc = 'Resize split up',
     },
     {
       '<C-Right>',
-      function()
-        require('smart-splits').resize_right()
-      end,
+      function() require('smart-splits').resize_right() end,
       desc = 'Resize split right',
     },
   },