Update

ftplugin/terraform.vim

@@ -5,71 +5,154 @@ endif
 " terraform.vim - basic vim/terraform integration
 " Maintainer: HashiVim <https://github.com/hashivim>
 
-set formatoptions-=t
-
-if exists("g:loaded_terraform") || v:version < 700 || &cp || !executable('terraform')
+if exists('b:did_ftplugin') || v:version < 700 || &compatible
   finish
 endif
-let g:loaded_terraform = 1
+let b:did_ftplugin = 1
 
-if !exists("g:terraform_fmt_on_save") || !filereadable(expand("%:p"))
+let s:cpo_save = &cpoptions
+
+setlocal formatoptions-=t
+let b:undo_ftplugin = 'setlocal formatoptions<'
+
+" Include hyphens as keyword characters so that a keyword appearing as part of
+" a longer name doesn't get partially highlighted.
+setlocal iskeyword+=-
+let b:undo_ftplugin .= ' iskeyword<'
+
+set cpoptions&vim
+
+if !exists('g:terraform_align')
+  let g:terraform_align = 0
+endif
+
+if !exists('g:terraform_remap_spacebar')
+  let g:terraform_remap_spacebar = 0
+endif
+
+if !exists('g:terraform_fold_sections')
+  let g:terraform_fold_sections = 0
+endif
+
+if g:terraform_align && exists(':Tabularize')
+  inoremap <buffer> <silent> = =<Esc>:call <SID>terraformalign()<CR>a
+  function! s:terraformalign()
+    let p = '^.*=[^>]*$'
+    if exists(':Tabularize') && getline('.') =~# '^.*=' && (getline(line('.')-1) =~# p || getline(line('.')+1) =~# p)
+      let column = strlen(substitute(getline('.')[0:col('.')],'[^=]','','g'))
+      let position = strlen(matchstr(getline('.')[0:col('.')],'.*=\s*\zs.*'))
+      Tabularize/=/l1
+      normal! 0
+      call search(repeat('[^=]*=',column).'\s\{-\}'.repeat('.',position),'ce',line('.'))
+    endif
+  endfunction
+endif
+
+if g:terraform_fold_sections
+  function! TerraformFolds()
+    let thisline = getline(v:lnum)
+    if match(thisline, '^resource') >= 0
+      return '>1'
+    elseif match(thisline, '^provider') >= 0
+      return '>1'
+    elseif match(thisline, '^module') >= 0
+      return '>1'
+    elseif match(thisline, '^variable') >= 0
+      return '>1'
+    elseif match(thisline, '^output') >= 0
+      return '>1'
+    elseif match(thisline, '^data') >= 0
+      return '>1'
+    elseif match(thisline, '^terraform') >= 0
+      return '>1'
+    elseif match(thisline, '^locals') >= 0
+      return '>1'
+    else
+      return '='
+    endif
+  endfunction
+  setlocal foldmethod=expr
+  setlocal foldexpr=TerraformFolds()
+  setlocal foldlevel=1
+  let b:undo_ftplugin .= ' foldmethod< foldexpr< foldlevel<'
+
+  function! TerraformFoldText()
+    let foldsize = (v:foldend-v:foldstart)
+    return getline(v:foldstart).' ('.foldsize.' lines)'
+  endfunction
+  setlocal foldtext=TerraformFoldText()
+  let b:undo_ftplugin .= ' foldtext<'
+endif
+
+" Re-map the space bar to fold and unfold
+if get(g:, 'terraform_remap_spacebar', 1)
+  "inoremap <space> <C-O>za
+  nnoremap <space> za
+  onoremap <space> <C-C>za
+  vnoremap <space> zf
+endif
+
+" Set the commentstring
+if exists('g:terraform_commentstring')
+    let &l:commentstring=g:terraform_commentstring
+else
+    setlocal commentstring=#%s
+endif
+let b:undo_ftplugin .= ' commentstring<'
+
+if !exists('g:terraform_fmt_on_save')
   let g:terraform_fmt_on_save = 0
 endif
 
 function! s:commands(A, L, P)
-  return join([
-  \ "apply",
-  \ "console",
-  \ "destroy",
-  \ "env",
-  \ "fmt",
-  \ "get",
-  \ "graph",
-  \ "import",
-  \ "init",
-  \ "output",
-  \ "plan",
-  \ "providers",
-  \ "push",
-  \ "refresh",
-  \ "show",
-  \ "taint",
-  \ "untaint",
-  \ "validate",
-  \ "version",
-  \ "workspace",
-  \ "debug",
-  \ "force-unlock",
-  \ "state"
-  \ ], "\n")
+  return [
+  \ 'apply',
+  \ 'console',
+  \ 'destroy',
+  \ 'env',
+  \ 'fmt',
+  \ 'get',
+  \ 'graph',
+  \ 'import',
+  \ 'init',
+  \ 'output',
+  \ 'plan',
+  \ 'providers',
+  \ 'push',
+  \ 'refresh',
+  \ 'show',
+  \ 'taint',
+  \ 'untaint',
+  \ 'validate',
+  \ 'version',
+  \ 'workspace',
+  \ '0.12checklist',
+  \ 'debug',
+  \ 'force-unlock',
+  \ 'state'
+  \ ]
 endfunction
 
-" Adapted from vim-hclfmt:
-" https://github.com/fatih/vim-hclfmt/blob/master/autoload/fmt.vim
-function! terraform#fmt()
-  let l:curw = winsaveview()
-  let l:tmpfile = tempname() . ".tf"
-  call writefile(getline(1, "$"), l:tmpfile)
-  let output = system("terraform fmt -write " . l:tmpfile)
-  if v:shell_error == 0
-    try | silent undojoin | catch | endtry
-    call rename(l:tmpfile, resolve(expand("%")))
-    silent edit!
-    let &syntax = &syntax
-  else
-    echo output
-    call delete(l:tmpfile)
-  endif
-  call winrestview(l:curw)
-endfunction
+let &cpoptions = s:cpo_save
+unlet s:cpo_save
 
-augroup terraform
-  autocmd!
-  autocmd BufEnter *
-        \ command! -nargs=+ -complete=custom,s:commands Terraform execute '!terraform '.<q-args>. ' -no-color'
-  autocmd BufEnter * command! -nargs=0 TerraformFmt call terraform#fmt()
-  if get(g:, "terraform_fmt_on_save", 1)
+if !executable('terraform')
+  finish
+endif
+
+let s:cpo_save = &cpoptions
+
+command! -nargs=+ -complete=customlist,s:commands -buffer Terraform execute '!terraform '.<q-args>. ' -no-color'
+command! -nargs=0 -buffer TerraformFmt call terraform#fmt()
+let b:undo_ftplugin .= '|delcommand Terraform|delcommand TerraformFmt'
+
+if get(g:, 'terraform_fmt_on_save', 1)
+  augroup terraform
+    autocmd!
     autocmd BufWritePre *.tf call terraform#fmt()
     autocmd BufWritePre *.tfvars call terraform#fmt()
-  endif
-augroup END
+  augroup END
+endif
+
+let &cpoptions = s:cpo_save
+unlet s:cpo_save