use abort argument for :function

This commit is contained in:
itchyny
2014-12-24 14:47:30 +09:00
parent 983d3075c1
commit b82c7ac54e
4 changed files with 42 additions and 42 deletions

View File

@@ -3,7 +3,7 @@
" Version: 0.0
" Author: itchyny
" License: MIT License
" Last Change: 2014/06/17 11:31:23.
" Last Change: 2014/12/17 00:14:04.
" =============================================================================
let s:save_cpo = &cpo
@@ -109,7 +109,7 @@ let s:guicolor = {
\ 'green' : '#859900',
\ }
function! s:convert(rgb)
function! s:convert(rgb) abort
let rgb = map(matchlist(a:rgb, '#\(..\)\(..\)\(..\)')[1:3], '0 + ("0x".v:val)')
if len(rgb) == 0
return 0
@@ -127,7 +127,7 @@ function! s:convert(rgb)
endif
endfunction
function! s:black(x)
function! s:black(x) abort
if a:x < 0x04
return 16
elseif a:x > 0xf4
@@ -140,15 +140,15 @@ function! s:black(x)
endif
endfunction
function! s:nr(x)
function! s:nr(x) abort
return a:x < 0x2f ? 0 : a:x < 0x73 ? 1 : a:x < 0x9b ? 2 : a:x < 0xc7 ? 3 : a:x < 0xef ? 4 : 5
endfunction
function! s:rgb(r, g, b)
function! s:rgb(r, g, b) abort
return printf("#%02x%02x%02x", a:r, a:g, a:b)
endfunction
function! s:upconvert(nr)
function! s:upconvert(nr) abort
let x = a:nr * 1
if x < 7
let [b, rg] = [x / 4, x % 4]
@@ -181,7 +181,7 @@ function! s:upconvert(nr)
endif
endfunction
function! lightline#colorscheme#fill(p)
function! lightline#colorscheme#fill(p) abort
for k in values(a:p)
for l in values(k)
for m in l
@@ -207,7 +207,7 @@ function! lightline#colorscheme#fill(p)
return a:p
endfunction
function! lightline#colorscheme#flatten(p)
function! lightline#colorscheme#flatten(p) abort
for k in values(a:p)
for l in values(k)
for m in range(len(l))

View File

@@ -3,13 +3,13 @@
" Version: 0.0
" Author: itchyny
" License: MIT License
" Last Change: 2014/11/18 09:52:16.
" Last Change: 2014/12/17 00:13:56.
" =============================================================================
let s:save_cpo = &cpo
set cpo&vim
function! s:load()
function! s:load() abort
let rgbfile = $VIMRUNTIME . '/rgb.txt'
let table = {}
if filereadable(rgbfile)
@@ -22,12 +22,12 @@ endfunction
let s:table = s:load()
function! lightline#colortable#name_to_rgb(name)
function! lightline#colortable#name_to_rgb(name) abort
let name = tolower(a:name)
return has_key(s:table, name) ? s:table[name] : []
endfunction
function! lightline#colortable#gui2cui(rgb, fallback)
function! lightline#colortable#gui2cui(rgb, fallback) abort
let rgb = map(matchlist(a:rgb, '#\(..\)\(..\)\(..\)')[1:3], '0 + ("0x".v:val)')
if len(rgb) == 0
let rgb = lightline#colortable#name_to_rgb(a:rgb)

View File

@@ -3,30 +3,30 @@
" Version: 0.0
" Author: itchyny
" License: MIT License
" Last Change: 2014/06/17 11:31:07.
" Last Change: 2014/12/17 00:13:51.
" =============================================================================
let s:save_cpo = &cpo
set cpo&vim
function! lightline#tab#filename(n)
function! lightline#tab#filename(n) abort
let buflist = tabpagebuflist(a:n)
let winnr = tabpagewinnr(a:n)
let _ = expand("#".buflist[winnr - 1].":t")
return strlen(_) ? _ : '[No Name]'
endfunction
function! lightline#tab#modified(n)
function! lightline#tab#modified(n) abort
let winnr = tabpagewinnr(a:n)
return gettabwinvar(a:n, winnr, '&modified') ? '+' : gettabwinvar(a:n, winnr, '&modifiable') ? '' : '-'
endfunction
function! lightline#tab#readonly(n)
function! lightline#tab#readonly(n) abort
let winnr = tabpagewinnr(a:n)
return gettabwinvar(a:n, winnr, '&readonly') ? 'RO' : ''
endfunction
function! lightline#tab#tabnum(n)
function! lightline#tab#tabnum(n) abort
return a:n
endfunction