diff options
| author | William Boman <william@redwill.se> | 2022-09-13 14:14:22 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-09-13 14:14:22 +0200 |
| commit | 2ca0caadbe9117cb295edda6aa3c03e354f2c3c1 (patch) | |
| tree | 2d855881b174cfa9dfbaca4890d899b052216597 /lua | |
| parent | chore: update generated code (#53) (diff) | |
| download | mason-lspconfig-2ca0caadbe9117cb295edda6aa3c03e354f2c3c1.tar mason-lspconfig-2ca0caadbe9117cb295edda6aa3c03e354f2c3c1.tar.gz mason-lspconfig-2ca0caadbe9117cb295edda6aa3c03e354f2c3c1.tar.bz2 mason-lspconfig-2ca0caadbe9117cb295edda6aa3c03e354f2c3c1.tar.lz mason-lspconfig-2ca0caadbe9117cb295edda6aa3c03e354f2c3c1.tar.xz mason-lspconfig-2ca0caadbe9117cb295edda6aa3c03e354f2c3c1.tar.zst mason-lspconfig-2ca0caadbe9117cb295edda6aa3c03e354f2c3c1.zip | |
chore: add selene & cbfmt (#54)
Diffstat (limited to 'lua')
| -rw-r--r-- | lua/mason-lspconfig/api/command.lua | 1 | ||||
| -rw-r--r-- | lua/mason-lspconfig/server_configurations/julials/init.lua | 11 | ||||
| -rw-r--r-- | lua/mason-lspconfig/server_configurations/omnisharp/README.md | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/lua/mason-lspconfig/api/command.lua b/lua/mason-lspconfig/api/command.lua index ba44b4f..9f58797 100644 --- a/lua/mason-lspconfig/api/command.lua +++ b/lua/mason-lspconfig/api/command.lua @@ -133,6 +133,7 @@ end, { complete = "custom,v:lua.mason_lspconfig_completion.installed_server_completion", }) +-- selene: allow(global_usage) _G.mason_lspconfig_completion = { available_server_completion = function() local available_servers = require("mason-lspconfig").get_available_servers() diff --git a/lua/mason-lspconfig/server_configurations/julials/init.lua b/lua/mason-lspconfig/server_configurations/julials/init.lua index e5bc6c4..d2802d5 100644 --- a/lua/mason-lspconfig/server_configurations/julials/init.lua +++ b/lua/mason-lspconfig/server_configurations/julials/init.lua @@ -1,18 +1,17 @@ local path = require "mason-core.path" -local platform = require "mason-core.platform" local fs = require "mason-core.fs" local _ = require "mason-core.functional" ----@param install_dir string -return function(install_dir) +return function() return { on_new_config = function(config, workspace_dir) local env_path = config.julia_env_path and vim.fn.expand(config.julia_env_path) if not env_path then local file_exists = _.compose(fs.sync.file_exists, path.concat, _.concat { workspace_dir }) - if file_exists { "Project.toml" } and file_exists { "Manifest.toml" } then - env_path = workspace_dir - elseif file_exists { "JuliaProject.toml" } and file_exists { "JuliaManifest.toml" } then + if + (file_exists { "Project.toml" } and file_exists { "Manifest.toml" }) + or (file_exists { "JuliaProject.toml" } and file_exists { "JuliaManifest.toml" }) + then env_path = workspace_dir end end diff --git a/lua/mason-lspconfig/server_configurations/omnisharp/README.md b/lua/mason-lspconfig/server_configurations/omnisharp/README.md index 2b7e601..f74344e 100644 --- a/lua/mason-lspconfig/server_configurations/omnisharp/README.md +++ b/lua/mason-lspconfig/server_configurations/omnisharp/README.md @@ -9,7 +9,7 @@ use the `omnisharp_mono` server instead (**this requires the `omnisharp-mono` pa This is done in order to separate the .NET and Mono variants, making both easily accessible. ```lua -local lspconfig = require("lspconfig") +local lspconfig = require "lspconfig" lspconfig.omnisharp_mono.setup {} ``` |