Skip to content

Amend the current tag regex to match tags like my-tag #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
AshinGau wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Amend the current tag regex to match tags like my-tag #3

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
85eb3b5
Fix <h1>|<h> issue, <a href="#">| issue
tylerbrazier Sep 29, 2015
b17a369
Update list of void elements for html 5
tylerbrazier Sep 29, 2015
bd7bd7f
Bug fix <a><div>|</a> didn't close div
tylerbrazier Sep 29, 2015
9f154a7
Amend the current tag regex to match tags like my-tag
AshinGau Jul 22, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions ftplugin/html_autoclosetag.vim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@ 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*')
return matchstr(matchstr(getline('.'), '.*<\zs.\+>\%'.col('.').'c'), '^[0-9A-Za-z_\-]*')
endf

" Cleanly return after autocompleting an html/xml tag.
Expand Down Expand Up @@ -59,8 +58,8 @@ fun s:CloseTag()
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'
" been closed. http://www.w3.org/TR/html5/syntax.html#void-elements
if tag != '' && tag !~ '\varea|base|br|col|embed|hr|img|input|keygen|link|meta|param|source|track|wbr'
\ && !s:ClosingTag(tag)
let line = substitute(line, '\%'.col.'c', '</'.escape(tag, '/').'>', '')
call setline('.', line)
Expand Down