diff --git a/vim/bundle/vim-javascript b/vim/bundle/vim-javascript new file mode 160000 index 0000000..395f890 --- /dev/null +++ b/vim/bundle/vim-javascript @@ -0,0 +1 @@ +Subproject commit 395f8901b34cc871c9576886938a6efda0eb7268 diff --git a/vim/bundle/web-indent/indent/html.vim b/vim/bundle/web-indent/indent/html.vim deleted file mode 100644 index ada5cc3..0000000 --- a/vim/bundle/web-indent/indent/html.vim +++ /dev/null @@ -1,254 +0,0 @@ - -" Description: html indenter -" Author: Johannes Zellner -" Last Change: Mo, 05 Jun 2006 22:32:41 CEST -" Restoring 'cpo' and 'ic' added by Bram 2006 May 5 -" Globals: g:html_indent_tags -- indenting tags -" g:html_indent_strict -- inhibit 'O O' elements -" g:html_indent_strict_table -- inhibit 'O -' elements - -" Only load this indent file when no other was loaded. -"if exists("b:did_indent") - "finish -"endif -"let b:did_indent = 1 - -if exists("g:js_indent") - so g:js_indent -else - ru! indent/javascript.vim -endif - -echo "Sourcing html indent" - - -" [-- local settings (must come before aborting the script) --] -setlocal indentexpr=HtmlIndentGetter(v:lnum) -setlocal indentkeys=o,O,*,<>>,{,} - - -if exists('g:html_indent_tags') - unlet g:html_indent_tags -endif - -" [-- helper function to assemble tag list --] -fun! HtmlIndentPush(tag) - if exists('g:html_indent_tags') - let g:html_indent_tags = g:html_indent_tags.'\|'.a:tag - else - let g:html_indent_tags = a:tag - endif -endfun - - -" [-- --] -call HtmlIndentPush('a') -call HtmlIndentPush('abbr') -call HtmlIndentPush('acronym') -call HtmlIndentPush('address') -call HtmlIndentPush('b') -call HtmlIndentPush('bdo') -call HtmlIndentPush('big') -call HtmlIndentPush('blockquote') -call HtmlIndentPush('button') -call HtmlIndentPush('caption') -call HtmlIndentPush('center') -call HtmlIndentPush('cite') -call HtmlIndentPush('code') -call HtmlIndentPush('colgroup') -call HtmlIndentPush('del') -call HtmlIndentPush('dfn') -call HtmlIndentPush('dir') -call HtmlIndentPush('div') -call HtmlIndentPush('dl') -call HtmlIndentPush('em') -call HtmlIndentPush('fieldset') -call HtmlIndentPush('font') -call HtmlIndentPush('form') -call HtmlIndentPush('frameset') -call HtmlIndentPush('h1') -call HtmlIndentPush('h2') -call HtmlIndentPush('h3') -call HtmlIndentPush('h4') -call HtmlIndentPush('h5') -call HtmlIndentPush('h6') -call HtmlIndentPush('i') -call HtmlIndentPush('iframe') -call HtmlIndentPush('ins') -call HtmlIndentPush('kbd') -call HtmlIndentPush('label') -call HtmlIndentPush('legend') -call HtmlIndentPush('map') -call HtmlIndentPush('menu') -call HtmlIndentPush('noframes') -call HtmlIndentPush('noscript') -call HtmlIndentPush('object') -call HtmlIndentPush('ol') -call HtmlIndentPush('optgroup') -" call HtmlIndentPush('pre') -call HtmlIndentPush('q') -call HtmlIndentPush('s') -call HtmlIndentPush('samp') -call HtmlIndentPush('script') -call HtmlIndentPush('select') -call HtmlIndentPush('small') -call HtmlIndentPush('span') -call HtmlIndentPush('strong') -call HtmlIndentPush('style') -call HtmlIndentPush('sub') -call HtmlIndentPush('sup') -call HtmlIndentPush('table') -call HtmlIndentPush('textarea') -call HtmlIndentPush('title') -call HtmlIndentPush('tt') -call HtmlIndentPush('u') -call HtmlIndentPush('ul') -call HtmlIndentPush('var') - - -" [-- --] -if !exists('g:html_indent_strict') - call HtmlIndentPush('body') - call HtmlIndentPush('head') - call HtmlIndentPush('html') - call HtmlIndentPush('tbody') -endif - - -" [-- --] -if !exists('g:html_indent_strict_table') - call HtmlIndentPush('th') - call HtmlIndentPush('td') - call HtmlIndentPush('tr') - call HtmlIndentPush('tfoot') - call HtmlIndentPush('thead') -endif - -delfun HtmlIndentPush - -let s:cpo_save = &cpo -set cpo-=C - -" [-- count indent-increasing tags of line a:lnum --] -fun! HtmlIndentOpen(lnum, pattern) - let s = substitute('x'.getline(a:lnum), - \ '.\{-}\(\(<\)\('.a:pattern.'\)\>\)', "\1", 'g') - let s = substitute(s, "[^\1].*$", '', '') - return strlen(s) -endfun - -" [-- count indent-decreasing tags of line a:lnum --] -fun! HtmlIndentClose(lnum, pattern) - let s = substitute('x'.getline(a:lnum), - \ '.\{-}\(\(<\)/\('.a:pattern.'\)\>>\)', "\1", 'g') - let s = substitute(s, "[^\1].*$", '', '') - return strlen(s) -endfun - -" [-- count indent-increasing '{' of (java|css) line a:lnum --] -fun! HtmlIndentOpenAlt(lnum) - return strlen(substitute(getline(a:lnum), '[^{]\+', '', 'g')) -endfun - -" [-- count indent-decreasing '}' of (java|css) line a:lnum --] -fun! HtmlIndentCloseAlt(lnum) - return strlen(substitute(getline(a:lnum), '[^}]\+', '', 'g')) -endfun - -" [-- return the sum of indents respecting the syntax of a:lnum --] -fun! HtmlIndentSum(lnum, style) - if a:style == match(getline(a:lnum), '^\s*') - let open = HtmlIndentOpen(a:lnum, g:html_indent_tags) - let close = HtmlIndentClose(a:lnum, g:html_indent_tags) - if 0 != open || 0 != close - return open - close - endif - endif - endif - if '' != &syntax && - \ synIDattr(synID(a:lnum, 1, 1), 'name') =~ '\(css\|java\).*' && - \ synIDattr(synID(a:lnum, strlen(getline(a:lnum)), 1), 'name') - \ =~ '\(css\|java\).*' - if a:style == match(getline(a:lnum), '^\s*}') - return HtmlIndentOpenAlt(a:lnum) - HtmlIndentCloseAlt(a:lnum) - endif - endif - return 0 -endfun - -fun! HtmlIndentGetter(lnum) - - echo "Grabbing html indent for line: " . a:lnum - " Find a non-empty line above the current line. - let lnum = prevnonblank(a:lnum - 1) - - " Hit the start of the file, use zero indent. - if lnum == 0 - return 0 - endif - - let restore_ic = &ic - setlocal ic " ignore case - - " [-- special handling for
: no indenting --]
-    if getline(a:lnum) =~ '\c
' - \ || 0 < searchpair('\c
', '', '\c
', 'nWb') - \ || 0 < searchpair('\c
', '', '\c
', 'nW') - " we're in a line with or inside
 ... 
- if restore_ic == 0 - setlocal noic - endif - return -1 - endif - - " [-- special handling for : use cindent --] - let js = ', 05 Jun 2006 - " ZDR: This needs to be an AND (we are 'after the start of the pair' AND - " we are 'before the end of the pair'). Otherwise, indentation - " before the start of the script block will be affected; the end of - " the pair will still match if we are before the beginning of the - " pair. - " - if 0 < searchpair(js, '', '', 'nWb') - \ && 0 < searchpair(js, '', '', 'nW') - " we're inside javascript - - if getline(lnum) !~ js && getline(a:lnum) !~ '' - if restore_ic == 0 - setlocal noic - endif - return GetJsIndent(a:lnum) - endif - endif - - if getline(lnum) =~ '\c' - " line before the current line a:lnum contains - " a closing . --> search for line before - " starting
 to restore the indent.
-	let preline = prevnonblank(search('\c
', 'bW') - 1)
-	if preline > 0
-	    if restore_ic == 0
-	      setlocal noic
-	    endif
-	    return indent(preline)
-	endif
-    endif
-
-    let ind = HtmlIndentSum(lnum, -1)
-    let ind = ind + HtmlIndentSum(a:lnum, 0)
-
-    if restore_ic == 0
-	setlocal noic
-    endif
-
-    return indent(lnum) + (&sw * ind)
-endfun
-
-let &cpo = s:cpo_save
-unlet s:cpo_save
-
-" [-- EOF /indent/html.vim --]
diff --git a/vim/bundle/web-indent/indent/javascript.vim b/vim/bundle/web-indent/indent/javascript.vim
deleted file mode 100644
index b0e190c..0000000
--- a/vim/bundle/web-indent/indent/javascript.vim
+++ /dev/null
@@ -1,407 +0,0 @@
-" Vim indent file Language:		JavaScript
-" Author: 		Preston Koprivica (pkopriv2@gmail.com)	
-" URL:
-" Last Change: 	April 30, 2010
-
-" 0. Standard Stuff
-" =================
-
-" Only load one indent script per buffer
-if exists('b:did_indent')
-  finish
-endif
-
-let b:did_indent = 1
-
-" Set the global log variable 1 = logging enabled, 0 = logging disabled
-if !exists("g:js_indent_log")
-	let g:js_indent_log = 0
-endif
-
-setlocal indentexpr=GetJsIndent(v:lnum)
-setlocal indentkeys=
-
-
-setlocal cindent
-setlocal autoindent
-
-
-" 1. Variables
-" ============
-
-" Inline comments (for anchoring other statements)
-let s:js_mid_line_comment = '\s*\(\/\*.*\*\/\)*\s*'
-let s:js_end_line_comment = s:js_mid_line_comment . '\s*\(//.*\)*'
-let s:js_line_comment = s:js_end_line_comment
-
-" Comment/String Syntax Key
-let s:syn_comment = '\(Comment\|String\|Regexp\)'
-
-
-" 2. Aux. Functions
-" =================
-
-" = Method: IsInComment
-"
-" Determines whether the specified position is contained in a comment. "Note:
-" This depends on a 
-function! s:IsInComment(lnum, cnum)
-	return synIDattr(synID(a:lnum, a:cnum, 1), 'name') =~? s:syn_comment
-endfunction
-
-
-" = Method: IsComment
-" 
-" Determines whether a line is a comment or not.
-function! s:IsComment(lnum)
-	let line = getline(a:lnum)
-
-	return s:IsInComment(a:lnum, 1) && s:IsInComment(a:lnum, strlen(line)) "Doesn't absolutely work.  Only Probably!
-endfunction
-
-
-" = Method: GetNonCommentLine
-"
-" Grabs the nearest non-commented line
-function! s:GetNonCommentLine(lnum)
-	let lnum = prevnonblank(a:lnum)
-
-	while lnum > 0
-		if s:IsComment(lnum)
-			let lnum = prevnonblank(lnum - 1)
-		else
-			return lnum
-		endif
-	endwhile
-
-	return lnum
-endfunction
-
-" = Method: SearchForPair
-"
-" Returns the beginning tag of a given pair starting from the given line.
-function! s:SearchForPair(lnum, beg, end)
-	" Save the cursor position.
-	let curpos = getpos(".")
-
-	" Set the cursor position to the beginning of the line (default
-	" behavior when using ==)
-	call cursor(a:lnum, 0)
-
-	" Search for the opening tag
-	let mnum = searchpair(a:beg, '', a:end, 'bW', 
-				\ 'synIDattr(synID(line("."), col("."), 0), "name") =~? s:syn_comment' )
-
-	"Restore the cursor position
-	call cursor(curpos)
-	
-	" Finally, return the matched line number
-	return mnum
-endfunction
-
-
-" Object Helpers
-" ==============
-let s:object_beg = '{[^}]*' . s:js_end_line_comment . '$'
-let s:object_end = '^' . s:js_mid_line_comment . '}[;,]\='
-
-
-function! s:IsObjectBeg(line)
-	return a:line =~ s:object_beg
-endfunction
-
-function! s:IsObjectEnd(line)
-	return a:line =~ s:object_end
-endfunction 
-
-function! s:GetObjectBeg(lnum)
-	return s:SearchForPair(a:lnum, '{', '}')
-endfunction
-
-
-" Array Helpers
-" ==============
-let s:array_beg = '\[[^\]]*' . s:js_end_line_comment . '$'
-let s:array_end = '^' . s:js_mid_line_comment . '[^\[]*\][;,]*' . s:js_end_line_comment . '$'
-
-
-function! s:IsArrayBeg(line)
-	return a:line =~ s:array_beg
-endfunction
-
-function! s:IsArrayEnd(line)
-	return a:line =~ s:array_end
-endfunction 
-
-function! s:GetArrayBeg(lnum)
-	return s:SearchForPair(a:lnum, '\[', '\]')
-endfunction
-
-
-" MultiLine Declaration/Invocation Helpers
-" ========================================
-let s:paren_beg = '([^)]*' . s:js_end_line_comment . '$'
-let s:paren_end = '^' . s:js_mid_line_comment . '[^(]*)[;,]*'
-
-function! s:IsParenBeg(line)
-	return a:line =~ s:paren_beg
-endfunction
-
-function! s:IsParenEnd(line)
-	return a:line =~ s:paren_end
-endfunction 
-
-function! s:GetParenBeg(lnum)
-	return s:SearchForPair(a:lnum, '(', ')')
-endfunction
-
-
-
-" Continuation Helpers
-" ====================
-let s:continuation = '\(+\|\\\)\{1}' . s:js_line_comment . '$' 
-
-function! s:IsContinuationLine(line)
-	return a:line =~ s:continuation
-endfunction
-
-function! s:GetContinuationBegin(lnum) 
-	let cur = a:lnum
-	
-	while s:IsContinuationLine(getline(cur)) 
-		let cur -= 1
-	endwhile
-	
-	return cur + 1
-endfunction 
-
-
-" Switch Helpers
-" ==============
-let s:switch_beg_next_line = 'switch\s*(.*)\s*' . s:js_mid_line_comment . s:js_end_line_comment . '$'
-let s:switch_beg_same_line = 'switch\s*(.*)\s*' . s:js_mid_line_comment . '{\s*' . s:js_line_comment . '$'
-let s:switch_mid = '^.*\(case.*\|default\)\s*:\s*' 
-
-function! s:IsSwitchBeginNextLine(line) 
-	return a:line =~ s:switch_beg_next_line 
-endfunction
-
-function! s:IsSwitchBeginSameLine(line) 
-	return a:line =~ s:switch_beg_same_line 
-endfunction
-
-function! s:IsSwitchMid(line)
-	return a:line =~ s:switch_mid
-endfunction 
-
-
-" Control Helpers
-" ===============
-let s:cntrl_beg_keys = '\(\(\(if\|for\|with\|while\)\s*(.*)\)\|\(try\|do\)\)\s*'
-let s:cntrl_mid_keys = '\(\(\(else\s*if\|catch\)\s*(.*)\)\|\(finally\|else\)\)\s*'
-
-let s:cntrl_beg = s:cntrl_beg_keys . s:js_end_line_comment . '$' 
-let s:cntrl_mid = s:cntrl_mid_keys . s:js_end_line_comment . '$' 
-
-let s:cntrl_end = '\(while\s*(.*)\)\s*;\=\s*' . s:js_end_line_comment . '$'
-
-function! s:IsControlBeg(line)
-	return a:line =~ s:cntrl_beg
-endfunction
-
-function! s:IsControlMid(line)
-	return a:line =~ s:cntrl_mid
-endfunction
-
-function! s:IsControlMidStrict(line)
-	return a:line =~ s:cntrl_mid
-endfunction
-
-function! s:IsControlEnd(line)
-	return a:line =~ s:cntrl_end
-endfunction
-
-" = Method: Log
-"
-" Logs a message to the stdout.
-function! s:Log(msg)
-	if g:js_indent_log
-		echo "LOG: " . a:msg
-	endif
-endfunction
-
-
-" 3. Indenter
-" ===========
-function! GetJsIndent(lnum)
-	" Grab the first non-comment line prior to this line
-	let pnum = s:GetNonCommentLine(a:lnum-1)
-
-	" First line, start at indent = 0
-	if pnum == 0
-		call s:Log("No, noncomment lines prior to the current line.")
-		return 0
-	endif
-
-	" Grab the second non-comment line prior to this line
-	let ppnum = s:GetNonCommentLine(pnum-1)
-
-	call s:Log("Line: " . a:lnum)
-	call s:Log("PLine: " . pnum)
-	call s:Log("PPLine: " . ppnum)
-
-	" Grab the lines themselves.
-	let line = getline(a:lnum)
-	let pline = getline(pnum)
-	let ppline = getline(ppnum)
-
-	" Determine the current level of indentation
-	let ind = indent(pnum)
-
-
-	" Handle: Object Closers (ie }) 
-	" =============================
-	if s:IsObjectEnd(line) && !s:IsComment(a:lnum)
-		call s:Log("Line matched object end")
-
-		let obeg = s:GetObjectBeg(a:lnum)
-		let oind = indent(obeg)
-		let oline = getline(obeg)
-
-		call s:Log("The object beg was found at: " . obeg)
-		return oind
-	endif
-
-	if s:IsObjectBeg(pline) 
-		call s:Log("Pline matched object beg")
-		return ind + &sw 
-	endif
-
-
-	" Handle: Array Closer (ie ])
-	" ============================
-	if s:IsArrayEnd(line) && !s:IsComment(a:lnum)
-		call s:Log("Line matched array end")
-
-		let abeg = s:GetArrayBeg(a:lnum)
-		let aind = indent(abeg)
-
-		call s:Log("The array beg was found at: " . abeg)
-		return aind
-	endif
-
-	if s:IsArrayBeg(pline) 
-		call s:Log("Pline matched array beg")
-		return ind + &sw 
-	endif
-
-	" Handle: Parens
-	" ==============
-	if s:IsParenEnd(line) && !s:IsComment(a:lnum)
-		call s:Log("Line matched paren end")
-
-		let abeg = s:GetParenBeg(a:lnum)
-		let aind = indent(abeg)
-
-		call s:Log("The paren beg was found at: " . abeg)
-		return aind
-	endif
-
-	if s:IsParenBeg(pline) 
-		call s:Log("Pline matched paren beg")
-		return ind + &sw 
-	endif
-
-
-	" Handle: Continuation Lines. 
-	" ========================================================
-	if s:IsContinuationLine(pline) 
-		call s:Log('Pline is a continuation line.')
-
-		let cbeg = s:GetContinuationBegin(pnum)
-		let cind = indent(cbeg)
-
-		call s:Log('The continuation block begin found at: ' . cbeg)
-		return cind + &sw
-	endif
-
-	if s:IsContinuationLine(ppline)
-		call s:Log('PPline was a continuation line but pline wasnt.')
-		return ind - &sw
-	endif
-
-	" Handle: Switch Control Blocks
-	" =============================
-	if s:IsSwitchMid(pline) 
-		call s:Log("PLine matched switch cntrl mid")
-		if s:IsSwitchMid(line) || s:IsObjectEnd(line)
-			call s:Log("Line matched a cntrl mid")
-			return ind
-		else
-			call s:Log("Line didnt match a cntrl mid")
-			return ind + &sw
-		endif 
-	endif
-
-	if s:IsSwitchMid(line)
-		call s:Log("Line matched switch cntrl mid")
-		return ind - &sw
-	endif
-
-	
-	" Handle: Single Line Control Blocks
-	" ==================================
-	if s:IsControlBeg(pline)
-		call s:Log("Pline matched control beginning")
-		
-		if s:IsControlMid(line)
-			call s:Log("Line matched a control mid")
-			return ind
-		elseif line =~ '^\s*{\s*$'
-			call s:Log("Line matched an object beg")
-			return ind
-		else
-			return ind + &sw
-		endif
-		
-	endif
-
-	if s:IsControlMid(pline)
-		call s:Log("Pline matched a control mid")
-
-		if s:IsControlMid(line)
-			call s:Log("Line matched a control mid")
-			return ind
-		elseif s:IsObjectBeg(line)
-			call s:Log("Line matched an object beg")
-			return ind
-		else
-			call s:Log("Line didn't match a control mid or object beg."
-			return ind + &sw
-		endif
-	endif
-
-	if s:IsControlMid(line)
-		call s:Log("Line matched a control mid.")
-
-		if s:IsControlEnd(pline) || s:IsObjectEnd(pline)
-			call s:Log("PLine matched control end")
-			return ind
-		else
-			call s:Log("Pline didn't match object end")
-			return ind - &sw
-		endif
-	endif
-
-
-	if ( s:IsControlBeg(ppline) || s:IsControlMid(ppline) ) &&
-			\ !s:IsObjectBeg(pline) && !s:IsObjectEnd(pline)
-		call s:Log("PPLine matched single line control beg or mid")
-		return ind - &sw
-	endif
-
-	" Handle: No matches
-	" ==================
-	"call s:Log("Line didn't match anything.  Retaining indent")
-	return ind
-endfunction
diff --git a/vim/bundle/web-indent/test.html b/vim/bundle/web-indent/test.html
deleted file mode 100644
index b475bc2..0000000
--- a/vim/bundle/web-indent/test.html
+++ /dev/null
@@ -1,399 +0,0 @@
-
-
-	
-		
-
-		Test
-	
-	
-		
-	
-