Merge pull request #1333 from pyrox0/feat/sqruff
Some checks failed
Set up binary cache / cachix (default) (push) Has been cancelled
Set up binary cache / cachix (maximal) (push) Has been cancelled
Set up binary cache / cachix (nix) (push) Has been cancelled
Treewide Checks / Validate flake (push) Has been cancelled
Treewide Checks / Check formatting (push) Has been cancelled
Treewide Checks / Check source tree for typos (push) Has been cancelled
Treewide Checks / Validate documentation builds (push) Has been cancelled
Treewide Checks / Validate hyperlinks in documentation sources (push) Has been cancelled
Treewide Checks / Validate Editorconfig conformance (push) Has been cancelled
Build and deploy documentation / Check latest commit (push) Has been cancelled
Build and deploy documentation / publish (push) Has been cancelled

languages/sql: support sqruff
This commit is contained in:
raf 2026-01-11 15:39:04 +03:00 committed by GitHub
commit c7fe3c1818
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 15 additions and 1 deletions

View file

@ -129,3 +129,5 @@
[pyrox0](https://github.com/pyrox0): [pyrox0](https://github.com/pyrox0):
- Added [rumdl](https://github.com/rvben/rumdl) support to `languages.markdown` - Added [rumdl](https://github.com/rvben/rumdl) support to `languages.markdown`
- Added [sqruff](https://github.com/quarylabs/sqruff) support to `languages.sql`

View file

@ -15,6 +15,7 @@
cfg = config.vim.languages.sql; cfg = config.vim.languages.sql;
sqlfluffDefault = pkgs.sqlfluff; sqlfluffDefault = pkgs.sqlfluff;
sqruffDefault = pkgs.sqruff;
defaultServers = ["sqls"]; defaultServers = ["sqls"];
servers = { servers = {
@ -39,6 +40,10 @@
command = getExe sqlfluffDefault; command = getExe sqlfluffDefault;
append_args = ["--dialect=${cfg.dialect}"]; append_args = ["--dialect=${cfg.dialect}"];
}; };
sqruff = {
command = getExe sqruffDefault;
append_args = ["--dialect=${cfg.dialect}"];
};
}; };
defaultDiagnosticsProvider = ["sqlfluff"]; defaultDiagnosticsProvider = ["sqlfluff"];
@ -50,6 +55,13 @@
args = ["lint" "--format=json" "--dialect=${cfg.dialect}"]; args = ["lint" "--format=json" "--dialect=${cfg.dialect}"];
}; };
}; };
sqruff = {
package = sqruffDefault;
config = {
cmd = getExe sqruffDefault;
args = ["lint" "--format=json" "--dialect=${cfg.dialect}" "-"];
};
};
}; };
in { in {
options.vim.languages.sql = { options.vim.languages.sql = {
@ -58,7 +70,7 @@ in {
dialect = mkOption { dialect = mkOption {
type = str; type = str;
default = "ansi"; default = "ansi";
description = "SQL dialect for sqlfluff (if used)"; description = "SQL dialect for formatters and diagnostics (if used)";
}; };
treesitter = { treesitter = {