diff options
| author | Ariel D'Alessandro <dalessandro.ariel@gmail.com> | 2023-03-09 20:13:56 +0100 |
|---|---|---|
| committer | Ariel D'Alessandro <dalessandro.ariel@gmail.com> | 2023-03-09 20:13:56 +0100 |
| commit | 3505100073d973c9f4f75e11ecaa777d84775984 (patch) | |
| tree | ec082550ae2fa4ce09adcd54a7874f294e9c2099 | |
| parent | 71f2be8e0d59e609eecf282e86d6c0de1dccac75 (diff) | |
| download | nvim-conf-3505100073d973c9f4f75e11ecaa777d84775984.tar.gz nvim-conf-3505100073d973c9f4f75e11ecaa777d84775984.zip | |
feat: update with composer version
| -rw-r--r-- | lazy-lock.json | 18 | ||||
| -rw-r--r-- | lua/alpha/lsp/null-ls.lua | 4 | ||||
| -rw-r--r-- | lua/alpha/snips/ft/php.lua | 33 |
3 files changed, 12 insertions, 43 deletions
diff --git a/lazy-lock.json b/lazy-lock.json index 0e3d9c4..09d6c0e 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": "b61173fb107455f18099715b88d86002579f2736" }, - "catppuccin": { "branch": "main", "commit": "68a2d7c82f9a2ad802e02a8a9452f8cefc28c10d" }, + "catppuccin": { "branch": "main", "commit": "90c4d1c6e1f8dd2cff9962b36a70b1e681947621" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-cmdline": { "branch": "main", "commit": "8fcc934a52af96120fe26358985c10c035984b53" }, "cmp-dap": { "branch": "master", "commit": "d16f14a210cd28988b97ca8339d504533b7e09a4" }, @@ -28,25 +28,25 @@ "markdown-preview.nvim": { "branch": "main", "commit": "cc05a30393e2bf9f12e2d59fc35a1aa928ed1727" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "a31e011135a79d63c71254c250c9158e1056a1cb" }, "mason-tool-installer.nvim": { "branch": "main", "commit": "6ca38efeb0406dea8da6c97f61d6f6ef30ab0576" }, - "mason.nvim": { "branch": "main", "commit": "a8cef27f071fe34696a9c8fa55829900e2291e86" }, + "mason.nvim": { "branch": "main", "commit": "b3db6999fdf0170619a1c8fa41586bea3669a94a" }, "mind.nvim": { "branch": "v2.2", "commit": "79e0ca131d5e37dfa65f3f0e725d99742e4ff783" }, "neogen": { "branch": "main", "commit": "93d997dbddfe084e77ba4541c54a7b8bfd754fb1" }, - "null-ls.nvim": { "branch": "main", "commit": "900c38cfa91eb7ff2716da70f2f2c1d33741cf0a" }, + "null-ls.nvim": { "branch": "main", "commit": "96e0305296615de2e084f1a94bbe90d927ac884b" }, "nvim-autopairs": { "branch": "master", "commit": "e755f366721bc9e189ddecd39554559045ac0a18" }, "nvim-cmp": { "branch": "main", "commit": "feed47fd1da7a1bad2c7dca456ea19c8a5a9823a" }, - "nvim-dap": { "branch": "master", "commit": "75a94b8b577a970c0cad25a54a64dc40fc6fa0ea" }, + "nvim-dap": { "branch": "master", "commit": "73196075627a4f079c62b0dd4aff8ce0a1b7cf57" }, "nvim-dap-go": { "branch": "main", "commit": "b4ded7de579b4e2a85c203388233b54bf1028816" }, "nvim-dap-ui": { "branch": "master", "commit": "bdb94e3853d11b5ce98ec182e5a3719d5c0ef6fd" }, "nvim-dap-virtual-text": { "branch": "master", "commit": "8db23ea51203b5f00ad107a0cef7e0b2d7a0476c" }, "nvim-dap-vscode-js": { "branch": "main", "commit": "03bd29672d7fab5e515fc8469b7d07cc5994bbf6" }, - "nvim-lspconfig": { "branch": "master", "commit": "f3e6c034d103e3476821af596a67df71d76f85a9" }, + "nvim-lspconfig": { "branch": "master", "commit": "2ba6e268d92934e14fe561fe446a49540803e57f" }, "nvim-notify": { "branch": "master", "commit": "281e4d793c550c866bea3fb85d39de1f0188fb50" }, "nvim-projectconfig": { "branch": "master", "commit": "05fd34831e170db269d1b84597615bcdcdde930e" }, "nvim-spectre": { "branch": "master", "commit": "b71b64afe9fedbfdd25a8abec897ff4af3bd553a" }, "nvim-transparent": { "branch": "main", "commit": "4c3c392f285378e606d154bee393b6b3dd18059c" }, - "nvim-treesitter": { "branch": "master", "commit": "d086563c02a582a552086ea94bfabd5f49d6872a" }, + "nvim-treesitter": { "branch": "master", "commit": "fc1ca10bfbdee17e29374d0d1bac8ea030539dc3" }, "nvim-treesitter-refactor": { "branch": "master", "commit": "75f5895cc662d61eb919da8050b7a0124400d589" }, - "nvim-treesitter-textobjects": { "branch": "master", "commit": "f5f13206ec33e55b16c8e1a9dec301e8bead4835" }, + "nvim-treesitter-textobjects": { "branch": "master", "commit": "542e0879d524ba717234fcba049b6c2da7989d5a" }, "nvim-various-textobjs": { "branch": "main", "commit": "623ef1f191754452605a921258cc1b9c84a805d3" }, "nvim-web-devicons": { "branch": "master", "commit": "4af94fec29f508159ceab5413383e5dedd6c24e3" }, "php-code-actions.nvim": { "branch": "main", "commit": "a85a695c58f9c5e8033d824ffae366e9797e0b28" }, @@ -56,7 +56,7 @@ "refactoring.nvim": { "branch": "master", "commit": "57c32c6b7a211e5a3a5e4ddc4ad2033daff5cf9a" }, "rest.nvim": { "branch": "main", "commit": "0fdb69f328529b34a2279c14be63b3325dc52740" }, "telescope-dap.nvim": { "branch": "master", "commit": "313d2ea12ae59a1ca51b62bf01fc941a983d9c9c" }, - "telescope-file-browser.nvim": { "branch": "master", "commit": "61b3769065131129716974f7fb63f82ee409bd80" }, + "telescope-file-browser.nvim": { "branch": "master", "commit": "94fe37a1ea217dd2f90d91222bc1531521146ac3" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "580b6c48651cabb63455e97d7e131ed557b8c7e2" }, "telescope-fzy-native.nvim": { "branch": "master", "commit": "282f069504515eec762ab6d6c89903377252bf5b" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "62ea5e58c7bbe191297b983a9e7e89420f581369" }, @@ -71,7 +71,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": "82a9af133ce15afc232a9e754898a8ba252780e6" }, + "vim-fugitive": { "branch": "master", "commit": "d4941aec931bfcb4086b6c80d3773191bab58f00" }, "vim-repeat": { "branch": "master", "commit": "24afe922e6a05891756ecf331f39a1f6743d3d5a" }, "vim-rhubarb": { "branch": "master", "commit": "cad60fe382f3f501bbb28e113dfe8c0de6e77c75" }, "vim-surround": { "branch": "master", "commit": "3d188ed2113431cf8dac77be61b842acb64433d9" }, diff --git a/lua/alpha/lsp/null-ls.lua b/lua/alpha/lsp/null-ls.lua index f80b183..91caa82 100644 --- a/lua/alpha/lsp/null-ls.lua +++ b/lua/alpha/lsp/null-ls.lua @@ -20,14 +20,14 @@ local sources = { }, } -if composer.query { "require", "symfony/framework-bundle" } ~= nil then +if composer.query_composer_file { "require", "symfony/framework-bundle" } ~= nil then table.insert( sources, null_ls.builtins.diagnostics.phpcs.with { method = null_ls.methods.DIAGNOSTICS_ON_SAVE, } ) -elseif composer.query { "require", "laravel/framework" } ~= nil then +elseif composer.query_composer_file { "require", "laravel/framework" } ~= nil then table.insert(sources, null_ls.builtins.formatting.pint) -- table.insert(sources, laravel_actions.relationships) end diff --git a/lua/alpha/snips/ft/php.lua b/lua/alpha/snips/ft/php.lua index ac1c3fb..f977bfd 100644 --- a/lua/alpha/snips/ft/php.lua +++ b/lua/alpha/snips/ft/php.lua @@ -28,37 +28,6 @@ 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 - globalNamespace = key:sub(1, -2) - dir = dir:sub(#key + 1) - break - end - end - dir = dir:gsub("/", "\\") - if dir == "" then - return globalNamespace - end - - return string.format("%s\\%s", globalNamespace, dir) -end - local class_name = function() return vim.fn.expand "%:t:r" end @@ -92,7 +61,7 @@ class {} }} ]], { - f(namespace), + f(composer.resolve_php_namespace), f(class_name), i(0), } |