Added vim-surround and html_autoclosetag

This commit is contained in:
Dreaded_X 2014-10-24 22:53:27 +02:00
parent d8798e5353
commit 71bfee84b7
4 changed files with 76 additions and 4 deletions

6
.gitmodules vendored
View File

@ -28,9 +28,6 @@
[submodule "vim/bundle/vim-blockify"] [submodule "vim/bundle/vim-blockify"]
path = vim/bundle/vim-blockify path = vim/bundle/vim-blockify
url = git@github.com:mhinz/vim-blockify.git url = git@github.com:mhinz/vim-blockify.git
[submodule "vim/bundle/MatchTagAlways"]
path = vim/bundle/MatchTagAlways
url = git@github.com:Valloric/MatchTagAlways.git
[submodule "vim/bundle/vim-interestingwords"] [submodule "vim/bundle/vim-interestingwords"]
path = vim/bundle/vim-interestingwords path = vim/bundle/vim-interestingwords
url = git@github.com:vasconcelloslf/vim-interestingwords.git url = git@github.com:vasconcelloslf/vim-interestingwords.git
@ -40,3 +37,6 @@
[submodule "vim/bundle/tabular"] [submodule "vim/bundle/tabular"]
path = vim/bundle/tabular path = vim/bundle/tabular
url = git@github.com:godlygeek/tabular.git url = git@github.com:godlygeek/tabular.git
[submodule "vim/bundle/vim-surround"]
path = vim/bundle/vim-surround
url = git@github.com:tpope/vim-surround.git

@ -1 +0,0 @@
Subproject commit ca74f05648ee66d6e43a1b54ba89969912ec79f2

@ -0,0 +1 @@
Subproject commit fa433e0b7330753688f715f3be5d10dc480f20e5

View File

@ -0,0 +1,72 @@
" File: HTML AutoCloseTag.vim
" Author: Michael Sanders (msanders42 [at] gmail [dot] com)
" Last Updated: April 7 2009
" Version: 0.3
" Description: Automatically closes HTML tag once you finish typing it with >
if exists('b:mapped_auto_closetag') || &cp | finish | endif
let b:mapped_auto_closetag = 1
ino <buffer> <silent> < <><left>
ino <buffer> <silent> > <c-r>=<SID>CloseTag()<cr>
ino <buffer> <expr> <cr> <SID>Return()
if exists('s:did_auto_closetag') | finish | endif
let s:did_auto_closetag = 1
" Gets the current HTML tag by the cursor.
fun s:GetCurrentTag()
return matchstr(matchstr(getline('.'),
\ '<\zs\(\w\|=\| \|''\|"\)*>\%'.col('.').'c'), '^\a*')
endf
" Cleanly return after autocompleting an html/xml tag.
fun s:Return()
let tag = s:GetCurrentTag()
return tag != '' && match(getline('.'), '</'.tag.'>') > -1 ?
\ "\<cr>\<cr>\<up>" : "\<cr>"
endf
fun s:InComment()
return stridx(synIDattr(synID(line('.'), col('.')-1, 0), 'name'), 'omment') != -1
endf
" Counts occurance of needle in page, when not in a comment.
fun s:CountInPage(needle)
let pos = [line('.'), col('.')]
call cursor(1, 1)
let counter = search(a:needle, 'Wc')
while search(a:needle, 'W')
if !s:InComment() | let counter += 1 | endif
endw
call cursor(pos)
return counter
endf
" Returns whether a closing tag has already been inserted.
fun s:ClosingTag(tag)
return s:CountInPage('\c<'.a:tag.'.\{-}>') <= s:CountInPage('\c</'.a:tag.'>')
endf
" Automatically inserts closing tag after starting tag is typed
fun s:CloseTag()
let line = getline('.')
let col = col('.')
if line[col-1] != '>' | return '>' | endif
let col += 1
call cursor(0, col)
" Don't autocomplete next to a word or another tag or if inside comment
if line[col] !~ '\w\|<\|>' && !s:InComment()
let tag = s:GetCurrentTag()
" Insert closing tag if tag is not self-closing and has not already
" been closed
if tag != '' && tag !~ '\vimg|input|link|meta|br|hr|area|base|param|dd|dt'
\ && !s:ClosingTag(tag)
let line = substitute(line, '\%'.col.'c', '</'.escape(tag, '/').'>', '')
call setline('.', line)
call cursor(0, col)
endif
endif
return ''
endf
" vim:noet:sw=4:ts=4:ft=vim