Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 54c9e1f53a75
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 559dfe485de3
Choose a head ref
  • 1 commit
  • 2 files changed
  • 1 contributor

Commits on Jan 4, 2020

  1. vim-plugins: hashivim/vim-terraform: fix the filetypedetect autocmd (#… 

    …76845) (#76950)

(cherry picked from commit fa92f00)
    @kalbasit
    kalbasit authored Jan 4, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    alyssais Alyssa Ross
    GPG key ID: F9DBED4859B271C0
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    559dfe4 View commit details
Showing with 26 additions and 0 deletions.
  1. +3 −0 pkgs/misc/vim-plugins/overrides.nix
  2. +23 −0 pkgs/misc/vim-plugins/vim-terraform-fix-event.patch
3 changes: 3 additions & 0 deletions pkgs/misc/vim-plugins/overrides.nix
View file
Original file line number Diff line number Diff line change
@@ -390,6 +390,9 @@ self: super: {
dependencies = with super; [ vim-addon-mw-utils tlib_vim ];
});

vim-terraform = super.vim-terraform.overrideAttrs(oa: {
patches = (oa.patches or []) ++ lib.singleton ./vim-terraform-fix-event.patch;
});

vim-wakatime = super.vim-wakatime.overrideAttrs(old: {
buildInputs = [ python ];
23 changes: 23 additions & 0 deletions pkgs/misc/vim-plugins/vim-terraform-fix-event.patch
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
From cad4661952ad7983ece6d6486f0f68d437037015 Mon Sep 17 00:00:00 2001
From: "Wael M. Nasreddine" <wael.nasreddine@gmail.com>
Date: Thu, 2 Jan 2020 13:31:13 -0800
Subject: [PATCH] Put the autocmd filetypedetect in an augroup

---
ftdetect/terraform.vim | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/ftdetect/terraform.vim b/ftdetect/terraform.vim
index 5919422..24bc731 100644
--- a/ftdetect/terraform.vim
+++ b/ftdetect/terraform.vim
@@ -1,5 +1,8 @@
" By default, Vim associates .tf files with TinyFugue - tell it not to.
-autocmd! filetypedetect BufRead,BufNewFile *.tf
+augroup filetypedetect
+ au BufRead,BufNewFile *.tf set filetype=terraform
+augroup END
+
autocmd BufRead,BufNewFile *.tf set filetype=terraform
autocmd BufRead,BufNewFile *.tfvars set filetype=terraform
autocmd BufRead,BufNewFile *.tfstate set filetype=json