aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.styluaignore8
-rw-r--r--CMakeLists.txt15
2 files changed, 14 insertions, 9 deletions
diff --git a/.styluaignore b/.styluaignore
index 786a9ce4d3..c9303e07ce 100644
--- a/.styluaignore
+++ b/.styluaignore
@@ -1,7 +1,7 @@
+/build
+/runtime/lua/coxpcall.lua
+/runtime/lua/vim/_meta
+/runtime/lua/vim/re.lua
/scripts
/src
/test
-/build
-/runtime/lua/vim/re.lua
-/runtime/lua/vim/_meta/options.lua
-/runtime/lua/coxpcall.lua
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 72889283dc..bcfac39098 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -225,11 +225,16 @@ add_glob_target(
TOUCH_STRATEGY SINGLE)
add_dependencies(lintlua-luacheck lua-dev-deps)
-# Don't use add_glob_target as .styluaignore won't be respected.
-# https://github.com/JohnnyMorganz/StyLua/issues/751
-add_custom_target(lintlua-stylua
- COMMAND ${STYLUA_PRG} --color=always --check .
- WORKING_DIRECTORY ${PROJECT_SOURCE_DIR})
+add_glob_target(
+ TARGET lintlua-stylua
+ COMMAND ${STYLUA_PRG}
+ FLAGS --color=always --check --respect-ignores
+ GLOB_DIRS runtime/
+ GLOB_PAT *.lua
+ EXCLUDE
+ /runtime/lua/vim/_meta
+ TOUCH_STRATEGY SINGLE)
+
add_custom_target(lintlua)
add_dependencies(lintlua lintlua-luacheck lintlua-stylua)