alxiong
diff --git a/‎README.md
Lines changed: 80 additions & 31 deletions b/‎README.md
Lines changed: 80 additions & 31 deletions
diff --git a/‎sources_forked/peaksea/colors/peaksea.vim
Lines changed: 1 addition & 1 deletion b/‎sources_forked/peaksea/colors/peaksea.vim
Lines changed: 1 addition & 1 deletion
diff --git a/‎sources_non_forked/ale/LICENSE
Lines changed: 1 addition & 1 deletion b/‎sources_non_forked/ale/LICENSE
Lines changed: 1 addition & 1 deletion
diff --git a/‎sources_non_forked/ale/ale_linters/ada/gcc.vim
Lines changed: 3 additions & 3 deletions b/‎sources_non_forked/ale/ale_linters/ada/gcc.vim
Lines changed: 3 additions & 3 deletions
diff --git a/‎sources_non_forked/ale/ale_linters/ansible/ansible_lint.vim
Lines changed: 1 addition & 1 deletion b/‎sources_non_forked/ale/ale_linters/ansible/ansible_lint.vim
Lines changed: 1 addition & 1 deletion
diff --git a/‎sources_non_forked/ale/ale_linters/asciidoc/alex.vim
Lines changed: 1 addition & 8 deletions b/‎sources_non_forked/ale/ale_linters/asciidoc/alex.vim
Lines changed: 1 addition & 8 deletions
diff --git a/‎sources_non_forked/ale/ale_linters/asciidoc/textlint.vim
Lines changed: 9 additions & 0 deletions b/‎sources_non_forked/ale/ale_linters/asciidoc/textlint.vim
Lines changed: 9 additions & 0 deletions
diff --git a/‎sources_non_forked/ale/ale_linters/asm/gcc.vim
Lines changed: 6 additions & 3 deletions b/‎sources_non_forked/ale/ale_linters/asm/gcc.vim
Lines changed: 6 additions & 3 deletions
diff --git a/‎sources_non_forked/ale/ale_linters/awk/gawk.vim
Lines changed: 2 additions & 2 deletions b/‎sources_non_forked/ale/ale_linters/awk/gawk.vim
Lines changed: 2 additions & 2 deletions
diff --git a/‎sources_non_forked/ale/ale_linters/bib/bibclean.vim
Lines changed: 27 additions & 26 deletions b/‎sources_non_forked/ale/ale_linters/bib/bibclean.vim
Lines changed: 27 additions & 26 deletions
@@ -64,6 +64,7 @@ Just do a git rebase!
 
     cd ~/.vim_runtime
     git pull --rebase
+    python update_plugins.py
 
 
 ## Some screenshots
@@ -97,14 +98,15 @@ I recommend reading the docs of these plugins to understand them better. Each pl
 * [open_file_under_cursor.vim](https://github.com/amix/open_file_under_cursor.vim): Open file under cursor when pressing `gf`
 * [pathogen.vim](https://github.com/tpope/vim-pathogen): Manage your vim runtimepath 
 * [snipmate.vim](https://github.com/garbas/vim-snipmate): snipmate.vim aims to be a concise vim script that implements some of TextMate's snippets features in Vim
-* [ale](https://github.com/w0rp/ale): Syntax and lint checking for vim (async)
+* [ale](https://github.com/w0rp/ale): Syntax and lint checking for vim (ALE requires NeoVim >= 0.2.0 or Vim 8 with +timers +job +channel)
 * [vim-commentary](https://github.com/tpope/vim-commentary): Comment stuff out.  Use `gcc` to comment out a line (takes a count), `gc` to comment out the target of a motion. `gcu` uncomments a set of adjacent commented lines.
 * [vim-expand-region](https://github.com/terryma/vim-expand-region): Allows you to visually select increasingly larger regions of text using the same key combination
 * [vim-fugitive](https://github.com/tpope/vim-fugitive): A Git wrapper so awesome, it should be illegal
 * [vim-indent-object](https://github.com/michaeljsmith/vim-indent-object): Defines a new text object representing lines of code at the same indent level. Useful for python/vim scripts
 * [vim-multiple-cursors](https://github.com/terryma/vim-multiple-cursors): Sublime Text style multiple selections for Vim, CTRL+N is remapped to CTRL+S (due to YankRing)
 * [vim-yankstack](https://github.com/maxbrunsfeld/vim-yankstack): Maintains a history of previous yanks, changes and deletes
 * [vim-zenroom2](https://github.com/amix/vim-zenroom2) Remove all clutter and focus only on the essential. Similar to iA Writer or Write Room
+* [gist-vim](https://github.com/mattn/gist-vim) Easily create gists from Vim using the `:Gist` command
 
 
 ## Included color schemes
@@ -121,9 +123,13 @@ I recommend reading the docs of these plugins to understand them better. Each pl
 * [vim-coffee-script](https://github.com/kchmck/vim-coffee-script)
 * [vim-less](https://github.com/groenewege/vim-less)
 * [vim-bundle-mako](https://github.com/sophacles/vim-bundle-mako)
-* [vim-markdown](https://github.com/tpope/vim-markdown)
+* [vim-markdown](https://github.com/plasticboy/vim-markdown)
 * [nginx.vim](https://github.com/vim-scripts/nginx.vim): Highlights configuration files for nginx
-* [vim-go](https://github.com/fatih/vim-go)
+* [rust.vim](https://github.com/rust-lang/rust.vim)
+* [vim-ruby](https://github.com/vim-ruby/vim-ruby)
+* [typescript-vim](https://github.com/leafgarland/typescript-vim)
+* [vim-javascript](https://github.com/pangloss/vim-javascript)
+* [vim-python-pep8-indent](https://github.com/Vimjas/vim-python-pep8-indent)
 
 
 ## How to include your own stuff?
@@ -145,31 +151,6 @@ You can also install your plugins, for instance, via pathogen you can install [v
 The [leader](http://learnvimscriptthehardway.stevelosh.com/chapters/06.html#leader) is `,`, so whenever you see `<leader>` it means `,`.
 
 
-### Plugin related mappings
-
-Open [bufexplorer](https://github.com/vim-scripts/bufexplorer.zip) to see and manage the current buffers (`<leader>o`):
-    
-    map <leader>o :BufExplorer<cr>
-
-Open [MRU.vim](https://github.com/vim-scripts/mru.vim) to see the recently open files (`<leader>f`):
-
-    map <leader>f :MRU<CR>
-
-Open [ctrlp.vim](https://github.com/kien/ctrlp.vim) plugin to quickly find a file or a buffer (`<leader>j` or `<ctrl>f`):
-    
-    let g:ctrlp_map = '<c-f>'
-
-[NERD Tree](https://github.com/scrooloose/nerdtree) mappings:
-
-    map <leader>nn :NERDTreeToggle<cr>
-    map <leader>nb :NERDTreeFromBookmark 
-    map <leader>nf :NERDTreeFind<cr>
-
-[goyo.vim](https://github.com/junegunn/goyo.vim) and [vim-zenroom2](https://github.com/amix/vim-zenroom2) lets you only focus on one thing at a time. It removes all the distractions and centers the content. It has a special look when editing Markdown, reStructuredText and textfiles. It only has one mapping. (`<leader>z`)
-
-    map <leader>z :Goyo<cr>
-
-
 ### Normal mode mappings
 
 Fast saving of a buffer (`<leader>w`):
@@ -179,7 +160,7 @@ Fast saving of a buffer (`<leader>w`):
 Map `<Space>` to `/` (search) and `<Ctrl>+<Space>` to `?` (backwards search):
 
 	map <space> /
-	map <c-space> ?
+	map <C-space> ?
 	map <silent> <leader><cr> :noh<cr>
 
 Disable highlights when you press `<leader><cr>`:
@@ -210,7 +191,7 @@ Useful mappings for managing tabs:
 
 	" Opens a new tab with the current buffer's path
 	" Super useful when editing files in the same directory
-	map <leader>te :tabedit <c-r>=expand("%:p:h")<cr>/
+	map <leader>te :tabedit <C-r>=expand("%:p:h")<cr>/
 
 Switch [CWD](http://vim.wikia.com/wiki/Set_working_directory_to_the_current_file) to the directory of the open buffer:
 
@@ -268,7 +249,7 @@ Quickly insert parenthesis/brackets/etc.:
 
 Insert the current date and time (useful for timestamps):
 
-    iab xdate <c-r>=strftime("%d/%m/%y %H:%M:%S")<cr>
+    iab xdate <C-r>=strftime("%d/%m/%y %H:%M:%S")<cr>
 
 
 ### Command line mappings
@@ -291,6 +272,67 @@ Write the file as sudo (works only on Unix). Super useful when you open a file a
     :W 
 
 
+### Plugin related mappings
+
+Open [bufexplorer](https://github.com/vim-scripts/bufexplorer.zip) to see and manage the current buffers (`<leader>o`):
+    
+    map <leader>o :BufExplorer<cr>
+
+Open [MRU.vim](https://github.com/vim-scripts/mru.vim) to see the recently open files (`<leader>f`):
+
+    map <leader>f :MRU<CR>
+
+Open [ctrlp.vim](https://github.com/kien/ctrlp.vim) plugin to quickly find a file or a buffer (`<leader>j` or `<ctrl>f`):
+    
+    let g:ctrlp_map = '<C-f>'
+
+[NERD Tree](https://github.com/scrooloose/nerdtree) mappings:
+
+    map <leader>nn :NERDTreeToggle<cr>
+    map <leader>nb :NERDTreeFromBookmark 
+    map <leader>nf :NERDTreeFind<cr>
+
+[goyo.vim](https://github.com/junegunn/goyo.vim) and [vim-zenroom2](https://github.com/amix/vim-zenroom2) lets you only focus on one thing at a time. It removes all the distractions and centers the content. It has a special look when editing Markdown, reStructuredText and textfiles. It only has one mapping. (`<leader>z`)
+
+    map <leader>z :Goyo<cr>
+
+[vim-multiple-cursors](https://github.com/terryma/vim-multiple-cursors) mappings to manage multiple cursors at once:
+
+    let g:multi_cursor_start_word_key      = '<C-s>'
+    let g:multi_cursor_select_all_word_key = '<A-s>'
+    let g:multi_cursor_start_key           = 'g<C-s>'
+    let g:multi_cursor_select_all_key      = 'g<A-s>'
+    let g:multi_cursor_next_key            = '<C-s>'
+    let g:multi_cursor_prev_key            = '<C-p>'
+    let g:multi_cursor_skip_key            = '<C-x>'
+    let g:multi_cursor_quit_key            = '<Esc>'
+
+[vim-yankstack](https://github.com/maxbrunsfeld/vim-yankstack) mappings to manage the kill-ring (clipboard):
+
+    nmap <C-p> <Plug>yankstack_substitute_older_paste
+    nmap <C-n> <Plug>yankstack_substitute_newer_paste
+
+[ctrl-p](https://github.com/ctrlpvim/ctrlp.vim) mappings to easily find and open a file, buffer, etc.:
+
+    let g:ctrlp_map = '<C-f>'
+    map <leader>j :CtrlP<cr>
+    map <C-b> :CtrlPBuffer<cr>
+
+[vim-snipmate](https://github.com/garbas/vim-snipmate) mappings to autocomplete via snippets:
+
+    ino <C-j> <C-r>=snipMate#TriggerSnippet()<cr>
+    snor <C-j> <esc>i<right><C-r>=snipMate#TriggerSnippet()<cr>
+
+[vim-surround](https://github.com/tpope/vim-surround) mappings to easily surround a string with `_()` gettext annotation:
+
+    vmap Si S(i_<esc>f)
+    au FileType mako vmap Si S"i${ _(<esc>2f"a) }<esc>
+
+[ale](https://github.com/dense-analysis/ale) to easily go to the next Ale syntax/lint error:
+
+    nmap <silent> <leader>a <Plug>(ale_next_wrap)
+
+
 ### Spell checking
 Pressing `<leader>ss` will toggle spell checking:
 
@@ -328,3 +370,10 @@ Cope mappings:
 Just do following:
 * Remove `~/.vim_runtime`
 * Remove any lines that reference `.vim_runtime` in your `~/.vimrc`
+
+
+## Doist
+
+Maintaining this Vim configuration isn't my day job. Daily I am the founder of [Doist](https://doist.com/). You could come and help us build the workplace of the future while living a balanced life (anywhere in the world 🌍🌎🌏).
+
+PS: Using Vim isn't a requirement 😄
@@ -281,7 +281,7 @@ elseif &background=='dark'
   hi ModeMsg		guifg=fg	guibg=#000080	gui=NONE
   hi VisualNOS		guifg=fg	guibg=#000080	gui=NONE
   hi SpecialKey		guifg=#b0d0f0	guibg=NONE	gui=NONE
-  hi NonText		guifg=#202020	guibg=#202020	gui=NONE
+  hi NonText		guifg=#6080f0	guibg=#101010	gui=NONE
   hi Directory		guifg=#80c0e0	guibg=NONE	gui=NONE
   hi ErrorMsg		guifg=#d0d090	guibg=#800000	gui=NONE
   hi MoreMsg		guifg=#c0e080	guibg=NONE	gui=NONE
 
@@ -1,4 +1,4 @@
-Copyright (c) 2016-2018, w0rp <devw0rp@gmail.com>
+Copyright (c) 2016-2019, w0rp <devw0rp@gmail.com>
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 
@@ -12,7 +12,7 @@ function! ale_linters#ada#gcc#GetCommand(buffer) abort
     " the .ali file may be created even if no code generation is attempted.
     " The output file name must match the source file name (except for the
     " extension), so here we cannot use the null file as output.
-    let l:tmp_dir = fnamemodify(ale#engine#CreateDirectory(a:buffer), ':p')
+    let l:tmp_dir = fnamemodify(ale#command#CreateDirectory(a:buffer), ':p')
     let l:out_file = l:tmp_dir . fnamemodify(bufname(a:buffer), ':t:r') . '.o'
 
     " -gnatc: Check syntax and semantics only (no code generation attempted)
@@ -48,7 +48,7 @@ endfunction
 call ale#linter#Define('ada', {
 \   'name': 'gcc',
 \   'output_stream': 'stderr',
-\   'executable_callback': ale#VarFunc('ada_gcc_executable'),
-\   'command_callback': 'ale_linters#ada#gcc#GetCommand',
+\   'executable': {b -> ale#Var(b, 'ada_gcc_executable')},
+\   'command': function('ale_linters#ada#gcc#GetCommand'),
 \   'callback': 'ale_linters#ada#gcc#Handle',
 \})
@@ -50,7 +50,7 @@ endfunction
 call ale#linter#Define('ansible', {
 \   'name': 'ansible_lint',
 \   'aliases': ['ansible', 'ansible-lint'],
-\   'executable_callback': 'ale_linters#ansible#ansible_lint#GetExecutable',
+\   'executable': function('ale_linters#ansible#ansible_lint#GetExecutable'),
 \   'command': '%e -p %t',
 \   'callback': 'ale_linters#ansible#ansible_lint#Handle',
 \})
@@ -1,11 +1,4 @@
 " Author: Johannes Wienke <languitar@semipol.de>
 " Description: alex for asciidoc files
 
-call ale#linter#Define('help', {
-\   'name': 'alex',
-\   'executable': 'alex',
-\   'command': 'alex %s -t',
-\   'output_stream': 'stderr',
-\   'callback': 'ale#handlers#alex#Handle',
-\   'lint_file': 1,
-\})
+call ale#handlers#alex#DefineLinter('asciidoc', '--text')
@@ -0,0 +1,9 @@
+" Author: TANIGUCHI Masaya <ta2gch@gmail.com>
+" Description: textlint for AsciiDoc files
+
+call ale#linter#Define('asciidoc', {
+\   'name': 'textlint',
+\   'executable': function('ale#handlers#textlint#GetExecutable'),
+\   'command': function('ale#handlers#textlint#GetCommand'),
+\   'callback': 'ale#handlers#textlint#HandleTextlintOutput',
+\})
@@ -5,7 +5,10 @@ call ale#Set('asm_gcc_executable', 'gcc')
 call ale#Set('asm_gcc_options', '-Wall')
 
 function! ale_linters#asm#gcc#GetCommand(buffer) abort
-    return '%e -x assembler -fsyntax-only '
+    " `-o /dev/null` or `-o null` is needed to catch all errors,
+    " -fsyntax-only doesn't catch everything.
+    return '%e -x assembler'
+    \   . ' -o ' . g:ale#util#nul_file
     \   . '-iquote ' . ale#Escape(fnamemodify(bufname(a:buffer), ':p:h'))
     \   . ' ' . ale#Var(a:buffer, 'asm_gcc_options') . ' -'
 endfunction
@@ -28,7 +31,7 @@ endfunction
 call ale#linter#Define('asm', {
 \    'name': 'gcc',
 \    'output_stream': 'stderr',
-\    'executable_callback': ale#VarFunc('asm_gcc_executable'),
-\    'command_callback': 'ale_linters#asm#gcc#GetCommand',
+\    'executable': {b -> ale#Var(b, 'asm_gcc_executable')},
+\    'command': function('ale_linters#asm#gcc#GetCommand'),
 \    'callback': 'ale_linters#asm#gcc#Handle',
 \})
@@ -15,8 +15,8 @@ endfunction
 
 call ale#linter#Define('awk', {
 \   'name': 'gawk',
-\   'executable_callback': ale#VarFunc('awk_gawk_executable'),
-\   'command_callback': 'ale_linters#awk#gawk#GetCommand',
+\   'executable': {b -> ale#Var(b, 'awk_gawk_executable')},
+\   'command': function('ale_linters#awk#gawk#GetCommand'),
 \   'callback': 'ale#handlers#gawk#HandleGawkFormat',
 \   'output_stream': 'both'
 \})
@@ -11,9 +11,9 @@ endfunction
 
 function! ale_linters#bib#bibclean#get_type(str) abort
     if a:str is# '??'
-       return 'E'
+        return 'E'
     else
-       return 'W'
+        return 'W'
     endif
 endfunction
 
@@ -36,39 +36,40 @@ function! ale_linters#bib#bibclean#Handle(buffer, lines) abort
     let l:msg  = ''
 
     for l:line in a:lines
-      if empty(l:msg)
-          let l:mlist = ale_linters#bib#bibclean#match_msg(l:line)
+        if empty(l:msg)
+            let l:mlist = ale_linters#bib#bibclean#match_msg(l:line)
 
-          if !empty(l:mlist)
-              let l:msg = l:mlist[3]
-              let l:type = ale_linters#bib#bibclean#get_type(l:mlist[1])
-          endif
-      else
-          if l:type is# 'E'
-               let l:mlist = ale_linters#bib#bibclean#match_entry(l:line)
-          else
-               let l:mlist = ale_linters#bib#bibclean#match_value(l:line)
-          endif
+            if !empty(l:mlist)
+                let l:msg = l:mlist[3]
+                let l:type = ale_linters#bib#bibclean#get_type(l:mlist[1])
+            endif
+        else
+            if l:type is# 'E'
+                let l:mlist = ale_linters#bib#bibclean#match_entry(l:line)
+            else
+                let l:mlist = ale_linters#bib#bibclean#match_value(l:line)
+            endif
 
-          if !empty(l:mlist)
-            call add(l:output, {
-              \ 'lnum': l:mlist[1],
-              \ 'col': l:mlist[2],
-              \ 'text': l:msg,
-              \ 'type': l:type
-              \})
-             let l:msg = ''
-          endif
-      endif
+            if !empty(l:mlist)
+                call add(l:output, {
+                \ 'lnum': l:mlist[1],
+                \ 'col': l:mlist[2],
+                \ 'text': l:msg,
+                \ 'type': l:type
+                \})
+
+                let l:msg = ''
+            endif
+        endif
     endfor
 
     return l:output
 endfunction
 
 call ale#linter#Define('bib', {
 \   'name': 'bibclean',
-\   'executable_callback': ale#VarFunc('bib_bibclean_executable'),
-\   'command_callback': 'ale_linters#bib#bibclean#GetCommand',
+\   'executable': {b -> ale#Var(b, 'bib_bibclean_executable')},
+\   'command': function('ale_linters#bib#bibclean#GetCommand'),
 \   'output_stream': 'stderr',
 \   'callback': 'ale_linters#bib#bibclean#Handle',
 \})
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-Copyright (c) 2016-2018, w0rp <devw0rp@gmail.com>`
	`1`	`+Copyright (c) 2016-2019, w0rp <devw0rp@gmail.com>`
`2`	`2`	`All rights reserved.`
`3`	`3`
`4`	`4`	`Redistribution and use in source and binary forms, with or without`