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

vimPlugins: turn filetype and syntax before sourcing the plugins (#66536)

Browse Source 
Vim Terraform expects the `filetypedetect` group to exist. However, since we were enabling the filetype and the syntax *after* loading the plugins, it was exiting with an error preventing us from generating the remote plugins manifest with the plugin enabled. See #65894 for context.
This commit is contained in:
Wael Nasreddine 2019-08-13 12:25:06 -07:00 committed by GitHub
parent 329e097828
commit a3bf0c2e40
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/editors/neovim/wrapper.nix
View File

@ -100,7 +100,7 @@ let
# Only display the log on error since it will contain a few normally # Only display the log on error since it will contain a few normally
# irrelevant messages. # irrelevant messages.
if ! $out/bin/nvim \ if ! $out/bin/nvim \
-u ${vimUtils.vimrcFile (configure // { customRC = ""; })} \ -u ${vimUtils.vimrcFile (configure // { customRC = ""; beforePlugins = ''filetype indent plugin on | syn on''; })} \
-i NONE -n \ -i NONE -n \
-E -V1rplugins.log -s \ -E -V1rplugins.log -s \
+UpdateRemotePlugins +quit! > outfile 2>&1; then +UpdateRemotePlugins +quit! > outfile 2>&1; then

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

@ -188,7 +188,8 @@ let
vam ? null, vam ? null,
pathogen ? null, pathogen ? null,
plug ? null, plug ? null,
customRC ? "" customRC ? "",
beforePlugins ? "",
}: }:
let let
@ -341,6 +342,8 @@ let
" minimal setup, generated by NIX " minimal setup, generated by NIX
set nocompatible set nocompatible
${beforePlugins}
${vamImpl} ${vamImpl}
${pathogenImpl} ${pathogenImpl}
${plugImpl} ${plugImpl}