From 61499082db8f34ca38fc9eb916f9cc87d82e7655 Mon Sep 17 00:00:00 2001 From: Ariel D'Alessandro Date: Tue, 28 Feb 2023 09:29:21 +0100 Subject: fix: update snippets, add todo for namespace --- .luacheckrc | 1 + lazy-lock.json | 16 +++++++-------- lua/alpha/snips/ft/php.lua | 51 ++++++++++++++++++++++++++-------------------- 3 files changed, 37 insertions(+), 31 deletions(-) diff --git a/.luacheckrc b/.luacheckrc index f88df1f..5a6c272 100644 --- a/.luacheckrc +++ b/.luacheckrc @@ -21,4 +21,5 @@ globals = { -- Global objects defined by the C code read_globals = { "vim", + "string", } diff --git a/lazy-lock.json b/lazy-lock.json index 84c9fe4..d351f00 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -2,7 +2,7 @@ "Comment.nvim": { "branch": "master", "commit": "6821b3ae27a57f1f3cf8ed030e4a55d70d0c4e43" }, "LuaSnip": { "branch": "master", "commit": "500981ff6cefc7343e3959ef0f939bd0bfd49ba9" }, "SmoothCursor.nvim": { "branch": "main", "commit": "679b5ee2ef6db53c328642535e0e8fdcb8e9bdec" }, - "catppuccin": { "branch": "main", "commit": "87516f43267f1ec286069621f9bd288381a9097f" }, + "catppuccin": { "branch": "main", "commit": "7c392fb5f27daa6addee050f7b7522718e8d9357" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-cmdline": { "branch": "main", "commit": "8fcc934a52af96120fe26358985c10c035984b53" }, "cmp-dap": { "branch": "master", "commit": "d16f14a210cd28988b97ca8339d504533b7e09a4" }, @@ -13,7 +13,6 @@ "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, "cmp_luasnip": { "branch": "master", "commit": "18095520391186d634a0045dacaa346291096566" }, "color-picker.nvim": { "branch": "master", "commit": "a94dc4424ec0f116bc3a5ff74514c9fa99006cd2" }, - "composer.nvim": { "branch": "main", "commit": "e62eaaef7c978d96a2abfeb2ca570650a4f21528" }, "dressing.nvim": { "branch": "master", "commit": "5f44f829481640be0f96759c965ae22a3bcaf7ce" }, "fidget.nvim": { "branch": "main", "commit": "688b4fec4517650e29c3e63cfbb6e498b3112ba1" }, "fzf.vim": { "branch": "master", "commit": "dc71692255b62d1f67dc55c8e51ab1aa467b1d46" }, @@ -23,18 +22,18 @@ "hydra.nvim": { "branch": "master", "commit": "3ced42c0b6a6c85583ff0f221635a7f4c1ab0dd0" }, "icon-picker.nvim": { "branch": "master", "commit": "66d37ceae84099ca76235de44466829eb37118c2" }, "indent-blankline.nvim": { "branch": "master", "commit": "018bd04d80c9a73d399c1061fa0c3b14a7614399" }, - "lazy.nvim": { "branch": "main", "commit": "8077428e63feb0f3bf795d53b23ba1695b28ab0e" }, + "lazy.nvim": { "branch": "main", "commit": "25132fc08f6c0c68068be19680f8b6d9d6149985" }, "lspkind-nvim": { "branch": "master", "commit": "c68b3a003483cf382428a43035079f78474cd11e" }, "lualine.nvim": { "branch": "master", "commit": "e99d733e0213ceb8f548ae6551b04ae32e590c80" }, "markdown-preview.nvim": { "branch": "main", "commit": "cc05a30393e2bf9f12e2d59fc35a1aa928ed1727" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "3f9c0ea157e88b08e2d11ec65002eeb6e421f0da" }, "mason-tool-installer.nvim": { "branch": "main", "commit": "6ca38efeb0406dea8da6c97f61d6f6ef30ab0576" }, - "mason.nvim": { "branch": "main", "commit": "63cff223169324a2e633954ac580c7c327182a97" }, + "mason.nvim": { "branch": "main", "commit": "5f38eca64b7ed9f8a1f997ce67f2ccc80ab80c91" }, "mind.nvim": { "branch": "v2.2", "commit": "79e0ca131d5e37dfa65f3f0e725d99742e4ff783" }, "neogen": { "branch": "main", "commit": "93d997dbddfe084e77ba4541c54a7b8bfd754fb1" }, "null-ls.nvim": { "branch": "main", "commit": "689cdd78f70af20a37b5309ebc287ac645ae4f76" }, "nvim-autopairs": { "branch": "master", "commit": "6a5faeabdbcc86cfbf1561ae430a451a72126e81" }, - "nvim-cmp": { "branch": "main", "commit": "7a3b1e76f74934b12fda82158237c6ad8bfd3d40" }, + "nvim-cmp": { "branch": "main", "commit": "01f697a68905f9dcae70960a9eb013695a17f9a2" }, "nvim-dap": { "branch": "master", "commit": "5b986edc95cf7b37da1db91a5c149daa3ac008d2" }, "nvim-dap-go": { "branch": "main", "commit": "b4ded7de579b4e2a85c203388233b54bf1028816" }, "nvim-dap-ui": { "branch": "master", "commit": "bdb94e3853d11b5ce98ec182e5a3719d5c0ef6fd" }, @@ -44,11 +43,10 @@ "nvim-notify": { "branch": "master", "commit": "9c987081390753b625e2d94e749e80e9b4a3e082" }, "nvim-projectconfig": { "branch": "master", "commit": "05fd34831e170db269d1b84597615bcdcdde930e" }, "nvim-transparent": { "branch": "main", "commit": "4c3c392f285378e606d154bee393b6b3dd18059c" }, - "nvim-treesitter": { "branch": "master", "commit": "50709361378fa37d455b21fb716169416888314f" }, + "nvim-treesitter": { "branch": "master", "commit": "418caac89dab5a37ccaf403b3829e4eeb4124d67" }, "nvim-treesitter-refactor": { "branch": "master", "commit": "75f5895cc662d61eb919da8050b7a0124400d589" }, "nvim-treesitter-textobjects": { "branch": "master", "commit": "4b30081d2736e09f90c890a8a7adfe4df36f5b36" }, - "nvim-web-devicons": { "branch": "master", "commit": "b8d173b330cff94258482ccfe8c024bd8051da6e" }, - "php-code-actions.nvim": { "branch": "main", "commit": "a85a695c58f9c5e8033d824ffae366e9797e0b28" }, + "nvim-web-devicons": { "branch": "master", "commit": "c2c2317f356c8b7da0252f5da758f71bb60bb6b2" }, "playground": { "branch": "master", "commit": "4044b53c4d4fcd7a78eae20b8627f78ce7dc6f56" }, "plenary.nvim": { "branch": "master", "commit": "253d34830709d690f013daf2853a9d21ad7accab" }, "popup.nvim": { "branch": "master", "commit": "b7404d35d5d3548a82149238289fa71f7f6de4ac" }, @@ -70,7 +68,7 @@ "vim-dotenv": { "branch": "master", "commit": "5c51cfcf8d87280d6414e03cd6b253eb70ecb800" }, "vim-easy-align": { "branch": "master", "commit": "12dd6316974f71ce333e360c0260b4e1f81169c3" }, "vim-eunuch": { "branch": "master", "commit": "291ef1f8c8996ca7715df1032a35a27b12d7b5cf" }, - "vim-fugitive": { "branch": "master", "commit": "62f42f013d866139fa23068ac2651b3f7e05a56f" }, + "vim-fugitive": { "branch": "master", "commit": "d507d00bd04794119beeb41da118774a96815b65" }, "vim-repeat": { "branch": "master", "commit": "24afe922e6a05891756ecf331f39a1f6743d3d5a" }, "vim-rhubarb": { "branch": "master", "commit": "cad60fe382f3f501bbb28e113dfe8c0de6e77c75" }, "vim-surround": { "branch": "master", "commit": "3d188ed2113431cf8dac77be61b842acb64433d9" }, diff --git a/lua/alpha/snips/ft/php.lua b/lua/alpha/snips/ft/php.lua index abfc6f7..630673b 100644 --- a/lua/alpha/snips/ft/php.lua +++ b/lua/alpha/snips/ft/php.lua @@ -32,13 +32,21 @@ local visibility = function(position, default) return c(position, options) end +-- FIX: This logic does not work properly local namespace = function() local dir = vim.fn.expand "%:h" local autoloads = composer.query { "autoload", "psr-4" } + local dev_autoloads = composer.query { "autoload-dev", "psr-4" } + if autoloads == nil then return (dir:gsub("^%l", string.upper)) end + for index, value in pairs(dev_autoloads) do + autoloads[index] = value + end + + P(dir) local globalNamespace for key, value in pairs(autoloads) do if string.starts(dir, value:sub(1, -2)) then @@ -97,8 +105,8 @@ class {} M.pro = fmt([[{} {}{} ${},]], { visibility(1, "private"), c(2, { - t "", t "readonly ", + t "", }), i(3, "Type"), d(4, function(args) @@ -108,6 +116,15 @@ M.pro = fmt([[{} {}{} ${},]], { end, { 3 }), }) +M.op = fmt("private {}|ObjectProphecy ${};", { + i(1, "Type"), + d(2, function(args) + return snippet_from_nodes(nil, { + i(1, args[1][1]:gsub("^%u", string.lower) or ""), + }) + end, { 1 }), +}) + M.arg = fmt([[{} ${}]], { i(1, "Type"), d(2, function(args) @@ -141,30 +158,20 @@ M._p = fmt( M.strict = t "declare(strict_types=1);" -M.fn = { - visibility(1, "public"), - t " function ", - i(2, "name"), - t "(", - i(3), - t ")", - c(4, { - t "", - snippet_from_nodes(nil, { - t ": ", - i(1, "void"), - }), - }), - newline "{", - newline "\t", - i(0, ""), - newline "}", -} +M["fn"] = fmt( + [[{} function {}({}): {} +{{ + {} +}}]], + { visibility(1, "public"), i(2), i(3), i(4, "void"), i(0) } +) M["then"] = fmt( - [[->then(function ({}) {{ + [[->then( + function ({}) {{ {} -}})]], + }} +)]], { i(1, ""), i(2, "") } ) -- cgit v1.2.3