mirror of
https://github.com/NotAShelf/nvf.git
synced 2026-02-04 19:05:55 +00:00
language/make: add treesitter, formatter and diagnostics support (#1380)
This commit is contained in:
parent
7ec2619375
commit
7db4da419e
4 changed files with 97 additions and 0 deletions
|
|
@ -92,6 +92,7 @@ isMaximal: {
|
|||
ruby.enable = false;
|
||||
fsharp.enable = false;
|
||||
just.enable = false;
|
||||
make.enable = false;
|
||||
qml.enable = false;
|
||||
jinja.enable = false;
|
||||
tailwind.enable = false;
|
||||
|
|
|
|||
|
|
@ -172,6 +172,8 @@
|
|||
|
||||
- Added [`golangci-lint`](https://golangci-lint.run/) for more diagnostics.
|
||||
|
||||
- Added Makefile support via `languages.make`.
|
||||
|
||||
[vagahbond](https://github.com/vagahbond): [codewindow.nvim]:
|
||||
https://github.com/gorbit99/codewindow.nvim
|
||||
|
||||
|
|
|
|||
|
|
@ -52,6 +52,7 @@ in {
|
|||
./yaml.nix
|
||||
./ruby.nix
|
||||
./just.nix
|
||||
./make.nix
|
||||
./xml.nix
|
||||
|
||||
# This is now a hard deprecation.
|
||||
|
|
|
|||
93
modules/plugins/languages/make.nix
Normal file
93
modules/plugins/languages/make.nix
Normal file
|
|
@ -0,0 +1,93 @@
|
|||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}: let
|
||||
inherit (builtins) attrNames;
|
||||
inherit (lib.options) mkEnableOption mkOption;
|
||||
inherit (lib.meta) getExe;
|
||||
inherit (lib.types) listOf enum;
|
||||
inherit (lib.modules) mkIf mkMerge;
|
||||
inherit (lib.nvim.types) mkGrammarOption diagnostics;
|
||||
inherit (lib.nvim.attrsets) mapListToAttrs;
|
||||
|
||||
cfg = config.vim.languages.make;
|
||||
|
||||
defaultFormat = ["bake"];
|
||||
formats = {
|
||||
bake = {
|
||||
command = "${pkgs.mbake}/bin/mbake";
|
||||
};
|
||||
};
|
||||
|
||||
defaultDiagnosticsProvider = ["checkmake"];
|
||||
diagnosticsProviders = {
|
||||
checkmake = {
|
||||
config = {
|
||||
cmd = getExe pkgs.checkmake;
|
||||
};
|
||||
};
|
||||
};
|
||||
in {
|
||||
options.vim.languages.make = {
|
||||
enable = mkEnableOption "Make support";
|
||||
|
||||
treesitter = {
|
||||
enable = mkEnableOption "Make treesitter" // {default = config.vim.languages.enableTreesitter;};
|
||||
package = mkGrammarOption pkgs "make";
|
||||
};
|
||||
|
||||
format = {
|
||||
enable = mkEnableOption "Make formatting" // {default = config.vim.languages.enableFormat;};
|
||||
type = mkOption {
|
||||
description = "make formatter to use";
|
||||
type = listOf (enum (attrNames formats));
|
||||
default = defaultFormat;
|
||||
};
|
||||
};
|
||||
|
||||
extraDiagnostics = {
|
||||
enable = mkEnableOption "extra Make diagnostics" // {default = config.vim.languages.enableExtraDiagnostics;};
|
||||
types = diagnostics {
|
||||
langDesc = "Make";
|
||||
inherit diagnosticsProviders;
|
||||
inherit defaultDiagnosticsProvider;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable (mkMerge [
|
||||
(mkIf cfg.treesitter.enable {
|
||||
vim.treesitter = {
|
||||
enable = true;
|
||||
grammars = [cfg.treesitter.package];
|
||||
};
|
||||
})
|
||||
|
||||
(mkIf cfg.format.enable {
|
||||
vim.formatter.conform-nvim = {
|
||||
enable = true;
|
||||
setupOpts = {
|
||||
formatters_by_ft.make = cfg.format.type;
|
||||
formatters =
|
||||
mapListToAttrs (name: {
|
||||
inherit name;
|
||||
value = formats.${name};
|
||||
})
|
||||
cfg.format.type;
|
||||
};
|
||||
};
|
||||
})
|
||||
|
||||
(mkIf cfg.extraDiagnostics.enable {
|
||||
vim.diagnostics.nvim-lint = {
|
||||
enable = true;
|
||||
linters_by_ft.make = cfg.extraDiagnostics.types;
|
||||
linters =
|
||||
mkMerge (map (name: {${name} = diagnosticsProviders.${name}.config;})
|
||||
cfg.extraDiagnostics.types);
|
||||
};
|
||||
})
|
||||
]);
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue