From fd74d8b2b170b540680a9bbf6c64990f8ebafd08 Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Mon, 8 Oct 2018 19:00:59 +0200
Subject: Update

---
 indent/nix.vim | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

(limited to 'indent/nix.vim')

diff --git a/indent/nix.vim b/indent/nix.vim
index 2910cbd6..b31ae42e 100644
--- a/indent/nix.vim
+++ b/indent/nix.vim
@@ -11,7 +11,7 @@ endif
 let b:did_indent = 1
 
 setlocal indentexpr=GetNixIndent()
-setlocal indentkeys+=0=then,0=else,0=inherit,*<Return>
+setlocal indentkeys+=0=then,0=else,0=inherit,0=in,*<Return>
 
 if exists("*GetNixIndent")
   finish
@@ -21,8 +21,8 @@ let s:cpo_save = &cpo
 set cpo&vim
 
 let s:skip_syntax = '\%(Comment\|String\)$'
-let s:binding_open = '\%(\<let\>\|{\)'
-let s:binding_close = '\%(\<in\>\|}\)'
+let s:binding_open = '\%(\<let\>\)'
+let s:binding_close = '\%(\<in\>\)'
 let s:block_open  = '\%({\|[\)'
 let s:block_close = '\%(}\|]\)'
 
@@ -54,14 +54,6 @@ function! GetNixIndent()
       return indent(bslnum)
     endif
 
-    if last_line =~ ';$'
-      let bslnum = searchpair(s:binding_open, '', s:binding_close, 'bnW',
-            \ 'synIDattr(synID(line("."), col("."), 0), "name") =~? "StringSpecial$"')
-      if bslnum != 0
-        let ind = indent(bslnum) + &sw
-      endif
-    endif
-
     if last_line =~ s:block_open . '\s*$'
       let ind += &sw
     endif
@@ -78,7 +70,7 @@ function! GetNixIndent()
       let ind += &sw
     endif
 
-    if getline(v:lnum - 1) =~ '^\<in\s*$'
+    if last_line =~ '^\<in\s*$'
       let ind += &sw
     endif
 
-- 
cgit v1.2.3