mirror of
https://github.com/NotAShelf/nvf.git
synced 2025-04-01 10:41:52 +00:00
lsp/otter: fix assertion (#696)
* otter: change assert into a warning * otter: update source and warning
This commit is contained in:
parent
414c92276e
commit
c3b9c979ee
2 changed files with 10 additions and 11 deletions
|
@ -15,13 +15,12 @@
|
|||
mappings = addDescriptionsToMappings cfg.otter-nvim.mappings mappingDefinitions;
|
||||
in {
|
||||
config = mkIf (cfg.enable && cfg.otter-nvim.enable) {
|
||||
assertions = [
|
||||
{
|
||||
assertion = !config.vim.utility.ccc.enable;
|
||||
message = ''
|
||||
ccc and otter have a breaking conflict. It's been reported upstream. Until it's fixed, disable one of them
|
||||
'';
|
||||
}
|
||||
warnings = [
|
||||
# TODO: remove warning when we update to nvim 0.11
|
||||
(mkIf config.vim.utility.ccc.enable ''
|
||||
ccc and otter occasionally have small conflicts that will disappear with nvim 0.11.
|
||||
In the meantime, otter handles it by throwing a warning, but both plugins will work.
|
||||
'')
|
||||
];
|
||||
vim = {
|
||||
startPlugins = ["otter-nvim"];
|
||||
|
|
|
@ -1804,9 +1804,9 @@
|
|||
"repo": "otter.nvim"
|
||||
},
|
||||
"branch": "main",
|
||||
"revision": "21f042f4d1a9ff4788634ad76a10033eed13c7f2",
|
||||
"url": "https://github.com/jmbuhr/otter.nvim/archive/21f042f4d1a9ff4788634ad76a10033eed13c7f2.tar.gz",
|
||||
"hash": "1gi603ckyxljbhkg8jhwh2pf5kvgb676ykw3sv9gvi0c2s4fb55r"
|
||||
"revision": "e37053d2c6a17463e705483122eee04d41e3d4af",
|
||||
"url": "https://github.com/jmbuhr/otter.nvim/archive/e37053d2c6a17463e705483122eee04d41e3d4af.tar.gz",
|
||||
"hash": "0sq7x2mcxl7z0j4s3a395fy0bzz13h4rxd03lp6674y6hsjxcm55"
|
||||
},
|
||||
"oxocarbon": {
|
||||
"type": "Git",
|
||||
|
@ -2206,4 +2206,4 @@
|
|||
}
|
||||
},
|
||||
"version": 3
|
||||
}
|
||||
}
|
Loading…
Add table
Reference in a new issue