diff --git a/autoload/zencoding.vim b/autoload/zencoding.vim index 0ac59c9..bd8131f 100644 --- a/autoload/zencoding.vim +++ b/autoload/zencoding.vim @@ -435,17 +435,17 @@ function! zencoding#toggleComment() let curpos = getpos('.') let mx = '<\%#[^>]*>' while 1 - let block = zencoding#util#search_region('') - if zencoding#util#region_is_valid(block) + let block = zencoding#util#searchRegion('') + if zencoding#util#regionIsValid(block) let block[1][1] += 2 - let content = zencoding#util#get_content(block) + let content = zencoding#util#getContent(block) let content = substitute(content, '^$', '\1', '') - call zencoding#util#change_content(block, content) + call zencoding#util#setContent(block, content) silent! call setpos('.', orgpos) return endif - let block = zencoding#util#search_region('<[^>]', '>') - if !zencoding#util#region_is_valid(block) + let block = zencoding#util#searchRegion('<[^>]', '>') + if !zencoding#util#regionIsValid(block) let pos1 = searchpos('<', 'bcW') if pos1[0] == 0 && pos1[1] == 0 return @@ -455,7 +455,7 @@ function! zencoding#toggleComment() endif let pos1 = block[0] let pos2 = block[1] - let content = zencoding#util#get_content(block) + let content = zencoding#util#getContent(block) let tag_name = matchstr(content, '^<\zs/\{0,1}[^ \r\n>]\+') if tag_name[0] == '/' call setpos('.', [0, pos1[0], pos1[1], 0]) @@ -463,12 +463,12 @@ function! zencoding#toggleComment() let pos1 = searchpos('>', 'cneW') let block = [pos2, pos1] elseif tag_name =~ '/$' - if !zencoding#util#point_in_region(orgpos[1:2], block) + if !zencoding#util#pointInRegion(orgpos[1:2], block) " it's broken tree call setpos('.', orgpos) - let block = zencoding#util#search_region('>', '<') - let content = '><' - call zencoding#util#change_content(block, content) + let block = zencoding#util#searchRegion('>', '<') + let content = '><' + call zencoding#util#setContent(block, content) silent! call setpos('.', orgpos) return endif @@ -479,13 +479,13 @@ function! zencoding#toggleComment() let pos2 = searchpos('>', 'cneW') let block = [pos1, pos2] endif - if !zencoding#util#region_is_valid(block) + if !zencoding#util#regionIsValid(block) silent! call setpos('.', orgpos) return endif - if zencoding#util#point_in_region(curpos[1:2], block) - let content = '' - call zencoding#util#change_content(block, content) + if zencoding#util#pointInRegion(curpos[1:2], block) + let content = '' + call zencoding#util#setContent(block, content) silent! call setpos('.', orgpos) return endif @@ -500,9 +500,9 @@ function! zencoding#splitJoinTag() 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:] == '/>' && zencoding#util#cursor_in_region(block) + if content[-2:] == '/>' && zencoding#util#cursorInRegion(block) let content = content[:-3] . ">' - call zencoding#util#change_content(block, content) + call zencoding#util#setContent(block, content) call setpos('.', [0, block[0][0], block[0][1], 0]) return else @@ -514,10 +514,10 @@ function! zencoding#splitJoinTag() let pos2 = searchpos('', 'cneW') endif let block = [pos1, pos2] - let content = zencoding#util#get_content(block) - if zencoding#util#point_in_region(curpos[1:2], block) && content[1:] !~ '<' . tag_name . '[^a-zA-Z0-9]*[^>]*>' + let content = zencoding#util#getContent(block) + if zencoding#util#pointInRegion(curpos[1:2], block) && content[1:] !~ '<' . tag_name . '[^a-zA-Z0-9]*[^>]*>' let content = matchstr(content, mx)[:-2] . '/>' - call zencoding#util#change_content(block, content) + call zencoding#util#setContent(block, content) call setpos('.', [0, block[0][0], block[0][1], 0]) return else @@ -547,8 +547,8 @@ function! zencoding#removeTag() let content = matchstr(getline(pos1[0])[pos1[1]-1:], mx) let tag_name = substitute(content, '^<\(/\{0,1}[a-zA-Z0-9:_\-]*\).*$', '\1', '') let block = [pos1, [pos1[0], pos1[1] + len(content) - 1]] - if content[-2:] == '/>' && zencoding#util#cursor_in_region(block) - call zencoding#util#change_content(block, '') + if content[-2:] == '/>' && zencoding#util#cursorInRegion(block) + call zencoding#util#setContent(block, '') call setpos('.', [0, block[0][0], block[0][1], 0]) return else @@ -560,9 +560,9 @@ function! zencoding#removeTag() let pos2 = searchpos('', 'cneW') endif let block = [pos1, pos2] - let content = zencoding#util#get_content(block) - if zencoding#util#point_in_region(curpos[1:2], block) && content[1:] !~ '<' . tag_name . '[^a-zA-Z0-9]*[^>]*>' - call zencoding#util#change_content(block, '') + let content = zencoding#util#getContent(block) + if zencoding#util#pointInRegion(curpos[1:2], block) && content[1:] !~ '<' . tag_name . '[^a-zA-Z0-9]*[^>]*>' + call zencoding#util#setContent(block, '') call setpos('.', [0, block[0][0], block[0][1], 0]) return else @@ -578,7 +578,7 @@ function! zencoding#removeTag() endfunction function! zencoding#balanceTag(flag) range - let vblock = zencoding#util#get_visualblock() + let vblock = zencoding#util#getVisualBlock() if a:flag == -2 || a:flag == 2 let curpos = [0, line("'<"), col("'<"), 0] else @@ -590,11 +590,11 @@ function! zencoding#balanceTag(flag) range let content = matchstr(getline(pos1[0])[pos1[1]-1:], mx) let tag_name = substitute(content, '^<\(/\{0,1}[a-zA-Z0-9:_\-]*\).*$', '\1', '') let block = [pos1, [pos1[0], pos1[1] + len(content) - 1]] - if !zencoding#util#region_is_valid(block) + if !zencoding#util#regionIsValid(block) break endif - if content[-2:] == '/>' && zencoding#util#point_in_region(curpos[1:2], block) - call zencoding#util#select_region(block) + if content[-2:] == '/>' && zencoding#util#pointInRegion(curpos[1:2], block) + call zencoding#util#selectRegion(block) return else if tag_name[0] == '/' @@ -608,14 +608,14 @@ function! zencoding#balanceTag(flag) range let pos2 = searchpos('', 'cneW') endif let block = [pos1, pos2] - if !zencoding#util#region_is_valid(block) + if !zencoding#util#regionIsValid(block) break endif - let content = zencoding#util#get_content(block) + let content = zencoding#util#getContent(block) if a:flag == -2 - let check = zencoding#util#region_in_region(vblock, block) && content[1:] !~ '<' . tag_name . '[^a-zA-Z0-9]*[^>]*>' + let check = zencoding#util#regionInRegion(vblock, block) && content[1:] !~ '<' . tag_name . '[^a-zA-Z0-9]*[^>]*>' else - let check = zencoding#util#point_in_region(curpos[1:2], block) && content[1:] !~ '<' . tag_name . '[^a-zA-Z0-9]*[^>]*>' + let check = zencoding#util#pointInRegion(curpos[1:2], block) && content[1:] !~ '<' . tag_name . '[^a-zA-Z0-9]*[^>]*>' endif if check if a:flag < 0 @@ -631,10 +631,10 @@ function! zencoding#balanceTag(flag) range let pos2 = searchpos('', 'cneW') endif let block = [pos1, pos2] - call zencoding#util#select_region(block) + call zencoding#util#selectRegion(block) return else - if zencoding#util#region_is_valid(block) + if zencoding#util#regionIsValid(block) if a:flag == -2 if setpos('.', [0, block[0][0]+1, block[0][1], 0]) == -1 break @@ -662,14 +662,14 @@ function! zencoding#anchorizeURL(flag) let pos1 = searchpos(mx, 'bcnW') let url = matchstr(getline(pos1[0])[pos1[1]-1:], mx) let block = [pos1, [pos1[0], pos1[1] + len(url) - 1]] - if !zencoding#util#cursor_in_region(block) + if !zencoding#util#cursorInRegion(block) return endif let mx = '.*]*>\s*\zs\([^<]\+\)\ze\s*<\/title[^>]*>.*' - let content = zencoding#util#get_content_from_url(url, 0) + let content = zencoding#util#getContentFromURL(url, 0) if len(matchstr(content, mx)) == 0 - let content = zencoding#util#get_content_from_url(url, 1) + let content = zencoding#util#getContentFromURL(url, 1) endif let content = substitute(content, '\r', '', 'g') let content = substitute(content, '[ \n]\+', ' ', 'g') @@ -683,7 +683,7 @@ function! zencoding#anchorizeURL(flag) let expand = zencoding#toString(a, 'html', 0, []) let expand = substitute(expand, '\${cursor}', '', 'g') else - let body = zencoding#util#get_text_from_html(content) + let body = zencoding#util#getTextFromHTML(content) let body = '{' . substitute(body, '^\(.\{0,100}\).*', '\1', '') . '...}' let blockquote = zencoding#lang#html#parseTag('
') @@ -703,7 +703,7 @@ function! zencoding#anchorizeURL(flag) let indent = substitute(getline('.'), '^\(\s*\).*', '\1', '') let expand = substitute(expand, "\n", "\n" . indent, 'g') endif - call zencoding#util#change_content(block, expand) + call zencoding#util#setContent(block, expand) endfunction function! zencoding#ExpandWord(abbr, type, orig) diff --git a/autoload/zencoding/lang/html.vim b/autoload/zencoding/lang/html.vim index c0e321b..239b82c 100644 --- a/autoload/zencoding/lang/html.vim +++ b/autoload/zencoding/lang/html.vim @@ -384,11 +384,11 @@ function! zencoding#lang#html#toString(settings, current, type, inline, filters, endfunction function! zencoding#lang#html#imageSize() - let img_region = zencoding#util#search_region('') - if !zencoding#util#region_is_valid(img_region) || !zencoding#util#cursor_in_region(img_region) + let img_region = zencoding#util#searchRegion('') + if !zencoding#util#regionIsValid(img_region) || !zencoding#util#cursorInRegion(img_region) return endif - let content = zencoding#util#get_content(img_region) + let content = zencoding#util#getContent(img_region) if content !~ '^<]\+>$' return endif @@ -408,7 +408,7 @@ function! zencoding#lang#html#imageSize() let current.attr.width = width let current.attr.height = height let html = zencoding#toString(current, 'html', 1) - call zencoding#util#change_content(img_region, html) + call zencoding#util#setContent(img_region, html) endfunction function! zencoding#lang#html#parseTag(tag) diff --git a/autoload/zencoding/util.vim b/autoload/zencoding/util.vim index fc5ebfd..22b3d4c 100644 --- a/autoload/zencoding/util.vim +++ b/autoload/zencoding/util.vim @@ -1,7 +1,7 @@ "============================================================================== " region utils "============================================================================== -" delete_content : delete content in region +" deleteContent : delete content in region " if region make from between '' and '' " -------------------- " begin: @@ -11,7 +11,7 @@ " -------------------- " begin::end " -------------------- -function! zencoding#util#delete_content(region) +function! zencoding#util#deleteContent(region) let lines = getline(a:region[0][0], a:region[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]) @@ -36,7 +36,7 @@ endfunction " bar " baz:end " -------------------- -function! zencoding#util#change_content(region, content) +function! zencoding#util#setContent(region, content) let newlines = split(a:content, '\n', 1) let oldlines = getline(a:region[0][0], a:region[1][0]) call setpos('.', [0, a:region[0][0], a:region[0][1], 0]) @@ -72,7 +72,7 @@ endfunction " select_region : select region " this function make a selection of region -function! zencoding#util#select_region(region) +function! zencoding#util#selectRegion(region) call setpos('.', [0, a:region[1][0], a:region[1][1], 0]) normal! v call setpos('.', [0, a:region[0][0], a:region[0][1], 0]) @@ -80,8 +80,8 @@ endfunction " point_in_region : check point is in the region " this function return 0 or 1 -function! zencoding#util#point_in_region(point, region) - if !zencoding#util#region_is_valid(a:region) | return 0 | endif +function! zencoding#util#pointInRegion(point, region) + if !zencoding#util#regionIsValid(a:region) | return 0 | endif if a:region[0][0] > a:point[0] | return 0 | endif if a:region[1][0] < a:point[0] | return 0 | endif if a:region[0][0] == a:point[0] && a:region[0][1] > a:point[1] | return 0 | endif @@ -91,29 +91,29 @@ endfunction " cursor_in_region : check cursor is in the region " this function return 0 or 1 -function! zencoding#util#cursor_in_region(region) - if !zencoding#util#region_is_valid(a:region) | return 0 | endif +function! zencoding#util#cursorInRegion(region) + if !zencoding#util#regionIsValid(a:region) | return 0 | endif let cur = getpos('.')[1:2] - return zencoding#util#point_in_region(cur, a:region) + return zencoding#util#pointInRegion(cur, a:region) endfunction " region_is_valid : check region is valid " this function return 0 or 1 -function! zencoding#util#region_is_valid(region) +function! zencoding#util#regionIsValid(region) if a:region[0][0] == 0 || a:region[1][0] == 0 | return 0 | endif return 1 endfunction " search_region : make region from pattern which is composing start/end " this function return array of position -function! zencoding#util#search_region(start, end) +function! zencoding#util#searchRegion(start, end) return [searchpairpos(a:start, '', a:end, 'bcnW'), searchpairpos(a:start, '\%#', a:end, 'nW')] endfunction " get_content : get content in region " this function return string in region -function! zencoding#util#get_content(region) - if !zencoding#util#region_is_valid(a:region) +function! zencoding#util#getContent(region) + if !zencoding#util#regionIsValid(a:region) return '' endif let lines = getline(a:region[0][0], a:region[1][0]) @@ -128,23 +128,23 @@ endfunction " region_in_region : check region is in the region " this function return 0 or 1 -function! zencoding#util#region_in_region(outer, inner) - if !zencoding#util#region_is_valid(a:inner) || !zencoding#util#region_is_valid(a:outer) +function! zencoding#util#regionInRegion(outer, inner) + if !zencoding#util#regionIsValid(a:inner) || !zencoding#util#regionIsValid(a:outer) return 0 endif - return zencoding#util#point_in_region(a:inner[0], a:outer) && zencoding#util#point_in_region(a:inner[1], a:outer) + return zencoding#util#pointInRegion(a:inner[0], a:outer) && zencoding#util#pointInRegion(a:inner[1], a:outer) endfunction " get_visualblock : get region of visual block " this function return region of visual block -function! zencoding#util#get_visualblock() +function! zencoding#util#getVisualBlock() return [[line("'<"), col("'<")], [line("'>"), col("'>")]] endfunction "============================================================================== " html utils "============================================================================== -function! zencoding#util#get_content_from_url(url, utf8) +function! zencoding#util#getContentFromURL(url, utf8) silent! new if a:utf8 silent! exec '0r ++enc=utf8 !'.g:zencoding_curl_command.' "'.substitute(a:url, '#.*', '', '').'"' @@ -156,7 +156,7 @@ function! zencoding#util#get_content_from_url(url, utf8) return ret endfunction -function! zencoding#util#get_text_from_html(buf) +function! zencoding#util#getTextFromHTML(buf) let threshold_len = 100 let threshold_per = 0.1 let buf = a:buf