From 0e6f1183a9f1020c4a2dbc928c1d64c49ed785ed Mon Sep 17 00:00:00 2001
From: wsdjeg <wsdjeg@163.com>
Date: Mon, 23 Oct 2017 15:39:07 +0800
Subject: [PATCH 1/4] Add base64 api

---
 autoload/SpaceVim/api/data/base64.vim | 121 ++++++++++++++++++++++++++
 test/api/data/base64.vader            |   3 +
 2 files changed, 124 insertions(+)
 create mode 100644 autoload/SpaceVim/api/data/base64.vim
 create mode 100644 test/api/data/base64.vader

diff --git a/autoload/SpaceVim/api/data/base64.vim b/autoload/SpaceVim/api/data/base64.vim
new file mode 100644
index 000000000..9e6f8c42a
--- /dev/null
+++ b/autoload/SpaceVim/api/data/base64.vim
@@ -0,0 +1,121 @@
+let s:self = {}
+
+
+if has('python')
+  function! s:self.encode(text) abort
+    py import vim
+    py import base64
+
+    py ret = base64.b64encode(vim.eval('a:text'))
+    py vim.command("return '{}'".format(ret))
+  endfunction
+  " base64Test => YmFzZTY0VGVzdA==
+
+function! s:self.decode(text) abort
+python <<EOF
+import vim
+import base64
+
+ret = vim.eval('a:text')
+try:
+    ret = base64.b64decode(ret)
+    vim.command("return '{}'".format(ret))
+except TypeError, e:
+    vim.command("return '{}'".format(ret))
+EOF
+endfunction
+else
+  function! s:self.encode(data) abort
+    let b64 = self._b64encode(self._str2bytes(a:data), self.standard_table, '=')
+    return join(b64, '')
+  endfunction
+
+  function! s:self.encodebin(data) abort
+    let b64 = self._b64encode(self._binstr2bytes(a:data), self.standard_table, '=')
+    return join(b64, '')
+  endfunction
+
+  function! s:self.decode(data) abort
+    let bytes = self._b64decode(split(a:data, '\zs'), self.standard_table, '=')
+    return self._bytes2str(bytes)
+  endfunction
+
+  let s:self.standard_table = [
+        \ 'A','B','C','D','E','F','G','H','I','J','K','L','M','N','O','P',
+        \ 'Q','R','S','T','U','V','W','X','Y','Z','a','b','c','d','e','f',
+        \ 'g','h','i','j','k','l','m','n','o','p','q','r','s','t','u','v',
+        \ 'w','x','y','z','0','1','2','3','4','5','6','7','8','9','+','/']
+
+  let s:self.urlsafe_table = [
+        \ 'A','B','C','D','E','F','G','H','I','J','K','L','M','N','O','P',
+        \ 'Q','R','S','T','U','V','W','X','Y','Z','a','b','c','d','e','f',
+        \ 'g','h','i','j','k','l','m','n','o','p','q','r','s','t','u','v',
+        \ 'w','x','y','z','0','1','2','3','4','5','6','7','8','9','-','_']
+
+  function! s:self._b64encode(bytes, table, pad) abort
+    let b64 = []
+    for i in range(0, len(a:bytes) - 1, 3)
+      let n = a:bytes[i] * 0x10000
+            \ + get(a:bytes, i + 1, 0) * 0x100
+            \ + get(a:bytes, i + 2, 0)
+      call add(b64, a:table[n / 0x40000])
+      call add(b64, a:table[n / 0x1000 % 0x40])
+      call add(b64, a:table[n / 0x40 % 0x40])
+      call add(b64, a:table[n % 0x40])
+    endfor
+    if len(a:bytes) % 3 == 1
+      let b64[-1] = a:pad
+      let b64[-2] = a:pad
+    endif
+    if len(a:bytes) % 3 == 2
+      let b64[-1] = a:pad
+    endif
+    return b64
+  endfunction
+
+  function! s:self._b64decode(b64, table, pad) abort
+    let a2i = {}
+    for i in range(len(a:table))
+      let a2i[a:table[i]] = i
+    endfor
+    let bytes = []
+    for i in range(0, len(a:b64) - 1, 4)
+      let n = a2i[a:b64[i]] * 0x40000
+            \ + a2i[a:b64[i + 1]] * 0x1000
+            \ + (a:b64[i + 2] == a:pad ? 0 : a2i[a:b64[i + 2]]) * 0x40
+            \ + (a:b64[i + 3] == a:pad ? 0 : a2i[a:b64[i + 3]])
+      call add(bytes, n / 0x10000)
+      call add(bytes, n / 0x100 % 0x100)
+      call add(bytes, n % 0x100)
+    endfor
+    if a:b64[-1] == a:pad
+      unlet a:b64[-1]
+    endif
+    if a:b64[-2] == a:pad
+      unlet a:b64[-1]
+    endif
+    return bytes
+  endfunction
+
+  function! s:self._binstr2bytes(str) abort
+    return map(range(len(a:str)/2), 'eval("0x".a:str[v:val*2 : v:val*2+1])')
+  endfunction
+
+  function! s:self._str2bytes(str) abort
+    return map(range(len(a:str)), 'char2nr(a:str[v:val])')
+  endfunction
+
+  function! s:self._bytes2str(bytes) abort
+    return eval('"' . join(map(copy(a:bytes), 'printf(''\x%02x'', v:val)'), '') . '"')
+  endfunction
+
+endif
+
+
+
+
+function! SpaceVim#api#data#base64#get()
+
+  return deepcopy(s:self)
+
+endfunction
diff --git a/test/api/data/base64.vader b/test/api/data/base64.vader
new file mode 100644
index 000000000..4312eb2bc
--- /dev/null
+++ b/test/api/data/base64.vader
@@ -0,0 +1,3 @@
+Execute ( SpaceVim api: data#list ):
+  let base64 = SpaceVim#api#import('data#base64')
+  AssertEqual "helloworld", base64.decode(base64.encode("helloworld"))

From 5e99dee238ed652aed23cb38102414de867ceca4 Mon Sep 17 00:00:00 2001
From: wsdjeg <wsdjeg@163.com>
Date: Tue, 24 Oct 2017 22:57:50 +0800
Subject: [PATCH 2/4] Fix lint

---
 autoload/SpaceVim/api/data/base64.vim | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/autoload/SpaceVim/api/data/base64.vim b/autoload/SpaceVim/api/data/base64.vim
index 9e6f8c42a..d333cab75 100644
--- a/autoload/SpaceVim/api/data/base64.vim
+++ b/autoload/SpaceVim/api/data/base64.vim
@@ -2,6 +2,7 @@ let s:self = {}
 
 
 if has('python')
+  " @vimlint(EVL103, 1, a:text)
   function! s:self.encode(text) abort
     py import vim
     py import base64
@@ -24,6 +25,7 @@ except TypeError, e:
     vim.command("return '{}'".format(ret))
 EOF
 endfunction
+  " @vimlint(EVL103, 0, a:text)
 else
   function! s:self.encode(data) abort
     let b64 = self._b64encode(self._str2bytes(a:data), self.standard_table, '=')

From 99bfdb4670bd522d0413afb256d2d001c898c867 Mon Sep 17 00:00:00 2001
From: Bigo <bigo@crisidev.org>
Date: Wed, 25 Oct 2017 16:28:20 +0100
Subject: [PATCH 3/4] Add statusline errors / warnings report for ale

---
 autoload/SpaceVim/layers/core/statusline.vim | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/autoload/SpaceVim/layers/core/statusline.vim b/autoload/SpaceVim/layers/core/statusline.vim
index f299d65ce..4867f723b 100644
--- a/autoload/SpaceVim/layers/core/statusline.vim
+++ b/autoload/SpaceVim/layers/core/statusline.vim
@@ -125,6 +125,18 @@ if g:spacevim_enable_neomake
     let l .=  errors ? (warnings ? '' : ' ') . '%#SpaceVim_statusline_error#●' . errors  . ' ' : ''
     return l
   endfunction
+elseif g:spacevim_enable_ale
+  function! s:syntax_checking()
+    if !exists('g:ale_enabled')
+      return ''
+    endif
+    let counts = ale#statusline#Count(bufnr(''))
+    let warnings = counts.warning + counts.style_warning
+    let errors = counts.error + counts.style_error
+    let l =  warnings ? ' %#SpaceVim_statusline_warn#●' . warnings . ' ' : ''
+    let l .=  errors ? (warnings ? '' : ' ') . '%#SpaceVim_statusline_error#●' . errors  . ' ' : ''
+    return l
+  endfunction
 else
   function! s:syntax_checking()
     if !exists(':SyntasticCheck')

From 698d2bfeafb2c2c9b29d638edc1d448e5961b12f Mon Sep 17 00:00:00 2001
From: Seong Yong-ju <sei40kr@gmail.com>
Date: Thu, 26 Oct 2017 01:49:53 +0900
Subject: [PATCH 4/4] Fixed ALE setting issues

* Fixed an issue that ALE settings get loaded after ALE initialization.
* Added linter info to error message by default.
---
 autoload/SpaceVim/layers/checkers.vim      | 2 +-
 config/{plugins => plugins_before}/ale.vim | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)
 rename config/{plugins => plugins_before}/ale.vim (83%)

diff --git a/autoload/SpaceVim/layers/checkers.vim b/autoload/SpaceVim/layers/checkers.vim
index 91d2dea71..877679f50 100644
--- a/autoload/SpaceVim/layers/checkers.vim
+++ b/autoload/SpaceVim/layers/checkers.vim
@@ -9,7 +9,7 @@ function! SpaceVim#layers#checkers#plugins() abort
   if g:spacevim_enable_neomake
     call add(plugins, ['neomake/neomake', {'merged' : 0, 'loadconf' : 1 , 'loadconf_before' : 1}])
   elseif g:spacevim_enable_ale
-    call add(plugins, ['w0rp/ale', {'merged' : 0, 'loadconf' : 1 , 'loadconf_before' : 1}])
+    call add(plugins, ['w0rp/ale', {'merged' : 0, 'loadconf_before' : 1}])
   else
     call add(plugins, ['wsdjeg/syntastic', {'on_event': 'WinEnter', 'loadconf' : 1, 'merged' : 0}])
   endif
diff --git a/config/plugins/ale.vim b/config/plugins_before/ale.vim
similarity index 83%
rename from config/plugins/ale.vim
rename to config/plugins_before/ale.vim
index 19ddb8334..990fc57cb 100644
--- a/config/plugins/ale.vim
+++ b/config/plugins_before/ale.vim
@@ -1,6 +1,7 @@
 scriptencoding utf-8
 let g:ale_sign_error = get(g:, 'spacevim_error_symbol', '✖')
 let g:ale_sign_warning = get(g:,'spacevim_warning_symbol', '➤')
+let g:ale_echo_msg_format = get(g:, 'ale_echo_msg_format', '%severity%: %linter%: %s')
 
 if g:spacevim_colorscheme == 'gruvbox'
   highlight link ALEErrorSign GruvboxRedSign