element configuration should be overridable

Fixes #432
This commit is contained in:
Yasuhiro Matsumoto
2018-08-07 16:03:23 +09:00
parent dcf8f6efd8
commit 645258ddd4
2 changed files with 8 additions and 1 deletions

View File

@@ -1882,6 +1882,12 @@ let s:emmet_settings = {
\ 'indentation': ' ', \ 'indentation': ' ',
\ 'extends': 'html', \ 'extends': 'html',
\ }, \ },
\ 'xml': {
\ 'extends': 'html',
\ 'empty_elements': '',
\ 'block_elements': '',
\ 'inline_elements': '',
\ },
\ 'htmldjango': { \ 'htmldjango': {
\ 'extends': 'html', \ 'extends': 'html',
\ }, \ },

View File

@@ -464,6 +464,7 @@ function! emmet#lang#html#toString(settings, current, type, inline, filters, ite
let q = emmet#getResource(type, 'quote_char', '"') let q = emmet#getResource(type, 'quote_char', '"')
let ct = emmet#getResource(type, 'comment_type', 'both') let ct = emmet#getResource(type, 'comment_type', 'both')
let an = emmet#getResource(type, 'attribute_name', {}) let an = emmet#getResource(type, 'attribute_name', {})
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) let empty_element_suffix = emmet#getResource(type, 'empty_element_suffix', settings.html.empty_element_suffix)
if emmet#useFilter(filters, 'haml') if emmet#useFilter(filters, 'haml')
@@ -587,7 +588,7 @@ function! emmet#lang#html#toString(settings, current, type, inline, filters, ite
endif endif
if current.empty if current.empty
let str .= ' />' let str .= ' />'
elseif stridx(','.settings.html.empty_elements.',', ','.current_name.',') != -1 elseif stridx(','.empty_elements.',', ','.current_name.',') != -1
let str .= empty_element_suffix let str .= empty_element_suffix
else else
let str .= '>' let str .= '>'