mirror of
https://github.com/NotAShelf/nvf.git
synced 2026-02-23 20:12:00 +00:00
language/go: correct treesitter filetypes and package options (#1402)
This commit is contained in:
parent
4d2f488358
commit
9d1cec158b
2 changed files with 27 additions and 3 deletions
|
|
@ -27,6 +27,20 @@
|
||||||
|
|
||||||
[Snoweuph](https://github.com/snoweuph)
|
[Snoweuph](https://github.com/snoweuph)
|
||||||
|
|
||||||
|
- "Correct `languages.go.treesitter` to contain all Go file types.
|
||||||
|
`languages.go.treesitter.package` is now `languages.go.treesitter.goPackage`.
|
||||||
|
New are:
|
||||||
|
|
||||||
|
- `languages.go.treesitter.goPackage`.
|
||||||
|
|
||||||
|
- `languages.go.treesitter.gomodPackage`.
|
||||||
|
|
||||||
|
- `languages.go.treesitter.gosumPackage`.
|
||||||
|
|
||||||
|
- `languages.go.treesitter.goworkPackage`.
|
||||||
|
|
||||||
|
- `languages.go.treesitter.gotmplPackage`.
|
||||||
|
|
||||||
- Fix `vim.assistant.codecompanion-nvim.setupOpts.display.diff.provider` to only
|
- Fix `vim.assistant.codecompanion-nvim.setupOpts.display.diff.provider` to only
|
||||||
allow valid options. `default` is no longer valid. `inline` and `split` are
|
allow valid options. `default` is no longer valid. `inline` and `split` are
|
||||||
two new valid options.
|
two new valid options.
|
||||||
|
|
|
||||||
|
|
@ -20,7 +20,7 @@
|
||||||
servers = {
|
servers = {
|
||||||
gopls = {
|
gopls = {
|
||||||
cmd = [(getExe pkgs.gopls)];
|
cmd = [(getExe pkgs.gopls)];
|
||||||
filetypes = ["go" "gomod" "gowork" "gotmpl"];
|
filetypes = ["go" "gomod" "gosum" "gowork" "gotmpl"];
|
||||||
root_dir = mkLuaInline ''
|
root_dir = mkLuaInline ''
|
||||||
function(bufnr, on_dir)
|
function(bufnr, on_dir)
|
||||||
local fname = vim.api.nvim_buf_get_name(bufnr)
|
local fname = vim.api.nvim_buf_get_name(bufnr)
|
||||||
|
|
@ -170,7 +170,11 @@ in {
|
||||||
treesitter = {
|
treesitter = {
|
||||||
enable = mkEnableOption "Go treesitter" // {default = config.vim.languages.enableTreesitter;};
|
enable = mkEnableOption "Go treesitter" // {default = config.vim.languages.enableTreesitter;};
|
||||||
|
|
||||||
package = mkGrammarOption pkgs "go";
|
goPackage = mkGrammarOption pkgs "go";
|
||||||
|
gomodPackage = mkGrammarOption pkgs "gomod";
|
||||||
|
gosumPackage = mkGrammarOption pkgs "gosum";
|
||||||
|
goworkPackage = mkGrammarOption pkgs "gowork";
|
||||||
|
gotmplPackage = mkGrammarOption pkgs "gotmpl";
|
||||||
};
|
};
|
||||||
|
|
||||||
lsp = {
|
lsp = {
|
||||||
|
|
@ -232,7 +236,13 @@ in {
|
||||||
config = mkIf cfg.enable (mkMerge [
|
config = mkIf cfg.enable (mkMerge [
|
||||||
(mkIf cfg.treesitter.enable {
|
(mkIf cfg.treesitter.enable {
|
||||||
vim.treesitter.enable = true;
|
vim.treesitter.enable = true;
|
||||||
vim.treesitter.grammars = [cfg.treesitter.package];
|
vim.treesitter.grammars = [
|
||||||
|
cfg.treesitter.goPackage
|
||||||
|
cfg.treesitter.gomodPackage
|
||||||
|
cfg.treesitter.gosumPackage
|
||||||
|
cfg.treesitter.goworkPackage
|
||||||
|
cfg.treesitter.gotmplPackage
|
||||||
|
];
|
||||||
})
|
})
|
||||||
|
|
||||||
(mkIf cfg.lsp.enable {
|
(mkIf cfg.lsp.enable {
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue