Skip to content

Commit df044f7

Browse files
committed
chore: use luals for style check
1 parent e02ba60 commit df044f7

3 files changed

Lines changed: 8 additions & 8 deletions

File tree

.github/workflows/ci.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,17 +43,17 @@ jobs:
4343

4444
strategy:
4545
matrix:
46-
emmy_lua_code_style_version: [ 1.5.6 ]
46+
luals_version: [ 3.13.9 ]
4747

4848
steps:
4949
- uses: actions/checkout@v4
5050

51-
- name: install emmy_lua_code_style
51+
- name: install luals
5252
run: |
53-
mkdir -p CodeFormat
54-
curl -L "https://github.com/CppCXY/EmmyLuaCodeStyle/releases/download/${{ matrix.emmy_lua_code_style_version }}/linux-x64.tar.gz" | tar zx --directory CodeFormat
53+
mkdir -p luals
54+
curl -L "https://github.com/LuaLS/lua-language-server/releases/download/${{ matrix.luals_version }}/lua-language-server-${{ matrix.luals_version }}-linux-x64.tar.gz" | tar zx --directory luals
5555
56-
- run: echo "CodeFormat/linux-x64/bin" >> "$GITHUB_PATH"
56+
- run: echo "luals/bin" >> "$GITHUB_PATH"
5757

5858
- run: make style
5959

CONTRIBUTING.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ Language server: [luals](https://luals.github.io)
1212

1313
Lint: [luacheck](https://github.com/lunarmodules/luacheck/)
1414

15-
Style: [EmmyLuaCodeStyle](https://github.com/CppCXY/EmmyLuaCodeStyle): `CodeCheck`
15+
Style Fixing: [EmmyLuaCodeStyle](https://github.com/CppCXY/EmmyLuaCodeStyle): `CodeCheck`
1616

1717
nvim-tree.lua migrated from stylua to EmmyLuaCodeStyle ~2024/10. `vim.lsp.buf.format()` may be used as it is the default formatter for luals
1818

@@ -36,7 +36,7 @@ make lint
3636

3737
## style
3838

39-
1. Runs CodeCheck using `.editorconfig` settings
39+
1. Runs lua language server `codestyle-check` only, using `.luarc.json` settings
4040
1. Runs `scripts/doc-comments.sh` to validate annotated documentation
4141

4242
```sh

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ luacheck:
1717

1818
# --diagnosis-as-error does not function for workspace, hence we post-process the output
1919
style-check:
20-
CodeFormat check --config .editorconfig --diagnosis-as-error --workspace lua
20+
@scripts/luals-check.sh codestyle-check
2121

2222
style-doc:
2323
scripts/doc-comments.sh

0 commit comments

Comments
 (0)