diff options
Diffstat (limited to 'autoload/vital/_crystal')
| -rw-r--r-- | autoload/vital/_crystal/ColorEcho.vim | 9 | ||||
| -rw-r--r-- | autoload/vital/_crystal/Data/List.vim | 26 | ||||
| -rw-r--r-- | autoload/vital/_crystal/Data/String.vim | 177 | ||||
| -rw-r--r-- | autoload/vital/_crystal/Prelude.vim | 389 | ||||
| -rw-r--r-- | autoload/vital/_crystal/Process.vim | 88 | ||||
| -rw-r--r-- | autoload/vital/_crystal/Web/JSON.vim | 90 |
6 files changed, 271 insertions, 508 deletions
diff --git a/autoload/vital/_crystal/ColorEcho.vim b/autoload/vital/_crystal/ColorEcho.vim index f2eae658..8358cc66 100644 --- a/autoload/vital/_crystal/ColorEcho.vim +++ b/autoload/vital/_crystal/ColorEcho.vim @@ -1,5 +1,14 @@ if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'crystal') == -1 +" ___vital___ +" NOTE: lines between '" ___vital___' is generated by :Vitalize. +" Do not mofidify the code nor insert new lines before '" ___vital___' +function! s:_SID() abort + return matchstr(expand('<sfile>'), '<SNR>\zs\d\+\ze__SID$') +endfunction +execute join(['function! vital#_crystal#ColorEcho#import() abort', printf("return map({'get_echorizer': '', 'echo': '', 'is_available': ''}, \"vital#_crystal#function('<SNR>%s_' . v:key)\")", s:_SID()), 'endfunction'], "\n") +delfunction s:_SID +" ___vital___ scriptencoding utf-8 let s:save_cpo = &cpo set cpo&vim diff --git a/autoload/vital/_crystal/Data/List.vim b/autoload/vital/_crystal/Data/List.vim index 55703b3d..1aac999f 100644 --- a/autoload/vital/_crystal/Data/List.vim +++ b/autoload/vital/_crystal/Data/List.vim @@ -1,5 +1,14 @@ if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'crystal') == -1 +" ___vital___ +" NOTE: lines between '" ___vital___' is generated by :Vitalize. +" Do not mofidify the code nor insert new lines before '" ___vital___' +function! s:_SID() abort + return matchstr(expand('<sfile>'), '<SNR>\zs\d\+\ze__SID$') +endfunction +execute join(['function! vital#_crystal#Data#List#import() abort', printf("return map({'combinations': '', 'and': '', 'sort_by': '', 'foldr1': '', 'sort': '', 'flatten': '', 'has_index': '', 'find_indices': '', 'any': '', 'unshift': '', 'span': '', 'pop': '', 'binary_search': '', 'uniq_by': '', 'or': '', 'all': '', 'zip': '', 'find_last_index': '', 'find': '', 'partition': '', 'shift': '', 'permutations': '', 'break': '', 'max_by': '', 'foldl': '', 'foldr': '', 'find_index': '', 'drop_while': '', 'group_by': '', 'take_while': '', 'conj': '', 'push': '', 'char_range': '', 'cons': '', 'foldl1': '', 'intersect': '', 'concat': '', 'map_accum': '', 'clear': '', 'has_common_items': '', 'product': '', 'zip_fill': '', 'uniq': '', 'has': '', 'min_by': '', 'with_index': ''}, \"vital#_crystal#function('<SNR>%s_' . v:key)\")", s:_SID()), 'endfunction'], "\n") +delfunction s:_SID +" ___vital___ " Utilities for list. let s:save_cpo = &cpo @@ -175,6 +184,11 @@ function! s:take_while(f, xs) abort return s:span(a:f, a:xs)[0] endfunction +" similar to Haskell's Data.List.dropWhile +function! s:drop_while(f, xs) abort + return s:span(a:f, a:xs)[1] +endfunction + " similar to Haskell's Data.List.partition function! s:partition(f, xs) abort return [filter(copy(a:xs), a:f), filter(copy(a:xs), '!(' . a:f . ')')] @@ -271,14 +285,22 @@ endfunction " similar to Ruby's detect or Haskell's find. function! s:find(list, default, f) abort + let l:Call = type(a:f) is type(function('function')) + \ ? function('call') + \ : function('s:_call_string_expr') + for x in a:list - if eval(substitute(a:f, 'v:val', string(x), 'g')) + if l:Call(a:f, [x]) return x endif endfor return a:default endfunction +function! s:_call_string_expr(expr, args) abort + return map([a:args[0]], a:expr)[0] +endfunction + " Returns the index of the first element which satisfies the given expr. function! s:find_index(xs, f, ...) abort let len = len(a:xs) @@ -426,7 +448,7 @@ function! s:combinations(list, r) abort if a:r > len(a:list) return [] elseif a:r < 0 - throw 'vital: Data:List: {r} must be non-negative integer' + throw 'vital: Data.List: {r} must be non-negative integer' endif let n = len(a:list) let result = [] diff --git a/autoload/vital/_crystal/Data/String.vim b/autoload/vital/_crystal/Data/String.vim index c2e2382c..7d3ef2c3 100644 --- a/autoload/vital/_crystal/Data/String.vim +++ b/autoload/vital/_crystal/Data/String.vim @@ -1,5 +1,14 @@ if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'crystal') == -1 +" ___vital___ +" NOTE: lines between '" ___vital___' is generated by :Vitalize. +" Do not mofidify the code nor insert new lines before '" ___vital___' +function! s:_SID() abort + return matchstr(expand('<sfile>'), '<SNR>\zs\d\+\ze__SID$') +endfunction +execute join(['function! vital#_crystal#Data#String#import() abort', printf("return map({'starts_with': '', 'split3': '', 'replace_first': '', 'chop': '', 'unescape': '', 'split_posix_text': '', 'replace': '', 'scan': '', 'strwidthpart': '', 'common_head': '', 'reverse': '', 'escape_pattern': '', 'trim_end': '', '_vital_depends': '', 'wrap': '', 'join_posix_lines': '', 'contains_multibyte': '', 'truncate_skipping': '', 'split_leftright': '', 'ends_with': '', 'nsplit': '', 'strwidthpart_reverse': '', 'unescape_pattern': '', 'levenshtein_distance': '', 'trim_start': '', 'justify_equal_spacing': '', 'nr2hex': '', 'iconv': '', 'pad_left': '', 'nr2enc_char': '', 'lines': '', 'repair_posix_text': '', 'nr2byte': '', 'trim': '', 'diffidx': '', 'truncate': '', 'split_by_displaywidth': '', '_vital_created': '', 'padding_by_displaywidth': '', 'hash': '', 'chomp': '', 'pad_between_letters': '', 'dstring': '', 'pad_both_sides': '', 'substitute_last': '', 'pad_right': '', 'remove_ansi_sequences': '', '_vital_loaded': ''}, \"vital#_crystal#function('<SNR>%s_' . v:key)\")", s:_SID()), 'endfunction'], "\n") +delfunction s:_SID +" ___vital___ " Utilities for string. let s:save_cpo = &cpo @@ -7,12 +16,21 @@ set cpo&vim function! s:_vital_loaded(V) abort let s:V = a:V - let s:P = s:V.import('Prelude') let s:L = s:V.import('Data.List') endfunction function! s:_vital_depends() abort - return ['Prelude', 'Data.List'] + return ['Data.List'] +endfunction + +function! s:_vital_created(module) abort + " Expose script-local funcref + if exists('s:strchars') + let a:module.strchars = s:strchars + endif + if exists('s:wcswidth') + let a:module.wcswidth = s:wcswidth + endif endfunction " Substitute a:from => a:to by string. @@ -61,7 +79,7 @@ function! s:common_head(strs) abort endif let strs = len == 2 ? a:strs : sort(copy(a:strs)) let pat = substitute(strs[0], '.', '\="[" . escape(submatch(0), "^\\") . "]"', 'g') - return pat == '' ? '' : matchstr(strs[-1], '\C^\%[' . pat . ']') + return pat ==# '' ? '' : matchstr(strs[-1], '\C^\%[' . pat . ']') endfunction " Split to two elements of List. ([left, right]) @@ -130,9 +148,7 @@ endfunction " even if a:str contains multibyte character(s). " s:strchars(str) {{{ if exists('*strchars') - function! s:strchars(str) abort - return strchars(a:str) - endfunction + let s:strchars = function('strchars') else function! s:strchars(str) abort return strlen(substitute(copy(a:str), '.', 'x', 'g')) @@ -210,7 +226,7 @@ function! s:nr2byte(nr) abort endfunction function! s:nr2enc_char(charcode) abort - if &encoding == 'utf-8' + if &encoding ==# 'utf-8' return nr2char(a:charcode) endif let char = s:nr2byte(a:charcode) @@ -222,7 +238,7 @@ endfunction function! s:nr2hex(nr) abort let n = a:nr - let r = "" + let r = '' while n let r = '0123456789ABCDEF'[n % 16] . r let n = n / 16 @@ -318,7 +334,7 @@ function! s:levenshtein_distance(str1, str2) abort let letters2 = split(a:str2, '\zs') let length1 = len(letters1) let length2 = len(letters2) - let distances = map(range(1, length1 + 1), 'map(range(1, length2 + 1), "0")') + let distances = map(range(1, length1 + 1), 'map(range(1, length2 + 1), ''0'')') for i1 in range(0, length1) let distances[i1][0] = i1 @@ -373,7 +389,7 @@ function! s:split_by_displaywidth(expr, width, float, is_wrap) abort let text = '' while cs_index < len(cs) - if cs[cs_index] is "\n" + if cs[cs_index] is# "\n" let text = s:padding_by_displaywidth(text, a:width, a:float) let lines += [text] let text = '' @@ -394,7 +410,7 @@ function! s:split_by_displaywidth(expr, width, float, is_wrap) abort if a:is_wrap if a:width < w if a:width < strdisplaywidth(cs[cs_index]) - while get(cs, cs_index, "\n") isnot "\n" + while get(cs, cs_index, "\n") isnot# "\n" let cs_index += 1 endwhile continue @@ -403,7 +419,7 @@ function! s:split_by_displaywidth(expr, width, float, is_wrap) abort endif endif else - while get(cs, cs_index, "\n") isnot "\n" + while get(cs, cs_index, "\n") isnot# "\n" let cs_index += 1 endwhile continue @@ -440,8 +456,9 @@ function! s:truncate(str, width) abort " http://github.com/mattn/googlereader-vim/tree/master if a:str =~# '^[\x00-\x7f]*$' - return len(a:str) < a:width ? - \ printf('%-'.a:width.'s', a:str) : strpart(a:str, 0, a:width) + return len(a:str) < a:width + \ ? printf('%-' . a:width . 's', a:str) + \ : strpart(a:str, 0, a:width) endif let ret = a:str @@ -471,57 +488,20 @@ function! s:truncate_skipping(str, max, footer_width, separator) abort endfunction function! s:strwidthpart(str, width) abort - if a:width <= 0 - return '' - endif - let strarr = split(a:str, '\zs') - let width = s:wcswidth(a:str) - let index = len(strarr) - let diff = (index + 1) / 2 - let rightindex = index - 1 - while width > a:width - let index = max([rightindex - diff + 1, 0]) - let partwidth = s:wcswidth(join(strarr[(index):(rightindex)], '')) - if width - partwidth >= a:width || diff <= 1 - let width -= partwidth - let rightindex = index - 1 - endif - if diff > 1 - let diff = diff / 2 - endif - endwhile - return index ? join(strarr[:index - 1], '') : '' + let str = tr(a:str, "\t", ' ') + let vcol = a:width + 2 + return matchstr(str, '.*\%<' . (vcol < 0 ? 0 : vcol) . 'v') endfunction function! s:strwidthpart_reverse(str, width) abort - if a:width <= 0 - return '' - endif - let strarr = split(a:str, '\zs') - let width = s:wcswidth(a:str) - let strlen = len(strarr) - let diff = (strlen + 1) / 2 - let leftindex = 0 - let index = -1 - while width > a:width - let index = min([leftindex + diff, strlen]) - 1 - let partwidth = s:wcswidth(join(strarr[(leftindex):(index)], '')) - if width - partwidth >= a:width || diff <= 1 - let width -= partwidth - let leftindex = index + 1 - endif - if diff > 1 - let diff = diff / 2 - endif - endwhile - return index < strlen ? join(strarr[(index + 1):], '') : '' + let str = tr(a:str, "\t", ' ') + let vcol = s:wcswidth(str) - a:width + return matchstr(str, '\%>' . (vcol < 0 ? 0 : vcol) . 'v.*') endfunction if v:version >= 703 " Use builtin function. - function! s:wcswidth(str) abort - return strwidth(a:str) - endfunction + let s:wcswidth = function('strwidth') else function! s:wcswidth(str) abort if a:str =~# '^[\x00-\x7f]*$' @@ -564,9 +544,88 @@ else endfunction endif +function! s:remove_ansi_sequences(text) abort + return substitute(a:text, '\e\[\%(\%(\d\+;\)*\d\+\)\?[mK]', '', 'g') +endfunction + +function! s:escape_pattern(str) abort + " escape characters for no-magic + return escape(a:str, '^$~.*[]\') +endfunction + +function! s:unescape_pattern(str) abort + " unescape characters for no-magic + return s:unescape(a:str, '^$~.*[]\') +endfunction + +function! s:unescape(str, chars) abort + let chars = map(split(a:chars, '\zs'), 'escape(v:val, ''^$~.*[]\'')') + return substitute(a:str, '\\\(' . join(chars, '\|') . '\)', '\1', 'g') +endfunction + +function! s:iconv(expr, from, to) abort + if a:from ==# '' || a:to ==# '' || a:from ==? a:to + return a:expr + endif + let result = iconv(a:expr, a:from, a:to) + return empty(result) ? a:expr : result +endfunction + +" NOTE: +" A definition of a TEXT file is "A file that contains characters organized +" into one or more lines." +" A definition of a LINE is "A sequence of zero or more non- <newline>s +" plus a terminating <newline>" +" That's why {stdin} always ends with <newline> ideally. However, there are +" some programs which does not follow the POSIX rule and a Vim's way to join +" List into TEXT; join({text}, "\n"); does not add <newline> to the end of +" the last line. +" That's why add a trailing <newline> if it does not exist. +" REF: +" http://pubs.opengroup.org/onlinepubs/000095399/basedefs/xbd_chap03.html#tag_03_392 +" http://pubs.opengroup.org/onlinepubs/000095399/basedefs/xbd_chap03.html#tag_03_205 +" :help split() +" NOTE: +" it does nothing if the text is a correct POSIX text +function! s:repair_posix_text(text, ...) abort + let newline = get(a:000, 0, "\n") + return a:text =~# '\n$' ? a:text : a:text . newline +endfunction + +" NOTE: +" A definition of a TEXT file is "A file that contains characters organized +" into one or more lines." +" A definition of a LINE is "A sequence of zero or more non- <newline>s +" plus a terminating <newline>" +" REF: +" http://pubs.opengroup.org/onlinepubs/000095399/basedefs/xbd_chap03.html#tag_03_392 +" http://pubs.opengroup.org/onlinepubs/000095399/basedefs/xbd_chap03.html#tag_03_205 +function! s:join_posix_lines(lines, ...) abort + let newline = get(a:000, 0, "\n") + return join(a:lines, newline) . newline +endfunction + +" NOTE: +" A definition of a TEXT file is "A file that contains characters organized +" into one or more lines." +" A definition of a LINE is "A sequence of zero or more non- <newline>s +" plus a terminating <newline>" +" TEXT into List; split({text}, '\r\?\n', 1); add an extra empty line at the +" end of List because the end of TEXT ends with <newline> and keepempty=1 is +" specified. (btw. keepempty=0 cannot be used because it will remove +" emptylines in the head and the tail). +" That's why removing a trailing <newline> before proceeding to 'split' is required +" REF: +" http://pubs.opengroup.org/onlinepubs/000095399/basedefs/xbd_chap03.html#tag_03_392 +" http://pubs.opengroup.org/onlinepubs/000095399/basedefs/xbd_chap03.html#tag_03_205 +function! s:split_posix_text(text, ...) abort + let newline = get(a:000, 0, '\r\?\n') + let text = substitute(a:text, newline . '$', '', '') + return split(text, newline, 1) +endfunction + let &cpo = s:save_cpo unlet s:save_cpo - " vim:set et ts=2 sts=2 sw=2 tw=0: endif diff --git a/autoload/vital/_crystal/Prelude.vim b/autoload/vital/_crystal/Prelude.vim deleted file mode 100644 index be31f980..00000000 --- a/autoload/vital/_crystal/Prelude.vim +++ /dev/null @@ -1,389 +0,0 @@ -if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'crystal') == -1 - -let s:save_cpo = &cpo -set cpo&vim - -if v:version ># 703 || -\ (v:version is 703 && has('patch465')) - function! s:glob(expr) abort - return glob(a:expr, 1, 1) - endfunction -else - function! s:glob(expr) abort - let R = glob(a:expr, 1) - return split(R, '\n') - endfunction -endif - -function! s:globpath(path, expr) abort - let R = globpath(a:path, a:expr, 1) - return split(R, '\n') -endfunction - -" Wrapper functions for type(). -let [ -\ s:__TYPE_NUMBER, -\ s:__TYPE_STRING, -\ s:__TYPE_FUNCREF, -\ s:__TYPE_LIST, -\ s:__TYPE_DICT, -\ s:__TYPE_FLOAT] = [ - \ type(3), - \ type(""), - \ type(function('tr')), - \ type([]), - \ type({}), - \ has('float') ? type(str2float('0')) : -1] -" __TYPE_FLOAT = -1 when -float -" This doesn't match to anything. - -" Number or Float -function! s:is_numeric(Value) abort - let _ = type(a:Value) - return _ ==# s:__TYPE_NUMBER - \ || _ ==# s:__TYPE_FLOAT -endfunction - -" Number -function! s:is_number(Value) abort - return type(a:Value) ==# s:__TYPE_NUMBER -endfunction - -" Float -function! s:is_float(Value) abort - return type(a:Value) ==# s:__TYPE_FLOAT -endfunction -" String -function! s:is_string(Value) abort - return type(a:Value) ==# s:__TYPE_STRING -endfunction -" Funcref -function! s:is_funcref(Value) abort - return type(a:Value) ==# s:__TYPE_FUNCREF -endfunction -" List -function! s:is_list(Value) abort - return type(a:Value) ==# s:__TYPE_LIST -endfunction -" Dictionary -function! s:is_dict(Value) abort - return type(a:Value) ==# s:__TYPE_DICT -endfunction - -function! s:truncate_skipping(str, max, footer_width, separator) abort - call s:_warn_deprecated("truncate_skipping", "Data.String.truncate_skipping") - - let width = s:wcswidth(a:str) - if width <= a:max - let ret = a:str - else - let header_width = a:max - s:wcswidth(a:separator) - a:footer_width - let ret = s:strwidthpart(a:str, header_width) . a:separator - \ . s:strwidthpart_reverse(a:str, a:footer_width) - endif - - return s:truncate(ret, a:max) -endfunction - -function! s:truncate(str, width) abort - " Original function is from mattn. - " http://github.com/mattn/googlereader-vim/tree/master - - call s:_warn_deprecated("truncate", "Data.String.truncate") - - if a:str =~# '^[\x00-\x7f]*$' - return len(a:str) < a:width ? - \ printf('%-'.a:width.'s', a:str) : strpart(a:str, 0, a:width) - endif - - let ret = a:str - let width = s:wcswidth(a:str) - if width > a:width - let ret = s:strwidthpart(ret, a:width) - let width = s:wcswidth(ret) - endif - - if width < a:width - let ret .= repeat(' ', a:width - width) - endif - - return ret -endfunction - -function! s:strwidthpart(str, width) abort - call s:_warn_deprecated("strwidthpart", "Data.String.strwidthpart") - - if a:width <= 0 - return '' - endif - let ret = a:str - let width = s:wcswidth(a:str) - while width > a:width - let char = matchstr(ret, '.$') - let ret = ret[: -1 - len(char)] - let width -= s:wcswidth(char) - endwhile - - return ret -endfunction -function! s:strwidthpart_reverse(str, width) abort - call s:_warn_deprecated("strwidthpart_reverse", "Data.String.strwidthpart_reverse") - - if a:width <= 0 - return '' - endif - let ret = a:str - let width = s:wcswidth(a:str) - while width > a:width - let char = matchstr(ret, '^.') - let ret = ret[len(char) :] - let width -= s:wcswidth(char) - endwhile - - return ret -endfunction - -if v:version >= 703 - " Use builtin function. - function! s:wcswidth(str) abort - call s:_warn_deprecated("wcswidth", "Data.String.wcswidth") - return strwidth(a:str) - endfunction -else - function! s:wcswidth(str) abort - call s:_warn_deprecated("wcswidth", "Data.String.wcswidth") - - if a:str =~# '^[\x00-\x7f]*$' - return strlen(a:str) - end - - let mx_first = '^\(.\)' - let str = a:str - let width = 0 - while 1 - let ucs = char2nr(substitute(str, mx_first, '\1', '')) - if ucs == 0 - break - endif - let width += s:_wcwidth(ucs) - let str = substitute(str, mx_first, '', '') - endwhile - return width - endfunction - - " UTF-8 only. - function! s:_wcwidth(ucs) abort - let ucs = a:ucs - if (ucs >= 0x1100 - \ && (ucs <= 0x115f - \ || ucs == 0x2329 - \ || ucs == 0x232a - \ || (ucs >= 0x2e80 && ucs <= 0xa4cf - \ && ucs != 0x303f) - \ || (ucs >= 0xac00 && ucs <= 0xd7a3) - \ || (ucs >= 0xf900 && ucs <= 0xfaff) - \ || (ucs >= 0xfe30 && ucs <= 0xfe6f) - \ || (ucs >= 0xff00 && ucs <= 0xff60) - \ || (ucs >= 0xffe0 && ucs <= 0xffe6) - \ || (ucs >= 0x20000 && ucs <= 0x2fffd) - \ || (ucs >= 0x30000 && ucs <= 0x3fffd) - \ )) - return 2 - endif - return 1 - endfunction -endif - -let s:is_windows = has('win16') || has('win32') || has('win64') || has('win95') -let s:is_cygwin = has('win32unix') -let s:is_mac = !s:is_windows && !s:is_cygwin - \ && (has('mac') || has('macunix') || has('gui_macvim') || - \ (!isdirectory('/proc') && executable('sw_vers'))) -let s:is_unix = has('unix') - -function! s:is_windows() abort - return s:is_windows -endfunction - -function! s:is_cygwin() abort - return s:is_cygwin -endfunction - -function! s:is_mac() abort - return s:is_mac -endfunction - -function! s:is_unix() abort - return s:is_unix -endfunction - -function! s:_warn_deprecated(name, alternative) abort - try - echohl Error - echomsg "Prelude." . a:name . " is deprecated! Please use " . a:alternative . " instead." - finally - echohl None - endtry -endfunction - -function! s:smart_execute_command(action, word) abort - execute a:action . ' ' . (a:word == '' ? '' : '`=a:word`') -endfunction - -function! s:escape_file_searching(buffer_name) abort - return escape(a:buffer_name, '*[]?{}, ') -endfunction - -function! s:escape_pattern(str) abort - return escape(a:str, '~"\.^$[]*') -endfunction - -function! s:getchar(...) abort - let c = call('getchar', a:000) - return type(c) == type(0) ? nr2char(c) : c -endfunction - -function! s:getchar_safe(...) abort - let c = s:input_helper('getchar', a:000) - return type(c) == type("") ? c : nr2char(c) -endfunction - -function! s:input_safe(...) abort - return s:input_helper('input', a:000) -endfunction - -function! s:input_helper(funcname, args) abort - let success = 0 - if inputsave() !=# success - throw 'vital: Prelude: inputsave() failed' - endif - try - return call(a:funcname, a:args) - finally - if inputrestore() !=# success - throw 'vital: Prelude: inputrestore() failed' - endif - endtry -endfunction - -function! s:set_default(var, val) abort - if !exists(a:var) || type({a:var}) != type(a:val) - let {a:var} = a:val - endif -endfunction - -function! s:substitute_path_separator(path) abort - return s:is_windows ? substitute(a:path, '\\', '/', 'g') : a:path -endfunction - -function! s:path2directory(path) abort - return s:substitute_path_separator(isdirectory(a:path) ? a:path : fnamemodify(a:path, ':p:h')) -endfunction - -function! s:_path2project_directory_git(path) abort - let parent = a:path - - while 1 - let path = parent . '/.git' - if isdirectory(path) || filereadable(path) - return parent - endif - let next = fnamemodify(parent, ':h') - if next == parent - return '' - endif - let parent = next - endwhile -endfunction - -function! s:_path2project_directory_svn(path) abort - let search_directory = a:path - let directory = '' - - let find_directory = s:escape_file_searching(search_directory) - let d = finddir('.svn', find_directory . ';') - if d == '' - return '' - endif - - let directory = fnamemodify(d, ':p:h:h') - - " Search parent directories. - let parent_directory = s:path2directory( - \ fnamemodify(directory, ':h')) - - if parent_directory != '' - let d = finddir('.svn', parent_directory . ';') - if d != '' - let directory = s:_path2project_directory_svn(parent_directory) - endif - endif - return directory -endfunction - -function! s:_path2project_directory_others(vcs, path) abort - let vcs = a:vcs - let search_directory = a:path - - let find_directory = s:escape_file_searching(search_directory) - let d = finddir(vcs, find_directory . ';') - if d == '' - return '' - endif - return fnamemodify(d, ':p:h:h') -endfunction - -function! s:path2project_directory(path, ...) abort - let is_allow_empty = get(a:000, 0, 0) - let search_directory = s:path2directory(a:path) - let directory = '' - - " Search VCS directory. - for vcs in ['.git', '.bzr', '.hg', '.svn'] - if vcs ==# '.git' - let directory = s:_path2project_directory_git(search_directory) - elseif vcs ==# '.svn' - let directory = s:_path2project_directory_svn(search_directory) - else - let directory = s:_path2project_directory_others(vcs, search_directory) - endif - if directory != '' - break - endif - endfor - - " Search project file. - if directory == '' - for d in ['build.xml', 'prj.el', '.project', 'pom.xml', 'package.json', - \ 'Makefile', 'configure', 'Rakefile', 'NAnt.build', - \ 'P4CONFIG', 'tags', 'gtags'] - let d = findfile(d, s:escape_file_searching(search_directory) . ';') - if d != '' - let directory = fnamemodify(d, ':p:h') - break - endif - endfor - endif - - if directory == '' - " Search /src/ directory. - let base = s:substitute_path_separator(search_directory) - if base =~# '/src/' - let directory = base[: strridx(base, '/src/') + 3] - endif - endif - - if directory == '' && !is_allow_empty - " Use original path. - let directory = search_directory - endif - - return s:substitute_path_separator(directory) -endfunction - -let &cpo = s:save_cpo -unlet s:save_cpo - -" vim:set et ts=2 sts=2 sw=2 tw=0: - -endif diff --git a/autoload/vital/_crystal/Process.vim b/autoload/vital/_crystal/Process.vim index c2deb9e5..1f7b001c 100644 --- a/autoload/vital/_crystal/Process.vim +++ b/autoload/vital/_crystal/Process.vim @@ -1,5 +1,14 @@ if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'crystal') == -1 +" ___vital___ +" NOTE: lines between '" ___vital___' is generated by :Vitalize. +" Do not mofidify the code nor insert new lines before '" ___vital___' +function! s:_SID() abort + return matchstr(expand('<sfile>'), '<SNR>\zs\d\+\ze__SID$') +endfunction +execute join(['function! vital#_crystal#Process#import() abort', printf("return map({'shellescape': '', 'has_vimproc': '', 'system': '', 'iconv': '', 'spawn': '', 'get_last_status': ''}, \"vital#_crystal#function('<SNR>%s_' . v:key)\")", s:_SID()), 'endfunction'], "\n") +delfunction s:_SID +" ___vital___ " TODO: move all comments to doc file. " " @@ -21,62 +30,36 @@ let s:need_trans = v:version < 704 || (v:version == 704 && !has('patch122')) let s:TYPE_DICT = type({}) let s:TYPE_LIST = type([]) -let s:TYPE_STRING = type("") - +let s:TYPE_STRING = type('') -" Execute program in the background from Vim. -" Return an empty string always. -" -" If a:expr is a List, shellescape() each argument. -" If a:expr is a String, the arguments are passed as-is. -" -" Windows: -" Using :!start , execute program without via cmd.exe. -" Spawning 'expr' with 'noshellslash' -" keep special characters from unwanted expansion. -" (see :help shellescape()) -" -" Unix: -" using :! , execute program in the background by shell. function! s:spawn(expr, ...) abort - let shellslash = 0 + if type(a:expr) is s:TYPE_LIST + let special = 1 + let cmdline = join(map(a:expr, 's:shellescape(v:val, special)'), ' ') + elseif type(a:expr) is s:TYPE_STRING + let cmdline = a:expr + if a:0 && a:1 + " for :! command + let cmdline = substitute(cmdline, '\([!%#]\|<[^<>]\+>\)', '\\\1', 'g') + endif + else + throw 'vital: Process: invalid argument (value type:' . type(a:expr) . ')' + endif if s:is_windows - let shellslash = &l:shellslash - setlocal noshellslash + silent execute '!start' cmdline + else + silent execute '!' cmdline '&' endif - try - if type(a:expr) is s:TYPE_LIST - let special = 1 - let cmdline = join(map(a:expr, 'shellescape(v:val, special)'), ' ') - elseif type(a:expr) is s:TYPE_STRING - let cmdline = a:expr - if a:0 && a:1 - " for :! command - let cmdline = substitute(cmdline, '\([!%#]\|<[^<>]\+>\)', '\\\1', 'g') - endif - else - throw 'Process.spawn(): invalid argument (value type:'.type(a:expr).')' - endif - if s:is_windows - silent execute '!start' cmdline - else - silent execute '!' cmdline '&' - endif - finally - if s:is_windows - let &l:shellslash = shellslash - endif - endtry return '' endfunction " iconv() wrapper for safety. function! s:iconv(expr, from, to) abort - if a:from == '' || a:to == '' || a:from ==? a:to + if a:from ==# '' || a:to ==# '' || a:from ==? a:to return a:expr endif let result = iconv(a:expr, a:from, a:to) - return result != '' ? result : a:expr + return result !=# '' ? result : a:expr endfunction " Check vimproc. @@ -128,7 +111,7 @@ function! s:system(str, ...) abort elseif type(a:1) is s:TYPE_STRING let args += [s:iconv(a:1, &encoding, 'char')] else - throw 'Process.system(): invalid argument (value type:'.type(a:1).')' + throw 'vital: Process: invalid argument (value type:' . type(a:1) . ')' endif elseif a:0 >= 2 " {command} [, {input} [, {timeout}]] @@ -145,13 +128,16 @@ function! s:system(str, ...) abort elseif type(a:str) is s:TYPE_STRING let command = a:str else - throw 'Process.system(): invalid argument (value type:'.type(a:str).')' + throw 'vital: Process: invalid argument (value type:' . type(a:str) . ')' endif if s:need_trans let command = s:iconv(command, &encoding, 'char') endif let args = [command] + args if background && (use_vimproc || !s:is_windows) + if has('nvim') + throw "vital: Process: neovim's system() doesn't support background(&) process (cmdline:" . string(a:str) . ')' + endif let args[0] = args[0] . ' &' endif @@ -167,8 +153,14 @@ function! s:get_last_status() abort endfunction if s:is_windows - function! s:shellescape(command) abort - return substitute(a:command, '[&()[\]{}^=;!''+,`~]', '^\0', 'g') + function! s:shellescape(...) abort + try + let shellslash = &shellslash + set noshellslash + return call('shellescape', a:000) + finally + let &shellslash = shellslash + endtry endfunction else function! s:shellescape(...) abort diff --git a/autoload/vital/_crystal/Web/JSON.vim b/autoload/vital/_crystal/Web/JSON.vim index 0e42ee0d..e99fa733 100644 --- a/autoload/vital/_crystal/Web/JSON.vim +++ b/autoload/vital/_crystal/Web/JSON.vim @@ -1,5 +1,14 @@ if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'crystal') == -1 +" ___vital___ +" NOTE: lines between '" ___vital___' is generated by :Vitalize. +" Do not mofidify the code nor insert new lines before '" ___vital___' +function! s:_SID() abort + return matchstr(expand('<sfile>'), '<SNR>\zs\d\+\ze__SID$') +endfunction +execute join(['function! vital#_crystal#Web#JSON#import() abort', printf("return map({'decode': '', '_vital_depends': '', '_vital_created': '', 'encode': '', '_vital_loaded': ''}, \"vital#_crystal#function('<SNR>%s_' . v:key)\")", s:_SID()), 'endfunction'], "\n") +delfunction s:_SID +" ___vital___ let s:save_cpo = &cpo set cpo&vim @@ -15,11 +24,6 @@ function! s:_null() abort return 0 endfunction -let s:const = {} -let s:const.true = function('s:_true') -let s:const.false = function('s:_false') -let s:const.null = function('s:_null') - function! s:_resolve(val, prefix) abort let t = type(a:val) if t == type('') @@ -36,6 +40,13 @@ endfunction function! s:_vital_created(module) abort " define constant variables + if !exists('s:const') + let s:const = {} + let s:const.true = function('s:_true') + let s:const.false = function('s:_false') + let s:const.null = function('s:_null') + lockvar s:const + endif call extend(a:module, s:const) endfunction @@ -55,7 +66,7 @@ function! s:decode(json, ...) abort let settings = extend({ \ 'use_token': 0, \}, get(a:000, 0, {})) - let json = iconv(a:json, "utf-8", &encoding) + let json = iconv(a:json, 'utf-8', &encoding) let json = join(split(json, "\n"), '') let json = substitute(json, '\\u34;', '\\"', 'g') let json = substitute(json, '\\u\(\x\x\x\x\)', '\=s:string.nr2enc_char("0x".submatch(1))', 'g') @@ -75,7 +86,11 @@ endfunction " @vimlint(EVL102, 0, l:true) " @vimlint(EVL102, 0, l:false) -function! s:encode(val) abort +function! s:encode(val, ...) abort + let settings = extend({ + \ 'indent': 0, + \}, get(a:000, 0, {}) + \) if type(a:val) == 0 return a:val elseif type(a:val) == 1 @@ -83,7 +98,7 @@ function! s:encode(val) abort let json = substitute(json, "\r", '\\r', 'g') let json = substitute(json, "\n", '\\n', 'g') let json = substitute(json, "\t", '\\t', 'g') - return iconv(json, &encoding, "utf-8") + return iconv(json, &encoding, 'utf-8') elseif type(a:val) == 2 if s:const.true == a:val return 'true' @@ -96,14 +111,69 @@ function! s:encode(val) abort return string(a:val) endif elseif type(a:val) == 3 - return '[' . join(map(copy(a:val), 's:encode(v:val)'), ',') . ']' + return s:_encode_list(a:val, settings) elseif type(a:val) == 4 - return '{' . join(map(keys(a:val), 's:encode(v:val).":".s:encode(a:val[v:val])'), ',') . '}' + return s:_encode_dict(a:val, settings) else return string(a:val) endif endfunction +" @vimlint(EVL102, 1, l:ns) +function! s:_encode_list(val, settings) abort + if empty(a:val) + return '[]' + elseif !a:settings.indent + let encoded_candidates = map(copy(a:val), 's:encode(v:val, a:settings)') + return printf('[%s]', join(encoded_candidates, ',')) + else + let previous_indent = get(a:settings, '_previous_indent') + let indent = previous_indent + a:settings.indent + let ns = extend(copy(a:settings), { + \ '_previous_indent': indent, + \}) + let encoded_candidates = map( + \ copy(a:val), + \ printf('''%s'' . s:encode(v:val, ns)', repeat(' ', indent)), + \) + return printf( + \ "[\n%s\n%s]", + \ join(encoded_candidates, ",\n"), + \ repeat(' ', previous_indent) + \) + endif +endfunction +" @vimlint(EVL102, 0, l:ns) + +" @vimlint(EVL102, 1, l:ns) +function! s:_encode_dict(val, settings) abort + if empty(a:val) + return '{}' + elseif !a:settings.indent + let encoded_candidates = map(keys(a:val), + \ 's:encode(v:val, a:settings) . '':'' . s:encode(a:val[v:val], a:settings)' + \) + return printf('{%s}', join(encoded_candidates, ',')) + else + let previous_indent = get(a:settings, '_previous_indent') + let indent = previous_indent + a:settings.indent + let ns = extend(copy(a:settings), { + \ '_previous_indent': indent, + \}) + let encoded_candidates = map(keys(a:val), + \ printf( + \ '''%s'' . s:encode(v:val, ns) . '': '' . s:encode(a:val[v:val], ns)', + \ repeat(' ', indent), + \ ), + \) + return printf("{\n%s\n%s}", + \ join(encoded_candidates, ",\n"), + \ repeat(' ', previous_indent), + \) + endif +endfunction +" @vimlint(EVL102, 0, l:ns) + let &cpo = s:save_cpo unlet s:save_cpo |