diff options
author | Bram Moolenaar <Bram@vim.org> | 2005-09-20 23:22:24 +0000 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2005-09-20 23:22:24 +0000 |
commit | bfd8fc0529f46612f7b3efca6c7b3305e70ac374 (patch) | |
tree | f6b8a9bdb8bf573cea7862b3ab5ad41dfb5d1b46 /runtime | |
parent | 60a795aad6ade281146a5343b416f21825af5364 (diff) |
updated for version 7.0149v7.0149
Diffstat (limited to 'runtime')
-rw-r--r-- | runtime/autoload/csscomplete.vim | 391 | ||||
-rw-r--r-- | runtime/autoload/htmlcomplete.vim | 390 | ||||
-rw-r--r-- | runtime/doc/cmdline.txt | 10 | ||||
-rw-r--r-- | runtime/doc/eval.txt | 68 | ||||
-rw-r--r-- | runtime/doc/insert.txt | 11 | ||||
-rw-r--r-- | runtime/doc/tags | 10 | ||||
-rw-r--r-- | runtime/doc/todo.txt | 17 | ||||
-rw-r--r-- | runtime/doc/version7.txt | 5 | ||||
-rw-r--r-- | runtime/filetype.vim | 5 | ||||
-rw-r--r-- | runtime/scripts.vim | 3 | ||||
-rw-r--r-- | runtime/spell/en.ascii.spl | bin | 566617 -> 566661 bytes | |||
-rw-r--r-- | runtime/spell/en.latin1.spl | bin | 568721 -> 568765 bytes | |||
-rw-r--r-- | runtime/spell/en.utf-8.spl | bin | 569152 -> 569196 bytes | |||
-rw-r--r-- | runtime/spell/en/en_US.diff | 25 | ||||
-rw-r--r-- | runtime/spell/nl/nl_NL.diff | 7 | ||||
-rw-r--r-- | runtime/syntax/asterisk.vim | 73 |
16 files changed, 844 insertions, 171 deletions
diff --git a/runtime/autoload/csscomplete.vim b/runtime/autoload/csscomplete.vim new file mode 100644 index 0000000000..8ac3600611 --- /dev/null +++ b/runtime/autoload/csscomplete.vim @@ -0,0 +1,391 @@ +" Vim completion script +" Language: CSS 2.1 +" Maintainer: Mikolaj Machowski ( mikmach AT wp DOT pl ) +" Last Change: 2005 Sep 19 + +function! csscomplete#CompleteCSS(findstart, base) +if a:findstart + " We need whole line to proper checking + return 0 +else + " There are few chars important for context: + " ^ ; : { } /* */ + " Where ^ is start of line and /* */ are comment borders + " Depending on their relative position to cursor we will now what should + " be completed. + " 1. if nearest are ^ or { or ; current word is property + " 2. if : it is value + " 3. if } we are outside of css definitions + " 4. for comments ignoring is be the easiest but assume they are the same + " as 1. + + let line = a:base + let res = [] + let res2 = [] + let borders = {} + + " We need the last occurrence of char so reverse line + let revline = join(reverse(split(line, '.\zs')), '') + let openbrace = stridx(revline, '{') + let closebrace = stridx(revline, '}') + let colon = stridx(revline, ':') + let semicolon = stridx(revline, ';') + let opencomm = stridx(revline, '*/') " Line was reversed + let closecomm = stridx(revline, '/*') " Line was reversed + let style = stridx(revline, '=\s*elyts') " Line was reversed + let atrule = stridx(revline, '@') + + if openbrace > -1 + let borders[openbrace] = "openbrace" + endif + if closebrace > -1 + let borders[closebrace] = "closebrace" + endif + if colon > -1 + let borders[colon] = "colon" + endif + if semicolon > -1 + let borders[semicolon] = "semicolon" + endif + if opencomm > -1 + let borders[opencomm] = "opencomm" + endif + if closecomm > -1 + let borders[closecomm] = "closecomm" + endif + if style > -1 + let borders[style] = "style" + endif + if atrule > -1 + let borders[atrule] = "atrule" + endif + + if len(borders) == 0 || borders[min(keys(borders))] =~ '^\(openbrace\|semicolon\|opencomm\|closecomm\|style\)$' + " Complete properties + + let values = split("azimuth background-attachment background-color background-image background-position background-repeat background border-collapse border-color border-spacing border-style border-top border-right border-bottom border-left border-top-color border-right-color border-bottom-color border-left-color border-top-style border-right-style border-bottom-style border-left-style border-top-width border-right-width border-bottom-width border-left-width border-width border bottom caption-side clear clip color content counter-increment counter-reset cue-after cue-before cue cursor direction display elevation empty-cells float font-family font-size font-style font-variant font-weight font height left letter-spacing line-height list-style-image list-style-position list-style-type list-style margin-right margin-left margin-top margin-bottom max-height max-width min-height min-width orphans outline-color outline-style outline-width outline overflow padding-top padding-right padding-bottom padding-left padding page-break-after page-break-before page-break-inside pause-after pause-before pause pitch-range pitch play-during position quotes richness right speak-header speak-numeral speak-punctuation speak speech-rate stress table-layout text-align text-decoration text-indent text-transform top unicode-bidi vertical-align visibility voice-family volume white-space widows width word-spacing z-index") + + let propbase = matchstr(line, '.\{-}\ze[a-zA-Z-]*$') + let entered_property = matchstr(line, '.\{-}\zs[a-zA-Z-]*$') + + for m in values + if m =~? '^'.entered_property + call add(res, propbase . m.': ') + elseif m =~? entered_property + call add(res2, propbase . m.': ') + endif + endfor + + return res + res2 + + elseif borders[min(keys(borders))] == 'colon' + " Get name of property + let prop = tolower(matchstr(line, '\zs[a-zA-Z-]*\ze\s*:[^:]\{-}$')) + + if prop == 'azimuth' + let values = ["left-side", "far-left", "left", "center-left", "center", "center-right", "right", "far-right", "right-side", "behind", "leftwards", "rightwards"] + elseif prop == 'background-attachment' + let values = ["scroll", "fixed"] + elseif prop == 'background-color' + let values = ["transparent", "rgb(", "#"] + elseif prop == 'background-image' + let values = ["url(", "none"] + elseif prop == 'background-position' + let vals = matchstr(line, '.*:\s*\zs.*') + if vals =~ '^\([a-zA-Z]\+\)\?$' + let values = ["top", "center", "bottom"] + elseif vals =~ '^[a-zA-Z]\+\s\+\([a-zA-Z]\+\)\?$' + let values = ["left", "center", "right"] + else + return [] + endif + elseif prop == 'background-repeat' + let values = ["repeat", "repeat-x", "repeat-y", "no-repeat"] + elseif prop == 'background' + let values = ["url(", "scroll", "fixed", "transparent", "rgb(", "#", "none", "top", "center", "bottom" , "left", "right", "repeat", "repeat-x", "repeat-y", "no-repeat"] + elseif prop == 'border-collapse' + let values = ["collapse", "separate"] + elseif prop == 'border-color' + let values = ["rgb(", "#", "transparent"] + elseif prop == 'border-spacing' + return [] + elseif prop == 'border-style' + let values = ["none", "hidden", "dotted", "dashed", "solid", "double", "groove", "ridge", "inset", "outset"] + elseif prop =~ 'border-\(top\|right\|bottom\|left\)$' + let vals = matchstr(line, '.*:\s*\zs.*') + if vals =~ '^\([a-zA-Z0-9.]\+\)\?$' + let values = ["thin", "thick", "medium"] + elseif vals =~ '^[a-zA-Z0-9.]\+\s\+\([a-zA-Z]\+\)\?$' + let values = ["none", "hidden", "dotted", "dashed", "solid", "double", "groove", "ridge", "inset", "outset"] + elseif vals =~ '^[a-zA-Z0-9.]\+\s\+[a-zA-Z]\+\s\+\([a-zA-Z(]\+\)\?$' + let values = ["rgb(", "#", "transparent"] + else + return [] + endif + elseif prop =~ 'border-\(top\|right\|bottom\|left\)-color' + let values = ["rgb(", "#", "transparent"] + elseif prop =~ 'border-\(top\|right\|bottom\|left\)-style' + let values = ["none", "hidden", "dotted", "dashed", "solid", "double", "groove", "ridge", "inset", "outset"] + elseif prop =~ 'border-\(top\|right\|bottom\|left\)-width' + let values = ["thin", "thick", "medium"] + elseif prop == 'border-width' + let values = ["thin", "thick", "medium"] + elseif prop == 'border' + let vals = matchstr(line, '.*:\s*\zs.*') + if vals =~ '^\([a-zA-Z0-9.]\+\)\?$' + let values = ["thin", "thick", "medium"] + elseif vals =~ '^[a-zA-Z0-9.]\+\s\+\([a-zA-Z]\+\)\?$' + let values = ["none", "hidden", "dotted", "dashed", "solid", "double", "groove", "ridge", "inset", "outset"] + elseif vals =~ '^[a-zA-Z0-9.]\+\s\+[a-zA-Z]\+\s\+\([a-zA-Z(]\+\)\?$' + let values = ["rgb(", "#", "transparent"] + else + return [] + endif + elseif prop == 'bottom' + let values = ["auto"] + elseif prop == 'caption-side' + let values = ["top", "bottom"] + elseif prop == 'clear' + let values = ["none", "left", "right", "both"] + elseif prop == 'clip' + let values = ["auto", "rect("] + elseif prop == 'color' + let values = ["rgb(", "#"] + elseif prop == 'content' + let values = ["normal", "attr(", "open-quote", "close-quote", "no-open-quote", "no-close-quote"] + elseif prop =~ 'counter-\(increment\|reset\)$' + let values = ["none"] + elseif prop =~ '^\(cue-after\|cue-before\|cue\)$' + let values = ["url(", "none"] + elseif prop == 'cursor' + let values = ["url(", "auto", "crosshair", "default", "pointer", "move", "e-resize", "ne-resize", "nw-resize", "n-resize", "se-resize", "sw-resize", "s-resize", "w-resize", "text", "wait", "help", "progress"] + elseif prop == 'direction' + let values = ["ltr", "rtl"] + elseif prop == 'display' + let values = ["inline", "block", "list-item", "run-in", "inline-block", "table", "inline-table", "table-row-group", "table-header-group", "table-footer-group", "table-row", "table-column-group", "table-column", "table-cell", "table-caption", "none"] + elseif prop == 'elevation' + let values = ["below", "level", "above", "higher", "lower"] + elseif prop == 'empty-cells' + let values = ["show", "hide"] + elseif prop == 'float' + let values = ["left", "right", "none"] + elseif prop == 'font-family' + let values = ["sans-serif", "serif", "monospace", "cursive", "fantasy"] + elseif prop == 'font-size' + return [] + elseif prop == 'font-style' + let values = ["normal", "italic", "oblique"] + elseif prop == 'font-variant' + let values = ["normal", "small-caps"] + elseif prop == 'font-weight' + let values = ["normal", "bold", "bolder", "lighter", "100", "200", "300", "400", "500", "600", "700", "800", "900"] + elseif prop == 'font' + let values = ["normal", "italic", "oblique", "small-caps", "bold", "bolder", "lighter", "100", "200", "300", "400", "500", "600", "700", "800", "900", "sans-serif", "serif", "monospace", "cursive", "fantasy", "caption", "icon", "menu", "message-box", "small-caption", "status-bar"] + elseif prop =~ '^\(height\|width\)$' + let values = ["auto"] + elseif prop =~ '^\(left\|rigth\)$' + let values = ["auto"] + elseif prop == 'letter-spacing' + let values = ["normal"] + elseif prop == 'line-height' + let values = ["normal"] + elseif prop == 'list-style-image' + let values = ["url(", "none"] + elseif prop == 'list-style-position' + let values = ["inside", "outside"] + elseif prop == 'list-style-type' + let values = ["disc", "circle", "square", "decimal", "decimal-leading-zero", "lower-roman", "upper-roman", "lower-latin", "upper-latin", "none"] + elseif prop == 'list-style' + return [] + elseif prop == 'margin' + let values = ["auto"] + elseif prop =~ 'margin-\(right\|left\|top\|bottom\)$' + let values = ["auto"] + elseif prop == 'max-height' + let values = ["auto"] + elseif prop == 'max-width' + let values = ["none"] + elseif prop == 'min-height' + let values = ["none"] + elseif prop == 'min-width' + let values = ["none"] + elseif prop == 'orphans' + return [] + elseif prop == 'outline-color' + let values = ["rgb(", "#"] + elseif prop == 'outline-style' + let values = ["none", "hidden", "dotted", "dashed", "solid", "double", "groove", "ridge", "inset", "outset"] + elseif prop == 'outline-width' + let values = ["thin", "thick", "medium"] + elseif prop == 'outline' + let vals = matchstr(line, '.*:\s*\zs.*') + if vals =~ '^\([a-zA-Z0-9,()#]\+\)\?$' + let values = ["rgb(", "#"] + elseif vals =~ '^[a-zA-Z0-9,()#]\+\s\+\([a-zA-Z]\+\)\?$' + let values = ["none", "hidden", "dotted", "dashed", "solid", "double", "groove", "ridge", "inset", "outset"] + elseif vals =~ '^[a-zA-Z0-9,()#]\+\s\+[a-zA-Z]\+\s\+\([a-zA-Z(]\+\)\?$' + let values = ["thin", "thick", "medium"] + else + return [] + endif + elseif prop == 'overflow' + let values = ["visible", "hidden", "scroll", "auto"] + elseif prop == 'padding' + return [] + elseif prop =~ 'padding-\(top\|right\|bottom\|left\)$' + return [] + elseif prop =~ 'page-break-\(after\|before\)$' + let values = ["auto", "always", "avoid", "left", "right"] + elseif prop == 'page-break-inside' + let values = ["auto", "avoid"] + elseif prop =~ 'pause-\(after\|before\)$' + return [] + elseif prop == 'pause' + return [] + elseif prop == 'pitch-range' + return [] + elseif prop == 'pitch' + let values = ["x-low", "low", "medium", "high", "x-high"] + elseif prop == 'play-during' + let values = ["url(", "mix", "repeat", "auto", "none"] + elseif prop == 'position' + let values = ["static", "relative", "absolute", "fixed"] + elseif prop == 'quotes' + let values = ["none"] + elseif prop == 'richness' + return [] + elseif prop == 'speak-header' + let values = ["once", "always"] + elseif prop == 'speak-numeral' + let values = ["digits", "continuous"] + elseif prop == 'speak-punctuation' + let values = ["code", "none"] + elseif prop == 'speak' + let values = ["normal", "none", "spell-out"] + elseif prop == 'speech-rate' + let values = ["x-slow", "slow", "medium", "fast", "x-fast", "faster", "slower"] + elseif prop == 'stress' + return [] + elseif prop == 'table-layout' + let values = ["auto", "fixed"] + elseif prop == 'text-align' + let values = ["left", "right", "center", "justify"] + elseif prop == 'text-decoration' + let values = ["none", "underline", "overline", "line-through", "blink"] + elseif prop == 'text-indent' + return [] + elseif prop == 'text-transform' + let values = ["capitalize", "uppercase", "lowercase", "none"] + elseif prop == 'top' + let values = ["auto"] + elseif prop == 'unicode-bidi' + let values = ["normal", "embed", "bidi-override"] + elseif prop == 'vertical-align' + let values = ["baseline", "sub", "super", "top", "text-top", "middle", "bottom", "text-bottom"] + elseif prop == 'visibility' + let values = ["visible", "hidden", "collapse"] + elseif prop == 'voice-family' + return [] + elseif prop == 'volume' + let values = ["silent", "x-soft", "soft", "medium", "loud", "x-loud"] + elseif prop == 'white-space' + let values = ["normal", "pre", "nowrap", "pre-wrap", "pre-line"] + elseif prop == 'widows' + return [] + elseif prop == 'word-spacing' + let values = ["normal"] + elseif prop == 'z-index' + let values = ["auto"] + else + return [] + endif + + " Complete values + let valbase = matchstr(line, '.\{-}\ze[a-zA-Z0-9#,.(_-]*$') + let entered_value = matchstr(line, '.\{-}\zs[a-zA-Z0-9#,.(_-]*$') + + for m in values + if m =~? '^'.entered_value + call add(res, valbase . m) + elseif m =~? entered_value + call add(res2, valbase . m) + endif + endfor + + return res + res2 + + elseif borders[min(keys(borders))] == 'closebrace' + + return [] + + elseif borders[min(keys(borders))] == 'atrule' + + let afterat = matchstr(line, '.*@\zs.*') + + if afterat =~ '\s' + + let atrulename = matchstr(line, '.*@\zs[a-zA-Z-]\+\ze') + + if atrulename == 'media' + let values = ["screen", "tty", "tv", "projection", "handheld", "print", "braille", "aural", "all"] + + let atruleafterbase = matchstr(line, '.*@media\s\+\ze.*$') + let entered_atruleafter = matchstr(line, '.*@media\s\+\zs.*$') + + elseif atrulename == 'import' + let atruleafterbase = matchstr(line, '.*@import\s\+\ze.*$') + let entered_atruleafter = matchstr(line, '.*@import\s\+\zs.*$') + + if entered_atruleafter =~ "^[\"']" + let filestart = matchstr(entered_atruleafter, '^.\zs.*') + let files = split(glob(filestart.'*'), '\n') + let values = map(copy(files), '"\"".v:val') + + elseif entered_atruleafter =~ "^url(" + let filestart = matchstr(entered_atruleafter, "^url([\"']\\?\\zs.*") + let files = split(glob(filestart.'*'), '\n') + let values = map(copy(files), '"url(".v:val') + + else + let values = ['"', 'url('] + + endif + + else + return [] + + endif + + for m in values + if m =~? '^'.entered_atruleafter + call add(res, atruleafterbase . m) + elseif m =~? entered_atruleafter + call add(res2, atruleafterbase . m) + endif + endfor + + return res + res2 + + endif + + let values = ["charset", "page", "media", "import"] + + let atrulebase = matchstr(line, '.*@\ze[a-zA-Z -]*$') + let entered_atrule = matchstr(line, '.*@\zs[a-zA-Z-]*$') + + for m in values + if m =~? '^'.entered_atrule + call add(res, atrulebase . m.' ') + elseif m =~? entered_atrule + call add(res2, atrulebase . m.' ') + endif + endfor + + return res + res2 + + endif + + return [] + + endif +endfunction diff --git a/runtime/autoload/htmlcomplete.vim b/runtime/autoload/htmlcomplete.vim index a9791451f0..ab50952435 100644 --- a/runtime/autoload/htmlcomplete.vim +++ b/runtime/autoload/htmlcomplete.vim @@ -1,7 +1,7 @@ " Vim completion script " Language: XHTML 1.0 Strict " Maintainer: Mikolaj Machowski ( mikmach AT wp DOT pl ) -" Last Change: 2005 Sep 15 +" Last Change: 2005 Sep 19 function! htmlcomplete#CompleteTags(findstart, base) if a:findstart @@ -11,26 +11,53 @@ function! htmlcomplete#CompleteTags(findstart, base) while start >= 0 && line[start - 1] !~ '<' let start -= 1 endwhile + if start < 0 + let curpos = line('.') + let stylestart = searchpair('<style\>', '', '<\/style\>', "bnW") + let styleend = searchpair('<style\>', '', '<\/style\>', "nW") + if stylestart != 0 && styleend != 0 + if stylestart <= curpos && styleend >= curpos + let b:csscompl = 1 + let start = 0 + endif + endif + endif return start else + " Check if we should do CSS completion inside of <style> tag + if exists("b:csscompl") + unlet! b:csscompl + return csscomplete#CompleteCSS(0, a:base) + endif + if a:base =~ '>' + " Generally if a:base contains > it means we are outside of tag and + " should abandon action - with one exception: <style> span { bo + if a:base =~ 'style[^>]\{-}>[^<]\{-}$' + return csscomplete#CompleteCSS(0, a:base) + else + return [] + endif + endif + " Set attribute groups - let g:coreattrs = ["id", "class", "style", "title"] - let g:i18n = ["lang", "xml:lang", "dir"] - let g:events = ["onclick", "ondblclick", "onmousedown", "onmouseup", "onmousemove", + let coreattrs = ["id", "class", "style", "title"] + let i18n = ["lang", "xml:lang", "dir=\"ltr\" ", "dir=\"rtl\" "] + let events = ["onclick", "ondblclick", "onmousedown", "onmouseup", "onmousemove", \ "onmouseout", "onkeypress", "onkeydown", "onkeyup"] - let g:focus = ["accesskey", "tabindex", "onfocus", "onblur"] - let g:coregroup = g:coreattrs - let g:coregroup = extend(g:coregroup, g:i18n) - let g:coregroup = extend(g:coregroup, g:events) - " find tags matching with "a:base" + let focus = ["accesskey", "tabindex", "onfocus", "onblur"] + let coregroup = coreattrs + i18n + events let res = [] + let res2 = [] + " find tags matching with "a:base" " If a:base contains > it means we are already outside of tag and we " should abandon action - if a:base =~ '>' - return [] - endif " If a:base contains white space it is attribute. " It could be also value of attribute... + " We have to get first word to offer + " proper completions + let tag = split(a:base)[0] + " Get last word, it should be attr name + let attr = matchstr(a:base, '.*\s\zs.*') " Possible situations where any prediction would be difficult: " 1. Events attributes if a:base =~ '\s' @@ -40,6 +67,113 @@ function! htmlcomplete#CompleteTags(findstart, base) " Also retrieving class names from current file and linked " stylesheets. if a:base =~ "\\(on[a-z]*\\|style\\|class\\)\\s*=\\s*[\"']" + if a:base =~ "class\\s*=\\s*[\"'][a-zA-Z0-9_ -]*$" + " Handle class name completion + " 1. Find lines of <link stylesheet> + " 1a. Check file for @import + " 2. Extract filename(s?) of stylesheet, + call cursor(1,1) + let head = getline(search('<head\>'), search('<\/head>')) + let headjoined = join(copy(head), ' ') + if headjoined =~ '<style' + let stylehead = substitute(headjoined, '+>\*[', ' ', 'g') + let styleheadlines = split(stylehead) + let headclasslines = filter(copy(styleheadlines), "v:val =~ '\\([a-zA-Z0-9:]\\+\\)\\?\\.[a-zA-Z0-9_-]\\+'") + let internal = 1 + else + let internal = 0 + endif + let styletable = [] + let secimportfiles = [] + let filestable = filter(copy(head), "v:val =~ '\\(@import\\|link.*stylesheet\\)'") + for line in filestable + if line =~ "@import" + let styletable += [matchstr(line, "import\\s\\+\\(url(\\)\\?[\"']\\?\\zs\\f\\+\\ze")] + elseif line =~ "<link" + let styletable += [matchstr(line, "href\\s*=\\s*[\"']\\zs\\f\\+\\ze")] + endif + endfor + for file in filestable + if filereadable(file) + let stylesheet = readfile(file) + let secimport = filter(copy(stylesheet), "v:val =~ '@import'") + if len(secimport) > 0 + for line in secimport + let secimportfiles += [matchstr(line, "import\\s\\+\\(url(\\)\\?[\"']\\?\\zs\\f\\+\\ze")] + endfor + endif + endif + endfor + let cssfiles = styletable + secimportfiles + let classes = [] + for file in cssfiles + if filereadable(file) + let stylesheet = readfile(file) + let stylefile = join(stylesheet) + let stylefile = substitute(stylefile, '+>\*[', ' ', 'g') + let stylesheet = split(stylefile) + let classlines = filter(copy(stylesheet), "v:val =~ '\\([a-zA-Z0-9:]\\+\\)\\?\\.[a-zA-Z0-9_-]\\+'") + endif + " We gathered classes definitions from all external files + let classes += classlines + endfor + if internal == 1 + let classes += headclasslines + endif + let elements = {} + for element in classes + if element =~ '^\.' + let class = matchstr(element, '^\.\zs[a-zA-Z][a-zA-Z0-9_-]*\ze') + let class = substitute(class, ':.*', '', '') + if has_key(elements, "common") + let elements["common"] .= " ".class + else + let elements["common"] = class + endif + else + let class = matchstr(element, '[a-zA-Z1-6]*\.\zs[a-zA-Z][a-zA-Z0-9_-]*\ze') + let tagname = tolower(matchstr(element, '[a-zA-Z1-6]*\ze.')) + if tagname != '' + if has_key(elements, tagname) + let elements[tagname] .= " ".class + else + let elements[tagname] = class + endif + endif + endif + endfor + + if has_key(elements, tag) && has_key(elements, "common") + let values = split(elements[tag]." ".elements["common"]) + elseif has_key(elements, tag) && !has_key(elements, "common") + let values = split(elements[tag]) + elseif !has_key(elements, tag) && has_key(elements, "common") + let values = split(elements["common"]) + else + return [] + endif + + " We need special version of sbase + let classbase = matchstr(a:base, ".*[\"']") + let classquote = matchstr(classbase, '.$') + + + let entered_class = matchstr(attr, ".*=\\s*[\"']\\zs.*") + + for m in sort(values) + if m =~? '^'.entered_class + call add(res, classbase . m . classquote . ' ') + elseif m =~? entered_class + call add(res2, classbase . m . classquote . ' ') + endif + endfor + + return res + res2 + + elseif a:base =~ "style\\s*=\\s*[\"'][^\"']*$" + return csscomplete#CompleteCSS(0, a:base) + + endif let stripbase = matchstr(a:base, ".*\\(on[a-z]*\\|style\\|class\\)\\s*=\\s*[\"']\\zs.*") " Now we have a:base stripped from all chars up to style/class. " It may fail with some strange style value combinations. @@ -47,11 +181,6 @@ function! htmlcomplete#CompleteTags(findstart, base) return [] endif endif - " We have to get first word to offer - " proper attributes. - let tag = split(a:base)[0] - " Get last word, it should be attr name - let attr = matchstr(a:base, '.*\s\zs.*') " If attr contains =\s*[\"'] we catched value of attribute if attr =~ "=\s*[\"']" " Let do attribute specific completion @@ -97,7 +226,7 @@ function! htmlcomplete#CompleteTags(findstart, base) endif elseif attrname == 'type' if a:base =~ '^input' - let values = ["input-text", "password", "checkbox", "radio", "submit", "reset", "input-file", "hidden", "input-image", "input-button"] + let values = ["text", "password", "checkbox", "radio", "submit", "reset", "file", "hidden", "image", "button"] elseif a:base =~ '^button' let values = ["button", "submit", "reset"] endif @@ -111,128 +240,114 @@ function! htmlcomplete#CompleteTags(findstart, base) " We need special version of sbase let attrbase = matchstr(a:base, ".*[\"']") + let attrquote = matchstr(attrbase, '.$') for m in values - if m =~ entered_value - call add(res, attrbase . m . '" ') + " This if is needed to not offer all completions as-is + " alphabetically but sort them. Those beginning with entered + " part will be as first choices + if m =~ '^'.entered_value + call add(res, attrbase . m . attrquote.' ') + elseif m =~ entered_value + call add(res2, attrbase . m . attrquote.' ') endif endfor + + return res + res2 + endif " Shorten a:base to not include last word let sbase = matchstr(a:base, '.*\ze\s.*') if tag =~ '^\(abbr\|acronym\|b\|bdo\|big\|caption\|cite\|code\|dd\|dfn\|div\|dl\|dt\|em\|fieldset\|h\d\|kbd\|li\|noscript\|ol\|p\|samp\|small\|span\|strong\|sub\|sup\|tt\|ul\|var\)$' - let attrs = g:coregroup + let attrs = coregroup elseif tag == 'a' - let tagspec = ["charset", "type", "name", "href", "hreflang", "rel", "rev", "shape", "coords"] - let attrs = extend(tagspec, g:coregroup) - let attrs = extend(attrs, g:focus) + let attrs = coregroup + focus + ["charset", "type", "name", "href", "hreflang", "rel", "rev", "shape", "coords"] elseif tag == 'area' - let attrs = g:coregroup + let attrs = coregroup elseif tag == 'base' let attrs = ["href", "id"] elseif tag == 'blockquote' - let attrs = g:coregroup - let attrs = extend(attrs, ["cite"]) + let attrs = coregroup + ["cite"] elseif tag == 'body' - let attrs = g:coregroup - let attrs = extend(attrs, ["onload", "onunload"]) + let attrs = coregroup + ["onload", "onunload"] elseif tag == 'br' - let attrs = g:coreattrs + let attrs = coreattrs elseif tag == 'button' - let attrs = g:coreattrs - let attrs = extend(attrs, g:focus) - let attrs = extend(attrs, ["name", "value", "type"]) + let attrs = coreattrs + focus + ["name", "value", "type"] elseif tag == '^\(col\|colgroup\)$' - let attrs = g:coreattrs - let attrs = extend(attrs, ["span", "width", "align", "char", "charoff", "valign"]) + let attrs = coreattrs + ["span", "width", "align", "char", "charoff", "valign"] elseif tag =~ '^\(del\|ins\)$' - let attrs = g:coreattrs - let attrs = extend(attrs, ["cite", "datetime"]) + let attrs = coreattrs + ["cite", "datetime"] elseif tag == 'form' - let attrs = g:coreattrs - let attrs = extend(attrs, ["action", "method", "enctype", "onsubmit", "onreset", "accept", "accept-charset"]) + let attrs = coreattrs + ["action", "method=\"get\" ", "method=\"post\" ", "enctype", "onsubmit", "onreset", "accept", "accept-charset"] elseif tag == 'head' - let attrs = g:i18n - let attrs = extend(attrs, ["id", "profile"]) + let attrs = i18n + ["id", "profile"] elseif tag == 'html' - let attrs = g:i18n - let attrs = extend(attrs, ["id", "xmlns"]) + let attrs = i18n + ["id", "xmlns"] elseif tag == 'img' - let attrs = g:coreattrs - let attrs = extend(attrs, ["src", "alt", "longdesc", "height", "width", "usemap", "ismap"]) + let attrs = coreattrs + ["src", "alt", "longdesc", "height", "width", "usemap", "ismap"] elseif tag == 'input' - let attrs = g:coreattrs - let attrs = extend(attrs, g:focus) - let attrs = extend(attrs, ["type", "name", "value", "checked", "disabled", "readonly", "size", "maxlength", "src", "alt", "usemap", "onselect", "onchange", "accept"]) + let attrs = coreattrs + focus + ["type", "name", "value", "checked", "disabled", "readonly", "size", "maxlength", "src", "alt", "usemap", "onselect", "onchange", "accept"] elseif tag == 'label' - let attrs = g:coreattrs - let attrs = extend(attrs, ["for", "accesskey", "onfocus", "onblur"]) + let attrs = coreattrs + ["for", "accesskey", "onfocus", "onblur"] elseif tag == 'legend' - let attrs = g:coreattrs - let attrs = extend(attrs, ["accesskey"]) + let attrs = coreattrs + ["accesskey"] elseif tag == 'link' - let attrs = g:coreattrs - let attrs = extend(attrs, ["charset", "href", "hreflang", "type", "rel", "rev", "media"]) + let attrs = coreattrs + ["charset", "href", "hreflang", "type", "rel", "rev", "media"] elseif tag == 'map' - let attrs = g:i18n - let attrs = extend(attrs, g:events) - let attrs = extend(attrs, ["id", "class", "style", "title", "name"]) + let attrs = i18n + events + ["id", "class", "style", "title", "name"] elseif tag == 'meta' - let attrs = g:i18n - let attrs = extend(attrs, ["id", "http-equiv", "content", "scheme", "name"]) + let attrs = i18n + ["id", "http-equiv", "content", "scheme", "name"] elseif tag == 'title' - let attrs = g:i18n - let attrs = extend(attrs, ["id"]) + let attrs = i18n + ["id"] elseif tag == 'object' - let attrs = g:coreattrs - let attrs = extend(attrs, ["declare", "classid", "codebase", "data", "type", "codetype", "archive", "standby", "height", "width", "usemap", "name", "tabindex"]) + let attrs = coreattrs + ["declare", "classid", "codebase", "data", "type", "codetype", "archive", "standby", "height", "width", "usemap", "name", "tabindex"] elseif tag == 'optgroup' - let attrs = g:coreattrs - let attrs = extend(attrs, ["disbled", "label"]) + let attrs = coreattrs + ["disbled", "label"] elseif tag == 'option' - let attrs = g:coreattrs - let attrs = extend(attrs, ["disbled", "selected", "value", "label"]) + let attrs = coreattrs + ["disbled", "selected", "value", "label"] elseif tag == 'param' let attrs = ["id", "name", "value", "valuetype", "type"] elseif tag == 'pre' - let attrs = g:coreattrs - let attrs = extend(attrs, ["xml:space"]) + let attrs = coreattrs + ["xml:space"] elseif tag == 'q' - let attrs = g:coreattrs - let attrs = extend(attrs, ["cite"]) + let attrs = coreattrs + ["cite"] elseif tag == 'script' let attrs = ["id", "charset", "type", "src", "defer", "xml:space"] elseif tag == 'select' - let attrs = g:coreattrs - let attrs = extend(attrs, ["name", "size", "multiple", "disabled", "tabindex", "onfocus", "onblur", "onchange"]) + let attrs = coreattrs + ["name", "size", "multiple", "disabled", "tabindex", "onfocus", "onblur", "onchange"] elseif tag == 'style' - let attrs = g:coreattrs - let attrs = extend(attrs, ["id", "type", "media", "title", "xml:space"]) + let attrs = coreattrs + ["id", "type", "media", "title", "xml:space"] elseif tag == 'table' - let attrs = g:coreattrs - let attrs = extend(attrs, ["summary", "width", "border", "frame", "rules" "cellspacing", "cellpadding"]) + let attrs = coreattrs + ["summary", "width", "border", "frame", "rules", "cellspacing", "cellpadding"] elseif tag =~ '^\(thead\|tfoot\|tbody\|tr\)$' - let attrs = g:coreattrs - let attrs = extend(attrs, ["align", "char", "charoff", "valign"]) + let attrs = coreattrs + ["align", "char", "charoff", "valign"] elseif tag == 'textarea' - let attrs = g:coreattrs - let attrs = extend(attrs, g:focus) - let attrs = extend(attrs, ["name", "rows", "cols", "disabled", "readonly", "onselect", "onchange"]) + let attrs = coreattrs + focus + ["name", "rows", "cols", "disabled", "readonly", "onselect", "onchange"] elseif tag =~ '^\(th\|td\)$' - let attrs = g:coreattrs - let attrs = extend(attrs, ["abbr", "headers", "scope", "rowspan", "colspan", "align", "char", "charoff", "valign"]) + let attrs = coreattrs + ["abbr", "headers", "scope", "rowspan", "colspan", "align", "char", "charoff", "valign"] + else + return [] endif for m in sort(attrs) - if m =~ attr - if m =~ '^\(ismap\|defer\|declare\|nohref\|checked\|disabled\|selected\|readonly\)$' + if m =~ '^'.attr + if m =~ '^\(ismap\|defer\|declare\|nohref\|checked\|disabled\|selected\|readonly\)$' || m =~ '=' call add(res, sbase.' '.m) else call add(res, sbase.' '.m.'="') endif + elseif m =~ attr + if m =~ '^\(ismap\|defer\|declare\|nohref\|checked\|disabled\|selected\|readonly\)$' || m =~ '=' + call add(res2, sbase.' '.m) + else + call add(res2, sbase.' '.m.'="') + endif endif endfor - return res + + return res + res2 + endif " Close tag let b:unaryTagsStack = "base meta link hr br param img area input col" @@ -258,17 +373,17 @@ function! htmlcomplete#CompleteTags(findstart, base) elseif opentag == 'pre' let tags = split("a tt i b big small br span bdo map ".phrase." ".miscinline." ".inlineforms) elseif opentag == 'html' - let tags = split("head body") + let tags = ["head", "body"] elseif opentag == 'legend' let tags = split(inline." ".miscinline) elseif opentag == 'head' - let tags = split("title base scipt style meta link object") + let tags = ["title", "base", "scipt", "style", "meta", "link", "object"] elseif opentag =~ '^\(noscript\|body\|blockquote\)$' let tags = split("form ".block." ".misc) elseif opentag =~ '^\(ul\|ol\)$' let tags = ["li"] elseif opentag == 'dl' - let tags = split("dt dd") + let tags = ["dt", "dd"] elseif opentag =~ '^\(ins\|del\|th\|td\|dd\|div\|li\)$' let tags = split("form ".block." ".inline." ".misc) elseif opentag == 'object' @@ -280,30 +395,34 @@ function! htmlcomplete#CompleteTags(findstart, base) elseif opentag == 'form' let tags = split(block." ".misc) elseif opentag == 'select' - let tags = split("optgroup option") + let tags = ["optgroup", "option"] elseif opentag == 'optgroup' let tags = ["option"] elseif opentag == 'colgroup' let tags = ["col"] elseif opentag == '^\(textarea\|option\|script\|style\|title\)$' - let tags = [] + let tags = ['empty'] elseif opentag == 'button' - let tags = split("p h1 h2 h3 h4 h5 h6 div ul ol dl table") - elseif opentag =~ '^\(thead\|tfoot\|tbody)$' + let tags = ["p", "h1", "h2", "h3", "h4", "h5", "h6", "div", "ul", "ol", "dl", "table"] + elseif opentag =~ '^\(thead\|tfoot\|tbody\)$' let tags = ["tr"] elseif opentag == 'tr' - let tags = split("th td") + let tags = ["th", "td"] elseif opentag == 'table' - let tags = split("caption col colgroup thead tfoot tbody tr") + let tags = ["caption", "col", "colgroup", "thead", "tfoot", "tbody", "tr"] + else + return [] endif for m in tags - if m =~ a:base + if m =~ '^'.a:base call add(res, m) + elseif m =~ a:base + call add(res2, m) endif endfor - return res |