diff options
| author | William Boman <william@redwill.se> | 2025-02-19 14:46:52 +0100 |
|---|---|---|
| committer | William Boman <william@redwill.se> | 2025-02-19 14:47:55 +0100 |
| commit | a8f5e511c686b6e8eec7bc57caf4d9d710005bcf (patch) | |
| tree | abca0182302608d93d45bb140b0ef8fee2e738de /lua | |
| parent | chore(main): release 1.32.0 (#479) (diff) | |
| download | mason-lspconfig-a8f5e511c686b6e8eec7bc57caf4d9d710005bcf.tar mason-lspconfig-a8f5e511c686b6e8eec7bc57caf4d9d710005bcf.tar.gz mason-lspconfig-a8f5e511c686b6e8eec7bc57caf4d9d710005bcf.tar.bz2 mason-lspconfig-a8f5e511c686b6e8eec7bc57caf4d9d710005bcf.tar.lz mason-lspconfig-a8f5e511c686b6e8eec7bc57caf4d9d710005bcf.tar.xz mason-lspconfig-a8f5e511c686b6e8eec7bc57caf4d9d710005bcf.tar.zst mason-lspconfig-a8f5e511c686b6e8eec7bc57caf4d9d710005bcf.zip | |
feat!: update usage of deprecated mason.nvim APIs
Diffstat (limited to 'lua')
| -rw-r--r-- | lua/mason-lspconfig/lspconfig_hook.lua | 3 | ||||
| -rw-r--r-- | lua/mason-lspconfig/server_configurations/pylsp/init.lua | 9 |
2 files changed, 7 insertions, 5 deletions
diff --git a/lua/mason-lspconfig/lspconfig_hook.lua b/lua/mason-lspconfig/lspconfig_hook.lua index 91284af..cc7606f 100644 --- a/lua/mason-lspconfig/lspconfig_hook.lua +++ b/lua/mason-lspconfig/lspconfig_hook.lua @@ -1,7 +1,6 @@ local _ = require "mason-core.functional" local log = require "mason-core.log" local notify = require "mason-lspconfig.notify" -local path = require "mason-core.path" local platform = require "mason-core.platform" local memoized_set = _.memoize(_.set_of) @@ -74,7 +73,7 @@ return function() if registry.is_installed(pkg_name) then resolve_server_config_factory(config.name):if_present(function(config_factory) - local mason_config = config_factory(path.package_prefix(pkg_name), config) + local mason_config = config_factory(vim.fn.expand("$MASON/packages/" .. pkg_name), config) _.reduce(merge_in_place, config, { mason_config, user_config or {} }) end) if platform.is.win and (config.cmd and config.cmd[1] ~= "cmd.exe") then diff --git a/lua/mason-lspconfig/server_configurations/pylsp/init.lua b/lua/mason-lspconfig/server_configurations/pylsp/init.lua index 9d930b0..8a683ec 100644 --- a/lua/mason-lspconfig/server_configurations/pylsp/init.lua +++ b/lua/mason-lspconfig/server_configurations/pylsp/init.lua @@ -7,7 +7,7 @@ return function(install_dir) "PylspInstall", a.scope(function(opts) local notify = require "mason-lspconfig.notify" - local pip3 = require "mason-core.managers.pip3" + local pypw = require "mason-core.installer.managers.pypi" local process = require "mason-core.process" local spawn = require "mason-core.spawn" @@ -19,8 +19,11 @@ return function(install_dir) "-U", "--disable-pip-version-check", plugins, - stdio_sink = process.simple_sink(), - with_paths = { pip3.venv_path(install_dir) }, + stdio_sink = process.StdioSink:new { + stdout = vim.schedule_wrap(vim.api.nvim_out_write), + stderr = vim.schedule_wrap(vim.api.nvim_err_write), + }, + with_paths = { pypw.venv_path(install_dir) }, } if vim.in_fast_event() then a.scheduler() |