Skip to content

Commit ce82d18

Browse files
language/twig: add treesitter, LSP, diagnostics, and formatting support. (#1407)
Due to better tools like twig-cs-fixer and curlylint not beeing packaged in nix, this uses worse alterantives. Co-authored-by: Ching Pei Yang <59727193+horriblename@users.noreply.github.com>
1 parent c4cad50 commit ce82d18

4 files changed

Lines changed: 127 additions & 0 deletions

File tree

configuration.nix

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,7 @@ isMaximal: {
101101
tailwind.enable = false;
102102
svelte.enable = false;
103103
tera.enable = false;
104+
twig.enable = false;
104105

105106
# Nim LSP is broken on Darwin and therefore
106107
# should be disabled by default. Users may still enable

docs/manual/release-notes/rl-0.9.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -225,6 +225,11 @@
225225
- Added Formatting support to `languages.php` via
226226
[PHP-CS-Fixer](https://github.com/PHP-CS-Fixer/PHP-CS-Fixer).
227227
228+
- Added minimal `languages.twig`. Currently using [djlint](https://djlint.com/)
229+
for most options, as better alternatives like
230+
[twig-cs-fixer](https://github.com/VincentLanglet/Twig-CS-Fixer) aren't
231+
packaged for nix.
232+
228233
- Didn't Add
229234
[`syntax-gaslighting`](https://github.com/NotAShelf/syntax-gaslighting.nvim),
230235
you're crazy.

modules/plugins/languages/default.nix

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ in {
2424
./kotlin.nix
2525
./html.nix
2626
./tera.nix
27+
./twig.nix
2728
./haskell.nix
2829
./java.nix
2930
./jinja.nix

modules/plugins/languages/twig.nix

Lines changed: 120 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,120 @@
1+
{
2+
config,
3+
pkgs,
4+
lib,
5+
...
6+
}: let
7+
inherit (builtins) attrNames;
8+
inherit (lib.options) mkEnableOption mkOption;
9+
inherit (lib.modules) mkIf mkMerge;
10+
inherit (lib.meta) getExe;
11+
inherit (lib.types) listOf enum;
12+
inherit (lib.nvim.types) mkGrammarOption diagnostics;
13+
inherit (lib.nvim.attrsets) mapListToAttrs;
14+
15+
cfg = config.vim.languages.twig;
16+
17+
defaultServers = ["twig-language-server"];
18+
servers = {
19+
twig-language-server = {
20+
enable = true;
21+
cmd = [(getExe pkgs.twig-language-server) "--stdio"];
22+
filetypes = ["twig"];
23+
root_markers = [".git"];
24+
};
25+
};
26+
27+
defaultFormat = ["djlint"];
28+
formats = {
29+
djlint = {
30+
command = getExe pkgs.djlint;
31+
};
32+
# TODO: if twig-cs-fixer gets packaged for nix, add it and default to it.
33+
};
34+
defaultDiagnosticsProvider = ["djlint"];
35+
diagnosticsProviders = {
36+
djlint = {
37+
config = {
38+
cmd = getExe pkgs.djlint;
39+
};
40+
};
41+
# TODO: if curlylint gets packaged for nix, add it.
42+
};
43+
in {
44+
options.vim.languages.twig = {
45+
enable = mkEnableOption "Twig templating language support";
46+
47+
treesitter = {
48+
enable = mkEnableOption "Twig treesitter" // {default = config.vim.languages.enableTreesitter;};
49+
package = mkGrammarOption pkgs "twig";
50+
};
51+
52+
lsp = {
53+
enable = mkEnableOption "Twig LSP support" // {default = config.vim.lsp.enable;};
54+
servers = mkOption {
55+
type = listOf (enum (attrNames servers));
56+
default = defaultServers;
57+
description = "Twig LSP server to use";
58+
};
59+
};
60+
61+
format = {
62+
enable = mkEnableOption "PHP formatting" // {default = config.vim.languages.enableFormat;};
63+
type = mkOption {
64+
description = "Twig formatter to use";
65+
type = listOf (enum (attrNames formats));
66+
default = defaultFormat;
67+
};
68+
};
69+
70+
extraDiagnostics = {
71+
enable = mkEnableOption "extra Twig diagnostics" // {default = config.vim.languages.enableExtraDiagnostics;};
72+
types = diagnostics {
73+
langDesc = "Twig";
74+
inherit diagnosticsProviders;
75+
inherit defaultDiagnosticsProvider;
76+
};
77+
};
78+
};
79+
80+
config = mkIf cfg.enable (mkMerge [
81+
(mkIf cfg.treesitter.enable {
82+
vim.treesitter.enable = true;
83+
vim.treesitter.grammars = [cfg.treesitter.package];
84+
})
85+
86+
(mkIf cfg.lsp.enable {
87+
vim.lsp.servers =
88+
mapListToAttrs (n: {
89+
name = n;
90+
value = servers.${n};
91+
})
92+
cfg.lsp.servers;
93+
})
94+
95+
(mkIf cfg.format.enable {
96+
vim.formatter.conform-nvim = {
97+
enable = true;
98+
setupOpts = {
99+
formatters_by_ft.twig = cfg.format.type;
100+
formatters =
101+
mapListToAttrs (name: {
102+
inherit name;
103+
value = formats.${name};
104+
})
105+
cfg.format.type;
106+
};
107+
};
108+
})
109+
110+
(mkIf cfg.extraDiagnostics.enable {
111+
vim.diagnostics.nvim-lint = {
112+
enable = true;
113+
linters_by_ft.twig = cfg.extraDiagnostics.types;
114+
linters =
115+
mkMerge (map (name: {${name} = diagnosticsProviders.${name}.config;})
116+
cfg.extraDiagnostics.types);
117+
};
118+
})
119+
]);
120+
}

0 commit comments

Comments
 (0)