annotate runtime/indent/html.vim @ 6009:7b83c190d370

Updated runtime files.
author Bram Moolenaar <bram@vim.org>
date Wed, 25 Jun 2014 18:50:27 +0200
parents 78c318784090
children b8f703a4e55f
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
4869
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
1 " Vim indent script for HTML
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
2 " General: "{{{
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
3 " File: html.vim (Vimscript #2075)
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
4 " Author: Andy Wokula <anwoku@yahoo.de>
6009
7b83c190d370 Updated runtime files.
Bram Moolenaar <bram@vim.org>
parents: 4911
diff changeset
5 " Last Change: 2014 Jun 19
4911
78c318784090 Updated runtime files.
Bram Moolenaar <bram@vim.org>
parents: 4869
diff changeset
6 " Rev Days: 13
78c318784090 Updated runtime files.
Bram Moolenaar <bram@vim.org>
parents: 4869
diff changeset
7 " Version: 0.9
4869
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
8 " Vim Version: Vim7
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
9 " Description:
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
10 " Improved version of the distributed html indent script, faster on a
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
11 " range of lines.
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
12 "
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
13 " Credits:
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
14 " indent/html.vim (2006 Jun 05) from J. Zellner
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
15 " indent/css.vim (2006 Dec 20) from N. Weibull
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
16 "
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
17 " History:
4911
78c318784090 Updated runtime files.
Bram Moolenaar <bram@vim.org>
parents: 4869
diff changeset
18 " 2012 Oct 21 (v0.9) added support for shiftwidth()
78c318784090 Updated runtime files.
Bram Moolenaar <bram@vim.org>
parents: 4869
diff changeset
19 " 2011 Sep 09 (v0.8) added HTML5 tags (thx to J. Zuckerman)
78c318784090 Updated runtime files.
Bram Moolenaar <bram@vim.org>
parents: 4869
diff changeset
20 " 2008 Apr 28 (v0.6) revised customization
78c318784090 Updated runtime files.
Bram Moolenaar <bram@vim.org>
parents: 4869
diff changeset
21 " 2008 Mar 09 (v0.5) fixed 'indk' issue (thx to C.J. Robinson)
4869
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
22 " }}}
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
23
4869
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
24 " Init Folklore, check user settings (2nd time ++) "{{{
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
25 if exists("b:did_indent")
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
26 finish
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
27 endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
28 let b:did_indent = 1
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
29
4869
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
30 setlocal indentexpr=HtmlIndent()
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
31 setlocal indentkeys=o,O,<Return>,<>>,{,},!^F
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
32
6009
7b83c190d370 Updated runtime files.
Bram Moolenaar <bram@vim.org>
parents: 4911
diff changeset
33 " Needed for % to work when finding start of a tag.
7b83c190d370 Updated runtime files.
Bram Moolenaar <bram@vim.org>
parents: 4911
diff changeset
34 setlocal matchpairs+=<:>
7b83c190d370 Updated runtime files.
Bram Moolenaar <bram@vim.org>
parents: 4911
diff changeset
35
4869
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
36 let b:indent = {"lnum": -1}
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
37 let b:undo_indent = "set inde< indk<| unlet b:indent"
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
38
4869
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
39 " Load Once:
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
40 if exists("*HtmlIndent")
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
41 call HtmlIndent_CheckUserSettings()
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
42 finish
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
43 endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
44
4911
78c318784090 Updated runtime files.
Bram Moolenaar <bram@vim.org>
parents: 4869
diff changeset
45 " Patch 7.3.694
78c318784090 Updated runtime files.
Bram Moolenaar <bram@vim.org>
parents: 4869
diff changeset
46 if exists('*shiftwidth')
78c318784090 Updated runtime files.
Bram Moolenaar <bram@vim.org>
parents: 4869
diff changeset
47 let s:ShiftWidth = function('shiftwidth')
78c318784090 Updated runtime files.
Bram Moolenaar <bram@vim.org>
parents: 4869
diff changeset
48 else
78c318784090 Updated runtime files.
Bram Moolenaar <bram@vim.org>
parents: 4869
diff changeset
49 func! s:ShiftWidth()
78c318784090 Updated runtime files.
Bram Moolenaar <bram@vim.org>
parents: 4869
diff changeset
50 return &shiftwidth
78c318784090 Updated runtime files.
Bram Moolenaar <bram@vim.org>
parents: 4869
diff changeset
51 endfunc
78c318784090 Updated runtime files.
Bram Moolenaar <bram@vim.org>
parents: 4869
diff changeset
52 endif
78c318784090 Updated runtime files.
Bram Moolenaar <bram@vim.org>
parents: 4869
diff changeset
53
867
a5677b7ce858 updated for version 7.0g04
vimboss
parents: 856
diff changeset
54 let s:cpo_save = &cpo
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
55 set cpo-=C
4869
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
56 "}}}
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
57
4869
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
58 func! HtmlIndent_CheckUserSettings() "{{{
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
59 if exists("g:html_indent_inctags")
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
60 call s:AddITags(split(g:html_indent_inctags, ","))
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
61 endif
4869
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
62 if exists("g:html_indent_autotags")
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
63 call s:RemoveITags(split(g:html_indent_autotags, ","))
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
64 endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
65
4869
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
66 let indone = {"zero": 0
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
67 \,"auto": "indent(prevnonblank(v:lnum-1))"
4911
78c318784090 Updated runtime files.
Bram Moolenaar <bram@vim.org>
parents: 4869
diff changeset
68 \,"inc": "b:indent.blocktagind + s:ShiftWidth()"}
4869
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
69 if exists("g:html_indent_script1")
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
70 let s:js1indent = get(indone, g:html_indent_script1, indone.zero)
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
71 endif
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
72 if exists("g:html_indent_style1")
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
73 let s:css1indent = get(indone, g:html_indent_style1, indone.zero)
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
74 endif
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
75 endfunc "}}}
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
76
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
77 " Init Script Vars "{{{
6009
7b83c190d370 Updated runtime files.
Bram Moolenaar <bram@vim.org>
parents: 4911
diff changeset
78 let s:lasttick = 0
4869
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
79 let s:css1indent = 0
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
80 let s:js1indent = 0
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
81 " not to be changed:
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
82 let s:endtags = [0,0,0,0,0,0,0,0] " some places unused
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
83 let s:newstate = {}
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
84 let s:countonly = 0
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
85 "}}}
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
86 func! s:AddITags(taglist) "{{{
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
87 for itag in a:taglist
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
88 let s:indent_tags[itag] = 1
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
89 let s:indent_tags['/'.itag] = -1
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
90 endfor
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
91 endfunc "}}}
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
92 func! s:AddBlockTag(tag, id, ...) "{{{
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
93 if !(a:id >= 2 && a:id < 2+len(s:endtags))
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
94 return
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
95 endif
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
96 let s:indent_tags[a:tag] = a:id
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
97 if a:0 == 0
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
98 let s:indent_tags['/'.a:tag] = -a:id
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
99 let s:endtags[a:id-2] = "</".a:tag.">"
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
100 else
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
101 let s:indent_tags[a:1] = -a:id
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
102 let s:endtags[a:id-2] = a:1
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
103 endif
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
104 endfunc "}}}
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
105 func! s:RemoveITags(taglist) "{{{
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
106 " remove itags (protect blocktags from being removed)
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
107 for itag in a:taglist
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
108 if !has_key(s:indent_tags, itag) || s:indent_tags[itag] != 1
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
109 continue
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
110 endif
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
111 unlet s:indent_tags[itag]
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
112 if itag =~ '^\w\+$'
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
113 unlet s:indent_tags["/".itag]
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
114 endif
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
115 endfor
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
116 endfunc "}}}
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
117 " Add Indent Tags: {{{
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
118 if !exists("s:indent_tags")
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
119 let s:indent_tags = {}
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
120 endif
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
121
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
122 " old tags:
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
123 call s:AddITags(['a', 'abbr', 'acronym', 'address', 'b', 'bdo', 'big',
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
124 \ 'blockquote', 'button', 'caption', 'center', 'cite', 'code', 'colgroup',
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
125 \ 'del', 'dfn', 'dir', 'div', 'dl', 'em', 'fieldset', 'font', 'form',
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
126 \ 'frameset', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'i', 'iframe', 'ins', 'kbd',
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
127 \ 'label', 'legend', 'map', 'menu', 'noframes', 'noscript', 'object', 'ol',
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
128 \ 'optgroup', 'q', 's', 'samp', 'select', 'small', 'span', 'strong', 'sub',
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
129 \ 'sup', 'table', 'textarea', 'title', 'tt', 'u', 'ul', 'var', 'th', 'td',
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
130 \ 'tr', 'tfoot', 'thead'])
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
131
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
132 " tags added 2011 Sep 09 (especially HTML5 tags):
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
133 call s:AddITags(['area', 'article', 'aside', 'audio', 'bdi', 'canvas',
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
134 \ 'command', 'datalist', 'details', 'embed', 'figure', 'footer',
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
135 \ 'header', 'group', 'keygen', 'mark', 'math', 'meter', 'nav', 'output',
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
136 \ 'progress', 'ruby', 'section', 'svg', 'texture', 'time', 'video',
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
137 \ 'wbr', 'text'])
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
138
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
139 "}}}
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
140 " Add Block Tags: contain alien content "{{{
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
141 call s:AddBlockTag('pre', 2)
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
142 call s:AddBlockTag('script', 3)
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
143 call s:AddBlockTag('style', 4)
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
144 call s:AddBlockTag('<!--', 5, '-->')
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
145 "}}}
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
146
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
147 func! s:CountITags(...) "{{{
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
148
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
149 " relative indent steps for current line [unit &sw]:
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
150 let s:curind = 0
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
151 " relative indent steps for next line [unit &sw]:
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
152 let s:nextrel = 0
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
153
4869
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
154 if a:0==0
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
155 let s:block = s:newstate.block
6009
7b83c190d370 Updated runtime files.
Bram Moolenaar <bram@vim.org>
parents: 4911
diff changeset
156 let tmpline = substitute(s:curline, '<\zs/\=\w\+\>\|<!--\|-->', '\=s:CheckTag(submatch(0))', 'g')
4869
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
157 if s:block == 3
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
158 let s:newstate.scripttype = s:GetScriptType(matchstr(tmpline, '\C.*<SCRIPT\>\zs[^>]*'))
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
159 endif
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
160 let s:newstate.block = s:block
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
161 else
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
162 let s:block = 0 " assume starting outside of a block
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
163 let s:countonly = 1 " don't change state
6009
7b83c190d370 Updated runtime files.
Bram Moolenaar <bram@vim.org>
parents: 4911
diff changeset
164 let tmpline = substitute(s:altline, '<\zs/\=\w\+\>\|<!--\|-->', '\=s:CheckTag(submatch(0))', 'g')
4869
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
165 let s:countonly = 0
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
166 endif
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
167 endfunc "}}}
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
168 func! s:CheckTag(itag) "{{{
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
169 " "tag" or "/tag" or "<!--" or "-->"
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
170 let ind = get(s:indent_tags, a:itag)
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
171 if ind == -1
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
172 " closing tag
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
173 if s:block != 0
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
174 " ignore itag within a block
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
175 return "foo"
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
176 endif
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
177 if s:nextrel == 0
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
178 let s:curind -= 1
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
179 else
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
180 let s:nextrel -= 1
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
181 endif
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
182 " if s:curind >= 1
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
183 " let s:curind -= 1
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
184 " else
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
185 " let s:nextrel -= 1
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
186 " endif
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
187 elseif ind == 1
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
188 " opening tag
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
189 if s:block != 0
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
190 return "foo"
867
a5677b7ce858 updated for version 7.0g04
vimboss
parents: 856
diff changeset
191 endif
4869
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
192 let s:nextrel += 1
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
193 elseif ind != 0
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
194 " block-tag (opening or closing)
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
195 return s:Blocktag(a:itag, ind)
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
196 endif
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
197 " else ind==0 (other tag found): keep indent
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
198 return "foo" " no matter
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
199 endfunc "}}}
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
200 func! s:Blocktag(blocktag, ind) "{{{
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
201 if a:ind > 0
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
202 " a block starts here
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
203 if s:block != 0
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
204 " already in a block (nesting) - ignore
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
205 " especially ignore comments after other blocktags
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
206 return "foo"
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
207 endif
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
208 let s:block = a:ind " block type
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
209 if s:countonly
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
210 return "foo"
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
211 endif
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
212 let s:newstate.blocklnr = v:lnum
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
213 " save allover indent for the endtag
4911
78c318784090 Updated runtime files.
Bram Moolenaar <bram@vim.org>
parents: 4869
diff changeset
214 let s:newstate.blocktagind = b:indent.baseindent + (s:nextrel + s:curind) * s:ShiftWidth()
4869
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
215 if a:ind == 3
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
216 return "SCRIPT" " all except this must be lowercase
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
217 " line is to be checked again for the type attribute
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
218 endif
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
219 else
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
220 let s:block = 0
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
221 " we get here if starting and closing block-tag on same line
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
222 endif
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
223 return "foo"
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
224 endfunc "}}}
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
225 func! s:GetScriptType(str) "{{{
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
226 if a:str == "" || a:str =~ "java"
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
227 return "javascript"
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
228 else
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
229 return ""
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
230 endif
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
231 endfunc "}}}
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
232
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
233 func! s:FreshState(lnum) "{{{
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
234 " Look back in the file (lines 1 to a:lnum-1) to calc a state for line
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
235 " a:lnum. A state is to know ALL relevant details about the lines
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
236 " 1..a:lnum-1, initial calculating (here!) can be slow, but updating is
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
237 " fast (incremental).
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
238 " State:
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
239 " lnum last indented line == prevnonblank(a:lnum - 1)
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
240 " block = 0 a:lnum located within special tag: 0:none, 2:<pre>,
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
241 " 3:<script>, 4:<style>, 5:<!--
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
242 " baseindent use this indent for line a:lnum as a start - kind of
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
243 " autoindent (if block==0)
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
244 " scripttype = '' type attribute of a script tag (if block==3)
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
245 " blocktagind indent for current opening (get) and closing (set)
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
246 " blocktag (if block!=0)
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
247 " blocklnr lnum of starting blocktag (if block!=0)
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
248 " inattr line {lnum} starts with attributes of a tag
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
249 let state = {}
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
250 let state.lnum = prevnonblank(a:lnum - 1)
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
251 let state.scripttype = ""
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
252 let state.blocktagind = -1
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
253 let state.block = 0
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
254 let state.baseindent = 0
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
255 let state.blocklnr = 0
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
256 let state.inattr = 0
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
257
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
258 if state.lnum == 0
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
259 return state
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
260 endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
261
4869
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
262 " Heuristic:
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
263 " remember startline state.lnum
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
264 " look back for <pre, </pre, <script, </script, <style, </style tags
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
265 " remember stopline
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
266 " if opening tag found,
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
267 " assume a:lnum within block
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
268 " else
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
269 " look back in result range (stopline, startline) for comment
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
270 " \ delimiters (<!--, -->)
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
271 " if comment opener found,
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
272 " assume a:lnum within comment
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
273 " else
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
274 " assume usual html for a:lnum
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
275 " if a:lnum-1 has a closing comment
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
276 " look back to get indent of comment opener
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
277 " FI
1121
e63691e7c504 updated for version 7.1a
vimboss
parents: 867
diff changeset
278
4869
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
279 " look back for blocktag
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
280 call cursor(a:lnum, 1)
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
281 let [stopline, stopcol] = searchpos('\c<\zs\/\=\%(pre\>\|script\>\|style\>\)', "bW")
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
282 " fugly ... why isn't there searchstr()
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
283 let tagline = tolower(getline(stopline))
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
284 let blocktag = matchstr(tagline, '\/\=\%(pre\>\|script\>\|style\>\)', stopcol-1)
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
285 if stopline > 0 && blocktag[0] != "/"
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
286 " opening tag found, assume a:lnum within block
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
287 let state.block = s:indent_tags[blocktag]
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
288 if state.block == 3
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
289 let state.scripttype = s:GetScriptType(matchstr(tagline, '\>[^>]*', stopcol))
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
290 endif
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
291 let state.blocklnr = stopline
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
292 " check preceding tags in the line:
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
293 let s:altline = tagline[: stopcol-2]
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
294 call s:CountITags(1)
4911
78c318784090 Updated runtime files.
Bram Moolenaar <bram@vim.org>
parents: 4869
diff changeset
295 let state.blocktagind = indent(stopline) + (s:curind + s:nextrel) * s:ShiftWidth()
4869
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
296 return state
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
297 elseif stopline == state.lnum
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
298 " handle special case: previous line (= state.lnum) contains a
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
299 " closing blocktag which is preceded by line-noise;
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
300 " blocktag == "/..."
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
301 let swendtag = match(tagline, '^\s*</') >= 0
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
302 if !swendtag
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
303 let [bline, bcol] = searchpos('<'.blocktag[1:].'\>', "bW")
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
304 let s:altline = tolower(getline(bline)[: bcol-2])
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
305 call s:CountITags(1)
4911
78c318784090 Updated runtime files.
Bram Moolenaar <bram@vim.org>
parents: 4869
diff changeset
306 let state.baseindent = indent(bline) + (s:nextrel+s:curline) * s:ShiftWidth()
4869
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
307 return state
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
308 endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
309 endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
310
4869
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
311 " else look back for comment
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
312 call cursor(a:lnum, 1)
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
313 let [comline, comcol, found] = searchpos('\(<!--\)\|-->', 'bpW', stopline)
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
314 if found == 2
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
315 " comment opener found, assume a:lnum within comment
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
316 let state.block = 5
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
317 let state.blocklnr = comline
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
318 " check preceding tags in the line:
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
319 let s:altline = tolower(getline(comline)[: comcol-2])
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
320 call s:CountITags(1)
4911
78c318784090 Updated runtime files.
Bram Moolenaar <bram@vim.org>
parents: 4869
diff changeset
321 let state.blocktagind = indent(comline) + (s:curind + s:nextrel) * s:ShiftWidth()
4869
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
322 return state
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
323 endif
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
324
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
325 " else within usual html
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
326 let s:altline = tolower(getline(state.lnum))
6009
7b83c190d370 Updated runtime files.
Bram Moolenaar <bram@vim.org>
parents: 4911
diff changeset
327
4869
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
328 " check a:lnum-1 for closing comment (we need indent from the opening line)
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
329 let comcol = stridx(s:altline, '-->')
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
330 if comcol >= 0
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
331 call cursor(state.lnum, comcol+1)
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
332 let [comline, comcol] = searchpos('<!--', 'bW')
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
333 if comline == state.lnum
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
334 let s:altline = s:altline[: comcol-2]
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
335 else
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
336 let s:altline = tolower(getline(comline)[: comcol-2])
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
337 endif
4869
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
338 call s:CountITags(1)
4911
78c318784090 Updated runtime files.
Bram Moolenaar <bram@vim.org>
parents: 4869
diff changeset
339 let state.baseindent = indent(comline) + (s:nextrel+s:curline) * s:ShiftWidth()
4869
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
340 return state
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
341 " TODO check tags that follow "-->"
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
342 endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
343
6009
7b83c190d370 Updated runtime files.
Bram Moolenaar <bram@vim.org>
parents: 4911
diff changeset
344 " Check if the previous line starts with end tag.
7b83c190d370 Updated runtime files.
Bram Moolenaar <bram@vim.org>
parents: 4911
diff changeset
345 let swendtag = match(s:altline, '^\s*</') >= 0
7b83c190d370 Updated runtime files.
Bram Moolenaar <bram@vim.org>
parents: 4911
diff changeset
346
7b83c190d370 Updated runtime files.
Bram Moolenaar <bram@vim.org>
parents: 4911
diff changeset
347 " If previous line ended in a closing tag, line up with the opening tag.
7b83c190d370 Updated runtime files.
Bram Moolenaar <bram@vim.org>
parents: 4911
diff changeset
348 " Avoids aligning with continuation lines.
7b83c190d370 Updated runtime files.
Bram Moolenaar <bram@vim.org>
parents: 4911
diff changeset
349 " TODO: this assumes the start tag is at the start of a line.
7b83c190d370 Updated runtime files.
Bram Moolenaar <bram@vim.org>
parents: 4911
diff changeset
350 if !swendtag && s:altline =~ '</\w\+\s*>\s*$'
7b83c190d370 Updated runtime files.
Bram Moolenaar <bram@vim.org>
parents: 4911
diff changeset
351 call cursor(state.lnum, 99999)
7b83c190d370 Updated runtime files.
Bram Moolenaar <bram@vim.org>
parents: 4911
diff changeset
352 normal F<h
7b83c190d370 Updated runtime files.
Bram Moolenaar <bram@vim.org>
parents: 4911
diff changeset
353 " TODO: doesn't work for nested <br> and the like
7b83c190d370 Updated runtime files.
Bram Moolenaar <bram@vim.org>
parents: 4911
diff changeset
354 let slnum = searchpair('<\w\+', '', '</\w', 'bW')
7b83c190d370 Updated runtime files.
Bram Moolenaar <bram@vim.org>
parents: 4911
diff changeset
355 if slnum > 0
7b83c190d370 Updated runtime files.
Bram Moolenaar <bram@vim.org>
parents: 4911
diff changeset
356 let state.baseindent = indent(slnum)
7b83c190d370 Updated runtime files.
Bram Moolenaar <bram@vim.org>
parents: 4911
diff changeset
357 return state
7b83c190d370 Updated runtime files.
Bram Moolenaar <bram@vim.org>
parents: 4911
diff changeset
358 endif
7b83c190d370 Updated runtime files.
Bram Moolenaar <bram@vim.org>
parents: 4911
diff changeset
359 endif
7b83c190d370 Updated runtime files.
Bram Moolenaar <bram@vim.org>
parents: 4911
diff changeset
360
4869
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
361 " else no comments
6009
7b83c190d370 Updated runtime files.
Bram Moolenaar <bram@vim.org>
parents: 4911
diff changeset
362 let state.lnum = s:FindTagStart(state.lnum)
7b83c190d370 Updated runtime files.
Bram Moolenaar <bram@vim.org>
parents: 4911
diff changeset
363 let s:altline = tolower(getline(state.lnum))
4869
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
364 call s:CountITags(1)
4911
78c318784090 Updated runtime files.
Bram Moolenaar <bram@vim.org>
parents: 4869
diff changeset
365 let state.baseindent = indent(state.lnum) + s:nextrel * s:ShiftWidth()
4869
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
366 if !swendtag
4911
78c318784090 Updated runtime files.
Bram Moolenaar <bram@vim.org>
parents: 4869
diff changeset
367 let state.baseindent += s:curind * s:ShiftWidth()
4869
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
368 endif
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
369 return state
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
370 endfunc "}}}
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
371
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
372 func! s:Alien2() "{{{
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
373 " <pre> block
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
374 return -1
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
375 endfunc "}}}
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
376 func! s:Alien3() "{{{
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
377 " <script> javascript
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
378 if prevnonblank(v:lnum-1) == b:indent.blocklnr
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
379 " indent for the first line after <script>
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
380 return eval(s:js1indent)
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
381 endif
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
382 if b:indent.scripttype == "javascript"
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
383 return cindent(v:lnum)
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
384 else
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
385 return -1
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
386 endif
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
387 endfunc "}}}
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
388 func! s:Alien4() "{{{
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
389 " <style>
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
390 if prevnonblank(v:lnum-1) == b:indent.blocklnr
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
391 " indent for first content line
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
392 return eval(s:css1indent)
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
393 endif
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
394 return s:CSSIndent()
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
395 endfunc
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
396
4869
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
397 func! s:CSSIndent() "{{{
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
398 " adopted $VIMRUNTIME/indent/css.vim
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
399 if getline(v:lnum) =~ '^\s*[*}]'
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
400 return cindent(v:lnum)
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
401 endif
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
402 let minline = b:indent.blocklnr
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
403 let pnum = s:css_prevnoncomment(v:lnum - 1, minline)
6009
7b83c190d370 Updated runtime files.
Bram Moolenaar <bram@vim.org>
parents: 4911
diff changeset
404 let pnum = s:FindTagStart(pnum)
4869
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
405 if pnum <= minline
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
406 " < is to catch errors
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
407 " indent for first content line after comments
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
408 return eval(s:css1indent)
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
409 endif
4911
78c318784090 Updated runtime files.
Bram Moolenaar <bram@vim.org>
parents: 4869
diff changeset
410 let ind = indent(pnum) + s:css_countbraces(pnum, 1) * s:ShiftWidth()
4869
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
411 let pline = getline(pnum)
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
412 if pline =~ '}\s*$'
4911
78c318784090 Updated runtime files.
Bram Moolenaar <bram@vim.org>
parents: 4869
diff changeset
413 let ind -= (s:css_countbraces(pnum, 0) - (pline =~ '^\s*}')) * s:ShiftWidth()
4869
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
414 endif
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
415 return ind
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
416 endfunc "}}}
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
417 func! s:css_prevnoncomment(lnum, stopline) "{{{
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
418 " caller starts from a line a:lnum-1 that is not a comment
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
419 let lnum = prevnonblank(a:lnum)
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
420 let ccol = match(getline(lnum), '\*/')
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
421 if ccol < 0
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
422 return lnum
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
423 endif
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
424 call cursor(lnum, ccol+1)
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
425 let lnum = search('/\*', 'bW', a:stopline)
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
426 if indent(".") == virtcol(".")-1
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
427 return prevnonblank(lnum-1)
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
428 else
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
429 return lnum
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
430 endif
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
431 endfunc "}}}
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
432 func! s:css_countbraces(lnum, count_open) "{{{
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
433 let brs = substitute(getline(a:lnum),'[''"].\{-}[''"]\|/\*.\{-}\*/\|/\*.*$\|[^{}]','','g')
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
434 let n_open = 0
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
435 let n_close = 0
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
436 for brace in split(brs, '\zs')
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
437 if brace == "{"
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
438 let n_open += 1
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
439 elseif brace == "}"
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
440 if n_open > 0
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
441 let n_open -= 1
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
442 else
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
443 let n_close += 1
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
444 endif
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
445 endif
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
446 endfor
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
447 return a:count_open ? n_open : n_close
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
448 endfunc "}}}
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
449
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
450 "}}}
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
451 func! s:Alien5() "{{{
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
452 " <!-- -->
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
453 return -1
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
454 endfunc "}}}
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
455
6009
7b83c190d370 Updated runtime files.
Bram Moolenaar <bram@vim.org>
parents: 4911
diff changeset
456 " When the "lnum" line ends in ">" find the line containing the
7b83c190d370 Updated runtime files.
Bram Moolenaar <bram@vim.org>
parents: 4911
diff changeset
457 " matching "<". Avoids using the indent of a continuation line.
7b83c190d370 Updated runtime files.
Bram Moolenaar <bram@vim.org>
parents: 4911
diff changeset
458 " Moves the cursor.
7b83c190d370 Updated runtime files.
Bram Moolenaar <bram@vim.org>
parents: 4911
diff changeset
459 " Return the matching line number or "lnum".
7b83c190d370 Updated runtime files.
Bram Moolenaar <bram@vim.org>
parents: 4911
diff changeset
460 func! s:FindTagStart(lnum) "{{{
7b83c190d370 Updated runtime files.
Bram Moolenaar <bram@vim.org>
parents: 4911
diff changeset
461 if getline(a:lnum) =~ '>\s*$'
7b83c190d370 Updated runtime files.
Bram Moolenaar <bram@vim.org>
parents: 4911
diff changeset
462 call cursor(a:lnum, 99999)
7b83c190d370 Updated runtime files.
Bram Moolenaar <bram@vim.org>
parents: 4911
diff changeset
463 normal! %
7b83c190d370 Updated runtime files.
Bram Moolenaar <bram@vim.org>
parents: 4911
diff changeset
464 return line('.')
7b83c190d370 Updated runtime files.
Bram Moolenaar <bram@vim.org>
parents: 4911
diff changeset
465 endif
7b83c190d370 Updated runtime files.
Bram Moolenaar <bram@vim.org>
parents: 4911
diff changeset
466 return a:lnum
7b83c190d370 Updated runtime files.
Bram Moolenaar <bram@vim.org>
parents: 4911
diff changeset
467 endfunc "}}}
7b83c190d370 Updated runtime files.
Bram Moolenaar <bram@vim.org>
parents: 4911
diff changeset
468
4869
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
469 func! HtmlIndent() "{{{
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
470 let s:curline = tolower(getline(v:lnum))
4911
78c318784090 Updated runtime files.
Bram Moolenaar <bram@vim.org>
parents: 4869
diff changeset
471 let indentunit = s:ShiftWidth()
4869
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
472
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
473 let s:newstate = {}
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
474 let s:newstate.lnum = v:lnum
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
475
4911
78c318784090 Updated runtime files.
Bram Moolenaar <bram@vim.org>
parents: 4869
diff changeset
476 " does the line start with a closing tag?
4869
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
477 let swendtag = match(s:curline, '^\s*</') >= 0
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
478
6009
7b83c190d370 Updated runtime files.
Bram Moolenaar <bram@vim.org>
parents: 4911
diff changeset
479 if prevnonblank(v:lnum-1) == b:indent.lnum && s:lasttick == b:changedtick - 1
4869
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
480 " use state (continue from previous line)
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
481 else
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
482 " start over (know nothing)
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
483 let b:indent = s:FreshState(v:lnum)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
484 endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
485
4869
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
486 if b:indent.block >= 2
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
487 " within block
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
488 let endtag = s:endtags[b:indent.block-2]
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
489 let blockend = stridx(s:curline, endtag)
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
490 if blockend >= 0
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
491 " block ends here
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
492 let s:newstate.block = 0
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
493 " calc indent for REST OF LINE (may start more blocks):
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
494 let s:curline = strpart(s:curline, blockend+strlen(endtag))
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
495 call s:CountITags()
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
496 if swendtag && b:indent.block != 5
4911
78c318784090 Updated runtime files.
Bram Moolenaar <bram@vim.org>
parents: 4869
diff changeset
497 let indent = b:indent.blocktagind + s:curind * indentunit
78c318784090 Updated runtime files.
Bram Moolenaar <bram@vim.org>
parents: 4869
diff changeset
498 let s:newstate.baseindent = indent + s:nextrel * indentunit
4869
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
499 else
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
500 let indent = s:Alien{b:indent.block}()
4911
78c318784090 Updated runtime files.
Bram Moolenaar <bram@vim.org>
parents: 4869
diff changeset
501 let s:newstate.baseindent = b:indent.blocktagind + s:nextrel * indentunit
4869
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
502 endif
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
503 else
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
504 " block continues
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
505 " indent this line with alien method
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
506 let indent = s:Alien{b:indent.block}()
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
507 endif
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
508 else
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
509 " not within a block - within usual html
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
510 " if < 2 then always 0
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
511 let s:newstate.block = b:indent.block
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
512 call s:CountITags()
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
513 if swendtag
4911
78c318784090 Updated runtime files.
Bram Moolenaar <bram@vim.org>
parents: 4869
diff changeset
514 let indent = b:indent.baseindent + s:curind * indentunit
78c318784090 Updated runtime files.
Bram Moolenaar <bram@vim.org>
parents: 4869
diff changeset
515 let s:newstate.baseindent = indent + s:nextrel * indentunit
4869
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
516 else
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
517 let indent = b:indent.baseindent
4911
78c318784090 Updated runtime files.
Bram Moolenaar <bram@vim.org>
parents: 4869
diff changeset
518 let s:newstate.baseindent = indent + (s:curind + s:nextrel) * indentunit
4869
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
519 endif
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
520 endif
6009
7b83c190d370 Updated runtime files.
Bram Moolenaar <bram@vim.org>
parents: 4911
diff changeset
521 let s:lasttick = b:changedtick
7b83c190d370 Updated runtime files.
Bram Moolenaar <bram@vim.org>
parents: 4911
diff changeset
522 call extend(b:indent, s:newstate, "force")
7b83c190d370 Updated runtime files.
Bram Moolenaar <bram@vim.org>
parents: 4911
diff changeset
523 return indent
4869
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
524
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
525 endfunc "}}}
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
526
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
527 " check user settings (first time), clear cpo, Modeline: {{{1
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
528
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
529 " DEBUG:
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
530 com! -nargs=* IndHtmlLocal <args>
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
531
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
532 call HtmlIndent_CheckUserSettings()
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
533
867
a5677b7ce858 updated for version 7.0g04
vimboss
parents: 856
diff changeset
534 let &cpo = s:cpo_save
a5677b7ce858 updated for version 7.0g04
vimboss
parents: 856
diff changeset
535 unlet s:cpo_save
a5677b7ce858 updated for version 7.0g04
vimboss
parents: 856
diff changeset
536
4869
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
537 " vim:set fdm=marker ts=8: