trigger indent before inserting a newline

Fixes NixOS#12
aszlig · Apr 30, 2017 · 867488a · 867488a
1 parent dce0529
commit 867488a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/indent/nix.vim b/indent/nix.vim
@@ -9,7 +9,7 @@ endif
 let b:did_indent = 1
 
 setlocal indentexpr=GetNixIndent()
-setlocal indentkeys+=0=then,0=else,0=in
+setlocal indentkeys+=0=then,0=else,0=inherit,*<Return>
 
 if exists("*GetNixIndent")
   finish

diff --git a/syntax/nix.vim b/syntax/nix.vim
@@ -55,7 +55,7 @@ syn region nixAttributeAssignment start="=" end="\ze;" contained contains=@nixEx
 syn region nixAttributeDefinition start=/\ze[a-zA-Z_"$]/ end=";" contained contains=nixComment,nixAttribute,nixInterpolation,nixSimpleString,nixAttributeDot,nixAttributeAssignment
 
 syn region nixInheritAttributeScope start="(" end=")" contained contains=nixComment,nixAttributeDot
-syn region nixAttributeDefinition matchgroup=nixInherit start="\<inherit\>" matchgroup=NONE end=";" contained contains=nixComment,nixInheritAttributeScope,nixAttribute
+syn region nixAttributeDefinition matchgroup=nixInherit start="\<inherit\>" end=";" contained contains=nixComment,nixInheritAttributeScope,nixAttribute
 
 syn region nixAttributeSet start="{" end="}" contains=nixComment,nixAttributeDefinition