From 28ff569be3b7d4c94a09d1a4a29882758664c800 Mon Sep 17 00:00:00 2001 From: Yasuhiro Matsumoto Date: Thu, 27 Oct 2016 09:14:09 +0900 Subject: [PATCH] empty_element_suffix should be " />" for JSX Close #313 --- autoload/emmet.vim | 1 + autoload/emmet/lang/html.vim | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/autoload/emmet.vim b/autoload/emmet.vim index 5939e68..7316d31 100644 --- a/autoload/emmet.vim +++ b/autoload/emmet.vim @@ -1936,6 +1936,7 @@ let s:emmet_settings = { \ 'jsx': { \ 'extends': 'html', \ 'attribute_name': {'class': 'className', 'for': 'htmlFor'}, +\ 'empty_element_suffix': ' />', \ }, \ 'xslt': { \ 'extends': 'xsl', diff --git a/autoload/emmet/lang/html.vim b/autoload/emmet/lang/html.vim index 4ecb584..9eefc8d 100644 --- a/autoload/emmet/lang/html.vim +++ b/autoload/emmet/lang/html.vim @@ -442,6 +442,7 @@ 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_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) @@ -563,7 +564,7 @@ function! emmet#lang#html#toString(settings, current, type, inline, filters, ite let str = '\n" . str endif if stridx(','.settings.html.empty_elements.',', ','.current_name.',') != -1 - let str .= settings.html.empty_element_suffix + let str .= empty_element_suffix else let str .= '>' let text = current.value[1:-2]