From 285d4d5f005b49c9f94deca9e7c0401498b1668b Mon Sep 17 00:00:00 2001 From: Chris Date: Fri, 21 Aug 2026 11:57:15 +0100 Subject: [PATCH] Small changes --- lua/autocmd.lua | 16 ++++++------ lua/keymap.lua | 3 +++ lua/projects/framework_utils/laravel.lua | 2 +- lua/projects/hylark.lua | 32 +++++++++++++----------- lua/projects/runcats.lua | 8 +++--- lua/snippets/php.lua | 5 ++-- 6 files changed, 35 insertions(+), 31 deletions(-) diff --git a/lua/autocmd.lua b/lua/autocmd.lua index 92bdbe0..a178c2a 100644 --- a/lua/autocmd.lua +++ b/lua/autocmd.lua @@ -14,17 +14,16 @@ vim.api.nvim_create_autocmd('TextYankPost', { local autosave_group = vim.api.nvim_create_augroup('autosaving', { clear = true }) -vim.api.nvim_create_autocmd('FocusLost', { +vim.api.nvim_create_autocmd({ 'FocusLost', 'BufLeave' }, { group = autosave_group, pattern = '*', - command = 'silent! wa', -- Save all files when moving away from the window - nested = true, -- Allow other autocommands to run after this one -}) + callback = function(args) + if vim.bo[args.buf].filetype == 'oil' then + return + end -vim.api.nvim_create_autocmd('BufLeave', { - group = autosave_group, - pattern = '*', - command = 'silent! wa', -- Save all files when switching buffers + vim.cmd 'silent! wa' + end, nested = true, -- Allow other autocommands to run after this one }) @@ -218,4 +217,3 @@ vim.api.nvim_create_autocmd('VimLeavePre', { }) require('helpers').edit_cf('a', '/lua/autocmd.lua') - diff --git a/lua/keymap.lua b/lua/keymap.lua index 63b59bf..953d41b 100644 --- a/lua/keymap.lua +++ b/lua/keymap.lua @@ -338,6 +338,7 @@ local test_maps = { { keys = { 'tn' }, action = function() + vim.cmd 'write' require('neotest').run.run() open_test() end, @@ -346,6 +347,7 @@ local test_maps = { { keys = { 'ta' }, action = function() + vim.cmd 'write' require('neotest').run.run { suite = true } open_test() end, @@ -354,6 +356,7 @@ local test_maps = { { keys = { 'tp' }, action = function() + vim.cmd 'write' require('neotest').run.run_last() open_test() end, diff --git a/lua/projects/framework_utils/laravel.lua b/lua/projects/framework_utils/laravel.lua index fd721c2..443ad03 100644 --- a/lua/projects/framework_utils/laravel.lua +++ b/lua/projects/framework_utils/laravel.lua @@ -21,7 +21,7 @@ local function make_laravel_file(dir, cmd) return end - local output = vim.system({ 'vendor/bin/sail', 'artisan', 'make:' .. cmd, input }):wait().stdout + local output = vim.system({ 'php', 'artisan', 'make:' .. cmd, input }):wait().stdout local new_file = output:match '%[([%w%./]+)%]' if new_file ~= nil then vim.cmd('edit ' .. new_file) diff --git a/lua/projects/hylark.lua b/lua/projects/hylark.lua index 310378f..839964b 100644 --- a/lua/projects/hylark.lua +++ b/lua/projects/hylark.lua @@ -29,6 +29,8 @@ return function(dir) vim.notify('Compiling typescript types', vim.log.levels.INFO, { title = 'hylark.lua' }) end + switch_to_root() + map('pl', ':cexpr system("vendor/bin/phpstan analyse --no-progress --error-format=raw --memory-limit=2G -vv") ', { desc = 'Run lint' }) map('T', function() helpers.open_term { cmd = 'lazysql pgsql://homestead:password@localhost:5432/homestead' } @@ -83,22 +85,22 @@ return function(dir) end, }) - vim.api.nvim_create_autocmd({ 'BufEnter' }, { - pattern = { dir .. '**' }, - callback = function() - if vim.fn.expand('%:p'):match(dir .. '/server/') then - switch_to_server() - elseif vim.fn.expand('%:p'):match(dir .. '/frontend2/') then - switch_to_frontend() - else - switch_to_root() - end - end, - }) + -- vim.api.nvim_create_autocmd({ 'BufEnter' }, { + -- pattern = { dir .. '**' }, + -- callback = function() + -- if vim.fn.expand('%:p'):match(dir .. '/server/') then + -- switch_to_server() + -- elseif vim.fn.expand('%:p'):match(dir .. '/frontend2/') then + -- switch_to_frontend() + -- else + -- switch_to_root() + -- end + -- end, + -- }) - laravel_utils.laravel_keymaps 'server/' - laravel_utils.laravel_makes 'server/' - laravel_utils.laravel_utils 'server/' + laravel_utils.laravel_keymaps(dir .. '/server/') + laravel_utils.laravel_makes(dir .. '/server/') + laravel_utils.laravel_utils(dir .. '/server/') laravel_utils.laravel_bookmarks(dir .. '/server/') create_bookmark('s', dir .. '/frontend2/src/types/api/server-types.d.ts') diff --git a/lua/projects/runcats.lua b/lua/projects/runcats.lua index cfbcb0f..520d484 100644 --- a/lua/projects/runcats.lua +++ b/lua/projects/runcats.lua @@ -30,10 +30,10 @@ return function(dir) end, }) - laravel_utils.laravel_keymaps 'server/' - laravel_utils.laravel_makes 'server/' - laravel_utils.laravel_utils 'server/' - laravel_utils.laravel_bookmarks 'server/' + laravel_utils.laravel_keymaps(dir .. '/server/') + laravel_utils.laravel_makes(dir .. '/server/') + laravel_utils.laravel_utils(dir .. '/server/') + laravel_utils.laravel_bookmark(dir .. '/server/') create_bookmark('E', dir .. '/client/src/types/api/endpointMap.d.ts') create_bookmark('q', dir .. '/client/quasar.config.ts') diff --git a/lua/snippets/php.lua b/lua/snippets/php.lua index 074f6ea..79c5bb4 100644 --- a/lua/snippets/php.lua +++ b/lua/snippets/php.lua @@ -433,7 +433,7 @@ return { */ public function #~(): HasMany { - return $this->hasOne(#~::class); + return $this->hasMany(#~::class); } ]], { rep(1), i(2), i(1) } @@ -448,7 +448,7 @@ return { */ public function #~(): HasMany { - return $this->hasOne(#~::class, #~); + return $this->hasMany(#~::class, #~); } ]], { rep(1), i(2), i(1), i(3) } @@ -615,3 +615,4 @@ return { -- }) -- ), } +