VimPlug/emmet-vim
1
0
Fork 1
mirror of https://github.com/mattn/emmet-vim.git synced 2026-05-18 06:19:43 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Refactor util.vim: extract duplicated logic into helper functions

Browse Source 
- Extract header/body split logic into s:splitHeaderBody()
- Extract file-to-hex reading logic into s:resolveAndReadHex()
- Simplify setContent() by unifying three near-identical branches
This commit is contained in:
Yasuhiro Matsumoto
2026-03-20 22:16:47 +09:00
parent cc8b1a9f22
commit 3c17b27664
1 changed files with 48 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files
autoload/emmet/util.vim
+48 -84
View File
@@ -42,30 +42,16 @@ function! emmet#util#setContent(region, content) abort
call setpos('.', [0, a:region[0][0], a:region[0][1], 0]) call setpos('.', [0, a:region[0][0], a:region[0][1], 0])
silent! exe 'delete '.(a:region[1][0] - a:region[0][0]) silent! exe 'delete '.(a:region[1][0] - a:region[0][0])
if len(l:newlines) == 0 if len(l:newlines) == 0
let l:tmp = '' let l:newlines = ['']
if a:region[0][1] > 1 endif
let l:tmp = l:oldlines[0][:a:region[0][1]-2] if a:region[0][1] > 1
endif let l:newlines[0] = l:oldlines[0][:a:region[0][1]-2] . l:newlines[0]
if a:region[1][1] >= 1 endif
let l:tmp .= l:oldlines[-1][a:region[1][1]:] if a:region[1][1] >= 1
endif let l:newlines[-1] .= l:oldlines[-1][a:region[1][1]:]
call setline(line('.'), l:tmp) endif
elseif len(l:newlines) == 1 call setline(line('.'), l:newlines[0])
if a:region[0][1] > 1 if len(l:newlines) > 1
let l:newlines[0] = l:oldlines[0][:a:region[0][1]-2] . l:newlines[0]
endif
if a:region[1][1] >= 1
let l:newlines[0] .= l:oldlines[-1][a:region[1][1]:]
endif
call setline(line('.'), l:newlines[0])
else
if a:region[0][1] > 1
let l:newlines[0] = l:oldlines[0][:a:region[0][1]-2] . l:newlines[0]
endif
if a:region[1][1] >= 1
let l:newlines[-1] .= l:oldlines[-1][a:region[1][1]:]
endif
call setline(line('.'), l:newlines[0])
call append(line('.'), l:newlines[1:]) call append(line('.'), l:newlines[1:])
endif endif
endfunction endfunction
@@ -149,24 +135,21 @@ endfunction
"============================================================================== "==============================================================================
" html utils " html utils
"============================================================================== "==============================================================================
function! s:splitHeaderBody(res) abort
let l:pos = stridx(a:res, "\r\n\r\n")
if l:pos != -1
return [l:pos, strpart(a:res, l:pos+4)]
endif
let l:pos = stridx(a:res, "\n\n")
return [l:pos, strpart(a:res, l:pos+2)]
endfunction
function! emmet#util#getContentFromURL(url) abort function! emmet#util#getContentFromURL(url) abort
let l:res = system(printf('%s -i %s', g:emmet_curl_command, shellescape(substitute(a:url, '#.*', '', '')))) let l:res = system(printf('%s -i %s', g:emmet_curl_command, shellescape(substitute(a:url, '#.*', '', ''))))
while l:res =~# '^HTTP/1.\d 3' || l:res =~# '^HTTP/1\.\d 200 Connection established' || l:res =~# '^HTTP/1\.\d 100 Continue' while l:res =~# '^HTTP/1.\d 3' || l:res =~# '^HTTP/1\.\d 200 Connection established' || l:res =~# '^HTTP/1\.\d 100 Continue'
let l:pos = stridx(l:res, "\r\n\r\n") let [l:pos, l:res] = s:splitHeaderBody(l:res)
if l:pos != -1
let l:res = strpart(l:res, l:pos+4)
else
let l:pos = stridx(l:res, "\n\n")
let l:res = strpart(l:res, l:pos+2)
endif
endwhile endwhile
let l:pos = stridx(l:res, "\r\n\r\n") let [l:pos, l:content] = s:splitHeaderBody(l:res)
if l:pos != -1
let l:content = strpart(l:res, l:pos+4)
else
let l:pos = stridx(l:res, "\n\n")
let l:content = strpart(l:res, l:pos+2)
endif
let l:header = l:res[:l:pos-1] let l:header = l:res[:l:pos-1]
let l:charset = matchstr(l:content, '<meta[^>]\+content=["''][^;"'']\+;\s*charset=\zs[^;"'']\+\ze["''][^>]*>') let l:charset = matchstr(l:content, '<meta[^>]\+content=["''][^;"'']\+;\s*charset=\zs[^;"'']\+\ze["''][^>]*>')
if len(l:charset) == 0 if len(l:charset) == 0
@@ -221,6 +204,31 @@ function! emmet#util#getTextFromHTML(buf) abort
return l:res return l:res
endfunction endfunction
function! s:resolveAndReadHex(fn) abort
let l:fn = a:fn
if filereadable(l:fn)
return substitute(system('xxd -p '.shellescape(l:fn)), '\n', '', 'g')
endif
if l:fn !~# '^\w\+://'
let l:path = fnamemodify(expand('%'), ':p:gs?\\?/?')
if has('win32') || has('win64') |
let l:path = tolower(l:path)
endif
for l:k in keys(g:emmet_docroot)
let l:root = fnamemodify(l:k, ':p:gs?\\?/?')
if has('win32') || has('win64') |
let l:root = tolower(l:root)
endif
if stridx(l:path, l:root) == 0
let l:v = g:emmet_docroot[l:k]
let l:fn = (len(l:v) == 0 ? l:k : l:v) . l:fn
break
endif
endfor
endif
return substitute(system(g:emmet_curl_command.' '.shellescape(l:fn).' | xxd -p'), '\n', '', 'g')
endfunction
function! emmet#util#getImageSize(fn) abort function! emmet#util#getImageSize(fn) abort
let l:fn = a:fn let l:fn = a:fn
@@ -228,28 +236,7 @@ function! emmet#util#getImageSize(fn) abort
return emmet#util#imageSizeWithImageMagick(l:fn) return emmet#util#imageSizeWithImageMagick(l:fn)
endif endif
if filereadable(l:fn) let l:hex = s:resolveAndReadHex(l:fn)
let l:hex = substitute(system('xxd -p '.shellescape(l:fn)), '\n', '', 'g')
else
if l:fn !~# '^\w\+://'
let l:path = fnamemodify(expand('%'), ':p:gs?\\?/?')
if has('win32') || has('win64') |
let l:path = tolower(l:path)
endif
for l:k in keys(g:emmet_docroot)
let l:root = fnamemodify(l:k, ':p:gs?\\?/?')
if has('win32') || has('win64') |
let l:root = tolower(l:root)
endif
if stridx(l:path, l:root) == 0
let l:v = g:emmet_docroot[l:k]
let l:fn = (len(l:v) == 0 ? l:k : l:v) . l:fn
break
endif
endfor
endif
let l:hex = substitute(system(g:emmet_curl_command.' '.shellescape(l:fn).' | xxd -p'), '\n', '', 'g')
endif
let [l:width, l:height] = [-1, -1] let [l:width, l:height] = [-1, -1]
if l:hex =~# '^89504e470d0a1a0a' if l:hex =~# '^89504e470d0a1a0a'
@@ -319,30 +306,7 @@ function! s:b64encode(bytes, table, pad)
endfunction endfunction
function! emmet#util#imageEncodeDecode(fn, flag) abort function! emmet#util#imageEncodeDecode(fn, flag) abort
let l:fn = a:fn let l:hex = s:resolveAndReadHex(a:fn)
if filereadable(l:fn)
let l:hex = substitute(system('xxd -p '.shellescape(l:fn)), '\n', '', 'g')
else
if l:fn !~# '^\w\+://'
let l:path = fnamemodify(expand('%'), ':p:gs?\\?/?')
if has('win32') || has('win64') |
let l:path = tolower(l:path)
endif
for l:k in keys(g:emmet_docroot)
let l:root = fnamemodify(l:k, ':p:gs?\\?/?')
if has('win32') || has('win64') |
let l:root = tolower(l:root)
endif
if stridx(l:path, l:root) == 0
let l:v = g:emmet_docroot[l:k]
let l:fn = (len(l:v) == 0 ? l:k : l:v) . l:fn
break
endif
endfor
endif
let l:hex = substitute(system(g:emmet_curl_command.' '.shellescape(l:fn).' | xxd -p'), '\n', '', 'g')
endif
let l:bin = map(split(l:hex, '..\zs'), 'eval("0x" . v:val)') let l:bin = map(split(l:hex, '..\zs'), 'eval("0x" . v:val)')
let l:table = split('ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/', '\zs') let l:table = split('ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/', '\zs')