diff --git a/.emmyrc.json b/.emmyrc.json index 36adf7e..384940a 100644 --- a/.emmyrc.json +++ b/.emmyrc.json @@ -1,17 +1,11 @@ { "$schema": "https://raw.githubusercontent.com/EmmyLuaLs/emmylua-analyzer-rust/refs/heads/main/crates/emmylua_code_analysis/resources/schema.json", - "diagnostics": { - "enable": true, - "globals": ["vim", "it", "describe", "before_each", "after_each"] - }, "runtime": { "version": "LuaJIT" }, "workspace": { "library": [ - "$VIMRUNTIME", - "library/busted", - "library/luassert" + "$VIMRUNTIME" ] } } diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 55d9ab4..866a18c 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -16,7 +16,7 @@ jobs: run: nix-shell --pure --run 'true' - - name: Type-check with lua-language-server + - name: Type-check run: nix-shell --pure --run 'make lint' diff --git a/.gitmodules b/.gitmodules index 435ce42..78473aa 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,20 +1,4 @@ -; [submodule "library/busted"] -; path = library/busted -; url = https://github.com/LuaCATS/busted -; branch = main -; [submodule "library/luassert"] -; path = library/luassert -; url = https://github.com/LuaCATS/luassert -; branch = main -; [submodule "library/luv"] -; path = library/luv -; url = https://github.com/LuaCATS/luv -; branch = main [submodule "library/busted"] path = library/busted url = https://github.com/LuaCATS/busted branch = main -[submodule "library/luassert"] - path = library/luassert - url = https://github.com/LuaCATS/luassert - branch = main diff --git a/library/luassert b/library/luassert deleted file mode 160000 index d3528bb..0000000 --- a/library/luassert +++ /dev/null @@ -1 +0,0 @@ -Subproject commit d3528bb679302cbfdedefabb37064515ab95f7b9 diff --git a/shell.nix b/shell.nix index fcebe49..c42bd26 100644 --- a/shell.nix +++ b/shell.nix @@ -12,7 +12,7 @@ pkgs.mkShell { packages = [ pkgs.git pkgs.gnumake - pkgs.emmylua-ls + pkgs.emmylua-check pkgs.lua51Packages.busted pkgs.lua51Packages.luacov pkgs.lua51Packages.luarocks