colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #74846 from rummik/vam-regression

Browse Source 
Fix converting vam.pluginDictionaries to VimL
This commit is contained in:
Timo Kaufmann 2020-03-19 21:39:01 +00:00 committed by GitHub
commit 71331ee9ef
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
pkgs/misc/vim-plugins/vim-utils.nix
View File

@ -250,13 +250,14 @@ let
# plugins with dependencies # plugins with dependencies
plugins = findDependenciesRecursively specifiedPlugins; plugins = findDependenciesRecursively specifiedPlugins;
# Vim almost reads JSON, so eventually JSON support should be added to Nix # Convert scalars, lists, and attrs, to VimL equivalents
# TODO: proper quoting toVimL = x:
toNix = x: if builtins.isString x then "'${lib.replaceStrings [ "\n" "'" ] [ "\n\\ " "''" ] x}'"
if (builtins.isString x) then "'${x}'" else if builtins.isAttrs x && builtins ? out then toVimL x # a derivation
else if builtins.isAttrs x && builtins ? out then toNix x # a derivation else if builtins.isAttrs x then "{${lib.concatStringsSep ", " (lib.mapAttrsToList (n: v: "${toVimL n}: ${toVimL v}") x)}}"
else if builtins.isAttrs x then "{${lib.concatStringsSep ", " (lib.mapAttrsToList (n: v: "${toNix n}: ${toNix v}") x)}}" else if builtins.isList x then "[${lib.concatMapStringsSep ", " toVimL x}]"
else if builtins.isList x then "[${lib.concatMapStringsSep ", " toNix x}]" else if builtins.isInt x || builtins.isFloat x then builtins.toString x
else if builtins.isBool x then (if x then "1" else "0")
else throw "turning ${lib.generators.toPretty {} x} into a VimL thing not implemented yet"; else throw "turning ${lib.generators.toPretty {} x} into a VimL thing not implemented yet";
in assert builtins.hasAttr "vim-addon-manager" knownPlugins; in assert builtins.hasAttr "vim-addon-manager" knownPlugins;
@ -293,9 +294,9 @@ let
endif endif
endif endif
" tell vam about which plugins to load when: " tell vam which plugins to load, and when:
let l = [] let l = []
${lib.concatMapStrings (p: "call add(l, {'name': '${p.pname}'})\n") plugins} ${lib.concatMapStrings (p: "call add(l, ${toVimL p})\n") vam.pluginDictionaries}
call vam#Scripts(l, {}) call vam#Scripts(l, {})
''); '');