Skip to content

Commit 75beb5f

Browse files
author
amix
committed
Updated vim plugins
1 parent 50ae0a5 commit 75beb5f

32 files changed

Lines changed: 697 additions & 231 deletions

File tree

sources_non_forked/ctrlp.vim/autoload/ctrlp.vim

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1763,6 +1763,7 @@ fu! ctrlp#setpathmode(pmode, ...)
17631763
let spath = a:0 ? a:1 : s:crfpath
17641764
let markers = ['.git', '.hg', '.svn', '.bzr', '_darcs']
17651765
if type(s:rmarkers) == 3 && !empty(s:rmarkers)
1766+
if s:findroot(spath, s:rmarkers, 0, 0) != [] | retu 1 | en
17661767
cal filter(markers, 'index(s:rmarkers, v:val) < 0')
17671768
let markers = s:rmarkers + markers
17681769
en
@@ -2384,7 +2385,7 @@ endf
23842385
fu! s:matchbuf(item, pat)
23852386
let bufnr = s:bufnrfilpath(a:item)[0]
23862387
let parts = s:bufparts(bufnr)
2387-
let item = bufnr.parts[0].parts[2].s:lash().parts[3]
2388+
let item = s:byfname ? parts[2] : bufnr.parts[0].parts[2].s:lash().parts[3]
23882389
retu match(item, a:pat)
23892390
endf
23902391

sources_non_forked/ctrlp.vim/doc/ctrlp.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -848,7 +848,7 @@ Example: >
848848
When this is set to 1, the <bs> on empty prompt exit CtrlP.
849849

850850
*ctrlp-default-value*
851-
Otherwize, you can use below to change default value.
851+
Otherwise, you can use below to change default value.
852852
Example: >
853853
let g:ctrlp_path_nolim = 1
854854
Lines changed: 170 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,170 @@
1+
goyo.txt goyo Last change: April 1 2017
2+
GOYO - TABLE OF CONTENTS *goyo* *goyo-toc*
3+
==============================================================================
4+
5+
goyo.vim (고요)
6+
Installation
7+
Usage
8+
Dimension expression
9+
Configuration
10+
Callbacks
11+
Inspiration
12+
Pros.
13+
License
14+
15+
GOYO.VIM (고요) *goyo*
16+
==============================================================================
17+
18+
Distraction-free writing in Vim.
19+
20+
https://raw.github.com/junegunn/i/master/goyo.png
21+
22+
(Color scheme: {seoul256}{1})
23+
24+
Best served with {limelight.vim}{2}.
25+
26+
{1} https://github.com/junegunn/seoul256.vim
27+
{2} https://github.com/junegunn/limelight.vim
28+
29+
30+
INSTALLATION *goyo-installation*
31+
==============================================================================
32+
33+
Use your favorite plugin manager.
34+
35+
*:PlugInstall*
36+
37+
- {vim-plug}{3}
38+
1. Add `Plug 'junegunn/goyo.vim'` to .vimrc
39+
2. Run `:PlugInstall`
40+
41+
{3} https://github.com/junegunn/vim-plug
42+
43+
44+
USAGE *goyo-usage*
45+
==============================================================================
46+
47+
*:Goyo*
48+
49+
- `:Goyo`
50+
- Toggle Goyo
51+
- `:Goyo [dimension]`
52+
- Turn on or resize Goyo
53+
- `:Goyo!`
54+
- Turn Goyo off
55+
56+
The window can be resized with the usual count]<CTRL-W + `>`, `<`, `+`, `-`
57+
keys.
58+
59+
60+
< Dimension expression >______________________________________________________~
61+
*goyo-dimension-expression*
62+
63+
The expected format of a dimension expression is
64+
`[WIDTH][XOFFSET][x[HEIGHT][YOFFSET]]`. `XOFFSET` and `YOFFSET` should be
65+
prefixed by `+` or `-`. Each component can be given in percentage.
66+
>
67+
" Width
68+
Goyo 120
69+
70+
" Height
71+
Goyo x30
72+
73+
" Both
74+
Goyo 120x30
75+
76+
" In percentage
77+
Goyo 120x50%
78+
79+
" With offsets
80+
Goyo 50%+25%x50%-25%
81+
<
82+
83+
CONFIGURATION *goyo-configuration*
84+
==============================================================================
85+
86+
*g:goyo_width* *g:goyo_height* *g:goyo_linenr*
87+
88+
- `g:goyo_width` (default: 80)
89+
- `g:goyo_height` (default: 85%)
90+
- `g:goyo_linenr` (default: 0)
91+
92+
93+
< Callbacks >_________________________________________________________________~
94+
*goyo-callbacks*
95+
96+
By default, {vim-airline}{4}, {vim-powerline}{5}, {powerline}{6},
97+
{lightline.vim}{7}, {vim-signify}{8}, and {vim-gitgutter}{9} are temporarily
98+
disabled while in Goyo mode.
99+
100+
If you have other plugins that you want to disable/enable, or if you want to
101+
change the default settings of Goyo window, you can set up custom routines to
102+
be triggered on `GoyoEnter` and `GoyoLeave` events.
103+
>
104+
function! s:goyo_enter()
105+
silent !tmux set status off
106+
silent !tmux list-panes -F '\#F' | grep -q Z || tmux resize-pane -Z
107+
set noshowmode
108+
set noshowcmd
109+
set scrolloff=999
110+
Limelight
111+
" ...
112+
endfunction
113+
114+
function! s:goyo_leave()
115+
silent !tmux set status on
116+
silent !tmux list-panes -F '\#F' | grep -q Z && tmux resize-pane -Z
117+
set showmode
118+
set showcmd
119+
set scrolloff=5
120+
Limelight!
121+
" ...
122+
endfunction
123+
124+
autocmd! User GoyoEnter nested call <SID>goyo_enter()
125+
autocmd! User GoyoLeave nested call <SID>goyo_leave()
126+
<
127+
More examples can be found here: {Customization}{10}
128+
129+
{4} https://github.com/bling/vim-airline
130+
{5} https://github.com/Lokaltog/vim-powerline
131+
{6} https://github.com/Lokaltog/powerline
132+
{7} https://github.com/itchyny/lightline.vim
133+
{8} https://github.com/mhinz/vim-signify
134+
{9} https://github.com/airblade/vim-gitgutter
135+
{10} https://github.com/junegunn/goyo.vim/wiki/Customization
136+
137+
138+
INSPIRATION *goyo-inspiration*
139+
==============================================================================
140+
141+
- {LiteDFM}{11}
142+
- {VimRoom}{12}
143+
144+
{11} https://github.com/bilalq/lite-dfm
145+
{12} http://projects.mikewest.org/vimroom/
146+
147+
148+
PROS. *goyo-pros*
149+
==============================================================================
150+
151+
1. Works well with splits. Doesn't mess up with the current window arrangement
152+
2. Works well with popular statusline plugins
153+
3. Prevents accessing the empty windows around the central buffer
154+
4. Can be closed with any of `:q[uit]`, `:clo[se]`, `:tabc[lose]`, or `:Goyo`
155+
5. Can dynamically change the width of the window
156+
6. Adjusts its colors when color scheme is changed
157+
7. Realigns the window when the terminal (or window) is resized or when the size
158+
of the font is changed
159+
8. Correctly hides colorcolumns and Emojis in statusline
160+
9. Highly customizable with callbacks
161+
162+
163+
LICENSE *goyo-license*
164+
==============================================================================
165+
166+
MIT
167+
168+
169+
==============================================================================
170+
vim:tw=78:sw=2:ts=2:ft=help:norl:nowrap:
Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
_To assist in resolving your issue, provide as much information as possible, in place of the ellipses (``) below._
2+
3+
---
4+
**Environment:** _Describe your Vim/NERDTree setup._
5+
6+
>* Operating System: …
7+
>* Vim version `:version`: …
8+
>* NERDTree version `git rev-parse --short HEAD`: …
9+
>* NERDTree settings applied in your vimrc, if any:
10+
>
11+
> ```
12+
> …
13+
> ```
14+
15+
**Process:** _List the steps that will recreate the issue._
16+
17+
>1. …
18+
19+
**Current Result:** _Describe what you you currently experience from this process._
20+
21+
>…
22+
23+
**Expected Result:** _Describe what you would expect to have resulted from this process._
24+
25+
>…
26+
27+
---
28+
**Optional**
29+
30+
**Screenshot(s):**
31+
32+
>…
33+
34+
**Possible Fix:** _(Have you poked around in the code?)_
35+
36+
>…
37+

sources_non_forked/nerdtree/README.markdown

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,14 +55,14 @@ The following features and functionality are provided by the NERD tree:
5555
Installation
5656
------------
5757

58-
####[pathogen.vim](https://github.com/tpope/vim-pathogen)
58+
#### [pathogen.vim](https://github.com/tpope/vim-pathogen)
5959

6060
git clone https://github.com/scrooloose/nerdtree.git ~/.vim/bundle/nerdtree
6161

6262
Then reload vim, run `:helptags ~/.vim/bundle/nerdtree/doc/`, and check out `:help NERD_tree.txt`.
6363

6464

65-
####[apt-vim](https://github.com/egalpin/apt-vim)
65+
#### [apt-vim](https://github.com/egalpin/apt-vim)
6666

6767
apt-vim install -y https://github.com/scrooloose/nerdtree.git
6868

sources_non_forked/syntastic/autoload/syntastic/preprocess.vim

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,35 @@ function! syntastic#preprocess#dockerfile_lint(errors) abort " {{{2
9898
return out
9999
endfunction " }}}2
100100

101+
function! syntastic#preprocess#dscanner(errors) abort " {{{2
102+
let idx = 0
103+
while idx < len(a:errors) && a:errors[idx][0] !=# '{'
104+
let idx += 1
105+
endwhile
106+
let errs = s:_decode_JSON(join(a:errors[idx :], ''))
107+
108+
let out = []
109+
if type(errs) == type({}) && has_key(errs, 'issues') && type(errs['issues']) == type([])
110+
for issue in errs['issues']
111+
try
112+
call add(out,
113+
\ issue['fileName'] . ':' .
114+
\ issue['line'] . ':' .
115+
\ issue['column'] . ':' .
116+
\ issue['message'] . ' [' . issue['key'] . ']')
117+
catch /\m^Vim\%((\a\+)\)\=:E716/
118+
call syntastic#log#warn('checker d/dscanner: unrecognized error item ' . string(issue))
119+
let out = []
120+
break
121+
endtry
122+
endfor
123+
else
124+
call syntastic#log#warn('checker d/dscanner: unrecognized error format (crashed checker?)')
125+
endif
126+
127+
return out
128+
endfunction " }}}2
129+
101130
function! syntastic#preprocess#flow(errors) abort " {{{2
102131
let idx = 0
103132
while idx < len(a:errors) && a:errors[idx][0] !=# '{'

0 commit comments

Comments
 (0)