Skip to content

Commit 0939e2c

Browse files
committed
languages/jinja: init
1 parent cf066ec commit 0939e2c

File tree

4 files changed

+105
-1
lines changed

4 files changed

+105
-1
lines changed

configuration.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ isMaximal: {
9292
fsharp.enable = false;
9393
just.enable = false;
9494
qml.enable = false;
95-
95+
jinja.enable = false;
9696
tailwind.enable = false;
9797
svelte.enable = false;
9898

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,8 @@
139139
[Tombi](https://tombi-toml.github.io/tombi/) language server, linter, and
140140
formatter.
141141
142+
- Added Jinja support via `languanges.jinja`
143+
142144
- Added [hlargs.nvim](https://github.com/m-demare/hlargs.nvim) support as
143145
`visuals.hlargs-nvim`.
144146

modules/plugins/languages/default.nix

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ in {
2121
./html.nix
2222
./haskell.nix
2323
./java.nix
24+
./jinja.nix
2425
./json.nix
2526
./lua.nix
2627
./markdown.nix
Lines changed: 101 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,101 @@
1+
{
2+
config,
3+
pkgs,
4+
lib,
5+
...
6+
}: let
7+
inherit (builtins) attrNames;
8+
inherit (lib.meta) getExe;
9+
inherit (lib.modules) mkIf mkMerge;
10+
inherit (lib.options) mkEnableOption mkOption;
11+
inherit (lib.types) enum;
12+
inherit (lib.nvim.types) diagnostics mkGrammarOption deprecatedSingleOrListOf;
13+
inherit (lib.nvim.attrsets) mapListToAttrs;
14+
15+
cfg = config.vim.languages.toml;
16+
defaultServers = ["jinja-lsp"];
17+
servers = {
18+
jinja-lsp = {
19+
enable = true;
20+
cmd = [(getExe pkgs.jinja-lsp)];
21+
filetypes = ["jinja"];
22+
root_markers = [
23+
".git"
24+
];
25+
};
26+
};
27+
in {
28+
options.vim.languages.jinja = {
29+
enable = mkEnableOption "Jinja template language support";
30+
31+
treesitter = {
32+
enable =
33+
mkEnableOption "Jinja treesitter"
34+
// {
35+
default = config.vim.languages.enableTreesitter;
36+
};
37+
package = mkGrammarOption pkgs "jinja";
38+
inlinePackage = mkGrammarOption pkgs "jinja_inline";
39+
};
40+
41+
lsp = {
42+
enable =
43+
mkEnableOption "Jinja LSP support"
44+
// {
45+
default = config.vim.lsp.enable;
46+
};
47+
48+
servers = mkOption {
49+
description = "Jinja LSP server to use";
50+
type = deprecatedSingleOrListOf "vim.language.toml.lsp.servers" (enum (attrNames servers));
51+
default = defaultServers;
52+
};
53+
};
54+
55+
format = {
56+
enable =
57+
mkEnableOption "TOML formatting"
58+
// {
59+
default = config.vim.languages.enableFormat;
60+
};
61+
62+
type = mkOption {
63+
type = deprecatedSingleOrListOf "vim.language.toml.format.type" (enum (attrNames formats));
64+
default = defaultFormat;
65+
description = "TOML formatter to use.";
66+
};
67+
};
68+
69+
extraDiagnostics = {
70+
enable =
71+
mkEnableOption "extra TOML diagnostics"
72+
// {
73+
default = config.vim.languages.enableExtraDiagnostics;
74+
};
75+
types = diagnostics {
76+
langDesc = "TOML";
77+
inherit diagnosticsProviders;
78+
inherit defaultDiagnosticsProvider;
79+
};
80+
};
81+
};
82+
83+
config = mkIf cfg.enable (mkMerge [
84+
(mkIf cfg.treesitter.enable {
85+
vim.treesitter.enable = true;
86+
vim.treesitter.grammars = [
87+
cfg.treesitter.package
88+
cfg.treesitter.inlinePackage
89+
];
90+
})
91+
92+
(mkIf cfg.lsp.enable {
93+
vim.lsp.servers =
94+
mapListToAttrs (n: {
95+
name = n;
96+
value = servers.${n};
97+
})
98+
cfg.lsp.servers;
99+
})
100+
]);
101+
}

0 commit comments

Comments
 (0)