From 676e9e9334043ce74af74f85f889b0327a443d0b Mon Sep 17 00:00:00 2001 From: Christian Clason Date: Mon, 9 May 2022 11:23:26 +0200 Subject: [PATCH] ci: lint runtime with stylua --- .github/workflows/ci.yml | 7 +++++++ .stylua.toml | 6 ++++++ .styluaignore | 3 +++ Makefile | 11 +++++++++-- 4 files changed, 25 insertions(+), 2 deletions(-) create mode 100644 .stylua.toml create mode 100644 .styluaignore diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1aa0906ffc..87c270afbe 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -86,6 +86,13 @@ jobs: name: clint-full run: ./ci/run_lint.sh clint-full + - if: "!cancelled()" + name: stylua + uses: JohnnyMorganz/stylua-action@1.0.0 + with: + token: ${{ secrets.GITHUB_TOKEN }} + args: --check runtime/ + - if: "!cancelled()" name: lualint run: ./ci/run_lint.sh lualint diff --git a/.stylua.toml b/.stylua.toml new file mode 100644 index 0000000000..255bfd939d --- /dev/null +++ b/.stylua.toml @@ -0,0 +1,6 @@ +column_width = 120 +line_endings = "Unix" +indent_type = "Spaces" +indent_width = 2 +quote_style = "AutoPreferSingle" +call_parentheses = "Always" diff --git a/.styluaignore b/.styluaignore new file mode 100644 index 0000000000..c1871de90a --- /dev/null +++ b/.styluaignore @@ -0,0 +1,3 @@ +/scripts +/src +/test diff --git a/Makefile b/Makefile index df4f2995d8..3039d84a6b 100644 --- a/Makefile +++ b/Makefile @@ -146,9 +146,16 @@ functionaltest: | nvim functionaltest-lua: | nvim +$(BUILD_TOOL) -C build functionaltest-lua +stylua: + stylua --check runtime/ + lualint: | build/.ran-cmake deps $(BUILD_TOOL) -C build lualint +_opt_stylua: + @command -v stylua && { $(MAKE) stylua; exit $$?; } \ + || echo "SKIP: stylua (stylua not found)" + shlint: @shellcheck --version | head -n 2 shellcheck scripts/vim-patch.sh @@ -214,7 +221,7 @@ appimage: appimage-%: bash scripts/genappimage.sh $* -lint: check-single-includes clint lualint _opt_pylint _opt_shlint _opt_commitlint +lint: check-single-includes clint _opt_stylua lualint _opt_pylint _opt_shlint _opt_commitlint # Generic pattern rules, allowing for `make build/bin/nvim` etc. # Does not work with "Unix Makefiles". @@ -226,4 +233,4 @@ $(DEPS_BUILD_DIR)/%: phony_force $(BUILD_TOOL) -C $(DEPS_BUILD_DIR) $(patsubst $(DEPS_BUILD_DIR)/%,%,$@) endif -.PHONY: test lualint pylint shlint functionaltest unittest lint clint clean distclean nvim libnvim cmake deps install appimage checkprefix commitlint +.PHONY: test stylua lualint pylint shlint functionaltest unittest lint clint clean distclean nvim libnvim cmake deps install appimage checkprefix commitlint