@@ -1,20 +1,96 @@ " Vim indent file -" Language: Windows PowerShell -" Maintainer: Peter Provost <peter@provost.org> -" Version: 1.0 -" -" $LastChangedDate $ -" $Rev $ +" Language: PowerShell +" Maintainer: Lior Elia - http://blogs.msdn.com/lior +" Version: 2.0 +" Last Change: 2009 Oct 18 +" Changelist: +" Ver Date By Fixed indentation of... +" ----- ---------- -------- ----------------------------------------- +" 1.0 2009-10-04 LiorE Comment rows +" 2.0 2009-10-18 LiorE Lines after (.*), comments after '{' or +" '}' and many many other things. I've made +" this a major version change because there +" are many changes in the behavior. + +" Dedicated to my loving and supporting family: Anat, Amit and Ofir. " Only load this indent file when no other was loaded. if exists("b:did_indent") - finish + finish endif let b:did_indent = 1 -" PS indenting is like indenting C -setlocal cindent cinoptions& cinoptions+=+0 cinkeys-=0# +setlocal cindent cinoptions& cinoptions+=+0 + +" Set the function to do the work. +setlocal indentexpr=GetPsIndent() + +let b:undo_indent = "set cin< cino< indentkeys< indentexpr<" + +" Only define the function once. +if exists("*GetPsIndent") + finish +endif + +function! Log(text) + " Enable the line below for debugging + " call confirm(a:text) +endfunction + +function! SkipPsComments(startline) + let lnum = a:startline + while lnum > 1 + let lnum = prevnonblank(lnum) + if getline(lnum) =~ '^\s*#' + let lnum = lnum - 1 + else + break + endif + endwhile + return lnum +endfunction + +function GetPsIndent() + + " PowerShell is almost like C; use the built-in C indenting and then correct the comment/precompiler duality. + let theIndent = cindent(v:lnum) + let prevLine = SkipPsComments(v:lnum-1) +if (prevLine > 0) + let prevLineIndent = indent(prevLine) +else + let prevLineIndent = 0 +endif + + call Log("prevline " . prevLine . " - Indent is " . prevLineIndent) + " if prev line ends with paranthesis (...) it messes the indentation + if getline(prevLine) =~ '(.*)$' + " set the indent to be the same of the prev non blank non comment line + let theIndent = prevLineIndent + if getline(v:lnum) =~ '^[^{]*}' + " remove one indentation level, clsoing a block + let theIndent -= &sw + endif + endif -" don't force comments to first line + " comment lines are mishandled as precompiler directives ('#') so fix that. + + call Log("before comment - Indent is " . theIndent) + " if current line is a comment... + if getline(v:lnum) =~ '^\s*#' + let theIndent = prevLineIndent + " if prev line opened a block - + if getline(prevLine) =~ '{$' + " indent once more, because we're in a beginning of a block + let theIndent += &sw + elseif getline(prevLine) =~ '([^)]*$' + " indent twice more, because we're in a beginning of a parameters + " block which gets indented twice by cindent, for some obscure + " reason... + let theIndent += &sw + let theIndent += &sw + endif + endif + call Log("After - Indent is " . theIndent) + return theIndent +endfunction -let b:undo_indent = "setl cin<" .vim/indent/ps1.vim 8b266ec0aba9ff82c47b0eb18e0c2d5eb939dcda Tomas Restrepo tomas@winterdom.com http://github.com/tomasr/dotfiles/commit/d26939a52929d35f1f11713696a23a9e5e5fc03d d26939a52929d35f1f11713696a23a9e5e5fc03d 2009-10-19T12:11:36-07:00 2009-10-19T12:11:36-07:00 Switching to Lior Elia's PowerShell indent plugin 0323750f19d664a7fa790fbc4344adea5058814a Tomas Restrepo tomas@winterdom.com