Skip to content

Commit 06261fc

Browse files
stasjoktraxys
authored andcommitted
modules/lsp/servers/vls: do not add filetype extension if not enabled
1 parent 8eb5763 commit 06261fc

File tree

2 files changed

+32
-1
lines changed
  • plugins/lsp/language-servers
  • tests/test-sources/plugins/lsp/language-servers

2 files changed

+32
-1
lines changed

plugins/lsp/language-servers/default.nix

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -591,7 +591,9 @@ let
591591
example = false;
592592
};
593593
};
594-
extraConfig = cfg: { filetype.extension = mkIf cfg.autoSetFiletype { v = "vlang"; }; };
594+
extraConfig = cfg: {
595+
filetype.extension = mkIf (cfg.enable && cfg.autoSetFiletype) { v = "vlang"; };
596+
};
595597
}
596598
{
597599
name = "vuels";
Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
{
2+
default = {
3+
plugins.lsp = {
4+
enable = true;
5+
servers.vls.enable = true;
6+
};
7+
8+
extraConfigLuaPost = ''
9+
-- V files are recognized by default
10+
assert(vim.filetype.match({ filename = "test.v" }) == "vlang", "V filetype is not recognized")
11+
'';
12+
};
13+
14+
extra-options = {
15+
plugins.lsp = {
16+
enable = true;
17+
18+
servers.vls = {
19+
enable = true;
20+
autoSetFiletype = true;
21+
};
22+
};
23+
24+
extraConfigLuaPost = ''
25+
-- autoSetFiletype
26+
assert(vim.filetype.match({ filename = "test.v" }) == "vlang", "V filetype is not recognized")
27+
'';
28+
};
29+
}

0 commit comments

Comments
 (0)