camelcase.

This commit is contained in:
mattn
2012-05-30 20:40:20 +09:00
parent 9295915002
commit e3f72a588a
3 changed files with 63 additions and 63 deletions

View File

@@ -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('<img\s', '>')
if !zencoding#util#region_is_valid(img_region) || !zencoding#util#cursor_in_region(img_region)
let img_region = zencoding#util#searchRegion('<img\s', '>')
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 !~ '^<img[^><]\+>$'
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)

View File

@@ -1,7 +1,7 @@
"==============================================================================
" region utils
"==============================================================================
" delete_content : delete content in region
" deleteContent : delete content in region
" if region make from between '<foo>' and '</foo>'
" --------------------
" begin:<foo>
@@ -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