diff options
| author | William Boman <william@redwill.se> | 2023-04-18 00:39:01 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-18 00:39:01 +0200 |
| commit | 601c0ad2f8870bd1d45fbdd27cb50ccfb2c8b3b9 (patch) | |
| tree | 1f037d09be867de6edc547776e7e8551dab04c51 /lua | |
| parent | feat: add helm-ls (#194) (diff) | |
| download | mason-lspconfig-601c0ad2f8870bd1d45fbdd27cb50ccfb2c8b3b9.tar mason-lspconfig-601c0ad2f8870bd1d45fbdd27cb50ccfb2c8b3b9.tar.gz mason-lspconfig-601c0ad2f8870bd1d45fbdd27cb50ccfb2c8b3b9.tar.bz2 mason-lspconfig-601c0ad2f8870bd1d45fbdd27cb50ccfb2c8b3b9.tar.lz mason-lspconfig-601c0ad2f8870bd1d45fbdd27cb50ccfb2c8b3b9.tar.xz mason-lspconfig-601c0ad2f8870bd1d45fbdd27cb50ccfb2c8b3b9.tar.zst mason-lspconfig-601c0ad2f8870bd1d45fbdd27cb50ccfb2c8b3b9.zip | |
feat: notify if mason has not been set up (#195)
Closes #181.
Diffstat (limited to 'lua')
| -rw-r--r-- | lua/mason-lspconfig/api/command.lua | 2 | ||||
| -rw-r--r-- | lua/mason-lspconfig/ensure_installed.lua | 2 | ||||
| -rw-r--r-- | lua/mason-lspconfig/init.lua | 9 | ||||
| -rw-r--r-- | lua/mason-lspconfig/install.lua | 2 | ||||
| -rw-r--r-- | lua/mason-lspconfig/notify.lua | 8 | ||||
| -rw-r--r-- | lua/mason-lspconfig/server_configurations/pylsp/init.lua | 2 |
6 files changed, 20 insertions, 5 deletions
diff --git a/lua/mason-lspconfig/api/command.lua b/lua/mason-lspconfig/api/command.lua index 2cd1ef5..7a7d623 100644 --- a/lua/mason-lspconfig/api/command.lua +++ b/lua/mason-lspconfig/api/command.lua @@ -1,7 +1,7 @@ local Optional = require "mason-core.optional" local _ = require "mason-core.functional" local a = require "mason-core.async" -local notify = require "mason-core.notify" +local notify = require "mason-lspconfig.notify" ---@async ---@param user_args string[]: The arguments, as provided by the user. diff --git a/lua/mason-lspconfig/ensure_installed.lua b/lua/mason-lspconfig/ensure_installed.lua index dabd931..cdb30eb 100644 --- a/lua/mason-lspconfig/ensure_installed.lua +++ b/lua/mason-lspconfig/ensure_installed.lua @@ -1,4 +1,4 @@ -local notify = require "mason-core.notify" +local notify = require "mason-lspconfig.notify" local registry = require "mason-registry" local settings = require "mason-lspconfig.settings" diff --git a/lua/mason-lspconfig/init.lua b/lua/mason-lspconfig/init.lua index c364634..95b2e85 100644 --- a/lua/mason-lspconfig/init.lua +++ b/lua/mason-lspconfig/init.lua @@ -6,6 +6,13 @@ local M = {} ---@param config MasonLspconfigSettings | nil function M.setup(config) + local ok, mason = pcall(require, "mason") + if not ok or mason.has_setup == false then + require "mason-lspconfig.notify"( + "mason.nvim has not been set up. Make sure to set up 'mason' before 'mason-lspconfig'. :h mason-lspconfig-quickstart", + vim.log.levels.WARN + ) + end local settings = require "mason-lspconfig.settings" if config then @@ -40,7 +47,7 @@ function M.setup_handlers(handlers) local Optional = require "mason-core.optional" local server_mapping = require "mason-lspconfig.mappings.server" local registry = require "mason-registry" - local notify = require "mason-core.notify" + local notify = require "mason-lspconfig.notify" local default_handler = Optional.of_nilable(handlers[1]) diff --git a/lua/mason-lspconfig/install.lua b/lua/mason-lspconfig/install.lua index 1ccb985..7d5320a 100644 --- a/lua/mason-lspconfig/install.lua +++ b/lua/mason-lspconfig/install.lua @@ -1,4 +1,4 @@ -local notify = require "mason-core.notify" +local notify = require "mason-lspconfig.notify" local server_mapping = require "mason-lspconfig.mappings.server" local M = {} diff --git a/lua/mason-lspconfig/notify.lua b/lua/mason-lspconfig/notify.lua new file mode 100644 index 0000000..ca291df --- /dev/null +++ b/lua/mason-lspconfig/notify.lua @@ -0,0 +1,8 @@ +local TITLE = "mason-lspconfig.nvim" + +return function(msg, level) + level = level or vim.log.levels.INFO + vim.notify(msg, level, { + title = TITLE, + }) +end diff --git a/lua/mason-lspconfig/server_configurations/pylsp/init.lua b/lua/mason-lspconfig/server_configurations/pylsp/init.lua index db34a8e..c9b3db7 100644 --- a/lua/mason-lspconfig/server_configurations/pylsp/init.lua +++ b/lua/mason-lspconfig/server_configurations/pylsp/init.lua @@ -1,6 +1,6 @@ local _ = require "mason-core.functional" local a = require "mason-core.async" -local notify = require "mason-core.notify" +local notify = require "mason-lspconfig.notify" local pip3 = require "mason-core.managers.pip3" local process = require "mason-core.process" local spawn = require "mason-core.spawn" |
