diff --git a/.ci/install/linux.sh b/.ci/install/linux.sh index a208461c1..4485207a7 100755 --- a/.ci/install/linux.sh +++ b/.ci/install/linux.sh @@ -9,7 +9,7 @@ export LC_ALL=C install_vim() { local URL=https://github.com/vim/vim local tag=$1 - local ext=$([[ $tag == "HEAD" ]] && echo "" || echo "-b $tag") + local ext=$([[ $tag == "nightly" ]] && echo "" || echo "-b $tag") local tmp="$(mktemp -d)" local out="${DEPS}/_vim/$tag" mkdir -p $out @@ -28,21 +28,16 @@ install_vim() { install_nvim() { local URL=https://github.com/neovim/neovim local tag=$1 - local ext=$([[ $tag == "HEAD" ]] && echo "" || echo "-b $tag") local tmp="$(mktemp -d)" local out="${DEPS}/_neovim/$tag" mkdir -p $out - local ncpu=$(awk '/^processor/{n+=1}END{print n}' /proc/cpuinfo) - git clone --depth 1 --single-branch $ext $URL $tmp - cd $tmp - sed -i '30d' ./third-party/cmake/BuildLibvterm.cmake - make deps - make -j$ncpu \ - CMAKE_BUILD_TYPE=Release \ - CMAKE_EXTRA_FLAGS="-DTRAVIS_CI_BUILD=ON -DCMAKE_INSTALL_PREFIX:PATH=$out" - make install - pip3 install --upgrade "pip < 21.0" - pip3 install pynvim + curl -o $tmp/nvim-linux64.tar.gz -L "https://github.com/neovim/neovim/releases/download/$tag/nvim-linux64.tar.gz" + tar -xzvf $tmp/nvim-linux64.tar.gz -C $tmp + cp -r $tmp/nvim-linux64/* $out + chmod +x $out/bin/nvim + # fix ModuleNotFoundError: No module named 'setuptools' + python3 -m pip install -U setuptools + python3 -m pip install pynvim } install() { diff --git a/.ci/install/nvim-linux64.tar.gz b/.ci/install/nvim-linux64.tar.gz new file mode 100644 index 000000000..853730769 --- /dev/null +++ b/.ci/install/nvim-linux64.tar.gz @@ -0,0 +1 @@ +Not Found \ No newline at end of file diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index 14e00dac3..cb56e1785 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -8,6 +8,8 @@ jobs: fail-fast: false matrix: include: + - vimbin: vim + vimtag: nightly - vimbin: vim vimtag: v7.4.052 - vimbin: vim @@ -21,8 +23,20 @@ jobs: - vimbin: vim vimtag: v8.1.2269 # vimtag: ["v7.4.052", "v7.4.629", "v7.4.1689", "v8.0.0027", "v8.0.1453", "v8.1.2269"] - # - vimbin: nvim - # vimtag: v0.4.3 + - vimbin: nvim + vimtag: nightly + - vimbin: nvim + vimtag: v0.5.0 + - vimbin: nvim + vimtag: v0.4.4 + - vimbin: nvim + vimtag: v0.4.3 + - vimbin: nvim + vimtag: v0.4.2 + - vimbin: nvim + vimtag: v0.4.0 + - vimbin: nvim + vimtag: v0.3.8 # vimtag: ["v0.4.3", "v0.4.3", "v0.4.3", "v0.4.2", "v0.3.8", "v0.3.7", "v0.3.5", "v0.3.4", "v0.3.3", "v0.3.2", "v0.3.1", "v0.3.0"] runs-on: ubuntu-18.04 env: @@ -35,7 +49,7 @@ jobs: - name: Install dependencies run: | sudo apt-get update - sudo apt-get install -y autoconf automake build-essential cmake gcc-multilib gettext gperf libtool-bin locales ninja-build pkg-config unzip python3-pip python-pip libncurses5-dev libgnome2-dev libgnomeui-dev libgtk2.0-dev libatk1.0-dev libbonoboui2-dev libcairo2-dev libx11-dev libxpm-dev libxt-dev python-dev python3-dev ruby-dev lua5.1 liblua5.1-dev libperl-dev ninja-build + sudo apt-get install ninja-build gettext libtool libtool-bin autoconf automake cmake g++ pkg-config unzip curl - name: Install ${{ matrix.vimbin }} ${{ matrix.vimtag }} run: | .ci/install/linux.sh $VIM_BIN $VIM_TAG diff --git a/Makefile b/Makefile index f8d83e2de..5ba176296 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ test: build/vader | build COVIMERAGE=$(shell command -v covimerage 2>/dev/null || echo build/covimerage/bin/covimerage) test_coverage: $(COVIMERAGE) build/vader | build - $(COVIMERAGE) run $(VIM_BIN) -Nu test/vimrc -c 'Vader! test/**' + $(COVIMERAGE) run --source after --source autoload --source colors --source config --source ftplugin $(VIM_BIN) -Nu test/vimrc -c 'Vader! test/**' build/covimerage: virtualenv $@ diff --git a/autoload/SpaceVim/api/data/dict.vim b/autoload/SpaceVim/api/data/dict.vim index 21dd515c0..a3b2c5f7c 100644 --- a/autoload/SpaceVim/api/data/dict.vim +++ b/autoload/SpaceVim/api/data/dict.vim @@ -46,36 +46,36 @@ function! SpaceVim#api#data#dict#get() abort endfunction -if get(g:, '_spacevim_if_lua', 0) || has('nvim') - function! s:entrys(dict) abort - lua require("spacevim.api.data.dict").entrys( - \ require("spacevim").eval("a:dict") - \ ) - endfunction - function! s:pick(dict, keys) abort - lua require("spacevim.api.data.dict").pick( - \ require("spacevim").eval("a:dict"), - \ require("spacevim").eval("a:keys") - \ ) - endfunction -else - function! s:entrys(dict) abort - let entrys = [] - for key in keys(a:dict) - call add(entrys, {key : a:dict[key]}) - endfor - return entrys - endfunction - function! s:pick(dict, keys) abort - let new_dict = {} - for key in a:keys - if has_key(a:dict, key) - let new_dict[key] = a:dict[key] - endif - endfor - return new_dict - endfunction -endif +" if get(g:, '_spacevim_if_lua', 0) || has('nvim') +" function! s:entrys(dict) abort +" lua require("spacevim.api.data.dict").entrys( +" \ require("spacevim").eval("a:dict") +" \ ) +" endfunction +" function! s:pick(dict, keys) abort +" lua require("spacevim.api.data.dict").pick( +" \ require("spacevim").eval("a:dict"), +" \ require("spacevim").eval("a:keys") +" \ ) +" endfunction +" else +function! s:entrys(dict) abort + let entrys = [] + for key in keys(a:dict) + call add(entrys, {key : a:dict[key]}) + endfor + return entrys +endfunction +function! s:pick(dict, keys) abort + let new_dict = {} + for key in a:keys + if has_key(a:dict, key) + let new_dict[key] = a:dict[key] + endif + endfor + return new_dict +endfunction +" endif function! s:make(keys, values, ...) abort let dict = {} diff --git a/autoload/SpaceVim/api/iconv.vim b/autoload/SpaceVim/api/iconv.vim index e03011e02..1ffe9b8d5 100644 --- a/autoload/SpaceVim/api/iconv.vim +++ b/autoload/SpaceVim/api/iconv.vim @@ -13,40 +13,40 @@ else endif -let s:ns = expand(':p:r:gs?[\\/]?#?:s?^.*#autoload#??:s?$?#?') +function! SpaceVim#api#iconv#import() abort -function {s:ns}import() return s:iconv + endfunction -function {s:ns}iconv(expr, from, to, ...) +function! SpaceVim#api#iconv#iconv(expr, from, to, ...) abort let errors = get(a:000, 0, 'strict') try return s:iconv.iconv(a:expr, a:from, a:to, errors) endtry endfunction -function {s:ns}iconvb(expr, from, to, ...) +function! SpaceVim#api#iconv#iconvb(expr, from, to, ...) abort let errors = get(a:000, 0, 'strict') try return s:iconv.iconvb(a:expr, a:from, a:to, errors) endtry endfunction -let s:bytes = {s:ns}bytes#import() +let s:bytes = SpaceVim#api#iconv#bytes#import() let s:iconv = {} -function s:iconv.iconv(expr, from, to, errors) +function! s:iconv.iconv(expr, from, to, errors) abort return s:bytes.bytes2str(self.iconvb(a:expr, a:from, a:to, a:errors)) endfunction -function s:iconv.iconvb(expr, from, to, errors) +function! s:iconv.iconvb(expr, from, to, errors) abort let expr = s:bytes.tobytes(a:expr) return self._iconv(expr, a:from, a:to, a:errors) endfunction -function s:iconv._iconv(expr, from, to, errors) +function! s:iconv._iconv(expr, from, to, errors) abort let from = tolower(a:from) let to = tolower(a:to) @@ -71,66 +71,66 @@ function s:iconv._iconv(expr, from, to, errors) endfunction let s:iconv.codecs = { - \ "ascii": function(s:ns."codecs#ascii#import"), - \ "utf-8": function(s:ns."codecs#utf8#import"), - \ "utf-16": function(s:ns."codecs#utf16#import"), - \ "utf-16be": function(s:ns."codecs#utf16be#import"), - \ "utf-16le": function(s:ns."codecs#utf16le#import"), - \ "utf-32": function(s:ns."codecs#utf32#import"), - \ "utf-32be": function(s:ns."codecs#utf32be#import"), - \ "utf-32le": function(s:ns."codecs#utf32le#import"), - \ "latin1": function(s:ns."codecs#_8859_1#import"), - \ "iso-8859-1": function(s:ns."codecs#_8859_1#import"), - \ "iso-8859-2": function(s:ns."codecs#_8859_2#import"), - \ "iso-8859-3": function(s:ns."codecs#_8859_3#import"), - \ "iso-8859-4": function(s:ns."codecs#_8859_4#import"), - \ "iso-8859-5": function(s:ns."codecs#_8859_5#import"), - \ "iso-8859-6": function(s:ns."codecs#_8859_6#import"), - \ "iso-8859-7": function(s:ns."codecs#_8859_7#import"), - \ "iso-8859-8": function(s:ns."codecs#_8859_8#import"), - \ "iso-8859-9": function(s:ns."codecs#_8859_9#import"), - \ "iso-8859-10": function(s:ns."codecs#_8859_10#import"), - \ "iso-8859-11": function(s:ns."codecs#_8859_11#import"), - \ "iso-8859-13": function(s:ns."codecs#_8859_13#import"), - \ "iso-8859-14": function(s:ns."codecs#_8859_14#import"), - \ "iso-8859-15": function(s:ns."codecs#_8859_15#import"), - \ "cp037": function(s:ns."codecs#_cp037#import"), - \ "cp1026": function(s:ns."codecs#_cp1026#import"), - \ "cp1250": function(s:ns."codecs#_cp1250#import"), - \ "cp1251": function(s:ns."codecs#_cp1251#import"), - \ "cp1252": function(s:ns."codecs#_cp1252#import"), - \ "cp1253": function(s:ns."codecs#_cp1253#import"), - \ "cp1254": function(s:ns."codecs#_cp1254#import"), - \ "cp1255": function(s:ns."codecs#_cp1255#import"), - \ "cp1256": function(s:ns."codecs#_cp1256#import"), - \ "cp1257": function(s:ns."codecs#_cp1257#import"), - \ "cp1258": function(s:ns."codecs#_cp1258#import"), - \ "cp437": function(s:ns."codecs#_cp437#import"), - \ "cp500": function(s:ns."codecs#_cp500#import"), - \ "cp737": function(s:ns."codecs#_cp737#import"), - \ "cp775": function(s:ns."codecs#_cp775#import"), - \ "cp850": function(s:ns."codecs#_cp850#import"), - \ "cp852": function(s:ns."codecs#_cp852#import"), - \ "cp855": function(s:ns."codecs#_cp855#import"), - \ "cp857": function(s:ns."codecs#_cp857#import"), - \ "cp860": function(s:ns."codecs#_cp860#import"), - \ "cp861": function(s:ns."codecs#_cp861#import"), - \ "cp862": function(s:ns."codecs#_cp862#import"), - \ "cp863": function(s:ns."codecs#_cp863#import"), - \ "cp864": function(s:ns."codecs#_cp864#import"), - \ "cp865": function(s:ns."codecs#_cp865#import"), - \ "cp866": function(s:ns."codecs#_cp866#import"), - \ "cp869": function(s:ns."codecs#_cp869#import"), - \ "cp874": function(s:ns."codecs#_cp874#import"), - \ "cp875": function(s:ns."codecs#_cp875#import"), - \ "cp932": function(s:ns."codecs#_cp932#import"), - \ "cp936": function(s:ns."codecs#_cp936#import"), - \ "cp949": function(s:ns."codecs#_cp949#import"), - \ "cp950": function(s:ns."codecs#_cp950#import"), - \ "euc-jp": function(s:ns."codecs#_euc_jp#import"), + \ 'ascii': function('SpaceVim#api#iconv#codecs#ascii#import'), + \ 'utf-8': function('SpaceVim#api#iconv#codecs#utf8#import'), + \ 'utf-16': function('SpaceVim#api#iconv#codecs#utf16#import'), + \ 'utf-16be': function('SpaceVim#api#iconv#codecs#utf16be#import'), + \ 'utf-16le': function('SpaceVim#api#iconv#codecs#utf16le#import'), + \ 'utf-32': function('SpaceVim#api#iconv#codecs#utf32#import'), + \ 'utf-32be': function('SpaceVim#api#iconv#codecs#utf32be#import'), + \ 'utf-32le': function('SpaceVim#api#iconv#codecs#utf32le#import'), + \ 'latin1': function('SpaceVim#api#iconv#codecs#_8859_1#import'), + \ 'iso-8859-1': function('SpaceVim#api#iconv#codecs#_8859_1#import'), + \ 'iso-8859-2': function('SpaceVim#api#iconv#codecs#_8859_2#import'), + \ 'iso-8859-3': function('SpaceVim#api#iconv#codecs#_8859_3#import'), + \ 'iso-8859-4': function('SpaceVim#api#iconv#codecs#_8859_4#import'), + \ 'iso-8859-5': function('SpaceVim#api#iconv#codecs#_8859_5#import'), + \ 'iso-8859-6': function('SpaceVim#api#iconv#codecs#_8859_6#import'), + \ 'iso-8859-7': function('SpaceVim#api#iconv#codecs#_8859_7#import'), + \ 'iso-8859-8': function('SpaceVim#api#iconv#codecs#_8859_8#import'), + \ 'iso-8859-9': function('SpaceVim#api#iconv#codecs#_8859_9#import'), + \ 'iso-8859-10': function('SpaceVim#api#iconv#codecs#_8859_10#import'), + \ 'iso-8859-11': function('SpaceVim#api#iconv#codecs#_8859_11#import'), + \ 'iso-8859-13': function('SpaceVim#api#iconv#codecs#_8859_13#import'), + \ 'iso-8859-14': function('SpaceVim#api#iconv#codecs#_8859_14#import'), + \ 'iso-8859-15': function('SpaceVim#api#iconv#codecs#_8859_15#import'), + \ 'cp037': function('SpaceVim#api#iconv#codecs#_cp037#import'), + \ 'cp1026': function('SpaceVim#api#iconv#codecs#_cp1026#import'), + \ 'cp1250': function('SpaceVim#api#iconv#codecs#_cp1250#import'), + \ 'cp1251': function('SpaceVim#api#iconv#codecs#_cp1251#import'), + \ 'cp1252': function('SpaceVim#api#iconv#codecs#_cp1252#import'), + \ 'cp1253': function('SpaceVim#api#iconv#codecs#_cp1253#import'), + \ 'cp1254': function('SpaceVim#api#iconv#codecs#_cp1254#import'), + \ 'cp1255': function('SpaceVim#api#iconv#codecs#_cp1255#import'), + \ 'cp1256': function('SpaceVim#api#iconv#codecs#_cp1256#import'), + \ 'cp1257': function('SpaceVim#api#iconv#codecs#_cp1257#import'), + \ 'cp1258': function('SpaceVim#api#iconv#codecs#_cp1258#import'), + \ 'cp437': function('SpaceVim#api#iconv#codecs#_cp437#import'), + \ 'cp500': function('SpaceVim#api#iconv#codecs#_cp500#import'), + \ 'cp737': function('SpaceVim#api#iconv#codecs#_cp737#import'), + \ 'cp775': function('SpaceVim#api#iconv#codecs#_cp775#import'), + \ 'cp850': function('SpaceVim#api#iconv#codecs#_cp850#import'), + \ 'cp852': function('SpaceVim#api#iconv#codecs#_cp852#import'), + \ 'cp855': function('SpaceVim#api#iconv#codecs#_cp855#import'), + \ 'cp857': function('SpaceVim#api#iconv#codecs#_cp857#import'), + \ 'cp860': function('SpaceVim#api#iconv#codecs#_cp860#import'), + \ 'cp861': function('SpaceVim#api#iconv#codecs#_cp861#import'), + \ 'cp862': function('SpaceVim#api#iconv#codecs#_cp862#import'), + \ 'cp863': function('SpaceVim#api#iconv#codecs#_cp863#import'), + \ 'cp864': function('SpaceVim#api#iconv#codecs#_cp864#import'), + \ 'cp865': function('SpaceVim#api#iconv#codecs#_cp865#import'), + \ 'cp866': function('SpaceVim#api#iconv#codecs#_cp866#import'), + \ 'cp869': function('SpaceVim#api#iconv#codecs#_cp869#import'), + \ 'cp874': function('SpaceVim#api#iconv#codecs#_cp874#import'), + \ 'cp875': function('SpaceVim#api#iconv#codecs#_cp875#import'), + \ 'cp932': function('SpaceVim#api#iconv#codecs#_cp932#import'), + \ 'cp936': function('SpaceVim#api#iconv#codecs#_cp936#import'), + \ 'cp949': function('SpaceVim#api#iconv#codecs#_cp949#import'), + \ 'cp950': function('SpaceVim#api#iconv#codecs#_cp950#import'), + \ 'euc-jp': function('SpaceVim#api#iconv#codecs#_euc_jp#import'), \ } -function! SpaceVim#api#iconv#get() +function! SpaceVim#api#iconv#get() abort return deepcopy(s:self) diff --git a/autoload/SpaceVim/api/iconv/bytes.vim b/autoload/SpaceVim/api/iconv/bytes.vim index 0f5525372..c8e5832f3 100644 --- a/autoload/SpaceVim/api/iconv/bytes.vim +++ b/autoload/SpaceVim/api/iconv/bytes.vim @@ -1,38 +1,36 @@ -let s:ns = expand(':p:r:gs?[\\/]?#?:s?^.*#autoload#??:s?$?#?') - -function {s:ns}import() +function! SpaceVim#api#iconv#bytes#import() abort return s:bytes endfunction let s:bytes = {} -function s:bytes.tobytes(v) +function! s:bytes.tobytes(v) abort if type(a:v) == type([]) return a:v - elseif type(a:v) == type("") + elseif type(a:v) == type('') return self.str2bytes(a:v) else throw "Can't convert to bytes" endif endfunction -function s:bytes.str2bytes(str) +function! s:bytes.str2bytes(str) abort return map(range(len(a:str)), 'char2nr(a:str[v:val])') endfunction -function s:bytes.bytes2str(bytes) +function! s:bytes.bytes2str(bytes) abort return eval('"' . join(map(copy(a:bytes), 'printf(''\x%02x'', v:val)'), '') . '"') endfunction -function s:bytes.bytes2hex(bytes) +function! s:bytes.bytes2hex(bytes) abort return join(map(copy(a:bytes), 'printf("%02x", v:val)'), '') endfunction -function s:bytes.hex2bytes(hex) +function! s:bytes.hex2bytes(hex) abort return map(split(a:hex, '..\zs'), 'str2nr(v:val, 16)') endfunction -function s:bytes.lines2bytes(lines) +function! s:bytes.lines2bytes(lines) abort let bytes = [] let first = 1 for line in a:lines @@ -40,12 +38,12 @@ function s:bytes.lines2bytes(lines) call add(bytes, 10) endif let first = 0 - call extend(bytes, map(range(len(line)), 'line[v:val] == "\n" ? 0 : char2nr(line[v:val])')) + call extend(bytes, map(range(len(line)), 'line[v:val] ==# "\n" ? 0 : char2nr(line[v:val])')) endfor return bytes endfunction -function s:bytes.bytes2lines(bytes) +function! s:bytes.bytes2lines(bytes) abort let table = map(range(256), 'printf(''\x%02x'', v:val == 0 ? 10 : v:val)') let lines = [] let start = 0 @@ -64,7 +62,7 @@ function s:bytes.bytes2lines(bytes) return lines endfunction -function s:bytes.readfile(filename) +function! s:bytes.readfile(filename) abort try let lines = readfile(a:filename, 'b') catch /^Vim\%((\a\+)\)\=:E484:/ @@ -74,7 +72,7 @@ function s:bytes.readfile(filename) return bytes endfunction -function s:bytes.writefile(bytes, filename) +function! s:bytes.writefile(bytes, filename) abort let lines = self.bytes2lines(a:bytes) if writefile(lines, a:filename, 'b') != 0 throw "Can't write file" diff --git a/autoload/SpaceVim/api/iconv/codecs/_8859_1.vim b/autoload/SpaceVim/api/iconv/codecs/_8859_1.vim index 6fe13d234..e8d2b973e 100644 --- a/autoload/SpaceVim/api/iconv/codecs/_8859_1.vim +++ b/autoload/SpaceVim/api/iconv/codecs/_8859_1.vim @@ -1,11 +1,8 @@ -let s:nsiconv = expand(':p:h:h:gs?[\\/]?#?:s?^.*#autoload\(#\|$\)??:s?$?#?') -let s:ns = expand(':p:r:gs?[\\/]?#?:s?^.*#autoload#??:s?$?#?') - -function {s:ns}import() +function! SpaceVim#api#iconv#codecs#_8859_1#import() abort return s:lib endfunction -let s:tablebase = {s:nsiconv}codecs#tablebase#import() +let s:tablebase = SpaceVim#api#iconv#codecs#tablebase#import() let s:lib = {} diff --git a/autoload/SpaceVim/api/iconv/codecs/_8859_10.vim b/autoload/SpaceVim/api/iconv/codecs/_8859_10.vim index c103292a1..665dacc1c 100644 --- a/autoload/SpaceVim/api/iconv/codecs/_8859_10.vim +++ b/autoload/SpaceVim/api/iconv/codecs/_8859_10.vim @@ -1,11 +1,8 @@ -let s:nsiconv = expand(':p:h:h:gs?[\\/]?#?:s?^.*#autoload\(#\|$\)??:s?$?#?') -let s:ns = expand(':p:r:gs?[\\/]?#?:s?^.*#autoload#??:s?$?#?') - -function {s:ns}import() +function! SpaceVim#api#iconv#codecs#_8859_10#import() abort return s:lib endfunction -let s:tablebase = {s:nsiconv}codecs#tablebase#import() +let s:tablebase = SpaceVim#api#iconv#codecs#tablebase#import() let s:lib = {} diff --git a/autoload/SpaceVim/api/iconv/codecs/_8859_11.vim b/autoload/SpaceVim/api/iconv/codecs/_8859_11.vim index 668ea18ce..a439e04cc 100644 --- a/autoload/SpaceVim/api/iconv/codecs/_8859_11.vim +++ b/autoload/SpaceVim/api/iconv/codecs/_8859_11.vim @@ -1,11 +1,8 @@ -let s:nsiconv = expand(':p:h:h:gs?[\\/]?#?:s?^.*#autoload\(#\|$\)??:s?$?#?') -let s:ns = expand(':p:r:gs?[\\/]?#?:s?^.*#autoload#??:s?$?#?') - -function {s:ns}import() +function! SpaceVim#api#iconv#codecs#_8859_11#import() abort return s:lib endfunction -let s:tablebase = {s:nsiconv}codecs#tablebase#import() +let s:tablebase = SpaceVim#api#iconv#codecs#tablebase#import() let s:lib = {} diff --git a/autoload/SpaceVim/api/iconv/codecs/_8859_13.vim b/autoload/SpaceVim/api/iconv/codecs/_8859_13.vim index 1e8cd7ef2..3395ec988 100644 --- a/autoload/SpaceVim/api/iconv/codecs/_8859_13.vim +++ b/autoload/SpaceVim/api/iconv/codecs/_8859_13.vim @@ -1,11 +1,8 @@ -let s:nsiconv = expand(':p:h:h:gs?[\\/]?#?:s?^.*#autoload\(#\|$\)??:s?$?#?') -let s:ns = expand(':p:r:gs?[\\/]?#?:s?^.*#autoload#??:s?$?#?') - -function {s:ns}import() +function! SpaceVim#api#iconv#codecs#_8859_13#import() abort return s:lib endfunction -let s:tablebase = {s:nsiconv}codecs#tablebase#import() +let s:tablebase = SpaceVim#api#iconv#codecs#tablebase#import() let s:lib = {} diff --git a/autoload/SpaceVim/api/iconv/codecs/_8859_14.vim b/autoload/SpaceVim/api/iconv/codecs/_8859_14.vim index 8bc058d55..8dc1dc568 100644 --- a/autoload/SpaceVim/api/iconv/codecs/_8859_14.vim +++ b/autoload/SpaceVim/api/iconv/codecs/_8859_14.vim @@ -1,11 +1,8 @@ -let s:nsiconv = expand(':p:h:h:gs?[\\/]?#?:s?^.*#autoload\(#\|$\)??:s?$?#?') -let s:ns = expand(':p:r:gs?[\\/]?#?:s?^.*#autoload#??:s?$?#?') - -function {s:ns}import() +function! SpaceVim#api#iconv#codecs#_8859_14#import() abort return s:lib endfunction -let s:tablebase = {s:nsiconv}codecs#tablebase#import() +let s:tablebase = SpaceVim#api#iconv#codecs#tablebase#import() let s:lib = {} diff --git a/autoload/SpaceVim/api/iconv/codecs/_8859_15.vim b/autoload/SpaceVim/api/iconv/codecs/_8859_15.vim index 1ed06e6a4..7412f5532 100644 --- a/autoload/SpaceVim/api/iconv/codecs/_8859_15.vim +++ b/autoload/SpaceVim/api/iconv/codecs/_8859_15.vim @@ -1,11 +1,8 @@ -let s:nsiconv = expand(':p:h:h:gs?[\\/]?#?:s?^.*#autoload\(#\|$\)??:s?$?#?') -let s:ns = expand(':p:r:gs?[\\/]?#?:s?^.*#autoload#??:s?$?#?') - -function {s:ns}import() +function! SpaceVim#api#iconv#codecs#_8859_15#import() abort return s:lib endfunction -let s:tablebase = {s:nsiconv}codecs#tablebase#import() +let s:tablebase = SpaceVim#api#iconv#codecs#tablebase#import() let s:lib = {} diff --git a/autoload/SpaceVim/api/iconv/codecs/_8859_16.vim b/autoload/SpaceVim/api/iconv/codecs/_8859_16.vim index 63f5cf06f..5ede5b361 100644 --- a/autoload/SpaceVim/api/iconv/codecs/_8859_16.vim +++ b/autoload/SpaceVim/api/iconv/codecs/_8859_16.vim @@ -1,11 +1,9 @@ -let s:nsiconv = expand(':p:h:h:gs?[\\/]?#?:s?^.*#autoload\(#\|$\)??:s?$?#?') -let s:ns = expand(':p:r:gs?[\\/]?#?:s?^.*#autoload#??:s?$?#?') +function! SpaceVim#api#iconv#codecs#_8859_16#import() abort -function {s:ns}import() return s:lib endfunction -let s:tablebase = {s:nsiconv}codecs#tablebase#import() +let s:tablebase = SpaceVim#api#iconv#codecs#tablebase#import() let s:lib = {} diff --git a/autoload/SpaceVim/api/iconv/codecs/_8859_2.vim b/autoload/SpaceVim/api/iconv/codecs/_8859_2.vim index 5c0877c52..e6e92db9a 100644 --- a/autoload/SpaceVim/api/iconv/codecs/_8859_2.vim +++ b/autoload/SpaceVim/api/iconv/codecs/_8859_2.vim @@ -1,11 +1,11 @@ let s:nsiconv = expand(':p:h:h:gs?[\\/]?#?:s?^.*#autoload\(#\|$\)??:s?$?#?') let s:ns = expand(':p:r:gs?[\\/]?#?:s?^.*#autoload#??:s?$?#?') -function {s:ns}import() +function! SpaceVim#api#iconv#codecs#_8859_2#import() abort return s:lib endfunction -let s:tablebase = {s:nsiconv}codecs#tablebase#import() +let s:tablebase = SpaceVim#api#iconv#codecs#tablebase#import() let s:lib = {} diff --git a/autoload/SpaceVim/api/iconv/codecs/_8859_3.vim b/autoload/SpaceVim/api/iconv/codecs/_8859_3.vim index c803804cb..dcb1d187b 100644 --- a/autoload/SpaceVim/api/iconv/codecs/_8859_3.vim +++ b/autoload/SpaceVim/api/iconv/codecs/_8859_3.vim @@ -1,11 +1,8 @@ -let s:nsiconv = expand(':p:h:h:gs?[\\/]?#?:s?^.*#autoload\(#\|$\)??:s?$?#?') -let s:ns = expand(':p:r:gs?[\\/]?#?:s?^.*#autoload#??:s?$?#?') - -function {s:ns}import() +function! SpaceVim#api#iconv#codecs#_8859_3#import() abort return s:lib endfunction -let s:tablebase = {s:nsiconv}codecs#tablebase#import() +let s:tablebase = SpaceVim#api#iconv#codecs#tablebase#import() let s:lib = {} diff --git a/autoload/SpaceVim/api/iconv/codecs/_8859_4.vim b/autoload/SpaceVim/api/iconv/codecs/_8859_4.vim index 60bab1512..f81d8192c 100644 --- a/autoload/SpaceVim/api/iconv/codecs/_8859_4.vim +++ b/autoload/SpaceVim/api/iconv/codecs/_8859_4.vim @@ -1,11 +1,8 @@ -let s:nsiconv = expand(':p:h:h:gs?[\\/]?#?:s?^.*#autoload\(#\|$\)??:s?$?#?') -let s:ns = expand(':p:r:gs?[\\/]?#?:s?^.*#autoload#??:s?$?#?') - -function {s:ns}import() +function! SpaceVim#api#iconv#codecs#_8859_4#import() abort return s:lib endfunction -let s:tablebase = {s:nsiconv}codecs#tablebase#import() +let s:tablebase = SpaceVim#api#iconv#codecs#tablebase#import() let s:lib = {} diff --git a/autoload/SpaceVim/api/iconv/codecs/_8859_5.vim b/autoload/SpaceVim/api/iconv/codecs/_8859_5.vim index 718c9e937..4c641cf37 100644 --- a/autoload/SpaceVim/api/iconv/codecs/_8859_5.vim +++ b/autoload/SpaceVim/api/iconv/codecs/_8859_5.vim @@ -1,11 +1,8 @@ -let s:nsiconv = expand(':p:h:h:gs?[\\/]?#?:s?^.*#autoload\(#\|$\)??:s?$?#?') -let s:ns = expand(':p:r:gs?[\\/]?#?:s?^.*#autoload#??:s?$?#?') - -function {s:ns}import() +function! SpaceVim#api#iconv#codecs#_8859_5#import() abort return s:lib endfunction -let s:tablebase = {s:nsiconv}codecs#tablebase#import() +let s:tablebase = SpaceVim#api#iconv#codecs#tablebase#import() let s:lib = {} diff --git a/autoload/SpaceVim/api/iconv/codecs/_8859_6.vim b/autoload/SpaceVim/api/iconv/codecs/_8859_6.vim index 29951f9d4..10ad942b6 100644 --- a/autoload/SpaceVim/api/iconv/codecs/_8859_6.vim +++ b/autoload/SpaceVim/api/iconv/codecs/_8859_6.vim @@ -1,11 +1,8 @@ -let s:nsiconv = expand(':p:h:h:gs?[\\/]?#?:s?^.*#autoload\(#\|$\)??:s?$?#?') -let s:ns = expand(':p:r:gs?[\\/]?#?:s?^.*#autoload#??:s?$?#?') - -function {s:ns}import() +function! SpaceVim#api#iconv#codecs#_8859_6#import() abort return s:lib endfunction -let s:tablebase = {s:nsiconv}codecs#tablebase#import() +let s:tablebase = SpaceVim#api#iconv#codecs#tablebase#import() let s:lib = {} diff --git a/autoload/SpaceVim/api/iconv/codecs/_8859_7.vim b/autoload/SpaceVim/api/iconv/codecs/_8859_7.vim index 6dab3d8e5..1d092badf 100644 --- a/autoload/SpaceVim/api/iconv/codecs/_8859_7.vim +++ b/autoload/SpaceVim/api/iconv/codecs/_8859_7.vim @@ -1,11 +1,8 @@ -let s:nsiconv = expand(':p:h:h:gs?[\\/]?#?:s?^.*#autoload\(#\|$\)??:s?$?#?') -let s:ns = expand(':p:r:gs?[\\/]?#?:s?^.*#autoload#??:s?$?#?') - -function {s:ns}import() +function! SpaceVim#api#iconv#codecs#_8859_7#import() abort return s:lib endfunction -let s:tablebase = {s:nsiconv}codecs#tablebase#import() +let s:tablebase = SpaceVim#api#iconv#codecs#tablebase#import() let s:lib = {} diff --git a/autoload/SpaceVim/api/iconv/codecs/_8859_8.vim b/autoload/SpaceVim/api/iconv/codecs/_8859_8.vim index 56d635724..0882570f9 100644 --- a/autoload/SpaceVim/api/iconv/codecs/_8859_8.vim +++ b/autoload/SpaceVim/api/iconv/codecs/_8859_8.vim @@ -1,11 +1,8 @@ -let s:nsiconv = expand(':p:h:h:gs?[\\/]?#?:s?^.*#autoload\(#\|$\)??:s?$?#?') -let s:ns = expand(':p:r:gs?[\\/]?#?:s?^.*#autoload#??:s?$?#?') - -function {s:ns}import() +function! SpaceVim#api#iconv#codecs#_8859_8#import() abort return s:lib endfunction -let s:tablebase = {s:nsiconv}codecs#tablebase#import() +let s:tablebase = SpaceVim#api#iconv#codecs#tablebase#import() let s:lib = {} diff --git a/autoload/SpaceVim/api/iconv/codecs/_8859_9.vim b/autoload/SpaceVim/api/iconv/codecs/_8859_9.vim index 3ebe2e806..c34fc4a17 100644 --- a/autoload/SpaceVim/api/iconv/codecs/_8859_9.vim +++ b/autoload/SpaceVim/api/iconv/codecs/_8859_9.vim @@ -1,11 +1,8 @@ -let s:nsiconv = expand(':p:h:h:gs?[\\/]?#?:s?^.*#autoload\(#\|$\)??:s?$?#?') -let s:ns = expand(':p:r:gs?[\\/]?#?:s?^.*#autoload#??:s?$?#?') - -function {s:ns}import() +function! SpaceVim#api#iconv#codecs#_8859_9#import() abort return s:lib endfunction -let s:tablebase = {s:nsiconv}codecs#tablebase#import() +let s:tablebase = SpaceVim#api#iconv#codecs#tablebase#import() let s:lib = {} diff --git a/autoload/SpaceVim/api/iconv/codecs/_cp037.vim b/autoload/SpaceVim/api/iconv/codecs/_cp037.vim index 2ee1da656..e797bef59 100644 --- a/autoload/SpaceVim/api/iconv/codecs/_cp037.vim +++ b/autoload/SpaceVim/api/iconv/codecs/_cp037.vim @@ -1,11 +1,9 @@ -let s:nsiconv = expand(':p:h:h:gs?[\\/]?#?:s?^.*#autoload\(#\|$\)??:s?$?#?') -let s:ns = expand(':p:r:gs?[\\/]?#?:s?^.*#autoload#??:s?$?#?') +function! SpaceVim#api#iconv#codecs#_cp037#import() abort -function {s:ns}import() return s:lib endfunction -let s:tablebase = {s:nsiconv}codecs#tablebase#import() +let s:tablebase = SpaceVim#api#iconv#codecs#tablebase#import() let s:lib = {} diff --git a/autoload/SpaceVim/api/iconv/codecs/_cp1026.vim b/autoload/SpaceVim/api/iconv/codecs/_cp1026.vim index 41f66c0af..00373523b 100644 --- a/autoload/SpaceVim/api/iconv/codecs/_cp1026.vim +++ b/autoload/SpaceVim/api/iconv/codecs/_cp1026.vim @@ -1,11 +1,9 @@ -let s:nsiconv = expand(':p:h:h:gs?[\\/]?#?:s?^.*#autoload\(#\|$\)??:s?$?#?') -let s:ns = expand(':p:r:gs?[\\/]?#?:s?^.*#autoload#??:s?$?#?') +function! SpaceVim#api#iconv#codecs#_cp1026#import() abort -function {s:ns}import() return s:lib endfunction -let s:tablebase = {s:nsiconv}codecs#tablebase#import() +let s:tablebase = SpaceVim#api#iconv#codecs#tablebase#import() let s:lib = {} diff --git a/autoload/SpaceVim/api/iconv/codecs/_cp1250.vim b/autoload/SpaceVim/api/iconv/codecs/_cp1250.vim index 0b972bf29..8f03e358f 100644 --- a/autoload/SpaceVim/api/iconv/codecs/_cp1250.vim +++ b/autoload/SpaceVim/api/iconv/codecs/_cp1250.vim @@ -1,11 +1,9 @@ -let s:nsiconv = expand(':p:h:h:gs?[\\/]?#?:s?^.*#autoload\(#\|$\)??:s?$?#?') -let s:ns = expand(':p:r:gs?[\\/]?#?:s?^.*#autoload#??:s?$?#?') +function! SpaceVim#api#iconv#codecs#_cp1250#import() abort -function {s:ns}import() return s:lib endfunction -let s:tablebase = {s:nsiconv}codecs#tablebase#import() +let s:tablebase = SpaceVim#api#iconv#codecs#tablebase#import() let s:lib = {} diff --git a/autoload/SpaceVim/api/iconv/codecs/_cp1251.vim b/autoload/SpaceVim/api/iconv/codecs/_cp1251.vim index 4b3f4740a..66c748c3f 100644 --- a/autoload/SpaceVim/api/iconv/codecs/_cp1251.vim +++ b/autoload/SpaceVim/api/iconv/codecs/_cp1251.vim @@ -1,11 +1,9 @@ -let s:nsiconv = expand(':p:h:h:gs?[\\/]?#?:s?^.*#autoload\(#\|$\)??:s?$?#?') -let s:ns = expand(':p:r:gs?[\\/]?#?:s?^.*#autoload#??:s?$?#?') +function! SpaceVim#api#iconv#codecs#_cp1251#import() abort -function {s:ns}import() return s:lib endfunction -let s:tablebase = {s:nsiconv}codecs#tablebase#import() +let s:tablebase = SpaceVim#api#iconv#codecs#tablebase#import() let s:lib = {} diff --git a/autoload/SpaceVim/api/iconv/codecs/_cp1252.vim b/autoload/SpaceVim/api/iconv/codecs/_cp1252.vim index 9a292d1fd..1d91ac7ab 100644 --- a/autoload/SpaceVim/api/iconv/codecs/_cp1252.vim +++ b/autoload/SpaceVim/api/iconv/codecs/_cp1252.vim @@ -1,11 +1,9 @@ -let s:nsiconv = expand(':p:h:h:gs?[\\/]?#?:s?^.*#autoload\(#\|$\)??:s?$?#?') -let s:ns = expand(':p:r:gs?[\\/]?#?:s?^.*#autoload#??:s?$?#?') +function! SpaceVim#api#iconv#codecs#_cp1252#import() abort -function {s:ns}import() return s:lib endfunction -let s:tablebase = {s:nsiconv}codecs#tablebase#import() +let s:tablebase = SpaceVim#api#iconv#codecs#tablebase#import() let s:lib = {} diff --git a/autoload/SpaceVim/api/iconv/codecs/_cp1253.vim b/autoload/SpaceVim/api/iconv/codecs/_cp1253.vim index e9c9c803d..c8d157efd 100644 --- a/autoload/SpaceVim/api/iconv/codecs/_cp1253.vim +++ b/autoload/SpaceVim/api/iconv/codecs/_cp1253.vim @@ -1,11 +1,9 @@ -let s:nsiconv = expand(':p:h:h:gs?[\\/]?#?:s?^.*#autoload\(#\|$\)??:s?$?#?') -let s:ns = expand(':p:r:gs?[\\/]?#?:s?^.*#autoload#??:s?$?#?') +function! SpaceVim#api#iconv#codecs#_cp1253#import() abort -function {s:ns}import() return s:lib endfunction -let s:tablebase = {s:nsiconv}codecs#tablebase#import() +let s:tablebase = SpaceVim#api#iconv#codecs#tablebase#import() let s:lib = {} diff --git a/autoload/SpaceVim/api/iconv/codecs/_cp1254.vim b/autoload/SpaceVim/api/iconv/codecs/_cp1254.vim index 5ea73d8d4..883d85a16 100644 --- a/autoload/SpaceVim/api/iconv/codecs/_cp1254.vim +++ b/autoload/SpaceVim/api/iconv/codecs/_cp1254.vim @@ -1,11 +1,9 @@ -let s:nsiconv = expand(':p:h:h:gs?[\\/]?#?:s?^.*#autoload\(#\|$\)??:s?$?#?') -let s:ns = expand(':p:r:gs?[\\/]?#?:s?^.*#autoload#??:s?$?#?') +function! SpaceVim#api#iconv#codecs#_cp1254#import() abort -function {s:ns}import() return s:lib endfunction -let s:tablebase = {s:nsiconv}codecs#tablebase#import() +let s:tablebase = SpaceVim#api#iconv#codecs#tablebase#import() let s:lib = {} diff --git a/autoload/SpaceVim/api/iconv/codecs/_cp1255.vim b/autoload/SpaceVim/api/iconv/codecs/_cp1255.vim index 896a22535..b415142b0 100644 --- a/autoload/SpaceVim/api/iconv/codecs/_cp1255.vim +++ b/autoload/SpaceVim/api/iconv/codecs/_cp1255.vim @@ -1,11 +1,9 @@ -let s:nsiconv = expand(':p:h:h:gs?[\\/]?#?:s?^.*#autoload\(#\|$\)??:s?$?#?') -let s:ns = expand(':p:r:gs?[\\/]?#?:s?^.*#autoload#??:s?$?#?') +function! SpaceVim#api#iconv#codecs#_cp1255#import() abort -function {s:ns}import() return s:lib endfunction -let s:tablebase = {s:nsiconv}codecs#tablebase#import() +let s:tablebase = SpaceVim#api#iconv#codecs#tablebase#import() let s:lib = {} diff --git a/autoload/SpaceVim/api/iconv/codecs/_cp1256.vim b/autoload/SpaceVim/api/iconv/codecs/_cp1256.vim index 62697ceac..eaaacee0b 100644 --- a/autoload/SpaceVim/api/iconv/codecs/_cp1256.vim +++ b/autoload/SpaceVim/api/iconv/codecs/_cp1256.vim @@ -1,11 +1,9 @@ -let s:nsiconv = expand(':p:h:h:gs?[\\/]?#?:s?^.*#autoload\(#\|$\)??:s?$?#?') -let s:ns = expand(':p:r:gs?[\\/]?#?:s?^.*#autoload#??:s?$?#?') +function! SpaceVim#api#iconv#codecs#_cp1256#import() abort -function {s:ns}import() return s:lib endfunction -let s:tablebase = {s:nsiconv}codecs#tablebase#import() +let s:tablebase = SpaceVim#api#iconv#codecs#tablebase#import() let s:lib = {} diff --git a/autoload/SpaceVim/api/iconv/codecs/_cp1257.vim b/autoload/SpaceVim/api/iconv/codecs/_cp1257.vim index e6a537e65..ff91ff6ce 100644 --- a/autoload/SpaceVim/api/iconv/codecs/_cp1257.vim +++ b/autoload/SpaceVim/api/iconv/codecs/_cp1257.vim @@ -1,11 +1,9 @@ -let s:nsiconv = expand(':p:h:h:gs?[\\/]?#?:s?^.*#autoload\(#\|$\)??:s?$?#?') -let s:ns = expand(':p:r:gs?[\\/]?#?:s?^.*#autoload#??:s?$?#?') +function! SpaceVim#api#iconv#codecs#_cp1257#import() abort -function! {s:ns}import() abort return s:lib endfunction -let s:tablebase = {s:nsiconv}codecs#tablebase#import() +let s:tablebase = SpaceVim#api#iconv#codecs#tablebase#import() let s:lib = {} diff --git a/autoload/SpaceVim/api/iconv/codecs/_cp1258.vim b/autoload/SpaceVim/api/iconv/codecs/_cp1258.vim index 1e7c1b613..ea2fba905 100644 --- a/autoload/SpaceVim/api/iconv/codecs/_cp1258.vim +++ b/autoload/SpaceVim/api/iconv/codecs/_cp1258.vim @@ -1,11 +1,9 @@ -let s:nsiconv = expand(':p:h:h:gs?[\\/]?#?:s?^.*#autoload\(#\|$\)??:s?$?#?') -let s:ns = expand(':p:r:gs?[\\/]?#?:s?^.*#autoload#??:s?$?#?') +function! SpaceVim#api#iconv#codecs#_cp1258#import() abort -function! {s:ns}import() abort return s:lib endfunction -let s:tablebase = {s:nsiconv}codecs#tablebase#import() +let s:tablebase = SpaceVim#api#iconv#codecs#tablebase#import() let s:lib = {} diff --git a/autoload/SpaceVim/api/iconv/codecs/_cp437.vim b/autoload/SpaceVim/api/iconv/codecs/_cp437.vim index 0c866aa95..177db7450 100644 --- a/autoload/SpaceVim/api/iconv/codecs/_cp437.vim +++ b/autoload/SpaceVim/api/iconv/codecs/_cp437.vim @@ -1,11 +1,9 @@ -let s:nsiconv = expand(':p:h:h:gs?[\\/]?#?:s?^.*#autoload\(#\|$\)??:s?$?#?') -let s:ns = expand(':p:r:gs?[\\/]?#?:s?^.*#autoload#??:s?$?#?') +function! SpaceVim#api#iconv#codecs#_cp437#import() abort -function {s:ns}import() return s:lib endfunction -let s:tablebase = {s:nsiconv}codecs#tablebase#import() +let s:tablebase = SpaceVim#api#iconv#codecs#tablebase#import() let s:lib = {} diff --git a/autoload/SpaceVim/api/iconv/codecs/_cp500.vim b/autoload/SpaceVim/api/iconv/codecs/_cp500.vim index d5370d5d1..e8a5e7801 100644 --- a/autoload/SpaceVim/api/iconv/codecs/_cp500.vim +++ b/autoload/SpaceVim/api/iconv/codecs/_cp500.vim @@ -1,11 +1,9 @@ -let s:nsiconv = expand(':p:h:h:gs?[\\/]?#?:s?^.*#autoload\(#\|$\)??:s?$?#?') -let s:ns = expand(':p:r:gs?[\\/]?#?:s?^.*#autoload#??:s?$?#?') +function! SpaceVim#api#iconv#codecs#_cp500#import() abort -function {s:ns}import() return s:lib endfunction -let s:tablebase = {s:nsiconv}codecs#tablebase#import() +let s:tablebase = SpaceVim#api#iconv#codecs#tablebase#import() let s:lib = {} diff --git a/autoload/SpaceVim/api/iconv/codecs/_cp737.vim b/autoload/SpaceVim/api/iconv/codecs/_cp737.vim index e1d9740b6..f1b7b550d 100644 --- a/autoload/SpaceVim/api/iconv/codecs/_cp737.vim +++ b/autoload/SpaceVim/api/iconv/codecs/_cp737.vim @@ -1,11 +1,9 @@ -let s:nsiconv = expand(':p:h:h:gs?[\\/]?#?:s?^.*#autoload\(#\|$\)??:s?$?#?') -let s:ns = expand(':p:r:gs?[\\/]?#?:s?^.*#autoload#??:s?$?#?') +function! SpaceVim#api#iconv#codecs#_cp737#import() abort -function {s:ns}import() return s:lib endfunction -let s:tablebase = {s:nsiconv}codecs#tablebase#import() +let s:tablebase = SpaceVim#api#iconv#codecs#tablebase#import() let s:lib = {} diff --git a/autoload/SpaceVim/api/iconv/codecs/_cp775.vim b/autoload/SpaceVim/api/iconv/codecs/_cp775.vim index e6a15d56f..445c0040f 100644 --- a/autoload/SpaceVim/api/iconv/codecs/_cp775.vim +++ b/autoload/SpaceVim/api/iconv/codecs/_cp775.vim @@ -1,11 +1,9 @@ -let s:nsiconv = expand(':p:h:h:gs?[\\/]?#?:s?^.*#autoload\(#\|$\)??:s?$?#?') -let s:ns = expand(':p:r:gs?[\\/]?#?:s?^.*#autoload#??:s?$?#?') +function! SpaceVim#api#iconv#codecs#_cp775#import() abort -function {s:ns}import() return s:lib endfunction -let s:tablebase = {s:nsiconv}codecs#tablebase#import() +let s:tablebase = SpaceVim#api#iconv#codecs#tablebase#import() let s:lib = {} diff --git a/autoload/SpaceVim/api/iconv/codecs/_cp850.vim b/autoload/SpaceVim/api/iconv/codecs/_cp850.vim index 6172423f5..29795dbc8 100644 --- a/autoload/SpaceVim/api/iconv/codecs/_cp850.vim +++ b/autoload/SpaceVim/api/iconv/codecs/_cp850.vim @@ -1,11 +1,9 @@ -let s:nsiconv = expand(':p:h:h:gs?[\\/]?#?:s?^.*#autoload\(#\|$\)??:s?$?#?') -let s:ns = expand(':p:r:gs?[\\/]?#?:s?^.*#autoload#??:s?$?#?') +function! SpaceVim#api#iconv#codecs#_cp850#import() abort -function {s:ns}import() return s:lib endfunction -let s:tablebase = {s:nsiconv}codecs#tablebase#import() +let s:tablebase = SpaceVim#api#iconv#codecs#tablebase#import() let s:lib = {} diff --git a/autoload/SpaceVim/api/iconv/codecs/_cp852.vim b/autoload/SpaceVim/api/iconv/codecs/_cp852.vim index 722b46e68..a5429c189 100644 --- a/autoload/SpaceVim/api/iconv/codecs/_cp852.vim +++ b/autoload/SpaceVim/api/iconv/codecs/_cp852.vim @@ -1,11 +1,9 @@ -let s:nsiconv = expand(':p:h:h:gs?[\\/]?#?:s?^.*#autoload\(#\|$\)??:s?$?#?') -let s:ns = expand(':p:r:gs?[\\/]?#?:s?^.*#autoload#??:s?$?#?') +function! SpaceVim#api#iconv#codecs#_cp852#import() abort -function {s:ns}import() return s:lib endfunction -let s:tablebase = {s:nsiconv}codecs#tablebase#import() +let s:tablebase = SpaceVim#api#iconv#codecs#tablebase#import() let s:lib = {} diff --git a/autoload/SpaceVim/api/iconv/codecs/_cp855.vim b/autoload/SpaceVim/api/iconv/codecs/_cp855.vim index ea2ed7151..b95a15d24 100644 --- a/autoload/SpaceVim/api/iconv/codecs/_cp855.vim +++ b/autoload/SpaceVim/api/iconv/codecs/_cp855.vim @@ -1,11 +1,10 @@ -let s:nsiconv = expand(':p:h:h:gs?[\\/]?#?:s?^.*#autoload\(#\|$\)??:s?$?#?') -let s:ns = expand(':p:r:gs?[\\/]?#?:s?^.*#autoload#??:s?$?#?') +function! SpaceVim#api#iconv#codecs#_cp855#import() abort + -function {s:ns}import() return s:lib endfunction -let s:tablebase = {s:nsiconv}codecs#tablebase#import() +let s:tablebase = SpaceVim#api#iconv#codecs#tablebase#import() let s:lib = {} diff --git a/autoload/SpaceVim/api/iconv/codecs/_cp857.vim b/autoload/SpaceVim/api/iconv/codecs/_cp857.vim index fca4e8dec..d162d66fd 100644 --- a/autoload/SpaceVim/api/iconv/codecs/_cp857.vim +++ b/autoload/SpaceVim/api/iconv/codecs/_cp857.vim @@ -1,11 +1,9 @@ -let s:nsiconv = expand(':p:h:h:gs?[\\/]?#?:s?^.*#autoload\(#\|$\)??:s?$?#?') -let s:ns = expand(':p:r:gs?[\\/]?#?:s?^.*#autoload#??:s?$?#?') +function! SpaceVim#api#iconv#codecs#_cp857#import() abort -function {s:ns}import() return s:lib endfunction -let s:tablebase = {s:nsiconv}codecs#tablebase#import() +let s:tablebase = SpaceVim#api#iconv#codecs#tablebase#import() let s:lib = {} diff --git a/autoload/SpaceVim/api/iconv/codecs/_cp860.vim b/autoload/SpaceVim/api/iconv/codecs/_cp860.vim index bf6d44b21..ba6d29d31 100644 --- a/autoload/SpaceVim/api/iconv/codecs/_cp860.vim +++ b/autoload/SpaceVim/api/iconv/codecs/_cp860.vim @@ -1,11 +1,9 @@ -let s:nsiconv = expand(':p:h:h:gs?[\\/]?#?:s?^.*#autoload\(#\|$\)??:s?$?#?') -let s:ns = expand(':p:r:gs?[\\/]?#?:s?^.*#autoload#??:s?$?#?') +function! SpaceVim#api#iconv#codecs#_cp860#import() abort -function {s:ns}import() return s:lib endfunction -let s:tablebase = {s:nsiconv}codecs#tablebase#import() +let s:tablebase = SpaceVim#api#iconv#codecs#tablebase#import() let s:lib = {} diff --git a/autoload/SpaceVim/api/iconv/codecs/_cp861.vim b/autoload/SpaceVim/api/iconv/codecs/_cp861.vim index 1e2f54396..923d8cc19 100644 --- a/autoload/SpaceVim/api/iconv/codecs/_cp861.vim +++ b/autoload/SpaceVim/api/iconv/codecs/_cp861.vim @@ -1,11 +1,8 @@ -let s:nsiconv = expand(':p:h:h:gs?[\\/]?#?:s?^.*#autoload\(#\|$\)??:s?$?#?') -let s:ns = expand(':p:r:gs?[\\/]?#?:s?^.*#autoload#??:s?$?#?') - -function {s:ns}import() +function! SpaceVim#api#iconv#codecs#_cp861#import() abort return s:lib endfunction -let s:tablebase = {s:nsiconv}codecs#tablebase#import() +let s:tablebase = SpaceVim#api#iconv#codecs#tablebase#import() let s:lib = {} diff --git a/autoload/SpaceVim/api/iconv/codecs/_cp862.vim b/autoload/SpaceVim/api/iconv/codecs/_cp862.vim index da31a75f6..e3fac2559 100644 --- a/autoload/SpaceVim/api/iconv/codecs/_cp862.vim +++ b/autoload/SpaceVim/api/iconv/codecs/_cp862.vim @@ -1,11 +1,9 @@ -let s:nsiconv = expand(':p:h:h:gs?[\\/]?#?:s?^.*#autoload\(#\|$\)??:s?$?#?') -let s:ns = expand(':p:r:gs?[\\/]?#?:s?^.*#autoload#??:s?$?#?') +function! SpaceVim#api#iconv#codecs#_cp862#import() abort -function {s:ns}import() return s:lib endfunction -let s:tablebase = {s:nsiconv}codecs#tablebase#import() +let s:tablebase = SpaceVim#api#iconv#codecs#tablebase#import() let s:lib = {} diff --git a/autoload/SpaceVim/api/iconv/codecs/_cp863.vim b/autoload/SpaceVim/api/iconv/codecs/_cp863.vim index 46e265de3..f7d84efd6 100644 --- a/autoload/SpaceVim/api/iconv/codecs/_cp863.vim +++ b/autoload/SpaceVim/api/iconv/codecs/_cp863.vim @@ -1,11 +1,9 @@ -let s:nsiconv = expand(':p:h:h:gs?[\\/]?#?:s?^.*#autoload\(#\|$\)??:s?$?#?') -let s:ns = expand(':p:r:gs?[\\/]?#?:s?^.*#autoload#??:s?$?#?') +function! SpaceVim#api#iconv#codecs#_cp863#import() abort -function {s:ns}import() return s:lib endfunction -let s:tablebase = {s:nsiconv}codecs#tablebase#import() +let s:tablebase = SpaceVim#api#iconv#codecs#tablebase#import() let s:lib = {} diff --git a/autoload/SpaceVim/api/iconv/codecs/_cp864.vim b/autoload/SpaceVim/api/iconv/codecs/_cp864.vim index 499286fd3..b6d3db783 100644 --- a/autoload/SpaceVim/api/iconv/codecs/_cp864.vim +++ b/autoload/SpaceVim/api/iconv/codecs/_cp864.vim @@ -1,11 +1,9 @@ -let s:nsiconv = expand(':p:h:h:gs?[\\/]?#?:s?^.*#autoload\(#\|$\)??:s?$?#?') -let s:ns = expand(':p:r:gs?[\\/]?#?:s?^.*#autoload#??:s?$?#?') +function! SpaceVim#api#iconv#codecs#_cp864#import() abort -function {s:ns}import() return s:lib endfunction -let s:tablebase = {s:nsiconv}codecs#tablebase#import() +let s:tablebase = SpaceVim#api#iconv#codecs#tablebase#import() let s:lib = {} diff --git a/autoload/SpaceVim/api/iconv/codecs/_cp865.vim b/autoload/SpaceVim/api/iconv/codecs/_cp865.vim index f21a0807a..d4e2863f7 100644 --- a/autoload/SpaceVim/api/iconv/codecs/_cp865.vim +++ b/autoload/SpaceVim/api/iconv/codecs/_cp865.vim @@ -1,11 +1,9 @@ -let s:nsiconv = expand(':p:h:h:gs?[\\/]?#?:s?^.*#autoload\(#\|$\)??:s?$?#?') -let s:ns = expand(':p:r:gs?[\\/]?#?:s?^.*#autoload#??:s?$?#?') +function! SpaceVim#api#iconv#codecs#_cp865#import() abort -function {s:ns}import() return s:lib endfunction -let s:tablebase = {s:nsiconv}codecs#tablebase#import() +let s:tablebase = SpaceVim#api#iconv#codecs#tablebase#import() let s:lib = {} diff --git a/autoload/SpaceVim/api/iconv/codecs/_cp866.vim b/autoload/SpaceVim/api/iconv/codecs/_cp866.vim index 2f796f1a2..37a0aafb4 100644 --- a/autoload/SpaceVim/api/iconv/codecs/_cp866.vim +++ b/autoload/SpaceVim/api/iconv/codecs/_cp866.vim @@ -1,11 +1,9 @@ -let s:nsiconv = expand(':p:h:h:gs?[\\/]?#?:s?^.*#autoload\(#\|$\)??:s?$?#?') -let s:ns = expand(':p:r:gs?[\\/]?#?:s?^.*#autoload#??:s?$?#?') +function! SpaceVim#api#iconv#codecs#_cp866#import() abort -function {s:ns}import() return s:lib endfunction -let s:tablebase = {s:nsiconv}codecs#tablebase#import() +let s:tablebase = SpaceVim#api#iconv#codecs#tablebase#import() let s:lib = {} diff --git a/autoload/SpaceVim/api/iconv/codecs/_cp869.vim b/autoload/SpaceVim/api/iconv/codecs/_cp869.vim index eabfee7cc..4b52e571f 100644 --- a/autoload/SpaceVim/api/iconv/codecs/_cp869.vim +++ b/autoload/SpaceVim/api/iconv/codecs/_cp869.vim @@ -1,11 +1,9 @@ -let s:nsiconv = expand(':p:h:h:gs?[\\/]?#?:s?^.*#autoload\(#\|$\)??:s?$?#?') -let s:ns = expand(':p:r:gs?[\\/]?#?:s?^.*#autoload#??:s?$?#?') +function! SpaceVim#api#iconv#codecs#_cp869#import() abort -function {s:ns}import() return s:lib endfunction -let s:tablebase = {s:nsiconv}codecs#tablebase#import() +let s:tablebase = SpaceVim#api#iconv#codecs#tablebase#import() let s:lib = {} diff --git a/autoload/SpaceVim/api/iconv/codecs/_cp874.vim b/autoload/SpaceVim/api/iconv/codecs/_cp874.vim index e3fe4210e..76d1fcfc7 100644 --- a/autoload/SpaceVim/api/iconv/codecs/_cp874.vim +++ b/autoload/SpaceVim/api/iconv/codecs/_cp874.vim @@ -1,11 +1,9 @@ -let s:nsiconv = expand(':p:h:h:gs?[\\/]?#?:s?^.*#autoload\(#\|$\)??:s?$?#?') -let s:ns = expand(':p:r:gs?[\\/]?#?:s?^.*#autoload#??:s?$?#?') +function! SpaceVim#api#iconv#codecs#_cp874#import() abort -function {s:ns}import() return s:lib endfunction -let s:tablebase = {s:nsiconv}codecs#tablebase#import() +let s:tablebase = SpaceVim#api#iconv#codecs#tablebase#import() let s:lib = {} diff --git a/autoload/SpaceVim/api/iconv/codecs/_cp875.vim b/autoload/SpaceVim/api/iconv/codecs/_cp875.vim index db1c6ecb6..0c3391c1c 100644 --- a/autoload/SpaceVim/api/iconv/codecs/_cp875.vim +++ b/autoload/SpaceVim/api/iconv/codecs/_cp875.vim @@ -1,11 +1,9 @@ -let s:nsiconv = expand(':p:h:h:gs?[\\/]?#?:s?^.*#autoload\(#\|$\)??:s?$?#?') -let s:ns = expand(':p:r:gs?[\\/]?#?:s?^.*#autoload#??:s?$?#?') +function! SpaceVim#api#iconv#codecs#_cp875#import() abort -function {s:ns}import() return s:lib endfunction -let s:tablebase = {s:nsiconv}codecs#tablebase#import() +let s:tablebase = SpaceVim#api#iconv#codecs#tablebase#import() let s:lib = {} diff --git a/autoload/SpaceVim/api/iconv/codecs/_cp932.vim b/autoload/SpaceVim/api/iconv/codecs/_cp932.vim index c8dcc2026..0d0b6613b 100644 --- a/autoload/SpaceVim/api/iconv/codecs/_cp932.vim +++ b/autoload/SpaceVim/api/iconv/codecs/_cp932.vim @@ -1,11 +1,9 @@ -let s:nsiconv = expand(':p:h:h:gs?[\\/]?#?:s?^.*#autoload\(#\|$\)??:s?$?#?') -let s:ns = expand(':p:r:gs?[\\/]?#?:s?^.*#autoload#??:s?$?#?') +function! SpaceVim#api#iconv#codecs#_cp932#import() abort -function {s:ns}import() return s:lib endfunction -let s:tablebase = {s:nsiconv}codecs#tablebase#import() +let s:tablebase = SpaceVim#api#iconv#codecs#tablebase#import() let s:lib = {} diff --git a/autoload/SpaceVim/api/iconv/codecs/_cp936.vim b/autoload/SpaceVim/api/iconv/codecs/_cp936.vim index 72c724ef3..035cc88e5 100644 --- a/autoload/SpaceVim/api/iconv/codecs/_cp936.vim +++ b/autoload/SpaceVim/api/iconv/codecs/_cp936.vim @@ -1,11 +1,9 @@ -let s:nsiconv = expand(':p:h:h:gs?[\\/]?#?:s?^.*#autoload\(#\|$\)??:s?$?#?') -let s:ns = expand(':p:r:gs?[\\/]?#?:s?^.*#autoload#??:s?$?#?') +function! SpaceVim#api#iconv#codecs#_cp936#import() abort -function {s:ns}import() return s:lib endfunction -let s:tablebase = {s:nsiconv}codecs#tablebase#import() +let s:tablebase = SpaceVim#api#iconv#codecs#tablebase#import() let s:lib = {} diff --git a/autoload/SpaceVim/api/iconv/codecs/_cp949.vim b/autoload/SpaceVim/api/iconv/codecs/_cp949.vim index 9cf3d38a3..6cd5dd9f5 100644 --- a/autoload/SpaceVim/api/iconv/codecs/_cp949.vim +++ b/autoload/SpaceVim/api/iconv/codecs/_cp949.vim @@ -1,11 +1,9 @@ -let s:nsiconv = expand(':p:h:h:gs?[\\/]?#?:s?^.*#autoload\(#\|$\)??:s?$?#?') -let s:ns = expand(':p:r:gs?[\\/]?#?:s?^.*#autoload#??:s?$?#?') +function! SpaceVim#api#iconv#codecs#_cp949#import() abort -function {s:ns}import() return s:lib endfunction -let s:tablebase = {s:nsiconv}codecs#tablebase#import() +let s:tablebase = SpaceVim#api#iconv#codecs#tablebase#import() let s:lib = {} diff --git a/autoload/SpaceVim/api/iconv/codecs/_cp950.vim b/autoload/SpaceVim/api/iconv/codecs/_cp950.vim index 9c4639d52..593f2d635 100644 --- a/autoload/SpaceVim/api/iconv/codecs/_cp950.vim +++ b/autoload/SpaceVim/api/iconv/codecs/_cp950.vim @@ -5,7 +5,7 @@ function {s:ns}import() return s:lib endfunction -let s:tablebase = {s:nsiconv}codecs#tablebase#import() +let s:tablebase = SpaceVim#api#iconv#codecs#tablebase#import() let s:lib = {} diff --git a/autoload/SpaceVim/api/iconv/codecs/_euc_jp.vim b/autoload/SpaceVim/api/iconv/codecs/_euc_jp.vim index 09afa7461..796aa651c 100644 --- a/autoload/SpaceVim/api/iconv/codecs/_euc_jp.vim +++ b/autoload/SpaceVim/api/iconv/codecs/_euc_jp.vim @@ -1,11 +1,9 @@ -let s:nsiconv = expand(':p:h:h:gs?[\\/]?#?:s?^.*#autoload\(#\|$\)??:s?$?#?') -let s:ns = expand(':p:r:gs?[\\/]?#?:s?^.*#autoload#??:s?$?#?') +function! SpaceVim#api#iconv#codecs#_euc_jp#import() abort -function! {s:ns}import() abort return s:lib endfunction -let s:tablebase = {s:nsiconv}codecs#tablebase#import() +let s:tablebase = SpaceVim#api#iconv#codecs#tablebase#import() let s:lib = {} diff --git a/autoload/SpaceVim/api/iconv/codecs/ascii.vim b/autoload/SpaceVim/api/iconv/codecs/ascii.vim index 10d6475a0..63f226394 100644 --- a/autoload/SpaceVim/api/iconv/codecs/ascii.vim +++ b/autoload/SpaceVim/api/iconv/codecs/ascii.vim @@ -1,12 +1,8 @@ - -let s:nsiconv = expand(':p:h:h:gs?[\\/]?#?:s?^.*#autoload\(#\|$\)??:s?$?#?') -let s:ns = expand(':p:r:gs?[\\/]?#?:s?^.*#autoload#??:s?$?#?') - -function! {s:ns}import() abort +function! SpaceVim#api#iconv#codecs#ascii#import() abort return s:ascii endfunction - -let s:tablebase = {s:nsiconv}codecs#tablebase#import() +" SpaceVim#api#iconv# +let s:tablebase = SpaceVim#api#iconv#codecs#tablebase#import() let s:ascii = {} diff --git a/autoload/SpaceVim/api/iconv/codecs/base.vim b/autoload/SpaceVim/api/iconv/codecs/base.vim index f7baa0277..8f3f42741 100644 --- a/autoload/SpaceVim/api/iconv/codecs/base.vim +++ b/autoload/SpaceVim/api/iconv/codecs/base.vim @@ -1,12 +1,8 @@ - -let s:nsiconv = expand(':p:h:h:gs?[\\/]?#?:s?^.*#autoload\(#\|$\)??:s?$?#?') -let s:ns = expand(':p:r:gs?[\\/]?#?:s?^.*#autoload#??:s?$?#?') - -function! {s:ns}import() abort +function! SpaceVim#api#iconv#codecs#base#import() abort return s:base endfunction -let s:error = {s:nsiconv}codecs#error#import() +let s:error = SpaceVim#api#iconv#codecs#error#import() let s:base = {} diff --git a/autoload/SpaceVim/api/iconv/codecs/error.vim b/autoload/SpaceVim/api/iconv/codecs/error.vim index 749c47b0b..a070999a3 100644 --- a/autoload/SpaceVim/api/iconv/codecs/error.vim +++ b/autoload/SpaceVim/api/iconv/codecs/error.vim @@ -1,7 +1,4 @@ - -let s:ns = expand(':p:r:gs?[\\/]?#?:s?^.*#autoload#??:s?$?#?') - -function {s:ns}import() +function! SpaceVim#api#iconv#codecs#error#import() abort return s:error endfunction diff --git a/autoload/SpaceVim/api/iconv/codecs/tablebase.vim b/autoload/SpaceVim/api/iconv/codecs/tablebase.vim index d9e9cfc73..b03ce4cae 100644 --- a/autoload/SpaceVim/api/iconv/codecs/tablebase.vim +++ b/autoload/SpaceVim/api/iconv/codecs/tablebase.vim @@ -1,12 +1,8 @@ - -let s:nsiconv = expand(':p:h:h:gs?[\\/]?#?:s?^.*#autoload\(#\|$\)??:s?$?#?') -let s:ns = expand(':p:r:gs?[\\/]?#?:s?^.*#autoload#??:s?$?#?') - -function {s:ns}import() +function! SpaceVim#api#iconv#codecs#tablebase#import() abort return s:tablebase endfunction -let s:base = {s:nsiconv}codecs#base#import() +let s:base = SpaceVim#api#iconv#codecs#base#import() let s:tablebase = {} diff --git a/autoload/SpaceVim/api/iconv/codecs/utf16.vim b/autoload/SpaceVim/api/iconv/codecs/utf16.vim index 83ea6c5db..a68362fa3 100644 --- a/autoload/SpaceVim/api/iconv/codecs/utf16.vim +++ b/autoload/SpaceVim/api/iconv/codecs/utf16.vim @@ -1,12 +1,9 @@ +function! SpaceVim#api#iconv#codecs#utf16#import() abort -let s:nsiconv = expand(':p:h:h:gs?[\\/]?#?:s?^.*#autoload\(#\|$\)??:s?$?#?') -let s:ns = expand(':p:r:gs?[\\/]?#?:s?^.*#autoload#??:s?$?#?') - -function {s:ns}import() return s:utf16 endfunction -let s:base = {s:nsiconv}codecs#base#import() +let s:base = SpaceVim#api#iconv#codecs#base#import() let s:utf16 = {} diff --git a/autoload/SpaceVim/api/iconv/codecs/utf16be.vim b/autoload/SpaceVim/api/iconv/codecs/utf16be.vim index c5921d075..2318684fe 100644 --- a/autoload/SpaceVim/api/iconv/codecs/utf16be.vim +++ b/autoload/SpaceVim/api/iconv/codecs/utf16be.vim @@ -1,12 +1,9 @@ +function! SpaceVim#api#iconv#codecs#utf16be#import() abort -let s:nsiconv = expand(':p:h:h:gs?[\\/]?#?:s?^.*#autoload\(#\|$\)??:s?$?#?') -let s:ns = expand(':p:r:gs?[\\/]?#?:s?^.*#autoload#??:s?$?#?') - -function {s:ns}import() return s:utf16be endfunction -let s:base = {s:nsiconv}codecs#base#import() +let s:base = SpaceVim#api#iconv#codecs#base#import() let s:utf16be = {} diff --git a/autoload/SpaceVim/api/iconv/codecs/utf16le.vim b/autoload/SpaceVim/api/iconv/codecs/utf16le.vim index 694cd4be4..0c87529a7 100644 --- a/autoload/SpaceVim/api/iconv/codecs/utf16le.vim +++ b/autoload/SpaceVim/api/iconv/codecs/utf16le.vim @@ -1,12 +1,9 @@ +function! SpaceVim#api#iconv#codecs#utf16le#import() abort -let s:nsiconv = expand(':p:h:h:gs?[\\/]?#?:s?^.*#autoload\(#\|$\)??:s?$?#?') -let s:ns = expand(':p:r:gs?[\\/]?#?:s?^.*#autoload#??:s?$?#?') - -function {s:ns}import() return s:utf16le endfunction -let s:base = {s:nsiconv}codecs#base#import() +let s:base = SpaceVim#api#iconv#codecs#base#import() let s:utf16le = {} diff --git a/autoload/SpaceVim/api/iconv/codecs/utf32.vim b/autoload/SpaceVim/api/iconv/codecs/utf32.vim index fa0c5531d..268ed617a 100644 --- a/autoload/SpaceVim/api/iconv/codecs/utf32.vim +++ b/autoload/SpaceVim/api/iconv/codecs/utf32.vim @@ -1,12 +1,9 @@ +function! SpaceVim#api#iconv#codecs#utf32#import() abort -let s:nsiconv = expand(':p:h:h:gs?[\\/]?#?:s?^.*#autoload\(#\|$\)??:s?$?#?') -let s:ns = expand(':p:r:gs?[\\/]?#?:s?^.*#autoload#??:s?$?#?') - -function {s:ns}import() return s:utf32 endfunction -let s:base = {s:nsiconv}codecs#base#import() +let s:base = SpaceVim#api#iconv#codecs#base#import() let s:utf32 = {} diff --git a/autoload/SpaceVim/api/iconv/codecs/utf32be.vim b/autoload/SpaceVim/api/iconv/codecs/utf32be.vim index 276dee6f3..bd342acd0 100644 --- a/autoload/SpaceVim/api/iconv/codecs/utf32be.vim +++ b/autoload/SpaceVim/api/iconv/codecs/utf32be.vim @@ -1,12 +1,9 @@ +function! SpaceVim#api#iconv#codecs#utf32be#import() abort -let s:nsiconv = expand(':p:h:h:gs?[\\/]?#?:s?^.*#autoload\(#\|$\)??:s?$?#?') -let s:ns = expand(':p:r:gs?[\\/]?#?:s?^.*#autoload#??:s?$?#?') - -function {s:ns}import() return s:utf32be endfunction -let s:base = {s:nsiconv}codecs#base#import() +let s:base = SpaceVim#api#iconv#codecs#base#import() let s:utf32be = {} diff --git a/autoload/SpaceVim/api/iconv/codecs/utf32le.vim b/autoload/SpaceVim/api/iconv/codecs/utf32le.vim index c97e2cfa0..b97f76dae 100644 --- a/autoload/SpaceVim/api/iconv/codecs/utf32le.vim +++ b/autoload/SpaceVim/api/iconv/codecs/utf32le.vim @@ -1,12 +1,9 @@ +function! SpaceVim#api#iconv#codecs#utf32le#import() abort -let s:nsiconv = expand(':p:h:h:gs?[\\/]?#?:s?^.*#autoload\(#\|$\)??:s?$?#?') -let s:ns = expand(':p:r:gs?[\\/]?#?:s?^.*#autoload#??:s?$?#?') - -function {s:ns}import() return s:utf32le endfunction -let s:base = {s:nsiconv}codecs#base#import() +let s:base = SpaceVim#api#iconv#codecs#base#import() let s:utf32le = {} diff --git a/autoload/SpaceVim/api/iconv/codecs/utf8.vim b/autoload/SpaceVim/api/iconv/codecs/utf8.vim index 2659f522f..e554a69d9 100644 --- a/autoload/SpaceVim/api/iconv/codecs/utf8.vim +++ b/autoload/SpaceVim/api/iconv/codecs/utf8.vim @@ -1,12 +1,9 @@ +function! SpaceVim#api#iconv#codecs#utf8#import() abort -let s:nsiconv = expand(':p:h:h:gs?[\\/]?#?:s?^.*#autoload\(#\|$\)??:s?$?#?') -let s:ns = expand(':p:r:gs?[\\/]?#?:s?^.*#autoload#??:s?$?#?') - -function {s:ns}import() return s:utf8 endfunction -let s:base = {s:nsiconv}codecs#base#import() +let s:base = SpaceVim#api#iconv#codecs#base#import() let s:utf8 = {} diff --git a/autoload/SpaceVim/layers/fzf.vim b/autoload/SpaceVim/layers/fzf.vim index 379194d40..c1d17a625 100644 --- a/autoload/SpaceVim/layers/fzf.vim +++ b/autoload/SpaceVim/layers/fzf.vim @@ -463,11 +463,27 @@ function! s:ansi(str, group, default, ...) abort \ (empty(bg) ? '' : s:csi(bg, 0)) return printf("\x1b[%s%sm%s\x1b[m", color, a:0 ? ';1' : '', a:str) endfunction -for s:color_name in keys(s:ansi) - execute 'function! s:'.s:color_name."(str, ...)\n" - \ " return s:ansi(a:str, get(a:, 1, ''), '".s:color_name."')\n" - \ 'endfunction' -endfor +function! s:black(str, ...) + return s:ansi(a:str, get(a:, 1, ''), 'black') +endfunction +function! s:blue(str, ...) + return s:ansi(a:str, get(a:, 1, ''), 'blue') +endfunction +function! s:green(str, ...) + return s:ansi(a:str, get(a:, 1, ''), 'green') +endfunction +function! s:cyan(str, ...) + return s:ansi(a:str, get(a:, 1, ''), 'cyan') +endfunction +function! s:yellow(str, ...) + return s:ansi(a:str, get(a:, 1, ''), 'yellow') +endfunction +function! s:magenta(str, ...) + return s:ansi(a:str, get(a:, 1, ''), 'magenta') +endfunction +function! s:red(str, ...) + return s:ansi(a:str, get(a:, 1, ''), 'red') +endfunction function! s:helptag_sink(line) abort let [tag, file, path] = split(a:line, "\t")[0:2] unlet file diff --git a/docs/index.md b/docs/index.md index 33177b146..633807317 100644 --- a/docs/index.md +++ b/docs/index.md @@ -71,12 +71,11 @@ Contribute code, report bugs and request features at [GitHub](https://github.com - Which version of Vim/Neovim is needed? - SpaceVim has been tested in [travis-ci](https://travis-ci.com/SpaceVim/SpaceVim) and -[appveyor](https://ci.appveyor.com/project/wsdjeg/spacevim/branch/master) with following + SpaceVim has been tested in [github action](https://github.com/SpaceVim/SpaceVim/actions) with following versions of neovim and vim: 1. vim: ~~`7.4.052`~~, `7.4.629`, `7.4.1689`,`8.0.0027`,`8.0.1453`, `8.1.2269` - 2. neovim: `0.3.0`, `0.3.1`, `0.3.2`, `0.3.3`, `0.3.4`, `0.3.5`, `0.3.7`, `0.3.8`, `0.4.2`, `0.4.3` + 2. neovim: `nightly`, `v0.5.0`, `v0.4.4`, `v0.4.3`, `v0.4.2`, `v0.4.0`, `v0.3.8` For more general questions, please read SpaceVim [FAQ](faq/). diff --git a/main.vim b/main.vim index 8d21a2722..ba63c1274 100644 --- a/main.vim +++ b/main.vim @@ -9,6 +9,7 @@ " Enable nocompatible if has('vim_starting') " set default encoding to utf-8 + " Let Vim use utf-8 internally, because many scripts require this exe 'set encoding=utf-8' scriptencoding utf-8 diff --git a/test/api/data/dict.vader b/test/api/data/dict.vader index 2df1473a4..127116770 100644 --- a/test/api/data/dict.vader +++ b/test/api/data/dict.vader @@ -1,4 +1,4 @@ -Execute ( SpaceVim api: data#list ): +Execute ( SpaceVim api: data#dict ): let dict = SpaceVim#api#import('data#dict') AssertEqual dict.make(['a','b'], [1, 2]), {'a':1, 'b':2} AssertEqual dict.swap({'a' : 1, 'b' : 2}), {'1' : 'a', '2' : 'b'} diff --git a/test/api/iconv.vader b/test/api/iconv.vader new file mode 100644 index 000000000..9bd923462 --- /dev/null +++ b/test/api/iconv.vader @@ -0,0 +1,6 @@ +Execute ( SpaceVim api: iconv.iconv() ): + let iconv = SpaceVim#api#import('iconv') + for from in keys(SpaceVim#api#iconv#import().codecs) + AssertEqual iconv.iconv('', from, 'utf-8'), '' + endfor + diff --git a/test/plugin/guide.vader b/test/plugin/guide.vader index 6ca404d0f..502eddd17 100644 --- a/test/plugin/guide.vader +++ b/test/plugin/guide.vader @@ -1,5 +1,5 @@ -Execute ( SpaceVim key binding guide ): - " let g:_spacevim_input_list = ['h', 'd', 'k', ' ', 'b', 'n'] - " LeaderGuide " " - " AssertEqual &ft, 'HelpDescribe' +Execute ( SpaceVim plugin: key bindings guide ): + let g:_spacevim_input_list = ['t', 't'] + LeaderGuide " " + AssertEqual &ft, 'SpaceVimTabsManager' diff --git a/test/plugin/help.vader b/test/plugin/help.vader new file mode 100644 index 000000000..8cd959ea1 --- /dev/null +++ b/test/plugin/help.vader @@ -0,0 +1,5 @@ +Execute ( SpaceVim plugin: help ): + let g:_spacevim_input_list = ['h', 'd', 'k', ' ', 'b', 'n'] + LeaderGuide " " + AssertEqual &ft, 'HelpDescribe' +