Skip to content

language/json: add json5 support #1438

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
NotAShelf merged 1 commit into from
Mar 6, 2026
+10 −3
Merged

language/json: add json5 support #1438

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions docs/manual/release-notes/rl-0.9.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,8 @@
- Added [taplo](https://taplo.tamasfe.dev/) as the default formatter and lsp for
`languages.toml` so we don't default to AI-Slop.

- Added `json5` into `languages.json`. Some options where renamed.

## Changelog {#sec-release-0-9-changelog}

[taylrfnt](https://github.com/taylrfnt)
Expand Down
11 changes: 8 additions & 3 deletions modules/plugins/languages/json.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
servers = {
jsonls = {
cmd = [(getExe' pkgs.vscode-langservers-extracted "vscode-json-language-server") "--stdio"];
filetypes = ["json" "jsonc"];
filetypes = ["json" "jsonc" "json5"];
init_options = {provideFormatter = true;};
root_markers = [".git"];
};
Expand All @@ -39,7 +39,8 @@ in {
treesitter = {
enable = mkEnableOption "JSON treesitter" // {default = config.vim.languages.enableTreesitter;};

package = mkGrammarOption pkgs "json";
jsonPackage = mkGrammarOption pkgs "json";
json5Package = mkGrammarOption pkgs "json5";
};

lsp = {
Expand All @@ -66,7 +67,10 @@ in {
config = mkIf cfg.enable (mkMerge [
(mkIf cfg.treesitter.enable {
vim.treesitter.enable = true;
vim.treesitter.grammars = [cfg.treesitter.package];
vim.treesitter.grammars = [
cfg.treesitter.jsonPackage
cfg.treesitter.json5Package
];
})

(mkIf cfg.lsp.enable {
Expand All @@ -83,6 +87,7 @@ in {
enable = true;
setupOpts = {
formatters_by_ft.json = cfg.format.type;
formatters_by_ft.json5 = cfg.format.type;
formatters =
mapListToAttrs (name: {
inherit name;
Expand Down
Loading