aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWilliam Boman <william@redwill.se>2023-03-12 09:25:41 +0100
committerGitHub <noreply@github.com>2023-03-12 09:25:41 +0100
commita81503f0019942111fe464209237f8b4e85f4687 (patch)
tree390147103c990591dc0131c2fc44ca53b4a1b699
parentfeat: add standardrb (#167) (diff)
downloadmason-lspconfig-a81503f0019942111fe464209237f8b4e85f4687.tar
mason-lspconfig-a81503f0019942111fe464209237f8b4e85f4687.tar.gz
mason-lspconfig-a81503f0019942111fe464209237f8b4e85f4687.tar.bz2
mason-lspconfig-a81503f0019942111fe464209237f8b4e85f4687.tar.lz
mason-lspconfig-a81503f0019942111fe464209237f8b4e85f4687.tar.xz
mason-lspconfig-a81503f0019942111fe464209237f8b4e85f4687.tar.zst
mason-lspconfig-a81503f0019942111fe464209237f8b4e85f4687.zip
style: enforce import order (#169)
* chore(workflows): update dependencies * style: enforce import order
-rw-r--r--.github/workflows/cbfmt.yml4
-rw-r--r--.github/workflows/selene.yml2
-rw-r--r--.github/workflows/stylua.yml2
-rw-r--r--lua/mason-lspconfig/api/command.lua4
-rw-r--r--lua/mason-lspconfig/ensure_installed.lua2
-rw-r--r--lua/mason-lspconfig/init.lua2
-rw-r--r--lua/mason-lspconfig/lspconfig_hook.lua2
-rw-r--r--lua/mason-lspconfig/server_configurations/angularls/init.lua2
-rw-r--r--lua/mason-lspconfig/server_configurations/julials/init.lua4
-rw-r--r--lua/mason-lspconfig/server_configurations/pylsp/init.lua4
-rw-r--r--lua/mason-lspconfig/typescript.lua2
-rw-r--r--scripts/lua/mason-scripts/mason-lspconfig/generate.lua6
-rw-r--r--scripts/lua/mason-scripts/utils.lua2
-rw-r--r--stylua.toml3
-rw-r--r--tests/helpers/lua/luassertx.lua2
-rw-r--r--tests/helpers/lua/test_helpers.lua6
-rw-r--r--tests/mason-lspconfig/api/api_spec.lua2
-rw-r--r--tests/mason-lspconfig/api/command_spec.lua8
-rw-r--r--tests/mason-lspconfig/setup_spec.lua6
19 files changed, 34 insertions, 31 deletions
diff --git a/.github/workflows/cbfmt.yml b/.github/workflows/cbfmt.yml
index d9a5e2d..57d7752 100644
--- a/.github/workflows/cbfmt.yml
+++ b/.github/workflows/cbfmt.yml
@@ -14,13 +14,13 @@ jobs:
- name: Download cbfmt
run: |
mkdir /tmp/cbfmt && cd $_
- curl -fsSL -o cbfmt.tar.gz "https://github.com/lukas-reineke/cbfmt/releases/download/v0.1.4/cbfmt_linux-x86_64_v0.1.4.tar.gz"
+ curl -fsSL -o cbfmt.tar.gz "https://github.com/lukas-reineke/cbfmt/releases/download/v0.2.0/cbfmt_linux-x86_64_v0.2.0.tar.gz"
tar --strip-components 1 -xvf cbfmt.tar.gz
mv cbfmt /usr/local/bin/
- name: Download Stylua
run: |
mkdir /tmp/stylua && cd $_
- curl -fsSL -o stylua.zip "https://github.com/JohnnyMorganz/StyLua/releases/download/v0.14.2/stylua-linux.zip"
+ curl -fsSL -o stylua.zip "https://github.com/JohnnyMorganz/StyLua/releases/download/v0.17.0/stylua-linux.zip"
unzip -d /usr/local/bin stylua.zip
- name: Download Shellharden
run: |
diff --git a/.github/workflows/selene.yml b/.github/workflows/selene.yml
index 7ce7ba8..5a71f62 100644
--- a/.github/workflows/selene.yml
+++ b/.github/workflows/selene.yml
@@ -17,4 +17,4 @@ jobs:
# token is needed because the action allegedly downloads binary from github releases
token: ${{ secrets.GITHUB_TOKEN }}
args: lua/ tests/ scripts/
- version: 0.20.0
+ version: 0.24.0
diff --git a/.github/workflows/stylua.yml b/.github/workflows/stylua.yml
index 89ce5ed..46286bb 100644
--- a/.github/workflows/stylua.yml
+++ b/.github/workflows/stylua.yml
@@ -18,4 +18,4 @@ jobs:
token: ${{ secrets.GITHUB_TOKEN }}
# CLI arguments
args: --check .
- version: 0.15.0
+ version: 0.17.0
diff --git a/lua/mason-lspconfig/api/command.lua b/lua/mason-lspconfig/api/command.lua
index 59ffa4f..b3c83d3 100644
--- a/lua/mason-lspconfig/api/command.lua
+++ b/lua/mason-lspconfig/api/command.lua
@@ -1,7 +1,7 @@
-local a = require "mason-core.async"
local Optional = require "mason-core.optional"
-local notify = require "mason-core.notify"
local _ = require "mason-core.functional"
+local a = require "mason-core.async"
+local notify = require "mason-core.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 ebfe9ff..15673d7 100644
--- a/lua/mason-lspconfig/ensure_installed.lua
+++ b/lua/mason-lspconfig/ensure_installed.lua
@@ -1,5 +1,5 @@
-local settings = require "mason-lspconfig.settings"
local notify = require "mason-core.notify"
+local settings = require "mason-lspconfig.settings"
---@param lspconfig_server_name string
local function resolve_package(lspconfig_server_name)
diff --git a/lua/mason-lspconfig/init.lua b/lua/mason-lspconfig/init.lua
index 040f45e..e90d18a 100644
--- a/lua/mason-lspconfig/init.lua
+++ b/lua/mason-lspconfig/init.lua
@@ -1,5 +1,5 @@
-local log = require "mason-core.log"
local _ = require "mason-core.functional"
+local log = require "mason-core.log"
local M = {}
diff --git a/lua/mason-lspconfig/lspconfig_hook.lua b/lua/mason-lspconfig/lspconfig_hook.lua
index b3e54e2..9075c6b 100644
--- a/lua/mason-lspconfig/lspconfig_hook.lua
+++ b/lua/mason-lspconfig/lspconfig_hook.lua
@@ -1,5 +1,5 @@
-local log = require "mason-core.log"
local _ = require "mason-core.functional"
+local log = require "mason-core.log"
local path = require "mason-core.path"
local platform = require "mason-core.platform"
diff --git a/lua/mason-lspconfig/server_configurations/angularls/init.lua b/lua/mason-lspconfig/server_configurations/angularls/init.lua
index fb6131c..6316dd0 100644
--- a/lua/mason-lspconfig/server_configurations/angularls/init.lua
+++ b/lua/mason-lspconfig/server_configurations/angularls/init.lua
@@ -1,6 +1,6 @@
-local platform = require "mason-core.platform"
local _ = require "mason-core.functional"
local path = require "mason-core.path"
+local platform = require "mason-core.platform"
---@param install_dir string
return function(install_dir)
diff --git a/lua/mason-lspconfig/server_configurations/julials/init.lua b/lua/mason-lspconfig/server_configurations/julials/init.lua
index d2802d5..5169b47 100644
--- a/lua/mason-lspconfig/server_configurations/julials/init.lua
+++ b/lua/mason-lspconfig/server_configurations/julials/init.lua
@@ -1,6 +1,6 @@
-local path = require "mason-core.path"
-local fs = require "mason-core.fs"
local _ = require "mason-core.functional"
+local fs = require "mason-core.fs"
+local path = require "mason-core.path"
return function()
return {
diff --git a/lua/mason-lspconfig/server_configurations/pylsp/init.lua b/lua/mason-lspconfig/server_configurations/pylsp/init.lua
index f65809f..db34a8e 100644
--- a/lua/mason-lspconfig/server_configurations/pylsp/init.lua
+++ b/lua/mason-lspconfig/server_configurations/pylsp/init.lua
@@ -1,8 +1,8 @@
-local a = require "mason-core.async"
local _ = require "mason-core.functional"
+local a = require "mason-core.async"
+local notify = require "mason-core.notify"
local pip3 = require "mason-core.managers.pip3"
local process = require "mason-core.process"
-local notify = require "mason-core.notify"
local spawn = require "mason-core.spawn"
---@param install_dir string
diff --git a/lua/mason-lspconfig/typescript.lua b/lua/mason-lspconfig/typescript.lua
index acae8be..8d727ba 100644
--- a/lua/mason-lspconfig/typescript.lua
+++ b/lua/mason-lspconfig/typescript.lua
@@ -1,7 +1,7 @@
local _ = require "mason-core.functional"
local fs = require "mason-core.fs"
-local path = require "mason-core.path"
local log = require "mason-core.log"
+local path = require "mason-core.path"
local typescript = {}
diff --git a/scripts/lua/mason-scripts/mason-lspconfig/generate.lua b/scripts/lua/mason-scripts/mason-lspconfig/generate.lua
index 3c5b0d4..d533287 100644
--- a/scripts/lua/mason-scripts/mason-lspconfig/generate.lua
+++ b/scripts/lua/mason-scripts/mason-lspconfig/generate.lua
@@ -1,11 +1,11 @@
require "mason-lspconfig.server_config_extensions"()
local Optional = require "mason-core.optional"
-local lspconfig = require "lspconfig"
-local a = require "mason-core.async"
-local path = require "mason-core.path"
local _ = require "mason-core.functional"
+local a = require "mason-core.async"
+local lspconfig = require "lspconfig"
local lspconfig_server_mapping = require "mason-lspconfig.mappings.server"
+local path = require "mason-core.path"
local script_utils = require "mason-scripts.utils"
local DOCS_DIR = path.concat { vim.loop.cwd(), "doc" }
diff --git a/scripts/lua/mason-scripts/utils.lua b/scripts/lua/mason-scripts/utils.lua
index a6cee3a..ee6ab10 100644
--- a/scripts/lua/mason-scripts/utils.lua
+++ b/scripts/lua/mason-scripts/utils.lua
@@ -1,5 +1,5 @@
-local fs = require "mason-core.fs"
local _ = require "mason-core.functional"
+local fs = require "mason-core.fs"
local M = {}
diff --git a/stylua.toml b/stylua.toml
index eb74155..4f0dd80 100644
--- a/stylua.toml
+++ b/stylua.toml
@@ -1,2 +1,5 @@
indent_type = "Spaces"
call_parentheses = "None"
+
+[sort_requires]
+enabled = true
diff --git a/tests/helpers/lua/luassertx.lua b/tests/helpers/lua/luassertx.lua
index 55ea0d7..bc02aca 100644
--- a/tests/helpers/lua/luassertx.lua
+++ b/tests/helpers/lua/luassertx.lua
@@ -1,6 +1,6 @@
+local a = require "mason-core.async"
local assert = require "luassert"
local match = require "luassert.match"
-local a = require "mason-core.async"
local function wait_for(_, arguments)
---@type (fun()): Function to execute until it does not error.
diff --git a/tests/helpers/lua/test_helpers.lua b/tests/helpers/lua/test_helpers.lua
index 1880c39..5e38639 100644
--- a/tests/helpers/lua/test_helpers.lua
+++ b/tests/helpers/lua/test_helpers.lua
@@ -1,10 +1,10 @@
---@diagnostic disable: lowercase-global
-local util = require "luassert.util"
local spy = require "luassert.spy"
+local util = require "luassert.util"
-local a = require "mason-core.async"
-local InstallHandle = require "mason-core.installer.handle"
local InstallContext = require "mason-core.installer.context"
+local InstallHandle = require "mason-core.installer.handle"
+local a = require "mason-core.async"
local registry = require "mason-registry"
function async_test(suspend_fn)
diff --git a/tests/mason-lspconfig/api/api_spec.lua b/tests/mason-lspconfig/api/api_spec.lua
index 01a4d13..4518595 100644
--- a/tests/mason-lspconfig/api/api_spec.lua
+++ b/tests/mason-lspconfig/api/api_spec.lua
@@ -1,5 +1,5 @@
-local mason_lspconfig = require "mason-lspconfig"
local _ = require "mason-core.functional"
+local mason_lspconfig = require "mason-lspconfig"
describe("mason-lspconfig API", function()
it("should return all available servers", function()
diff --git a/tests/mason-lspconfig/api/command_spec.lua b/tests/mason-lspconfig/api/command_spec.lua
index 0551c77..adf0a33 100644
--- a/tests/mason-lspconfig/api/command_spec.lua
+++ b/tests/mason-lspconfig/api/command_spec.lua
@@ -1,12 +1,12 @@
+local match = require "luassert.match"
local spy = require "luassert.spy"
local stub = require "luassert.stub"
-local match = require "luassert.match"
-local server_mappings = require "mason-lspconfig.mappings.server"
-local filetype_mappings = require "mason-lspconfig.mappings.filetype"
+local Pkg = require "mason-core.package"
local api = require "mason-lspconfig.api.command"
+local filetype_mappings = require "mason-lspconfig.mappings.filetype"
local registry = require "mason-registry"
-local Pkg = require "mason-core.package"
+local server_mappings = require "mason-lspconfig.mappings.server"
describe(":LspInstall", function()
server_mappings.lspconfig_to_package["dummylsp"] = "dummy"
diff --git a/tests/mason-lspconfig/setup_spec.lua b/tests/mason-lspconfig/setup_spec.lua
index d249675..1441c4f 100644
--- a/tests/mason-lspconfig/setup_spec.lua
+++ b/tests/mason-lspconfig/setup_spec.lua
@@ -1,12 +1,12 @@
local match = require "luassert.match"
-local stub = require "luassert.stub"
local spy = require "luassert.spy"
+local stub = require "luassert.stub"
local Pkg = require "mason-core.package"
+local filetype_mappings = require "mason-lspconfig.mappings.filetype"
local mason_lspconfig = require "mason-lspconfig"
-local server_mappings = require "mason-lspconfig.mappings.server"
local registry = require "mason-registry"
-local filetype_mappings = require "mason-lspconfig.mappings.filetype"
+local server_mappings = require "mason-lspconfig.mappings.server"
describe("mason-lspconfig setup", function()
before_each(function()