m-vim_plugins/vim-indent-guides
1
0
Fork 0
mirror of https://github.com/preservim/vim-indent-guides.git synced 2025-11-10 19:03:47 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

refactor: Use the abort attribute for functions in autoload

Browse Source
This commit is contained in:
Caleb Maclennan
2023-02-21 16:08:59 +03:00
parent b507cbd39b
commit 425bdc51fd
2 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
autoload/color_helper.vim
View File

@@ -10,7 +10,7 @@
" Example: color_helper#dec_to_hex(255, 5) " Example: color_helper#dec_to_hex(255, 5)
" Returns: '000FF' " Returns: '000FF'
" "
function! color_helper#dec_to_hex(arg, padding) function! color_helper#dec_to_hex(arg, padding) abort
return toupper(printf('%0' . a:padding . 'x', a:arg + 0)) return toupper(printf('%0' . a:padding . 'x', a:arg + 0))
endfunction endfunction
@@ -26,7 +26,7 @@ endfunction
" Example: color_helper#hex_to_dec('00') " Example: color_helper#hex_to_dec('00')
" Returns: 0 " Returns: 0
" "
function! color_helper#hex_to_dec(arg) function! color_helper#hex_to_dec(arg) abort
return (a:arg =~? '^0x') ? a:arg + 0 : ('0x'.a:arg) + 0 return (a:arg =~? '^0x') ? a:arg + 0 : ('0x'.a:arg) + 0
endfunction endfunction
@@ -36,7 +36,7 @@ endfunction
" Example: color_helper#hex_color_to_rgb('#0088FF') " Example: color_helper#hex_color_to_rgb('#0088FF')
" Returns: [0, 136, 255] " Returns: [0, 136, 255]
" "
function! color_helper#hex_color_to_rgb(hex_color) function! color_helper#hex_color_to_rgb(hex_color) abort
let l:rgb = [] let l:rgb = []
if a:hex_color =~ g:indent_guides_color_hex_pattern if a:hex_color =~ g:indent_guides_color_hex_pattern
@@ -55,7 +55,7 @@ endfunction
" Example: color_helper#rgb_color_to_hex([0, 136, 255]) " Example: color_helper#rgb_color_to_hex([0, 136, 255])
" Returns: '#0088FF' " Returns: '#0088FF'
" "
function! color_helper#rgb_color_to_hex(rgb_color) function! color_helper#rgb_color_to_hex(rgb_color) abort
let l:hex_color = '#' let l:hex_color = '#'
let l:hex_color .= color_helper#dec_to_hex(a:rgb_color[0], 2) " red let l:hex_color .= color_helper#dec_to_hex(a:rgb_color[0], 2) " red
let l:hex_color .= color_helper#dec_to_hex(a:rgb_color[1], 2) " green let l:hex_color .= color_helper#dec_to_hex(a:rgb_color[1], 2) " green
@@ -71,7 +71,7 @@ endfunction
" Example: color_helper#hex_color_lighten('#000000', 0.10) " Example: color_helper#hex_color_lighten('#000000', 0.10)
" Returns: '#191919' " Returns: '#191919'
" "
function! color_helper#hex_color_lighten(color, percent) function! color_helper#hex_color_lighten(color, percent) abort
let l:rgb = color_helper#hex_color_to_rgb(a:color) let l:rgb = color_helper#hex_color_to_rgb(a:color)
let l:rgb_lightened = [] let l:rgb_lightened = []
@@ -89,7 +89,7 @@ endfunction
" Example: color_helper#hex_color_darken('#FFFFFF', 0.10) " Example: color_helper#hex_color_darken('#FFFFFF', 0.10)
" Returns: '#E5E5E5' " Returns: '#E5E5E5'
" "
function! color_helper#hex_color_darken(color, percent) function! color_helper#hex_color_darken(color, percent) abort
let l:rgb = color_helper#hex_color_to_rgb(a:color) let l:rgb = color_helper#hex_color_to_rgb(a:color)
let l:rgb_darkened = [] let l:rgb_darkened = []
@@ -106,7 +106,7 @@ endfunction
" Example: color_helper#color_name_to_hex('darkslategray') " Example: color_helper#color_name_to_hex('darkslategray')
" Returns: '#2F4F4F' " Returns: '#2F4F4F'
" "
function! color_helper#color_name_to_hex(color_name) function! color_helper#color_name_to_hex(color_name) abort
let l:hex_code = '' let l:hex_code = ''
let l:color_name = tolower(a:color_name) let l:color_name = tolower(a:color_name)

32
autoload/indent_guides.vim
View File

@@ -4,7 +4,7 @@
" "
" Toggles the indent guides on and off. " Toggles the indent guides on and off.
" "
function! indent_guides#toggle() function! indent_guides#toggle() abort
call indent_guides#init_matches() call indent_guides#init_matches()
if empty(w:indent_guides_matches) if empty(w:indent_guides_matches)
@@ -18,7 +18,7 @@ endfunction
" Called from autocmds, keeps indent guides enabled or disabled when entering " Called from autocmds, keeps indent guides enabled or disabled when entering
" other buffers and windows. " other buffers and windows.
" "
function! indent_guides#process_autocmds() function! indent_guides#process_autocmds() abort
if g:indent_guides_autocmds_enabled if g:indent_guides_autocmds_enabled
call indent_guides#enable() call indent_guides#enable()
else else
@@ -30,7 +30,7 @@ endfunction
" Enables the indent guides for the current buffer and any other buffer upon " Enables the indent guides for the current buffer and any other buffer upon
" entering it. " entering it.
" "
function! indent_guides#enable() function! indent_guides#enable() abort
let g:indent_guides_autocmds_enabled = 1 let g:indent_guides_autocmds_enabled = 1
if &diff || indent_guides#exclude_filetype() if &diff || indent_guides#exclude_filetype()
@@ -64,7 +64,7 @@ endfunction
" Disables the indent guides for the current buffer and any other buffer upon " Disables the indent guides for the current buffer and any other buffer upon
" entering it. " entering it.
" "
function! indent_guides#disable() function! indent_guides#disable() abort
let g:indent_guides_autocmds_enabled = 0 let g:indent_guides_autocmds_enabled = 0
call indent_guides#clear_matches() call indent_guides#clear_matches()
endfunction endfunction
@@ -72,7 +72,7 @@ endfunction
" "
" Clear all highlight matches for the current window. " Clear all highlight matches for the current window.
" "
function! indent_guides#clear_matches() function! indent_guides#clear_matches() abort
call indent_guides#init_matches() call indent_guides#init_matches()
if !empty(w:indent_guides_matches) if !empty(w:indent_guides_matches)
let l:index = 0 let l:index = 0
@@ -91,7 +91,7 @@ endfunction
" "
" Automagically calculates and defines the indent highlight colors. " Automagically calculates and defines the indent highlight colors.
" "
function! indent_guides#highlight_colors() function! indent_guides#highlight_colors() abort
if s:auto_colors if s:auto_colors
if has('gui_running') || has('nvim') if has('gui_running') || has('nvim')
call indent_guides#gui_highlight_colors() call indent_guides#gui_highlight_colors()
@@ -105,7 +105,7 @@ endfunction
" Defines some basic indent highlight colors that work for Terminal Vim and " Defines some basic indent highlight colors that work for Terminal Vim and
" gVim when colors can't be automatically calculated. " gVim when colors can't be automatically calculated.
" "
function! indent_guides#basic_highlight_colors() function! indent_guides#basic_highlight_colors() abort
let l:cterm_colors = (&g:background == 'dark') ? ['darkgrey', 'black'] : ['lightgrey', 'white'] let l:cterm_colors = (&g:background == 'dark') ? ['darkgrey', 'black'] : ['lightgrey', 'white']
let l:gui_colors = (&g:background == 'dark') ? ['grey15', 'grey30'] : ['grey70', 'grey85'] let l:gui_colors = (&g:background == 'dark') ? ['grey15', 'grey30'] : ['grey70', 'grey85']
@@ -117,7 +117,7 @@ endfunction
" Automagically calculates and defines the indent highlight colors for gui " Automagically calculates and defines the indent highlight colors for gui
" vim. " vim.
" "
function! indent_guides#gui_highlight_colors() function! indent_guides#gui_highlight_colors() abort
let l:hi_normal_guibg = '' let l:hi_normal_guibg = ''
" capture the backgroud color from the normal highlight " capture the backgroud color from the normal highlight
@@ -150,7 +150,7 @@ endfunction
" Takes a color and darkens or lightens it depending on whether a dark or light " Takes a color and darkens or lightens it depending on whether a dark or light
" colorscheme is being used. " colorscheme is being used.
" "
function! indent_guides#lighten_or_darken_color(color) function! indent_guides#lighten_or_darken_color(color) abort
let l:new_color = '' let l:new_color = ''
if (&g:background == 'dark') if (&g:background == 'dark')
@@ -165,7 +165,7 @@ endfunction
" "
" Define default highlights. " Define default highlights.
" "
function! indent_guides#define_default_highlights() function! indent_guides#define_default_highlights() abort
hi default clear IndentGuidesOdd hi default clear IndentGuidesOdd
hi default clear IndentGuidesEven hi default clear IndentGuidesEven
endfunction endfunction
@@ -173,7 +173,7 @@ endfunction
" "
" Init the w:indent_guides_matches variable. " Init the w:indent_guides_matches variable.
" "
function! indent_guides#init_matches() function! indent_guides#init_matches() abort
let w:indent_guides_matches = exists('w:indent_guides_matches') ? w:indent_guides_matches : [] let w:indent_guides_matches = exists('w:indent_guides_matches') ? w:indent_guides_matches : []
endfunction endfunction
@@ -181,7 +181,7 @@ endfunction
" We need to initialize these vars every time a buffer is entered while the " We need to initialize these vars every time a buffer is entered while the
" plugin is enabled. " plugin is enabled.
" "
function! indent_guides#init_script_vars() function! indent_guides#init_script_vars() abort
if &l:shiftwidth > 0 && &l:expandtab if &l:shiftwidth > 0 && &l:expandtab
let s:indent_size = &l:shiftwidth let s:indent_size = &l:shiftwidth
else else
@@ -229,7 +229,7 @@ endfunction
" "
" NOTE: Currently, this only works when soft-tabs are being used. " NOTE: Currently, this only works when soft-tabs are being used.
" "
function! indent_guides#calculate_guide_size() function! indent_guides#calculate_guide_size() abort
let l:guide_size = g:indent_guides_guide_size let l:guide_size = g:indent_guides_guide_size
if l:guide_size == 0 || l:guide_size > s:indent_size if l:guide_size == 0 || l:guide_size > s:indent_size
@@ -245,7 +245,7 @@ endfunction
" Example: indent_guides#capture_highlight('normal') " Example: indent_guides#capture_highlight('normal')
" Returns: 'Normal xxx guifg=#323232 guibg=#ffffff' " Returns: 'Normal xxx guifg=#323232 guibg=#ffffff'
" "
function! indent_guides#capture_highlight(group_name) function! indent_guides#capture_highlight(group_name) abort
redir => l:output redir => l:output
exe "silent hi " . a:group_name exe "silent hi " . a:group_name
redir END redir END
@@ -266,7 +266,7 @@ endfunction
" Example: indent_guides#indent_highlight_pattern('\t', 9, 2) " Example: indent_guides#indent_highlight_pattern('\t', 9, 2)
" Returns: /^\t*\%9v\zs\t*\%11v\ze/ " Returns: /^\t*\%9v\zs\t*\%11v\ze/
" "
function! indent_guides#indent_highlight_pattern(indent_pattern, column_start, indent_size) function! indent_guides#indent_highlight_pattern(indent_pattern, column_start, indent_size) abort
let l:pattern = '^' . a:indent_pattern . '*\%' . a:column_start . 'v\zs' let l:pattern = '^' . a:indent_pattern . '*\%' . a:column_start . 'v\zs'
let l:pattern .= a:indent_pattern . '*\%' . (a:column_start + a:indent_size) . 'v' let l:pattern .= a:indent_pattern . '*\%' . (a:column_start + a:indent_size) . 'v'
let l:pattern .= '\ze' let l:pattern .= '\ze'
@@ -276,7 +276,7 @@ endfunction
" "
" Detect if any of the buffer filetypes should be excluded. " Detect if any of the buffer filetypes should be excluded.
" "
function! indent_guides#exclude_filetype() function! indent_guides#exclude_filetype() abort
for ft in split(&ft, '\.') for ft in split(&ft, '\.')
if index(g:indent_guides_exclude_filetypes, ft) > -1 if index(g:indent_guides_exclude_filetypes, ft) > -1
return 1 return 1