NotAShelf/nvf
1
0
Fork 0
mirror of https://github.com/NotAShelf/nvf.git synced 2025-04-03 11:31:52 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

lsp/otter: fix assertion (#696)

Browse source 
* otter: change assert into a warning

* otter: update source and warning
This commit is contained in:
Soliprem 2025-03-07 20:59:28 +01:00 • committed by GitHub
parent 414c92276e
commit c3b9c979ee
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
modules/plugins/lsp/otter/config.nix
View file

@ -15,13 +15,12 @@
mappings = addDescriptionsToMappings cfg.otter-nvim.mappings mappingDefinitions; mappings = addDescriptionsToMappings cfg.otter-nvim.mappings mappingDefinitions;
in { in {
config = mkIf (cfg.enable && cfg.otter-nvim.enable) { config = mkIf (cfg.enable && cfg.otter-nvim.enable) {
assertions = [ warnings = [
{ # TODO: remove warning when we update to nvim 0.11
assertion = !config.vim.utility.ccc.enable; (mkIf config.vim.utility.ccc.enable ''
message = '' ccc and otter occasionally have small conflicts that will disappear with nvim 0.11.
ccc and otter have a breaking conflict. It's been reported upstream. Until it's fixed, disable one of them In the meantime, otter handles it by throwing a warning, but both plugins will work.
''; '')
}
]; ];
vim = { vim = {
startPlugins = ["otter-nvim"]; startPlugins = ["otter-nvim"];

6
npins/sources.json
View file

@ -1804,9 +1804,9 @@
"repo": "otter.nvim" "repo": "otter.nvim"
}, },
"branch": "main", "branch": "main",
"revision": "21f042f4d1a9ff4788634ad76a10033eed13c7f2", "revision": "e37053d2c6a17463e705483122eee04d41e3d4af",
"url": "https://github.com/jmbuhr/otter.nvim/archive/21f042f4d1a9ff4788634ad76a10033eed13c7f2.tar.gz", "url": "https://github.com/jmbuhr/otter.nvim/archive/e37053d2c6a17463e705483122eee04d41e3d4af.tar.gz",
"hash": "1gi603ckyxljbhkg8jhwh2pf5kvgb676ykw3sv9gvi0c2s4fb55r" "hash": "0sq7x2mcxl7z0j4s3a395fy0bzz13h4rxd03lp6674y6hsjxcm55"
}, },
"oxocarbon": { "oxocarbon": {
"type": "Git", "type": "Git",