VimPlug/emmet-vim
1
0
Fork 1
mirror of https://github.com/mattn/emmet-vim.git synced 2025-12-06 18:54:27 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Compare commits

base: VimPlug:74d582b66eb75ee2bc2de0a5264bb0c879ae1a11
Branches Tags
VimPlug:master VimPlug:styled VimPlug:fix-abbr VimPlug:fix287 VimPlug:gh-pages VimPlug:wip
VimPlug:emmet
..
compare: VimPlug:master
Branches Tags
VimPlug:master VimPlug:styled VimPlug:fix-abbr VimPlug:fix287 VimPlug:gh-pages VimPlug:wip
VimPlug:emmet

2 Commits
74d582b66e ... master

Author SHA1 Message Date
mattn
e983971449 Merge pull request #566 from mmppppss/master 
fix bug in len() invalid
 2025-07-15 11:44:13 +09:00
Pedro Pozo
56199c129a fix bugemmet.vim 
in files with double extension type: "hola.txt.md" it generated an error
it is because you were passing a null to len() that detects if the file does not have an extension len(type)==0
 2025-07-14 21:12:24 -04:00
2 changed files with 11 additions and 15 deletions
Expand all files Collapse all files

2
autoload/emmet.vim
View File

@@ -430,7 +430,7 @@ function! emmet#getFileType(...) abort
endfor
endif
return len(type) == 0 ? 'html' : type
return empty(type) ? 'html' : type
endfunction
function! emmet#getDollarExprs(expand) abort

24
autoload/emmet/lang/html.vim
View File

@@ -269,7 +269,7 @@ function! emmet#lang#html#parseIntoTree(abbr, type) abort
endif
endfor
endif
if has_key(default_attributes, current.name)
if has_key(settings.html.default_attributes, current.name)
let current.name = substitute(current.name, ':.*$', '', '')
endif
break
@@ -483,12 +483,8 @@ function! emmet#lang#html#toString(settings, current, type, inline, filters, ite
let q = emmet#getResource(type, 'quote_char', '"')
let ct = emmet#getResource(type, 'comment_type', 'both')
let an = emmet#getResource(type, 'attribute_name', {})
let empty_elements = emmet#getResource(type, 'empty_elements', '')
let empty_element_suffix = emmet#getResource(type, 'empty_element_suffix', '')
let inline_elements = emmet#getResource(type, 'inline_elements', '')
let block_elements = emmet#getResource(type, 'block_elements', '')
let indent_blockelement = emmet#getResource(type, 'indent_blockelement', '')
let block_all_childless = emmet#getResource(type, 'block_all_childless', 0)
let empty_elements = emmet#getResource(type, 'empty_elements', settings.html.empty_elements)
let empty_element_suffix = emmet#getResource(type, 'empty_element_suffix', settings.html.empty_element_suffix)
if emmet#useFilter(filters, 'haml')
return emmet#lang#haml#toString(settings, current, type, inline, filters, itemno, indent)
@@ -636,11 +632,11 @@ function! emmet#lang#html#toString(settings, current, type, inline, filters, ite
if nc > 0
for n in range(nc)
let child = current.child[n]
if child.multiplier > 1 || (child.multiplier == 1 && len(child.child) > 0 && stridx(','.inline_elements.',', ','.current_name.',') == -1) || block_all_childless
if child.multiplier > 1 || (child.multiplier == 1 && len(child.child) > 0 && stridx(','.settings.html.inline_elements.',', ','.current_name.',') == -1) || settings.html.block_all_childless
let str .= "\n" . indent
let dr = 1
elseif len(current_name) > 0 && stridx(','.inline_elements.',', ','.current_name.',') == -1
if nc > 1 || (len(child.name) > 0 && stridx(','.inline_elements.',', ','.child.name.',') == -1)
elseif len(current_name) > 0 && stridx(','.settings.html.inline_elements.',', ','.current_name.',') == -1
if nc > 1 || (len(child.name) > 0 && stridx(','.settings.html.inline_elements.',', ','.child.name.',') == -1)
let str .= "\n" . indent
let dr = 1
elseif current.multiplier == 1 && nc == 1 && len(child.name) == 0
@@ -655,7 +651,7 @@ function! emmet#lang#html#toString(settings, current, type, inline, filters, ite
let str .= inner
endfor
else
if indent_blockelement && len(current_name) > 0 && stridx(','.inline_elements.',', ','.current_name.',') == -1 || block_all_childless
if settings.html.indent_blockelement && len(current_name) > 0 && stridx(','.settings.html.inline_elements.',', ','.current_name.',') == -1 || settings.html.block_all_childless
let str .= "\n" . indent . '${cursor}' . "\n"
else
let str .= '${cursor}'
@@ -673,7 +669,7 @@ function! emmet#lang#html#toString(settings, current, type, inline, filters, ite
let str .= "\n<!-- /" . comment . ' -->'
endif
endif
if len(current_name) > 0 && current.multiplier > 0 || stridx(','.block_elements.',', ','.current_name.',') != -1
if len(current_name) > 0 && current.multiplier > 0 || stridx(','.settings.html.block_elements.',', ','.current_name.',') != -1
let str .= "\n"
endif
return str
@@ -842,7 +838,7 @@ function! emmet#lang#html#balanceTag(flag) range abort
let pos1 = searchpos(mx, 'bW')
let content = matchstr(getline(pos1[0])[pos1[1]-1:], mx)
let tag_name = matchstr(content, '^<\zs[a-zA-Z0-9:_\-]*\ze')
if stridx(','.empty_elements.',', ','.tag_name.',') != -1
if stridx(','.settings.html.empty_elements.',', ','.tag_name.',') != -1
let pos2 = searchpos('>', 'nW')
else
let pos2 = searchpairpos('<' . tag_name . '[^>]*>', '', '</'. tag_name . '\zs>', 'nW')
@@ -875,7 +871,7 @@ function! emmet#lang#html#balanceTag(flag) range abort
endif
let content = matchstr(getline(pos1[0])[pos1[1]-1:], mx)
let tag_name = matchstr(content, '^<\zs[a-zA-Z0-9:_\-]*\ze')
if stridx(','.empty_elements.',', ','.tag_name.',') != -1
if stridx(','.settings.html.empty_elements.',', ','.tag_name.',') != -1
let pos2 = searchpos('>', 'nW')
else
let pos2 = searchpairpos('<' . tag_name . '[^>]*>', '', '</'. tag_name . '\zs>', 'nW')