diff --git a/autoload/emmet/lang/css.vim b/autoload/emmet/lang/css.vim index 8217c4d..b3977ab 100644 --- a/autoload/emmet/lang/css.vim +++ b/autoload/emmet/lang/css.vim @@ -368,3 +368,7 @@ endfunction function! emmet#lang#css#removeTag() abort " nothing to do endfunction + +function! emmet#lang#css#mergeLines() abort + " nothing to do +endfunction diff --git a/autoload/emmet/lang/elm.vim b/autoload/emmet/lang/elm.vim index 5bb5331..ce663bd 100644 --- a/autoload/emmet/lang/elm.vim +++ b/autoload/emmet/lang/elm.vim @@ -208,7 +208,34 @@ function! emmet#lang#elm#toString(settings, current, type, inline, filters, item endif let str .= "\n" - return str - +endfunction + +function! emmet#lang#elm#imageEncode() abort +endfunction + +function! emmet#lang#elm#parseTag(tag) abort + return {} +endfunction + +function! emmet#lang#elm#toggleComment() abort +endfunction + +function! emmet#lang#elm#balanceTag(flag) range abort +endfunction + +function! emmet#lang#elm#moveNextPrevItem(flag) abort + return emmet#lang#elm#moveNextPrev(a:flag) +endfunction + +function! emmet#lang#elm#moveNextPrev(flag) abort +endfunction + +function! emmet#lang#elm#splitJoinTag() abort +endfunction + +function! emmet#lang#elm#removeTag() abort +endfunction + +function! emmet#lang#elm#mergeLines() abort endfunction diff --git a/autoload/emmet/lang/haml.vim b/autoload/emmet/lang/haml.vim index ccec8ad..7ea97d1 100644 --- a/autoload/emmet/lang/haml.vim +++ b/autoload/emmet/lang/haml.vim @@ -332,3 +332,6 @@ function! emmet#lang#haml#removeTag() abort exe sn ',' (n-1) 'delete' endif endfunction + +function! emmet#lang#haml#mergeLines() abort +endfunction diff --git a/autoload/emmet/lang/html.vim b/autoload/emmet/lang/html.vim index b6445f7..e9a23f3 100644 --- a/autoload/emmet/lang/html.vim +++ b/autoload/emmet/lang/html.vim @@ -955,10 +955,8 @@ function! emmet#lang#html#removeTag() abort call setpos('.', [0, pos1[0], pos1[1], 0]) let pos2 = searchpairpos('<'. tag_name[1:] . '\>[^/>]*>', '', '', 'W') else - echomsg string(tag_name) let pos2 = searchpairpos('<'. tag_name . '[^/>]*>', '', '', 'W') endif - echomsg string(pos2) if pos2 == [0, 0] return endif @@ -968,12 +966,44 @@ function! emmet#lang#html#removeTag() abort call emmet#util#setContent(block, '') call setpos('.', [0, block[0][0], block[0][1], 0]) return + endif + if block[0][0] > 0 + call setpos('.', [0, block[0][0]-1, block[0][1], 0]) else - if block[0][0] > 0 - call setpos('.', [0, block[0][0]-1, block[0][1], 0]) - else - call setpos('.', curpos) - return - endif + call setpos('.', curpos) + endif +endfunction + +function! emmet#lang#html#mergeLines() abort + let curpos = emmet#util#getcurpos() + let mx = '<\(/\{0,1}[a-zA-Z][-a-zA-Z0-9:_\-]*\)\%(\%(\s[a-zA-Z][a-zA-Z0-9]\+=\%([^"'' \t]\+\|"[^"]\{-}"\|''[^'']\{-}''\)\s*\)*\)\s*\%(/\{0,1}\)>' + + let pos1 = searchpos(mx, 'bcnW') + let content = matchstr(getline(pos1[0])[pos1[1]-1:], mx) + let tag_name = substitute(content, '^<\(/\{0,1}[a-zA-Z][a-zA-Z0-9:_\-]*\).*$', '\1', '') + let block = [pos1, [pos1[0], pos1[1] + len(content) - 1]] + if content[-2:] ==# '/>' && emmet#util#cursorInRegion(block) + call setpos('.', [0, block[0][0], block[0][1], 0]) + return + endif + if tag_name[0] ==# '/' + let pos1 = searchpos('<' . tag_name[1:] . '[^a-zA-Z0-9]', 'bcnW') + call setpos('.', [0, pos1[0], pos1[1], 0]) + let pos2 = searchpairpos('<'. tag_name[1:] . '\>[^/>]*>', '', '', 'W') + else + let pos2 = searchpairpos('<'. tag_name . '[^/>]*>', '', '', 'W') + endif + if pos2 == [0, 0] + return + endif + let pos2 = searchpos('>', 'neW') + let block = [pos1, pos2] + let content = emmet#util#getContent(block) + let content = join(map(split(content, mx . '\zs\s*'), 'trim(v:val)'), '') + call emmet#util#setContent(block, content) + if block[0][0] > 0 + call setpos('.', [0, block[0][0], block[0][1], 0]) + else + call setpos('.', curpos) endif endfunction diff --git a/autoload/emmet/lang/jade.vim b/autoload/emmet/lang/jade.vim index 6a59e87..f59f22d 100644 --- a/autoload/emmet/lang/jade.vim +++ b/autoload/emmet/lang/jade.vim @@ -329,3 +329,7 @@ function! emmet#lang#jade#removeTag() abort exe sn ',' (n-1) 'delete' endif endfunction + +function! emmet#lang#jade#mergeLines() abort + " nothing to do +endfunction diff --git a/autoload/emmet/lang/less.vim b/autoload/emmet/lang/less.vim index 088f8c2..ae956c4 100644 --- a/autoload/emmet/lang/less.vim +++ b/autoload/emmet/lang/less.vim @@ -45,3 +45,7 @@ endfunction function! emmet#lang#less#removeTag() abort call emmet#lang#css#removeTag() endfunction + +function! emmet#lang#less#mergeLines() abort + call emmet#lang#css#mergeLines() +endfunction diff --git a/autoload/emmet/lang/sass.vim b/autoload/emmet/lang/sass.vim index 49012cb..3d3fd58 100644 --- a/autoload/emmet/lang/sass.vim +++ b/autoload/emmet/lang/sass.vim @@ -158,3 +158,6 @@ endfunction function! emmet#lang#sass#removeTag() abort endfunction + +function! emmet#lang#sass#mergeLines() abort +endfunction diff --git a/autoload/emmet/lang/scss.vim b/autoload/emmet/lang/scss.vim index ad2253d..ae35469 100644 --- a/autoload/emmet/lang/scss.vim +++ b/autoload/emmet/lang/scss.vim @@ -123,3 +123,7 @@ endfunction function! emmet#lang#scss#removeTag() abort call emmet#lang#css#removeTag() endfunction + +function! emmet#lang#scss#mergeLines() abort + call emmet#lang#css#mergeLines() +endfunction diff --git a/autoload/emmet/lang/slim.vim b/autoload/emmet/lang/slim.vim index eb816a6..c583c1c 100644 --- a/autoload/emmet/lang/slim.vim +++ b/autoload/emmet/lang/slim.vim @@ -279,3 +279,6 @@ function! emmet#lang#slim#removeTag() abort exe sn ',' (n-1) 'delete' endif endfunction + +function! emmet#lang#slim#mergeLines() abort +endfunction