Skip to content

modules/lsp/servers/vls: do not add filetype extension if not enabled #1907

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
merged 1 commit into from
Jul 21, 2024
Merged

modules/lsp/servers/vls: do not add filetype extension if not enabled #1907

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
4 changes: 3 additions & 1 deletion plugins/lsp/language-servers/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -591,7 +591,9 @@ let
example = false;
};
};
extraConfig = cfg: { filetype.extension = mkIf cfg.autoSetFiletype { v = "vlang"; }; };
extraConfig = cfg: {
filetype.extension = mkIf (cfg.enable && cfg.autoSetFiletype) { v = "vlang"; };
Copy link
Member

@MattSturgeon MattSturgeon Jul 21, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wonder if the issue here is actually _mk-lsp.nix not having mkIf cfg.enable like the other mkPlugins do in our helper lib?

};
}
{
name = "vuels";
Expand Down
29 changes: 29 additions & 0 deletions tests/test-sources/plugins/lsp/language-servers/vls.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
{
default = {
plugins.lsp = {
enable = true;
servers.vls.enable = true;
};

extraConfigLuaPost = ''
-- V files are recognized by default
assert(vim.filetype.match({ filename = "test.v" }) == "vlang", "V filetype is not recognized")
'';
};

extra-options = {
plugins.lsp = {
enable = true;

servers.vls = {
enable = true;
autoSetFiletype = true;
};
};

extraConfigLuaPost = ''
-- autoSetFiletype
assert(vim.filetype.match({ filename = "test.v" }) == "vlang", "V filetype is not recognized")
'';
};
}