Permalink
Browse files

Solved HTML indentation in PHP files problem.

  • Loading branch information...
1 parent 5a4a65a commit 42ba8a6914c99fd3a9c663d9c25d645a04cbc793 alessioalex committed May 12, 2011
Showing with 40 additions and 255 deletions.
  1. +40 −0 vim/bundle/phpHtmlIndent/indent/php.vim
  2. +0 −254 vim/bundle/web-indent/indent/html.vim
  3. +0 −1 vim/tmp/README
@@ -0,0 +1,40 @@
+" Better indent support for PHP by making it possible to indent HTML sections
+" as well.
+if exists("b:did_indent")
+ finish
+endif
+
+" This script pulls in the default indent/php.vim with the :runtime command
+" which could re-run this script recursively unless we catch that:
+if exists('s:doing_indent_inits')
+ finish
+endif
+let s:doing_indent_inits = 1
+runtime! indent/html.vim
+unlet b:did_indent
+runtime! indent/php.vim
+unlet s:doing_indent_inits
+
+function! GetPhpHtmlIndent(lnum)
+ if exists('*HtmlIndent')
+ let html_ind = HtmlIndent()
+ else
+ let html_ind = HtmlIndentGet(a:lnum)
+ endif
+ let php_ind = GetPhpIndent()
+ " priority one for php indent script
+ if php_ind > -1
+ return php_ind
+ endif
+ if html_ind > -1
+ if getline(a:num) =~ "^<?" && (0< searchpair('<?', '', '?>', 'nWb')
+ \ || 0 < searchpair('<?', '', '?>', 'nW'))
+ return -1
+ endif
+ return html_ind
+ endif
+ return -1
+endfunction
+
+setlocal indentexpr=GetPhpHtmlIndent(v:lnum)
+setlocal indentkeys+=<>>
@@ -1,254 +0,0 @@
-
-" Description: html indenter
-" Author: Johannes Zellner <johannes@zellner.org>
-" 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,*<Return>,<>>,{,}
-
-
-if exists('g:html_indent_tags')
- unlet g:html_indent_tags
-endif
-
-" [-- helper function to assemble tag list --]
-fun! <SID>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
-
-
-" [-- <ELEMENT ? - - ...> --]
-call <SID>HtmlIndentPush('a')
-call <SID>HtmlIndentPush('abbr')
-call <SID>HtmlIndentPush('acronym')
-call <SID>HtmlIndentPush('address')
-call <SID>HtmlIndentPush('b')
-call <SID>HtmlIndentPush('bdo')
-call <SID>HtmlIndentPush('big')
-call <SID>HtmlIndentPush('blockquote')
-call <SID>HtmlIndentPush('button')
-call <SID>HtmlIndentPush('caption')
-call <SID>HtmlIndentPush('center')
-call <SID>HtmlIndentPush('cite')
-call <SID>HtmlIndentPush('code')
-call <SID>HtmlIndentPush('colgroup')
-call <SID>HtmlIndentPush('del')
-call <SID>HtmlIndentPush('dfn')
-call <SID>HtmlIndentPush('dir')
-call <SID>HtmlIndentPush('div')
-call <SID>HtmlIndentPush('dl')
-call <SID>HtmlIndentPush('em')
-call <SID>HtmlIndentPush('fieldset')
-call <SID>HtmlIndentPush('font')
-call <SID>HtmlIndentPush('form')
-call <SID>HtmlIndentPush('frameset')
-call <SID>HtmlIndentPush('h1')
-call <SID>HtmlIndentPush('h2')
-call <SID>HtmlIndentPush('h3')
-call <SID>HtmlIndentPush('h4')
-call <SID>HtmlIndentPush('h5')
-call <SID>HtmlIndentPush('h6')
-call <SID>HtmlIndentPush('i')
-call <SID>HtmlIndentPush('iframe')
-call <SID>HtmlIndentPush('ins')
-call <SID>HtmlIndentPush('kbd')
-call <SID>HtmlIndentPush('label')
-call <SID>HtmlIndentPush('legend')
-call <SID>HtmlIndentPush('map')
-call <SID>HtmlIndentPush('menu')
-call <SID>HtmlIndentPush('noframes')
-call <SID>HtmlIndentPush('noscript')
-call <SID>HtmlIndentPush('object')
-call <SID>HtmlIndentPush('ol')
-call <SID>HtmlIndentPush('optgroup')
-" call <SID>HtmlIndentPush('pre')
-call <SID>HtmlIndentPush('q')
-call <SID>HtmlIndentPush('s')
-call <SID>HtmlIndentPush('samp')
-call <SID>HtmlIndentPush('script')
-call <SID>HtmlIndentPush('select')
-call <SID>HtmlIndentPush('small')
-call <SID>HtmlIndentPush('span')
-call <SID>HtmlIndentPush('strong')
-call <SID>HtmlIndentPush('style')
-call <SID>HtmlIndentPush('sub')
-call <SID>HtmlIndentPush('sup')
-call <SID>HtmlIndentPush('table')
-call <SID>HtmlIndentPush('textarea')
-call <SID>HtmlIndentPush('title')
-call <SID>HtmlIndentPush('tt')
-call <SID>HtmlIndentPush('u')
-call <SID>HtmlIndentPush('ul')
-call <SID>HtmlIndentPush('var')
-
-
-" [-- <ELEMENT ? O O ...> --]
-if !exists('g:html_indent_strict')
- call <SID>HtmlIndentPush('body')
- call <SID>HtmlIndentPush('head')
- call <SID>HtmlIndentPush('html')
- call <SID>HtmlIndentPush('tbody')
-endif
-
-
-" [-- <ELEMENT ? O - ...> --]
-if !exists('g:html_indent_strict_table')
- call <SID>HtmlIndentPush('th')
- call <SID>HtmlIndentPush('td')
- call <SID>HtmlIndentPush('tr')
- call <SID>HtmlIndentPush('tfoot')
- call <SID>HtmlIndentPush('thead')
-endif
-
-delfun <SID>HtmlIndentPush
-
-let s:cpo_save = &cpo
-set cpo-=C
-
-" [-- count indent-increasing tags of line a:lnum --]
-fun! <SID>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! <SID>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! <SID>HtmlIndentOpenAlt(lnum)
- return strlen(substitute(getline(a:lnum), '[^{]\+', '', 'g'))
-endfun
-
-" [-- count indent-decreasing '}' of (java|css) line a:lnum --]
-fun! <SID>HtmlIndentCloseAlt(lnum)
- return strlen(substitute(getline(a:lnum), '[^}]\+', '', 'g'))
-endfun
-
-" [-- return the sum of indents respecting the syntax of a:lnum --]
-fun! <SID>HtmlIndentSum(lnum, style)
- if a:style == match(getline(a:lnum), '^\s*</')
- if a:style == match(getline(a:lnum), '^\s*</\<\('.g:html_indent_tags.'\)\>')
- let open = <SID>HtmlIndentOpen(a:lnum, g:html_indent_tags)
- let close = <SID>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 <SID>HtmlIndentOpenAlt(a:lnum) - <SID>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 <pre>: no indenting --]
- if getline(a:lnum) =~ '\c</pre>'
- \ || 0 < searchpair('\c<pre>', '', '\c</pre>', 'nWb')
- \ || 0 < searchpair('\c<pre>', '', '\c</pre>', 'nW')
- " we're in a line with </pre> or inside <pre> ... </pre>
- if restore_ic == 0
- setlocal noic
- endif
- return -1
- endif
-
- " [-- special handling for <javascript>: use cindent --]
- let js = '<script.*type\s*=.*javascript'
-
- """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
- " by Tye Zdrojewski <zdro@yahoo.com>, 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, '', '</script>', 'nWb')
- \ && 0 < searchpair(js, '', '</script>', 'nW')
- " we're inside javascript
-
- if getline(lnum) !~ js && getline(a:lnum) !~ '</script>'
- if restore_ic == 0
- setlocal noic
- endif
- return GetJsIndent(a:lnum)
- endif
- endif
-
- if getline(lnum) =~ '\c</pre>'
- " line before the current line a:lnum contains
- " a closing </pre>. --> search for line before
- " starting <pre> to restore the indent.
- let preline = prevnonblank(search('\c<pre>', 'bW') - 1)
- if preline > 0
- if restore_ic == 0
- setlocal noic
- endif
- return indent(preline)
- endif
- endif
-
- let ind = <SID>HtmlIndentSum(lnum, -1)
- let ind = ind + <SID>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 <runtime>/indent/html.vim --]
View
@@ -1 +0,0 @@
-This is the folder where the temporary Vim files will be kept.

0 comments on commit 42ba8a6

Please sign in to comment.