From bb8be60d94b313547f83718f2e36e774784ad634 Mon Sep 17 00:00:00 2001 From: TKNGUE Date: Mon, 27 Jul 2015 17:40:31 +0900 Subject: [PATCH] Reafactor codes - rename function names. - remove local variable annotation. --- autoload/lightline/colorscheme/PaperColor.vim | 66 +++++++++---------- .../lightline/colorscheme/PaperColor_dark.vim | 50 +++++++------- .../colorscheme/PaperColor_light.vim | 28 ++++---- 3 files changed, 72 insertions(+), 72 deletions(-) diff --git a/autoload/lightline/colorscheme/PaperColor.vim b/autoload/lightline/colorscheme/PaperColor.vim index 7c568d3..2b5ab55 100644 --- a/autoload/lightline/colorscheme/PaperColor.vim +++ b/autoload/lightline/colorscheme/PaperColor.vim @@ -31,12 +31,12 @@ if a:x < 14 return 0 else - let l:n = (a:x - 8) / 10 - let l:m = (a:x - 8) % 10 - if l:m < 5 - return l:n + let n = (a:x - 8) / 10 + let m = (a:x - 8) % 10 + if m < 5 + return n else - return l:n + 1 + return n + 1 endif endif endif @@ -112,12 +112,12 @@ if a:x < 75 return 0 else - let l:n = (a:x - 55) / 40 - let l:m = (a:x - 55) % 40 - if l:m < 20 - return l:n + let n = (a:x - 55) / 40 + let m = (a:x - 55) % 40 + if m < 20 + return n else - return l:n + 1 + return n + 1 endif endif endif @@ -156,45 +156,45 @@ " Returns the palette index to approximate the given R/G/B color levels function! s:color(r, g, b) " Get the closest grey - let l:gx = s:grey_number(a:r) - let l:gy = s:grey_number(a:g) - let l:gz = s:grey_number(a:b) + let gx = s:grey_number(a:r) + let gy = s:grey_number(a:g) + let gz = s:grey_number(a:b) " Get the closest color - let l:x = s:rgb_number(a:r) - let l:y = s:rgb_number(a:g) - let l:z = s:rgb_number(a:b) + let x = s:rgb_number(a:r) + let y = s:rgb_number(a:g) + let z = s:rgb_number(a:b) - if l:gx == l:gy && l:gy == l:gz + if gx == gy && gy == gz " There are two possibilities - let l:dgr = s:grey_level(l:gx) - a:r - let l:dgg = s:grey_level(l:gy) - a:g - let l:dgb = s:grey_level(l:gz) - a:b - let l:dgrey = (l:dgr * l:dgr) + (l:dgg * l:dgg) + (l:dgb * l:dgb) - let l:dr = s:rgb_level(l:gx) - a:r - let l:dg = s:rgb_level(l:gy) - a:g - let l:db = s:rgb_level(l:gz) - a:b - let l:drgb = (l:dr * l:dr) + (l:dg * l:dg) + (l:db * l:db) - if l:dgrey < l:drgb + let dgr = s:grey_level(gx) - a:r + let dgg = s:grey_level(gy) - a:g + let dgb = s:grey_level(gz) - a:b + let dgrey = (dgr * dgr) + (dgg * dgg) + (dgb * dgb) + let dr = s:rgb_level(gx) - a:r + let dg = s:rgb_level(gy) - a:g + let db = s:rgb_level(gz) - a:b + let drgb = (dr * dr) + (dg * dg) + (db * db) + if dgrey < drgb " Use the grey - return s:grey_color(l:gx) + return s:grey_color(gx) else " Use the color - return s:rgb_color(l:x, l:y, l:z) + return s:rgb_color(x, y, z) endif else " Only one possibility - return s:rgb_color(l:x, l:y, l:z) + return s:rgb_color(x, y, z) endif endfunction " Returns the palette index to approximate the '#rrggbb' hex string function! s:rgb(rgb) - let l:r = ("0x" . strpart(a:rgb, 1, 2)) + 0 - let l:g = ("0x" . strpart(a:rgb, 3, 2)) + 0 - let l:b = ("0x" . strpart(a:rgb, 5, 2)) + 0 + let r = ("0x" . strpart(a:rgb, 1, 2)) + 0 + let g = ("0x" . strpart(a:rgb, 3, 2)) + 0 + let b = ("0x" . strpart(a:rgb, 5, 2)) + 0 - return s:color(l:r, l:g, l:b) + return s:color(r, g, b) endfunction function! lightline#colorscheme#PaperColor#X(color) diff --git a/autoload/lightline/colorscheme/PaperColor_dark.vim b/autoload/lightline/colorscheme/PaperColor_dark.vim index 8173c4b..b0af411 100644 --- a/autoload/lightline/colorscheme/PaperColor_dark.vim +++ b/autoload/lightline/colorscheme/PaperColor_dark.vim @@ -5,41 +5,41 @@ " Last Change: 2015-07-27 06:01 " ============================================================================= -let s:red = lightline#colorscheme#PaperColor#X("#df0000") -let s:green = lightline#colorscheme#PaperColor#X("#008700") -let s:blue = lightline#colorscheme#PaperColor#X("#00afaf") +let s:red = lightline#colorscheme#PaperColor#color_set("#df0000") +let s:green = lightline#colorscheme#PaperColor#color_set("#008700") +let s:blue = lightline#colorscheme#PaperColor#color_set("#00afaf") -let s:pink = lightline#colorscheme#PaperColor#X("#afdf00") -let s:olive = lightline#colorscheme#PaperColor#X("#dfaf5f") -let s:navy = lightline#colorscheme#PaperColor#X("#df875f") +let s:pink = lightline#colorscheme#PaperColor#color_set("#afdf00") +let s:olive = lightline#colorscheme#PaperColor#color_set("#dfaf5f") +let s:navy = lightline#colorscheme#PaperColor#color_set("#df875f") -let s:orange = lightline#colorscheme#PaperColor#X("#d75f00") -let s:purple = lightline#colorscheme#PaperColor#X("#8959a8") -let s:aqua = lightline#colorscheme#PaperColor#X("#3e999f") +let s:orange = lightline#colorscheme#PaperColor#color_set("#d75f00") +let s:purple = lightline#colorscheme#PaperColor#color_set("#8959a8") +let s:aqua = lightline#colorscheme#PaperColor#color_set("#3e999f") " Basics: -let s:foreground = lightline#colorscheme#PaperColor#X("#d0d0d0") -let s:background = lightline#colorscheme#PaperColor#X("#444444") -let s:window = lightline#colorscheme#PaperColor#X("#efefef") -let s:status = lightline#colorscheme#PaperColor#X("#c6c6c6") -let s:error = lightline#colorscheme#PaperColor#X("#5f0000") +let s:foreground = lightline#colorscheme#PaperColor#color_set("#d0d0d0") +let s:background = lightline#colorscheme#PaperColor#color_set("#444444") +let s:window = lightline#colorscheme#PaperColor#color_set("#efefef") +let s:status = lightline#colorscheme#PaperColor#color_set("#c6c6c6") +let s:error = lightline#colorscheme#PaperColor#color_set("#5f0000") " Tabline: -let s:tabline_bg = lightline#colorscheme#PaperColor#X("#3a3a3a") -let s:tabline_active_fg = lightline#colorscheme#PaperColor#X("#1c1c1c") -let s:tabline_active_bg = lightline#colorscheme#PaperColor#X("#00afaf") -let s:tabline_inactive_fg = lightline#colorscheme#PaperColor#X("#c6c6c6") -let s:tabline_inactive_bg = lightline#colorscheme#PaperColor#X("#585858") +let s:tabline_bg = lightline#colorscheme#PaperColor#color_set("#3a3a3a") +let s:tabline_active_fg = lightline#colorscheme#PaperColor#color_set("#1c1c1c") +let s:tabline_active_bg = lightline#colorscheme#PaperColor#color_set("#00afaf") +let s:tabline_inactive_fg = lightline#colorscheme#PaperColor#color_set("#c6c6c6") +let s:tabline_inactive_bg = lightline#colorscheme#PaperColor#color_set("#585858") " Statusline: -let s:statusline_active_fg = lightline#colorscheme#PaperColor#X("#1c1c1c") -let s:statusline_active_bg = lightline#colorscheme#PaperColor#X("#5f8787") -let s:statusline_inactive_fg = lightline#colorscheme#PaperColor#X("#c6c6c6") -let s:statusline_inactive_bg = lightline#colorscheme#PaperColor#X("#444444") +let s:statusline_active_fg = lightline#colorscheme#PaperColor#color_set("#1c1c1c") +let s:statusline_active_bg = lightline#colorscheme#PaperColor#color_set("#5f8787") +let s:statusline_inactive_fg = lightline#colorscheme#PaperColor#color_set("#c6c6c6") +let s:statusline_inactive_bg = lightline#colorscheme#PaperColor#color_set("#444444") " Visual: -let s:visual_fg = lightline#colorscheme#PaperColor#X("#000000") -let s:visual_bg = lightline#colorscheme#PaperColor#X("#8787af") +let s:visual_fg = lightline#colorscheme#PaperColor#color_set("#000000") +let s:visual_bg = lightline#colorscheme#PaperColor#color_set("#8787af") let s:p = {'normal': {}, 'inactive': {}, 'insert': {}, 'replace': {}, 'visual': {}, 'tabline': {}} let s:p.normal.left = [ [ s:foreground, s:background ], [ s:statusline_active_fg, s:status ], [ s:statusline_active_fg, s:statusline_active_bg ] ] diff --git a/autoload/lightline/colorscheme/PaperColor_light.vim b/autoload/lightline/colorscheme/PaperColor_light.vim index 6d9d797..3176591 100644 --- a/autoload/lightline/colorscheme/PaperColor_light.vim +++ b/autoload/lightline/colorscheme/PaperColor_light.vim @@ -4,23 +4,23 @@ " License: MIT License " Last Change: 2015-07-27 06:010 " ============================================================================= -let s:red = lightline#colorscheme#PaperColor#X("#df0000") "Include/Exception -let s:green = lightline#colorscheme#PaperColor#X("#008700") "Boolean/Special -let s:blue = lightline#colorscheme#PaperColor#X("#4271ae") "Keyword -let s:pink = lightline#colorscheme#PaperColor#X("#d7005f") "Type -let s:olive = lightline#colorscheme#PaperColor#X("#718c00") "String -let s:navy = lightline#colorscheme#PaperColor#X("#005f87") "StorageClass -let s:orange = lightline#colorscheme#PaperColor#X("#d75f00") "Number -let s:purple = lightline#colorscheme#PaperColor#X("#8959a8") "Repeat/Conditional -let s:aqua = lightline#colorscheme#PaperColor#X("#3e999f") "Operator/Delimiter +let s:red = lightline#colorscheme#PaperColor#color_set("#df0000") "Include/Exception +let s:green = lightline#colorscheme#PaperColor#color_set("#008700") "Boolean/Special +let s:blue = lightline#colorscheme#PaperColor#color_set("#4271ae") "Keyword +let s:pink = lightline#colorscheme#PaperColor#color_set("#d7005f") "Type +let s:olive = lightline#colorscheme#PaperColor#color_set("#718c00") "String +let s:navy = lightline#colorscheme#PaperColor#color_set("#005f87") "StorageClass +let s:orange = lightline#colorscheme#PaperColor#color_set("#d75f00") "Number +let s:purple = lightline#colorscheme#PaperColor#color_set("#8959a8") "Repeat/Conditional +let s:aqua = lightline#colorscheme#PaperColor#color_set("#3e999f") "Operator/Delimiter " Basics: -let s:foreground = lightline#colorscheme#PaperColor#X("#4d4d4c") -let s:background = lightline#colorscheme#PaperColor#X("#F5F5F5") -let s:window = lightline#colorscheme#PaperColor#X("#efefef") +let s:foreground = lightline#colorscheme#PaperColor#color_set("#4d4d4c") +let s:background = lightline#colorscheme#PaperColor#color_set("#F5F5F5") +let s:window = lightline#colorscheme#PaperColor#color_set("#efefef") let s:status = s:aqua -let s:error = lightline#colorscheme#PaperColor#X("#ffafdf") +let s:error = lightline#colorscheme#PaperColor#color_set("#ffafdf") " Tabline: let s:tabline_bg = s:navy @@ -33,7 +33,7 @@ let s:tabline_inactive_bg = s:aqua let s:statusline_active_fg = s:window let s:statusline_active_bg = s:navy let s:statusline_inactive_fg = s:foreground -let s:statusline_inactive_bg = lightline#colorscheme#PaperColor#X("#dadada") +let s:statusline_inactive_bg = lightline#colorscheme#PaperColor#color_set("#dadada") " Visual: let s:visual_fg = s:background