Skip to content

Commit

Permalink
getting on well
Browse files Browse the repository at this point in the history
  • Loading branch information
smokd committed May 30, 2014
1 parent 7388ffa commit 03eb0e7
Show file tree
Hide file tree
Showing 83 changed files with 1,210 additions and 500 deletions.
12 changes: 12 additions & 0 deletions .gitmodules~
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
[submodule "sources_non_forked/SingleCompile"]
path = sources_non_forked/SingleCompile
url = https://github.com/xuhdev/SingleCompile
[submodule "sources_non_forked/Deliminate"]
path = sources_non_forked/Deliminate
url = https://github.com/Raimondi/delimitMate
[submodule "sources_non_forked/ScrollColors"]
path = sources_non_forked/ScrollColors
url = https://github.com/Raimondi/delimitMate
[submodule "sources_non_forked/vim-colorschemes"]
path = sources_non_forked/vim-colorschemes
url = https://github.com/flazz/vim-colorschemes.git
29 changes: 26 additions & 3 deletions sources_non_forked/ack.vim/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ ack from vim, and shows the results in a split window.

### Ack

You will need the ack, of course, to install it follow the
You will need the ack(>= 2.0), of course, to install it follow the
[manual](http://beyondgrep.com/install/)

### The Plugin
Expand Down Expand Up @@ -75,8 +75,8 @@ check out the docs for the Perl script 'ack', for obvious reasons:
### Gotchas

Some characters have special meaning, and need to be escaped your search
pattern. For instance, '#'. You have to escape it like this :Ack '\\\#define
foo' to search for #define foo. (From blueyed in issue #5.)
pattern. For instance, '#'. You have to escape it like this `:Ack '\\\#define
foo'` to search for '#define foo'. (From blueyed in issue #5.)

## Changelog

Expand All @@ -91,3 +91,26 @@ foo' to search for #define foo. (From blueyed in issue #5.)
* Add g:ack_mapping
* Add g:ack_default_options
* Add a help toggle `?`(like NERDTree)

### 1.0.1

* Fixes #124. Bug with `g:ack_autofold_results`

### 1.0.2

* Add compatibility with [vim-dispatch](https://github.com/tpope/vim-dispatch)

### 1.0.3

* Fixes #127. Use `&l:hlsearch` instead of `v:hlsearch` to keep compatibility
with versions that does not have this variable.

### 1.0.4

* Fixes #128. Always apply mappings, even when using vim-dispatch.

### 1.0.5

* Fixes #128. Fixes the `errorformat` for ack when using vim-dispatch.
* Do not use vim-dispatch by default. To use vim-dispath must set
`g:ack_use_dispatch`
20 changes: 15 additions & 5 deletions sources_non_forked/ack.vim/autoload/ack.vim
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,14 @@ function! ack#Ack(cmd, args)
try
" NOTE: we escape special chars, but not everything using shellescape to
" allow for passing arguments etc
silent execute a:cmd . " " . escape(l:grepargs, '|#%')
if g:ack_use_dispatch
let &l:errorformat = g:ackformat
let &l:makeprg=g:ackprg." " . escape(l:grepargs, '|#%')
Make
else
silent execute a:cmd . " " . escape(l:grepargs, '|#%')
endif

finally
let &grepprg=grepprg_bak
let &grepformat=grepformat_bak
Expand All @@ -42,15 +49,19 @@ function! ack#Ack(cmd, args)
let s:close_cmd = ':cclose<CR>'
endif

call ack#show_results()
if !g:ack_use_dispatch
call ack#show_results()
else
copen
endif
call <SID>apply_maps()
call <SID>highlight(l:grepargs)

redraw!
endfunction

function! ack#show_results()
execute s:handler
call <SID>apply_maps()
endfunction

function! s:apply_maps()
Expand Down Expand Up @@ -101,8 +112,7 @@ function! s:highlight(args)
endif

let @/ = matchstr(a:args, "\\v\\w+\>|['\"]\\zs[^\"]+\\ze['\"]")
setlocal hlsearch
call feedkeys(":let v:hlsearch=1 \| echo \<CR>", "n")
call feedkeys(":let &l:hlsearch=1 \| echo \<CR>", "n")
endfunction

function! ack#AckFromSearch(cmd, args)
Expand Down
16 changes: 14 additions & 2 deletions sources_non_forked/ack.vim/doc/ack.txt
Original file line number Diff line number Diff line change
Expand Up @@ -86,15 +86,15 @@ Example:
let g:ackprg = "other-bin-ack"
<

g:ack_default_options*
*g:ack_default_options*
g:ack_default_options
Default: " -s -H --nocolor --nogroup --column"

Use this option to specify the options used by ack

Example:
>
let g:ackprg =
let g:ack_default_options =
\ " -s -H --nocolor --nogroup --column --smart-case --follow"
<

Expand Down Expand Up @@ -203,6 +203,18 @@ Example:
let g:ackpreview = 1
<

*g:ack_use_dispatch*

g:ack_use_dispatch
Default: 0

Use this option to use vim-dispatch to search the results in background

Example:
>
let g:ack_use_dispatch = 1
<

==============================================================================
MAPPINGS *ack-mappings*

Expand Down
2 changes: 1 addition & 1 deletion sources_non_forked/ack.vim/ftplugin/qf.vim
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
if g:ack_autofold_results
if exists("g:ack_autofold_results") && g:ack_autofold_results
setlocal foldlevel=0
setlocal foldmethod=expr
setlocal foldexpr=matchstr(getline(v:lnum),'^[^\|]\\+')==#matchstr(getline(v:lnum+1),'^[^\|]\\+')?1:'<1'
Expand Down
4 changes: 4 additions & 0 deletions sources_non_forked/ack.vim/plugin/ack.vim
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,10 @@ if !exists("g:ack_apply_lmappings")
let g:ack_apply_lmappings = !exists("g:ack_lhandler")
endif

if !exists("g:ack_use_dispatch")
let g:ack_use_dispatch = 0
end

let s:ack_mappings = {
\ "t": "<C-W><CR><C-W>T",
\ "T": "<C-W><CR><C-W>TgT<C-W>j",
Expand Down
7 changes: 6 additions & 1 deletion sources_non_forked/goyo.vim/plugin/goyo.vim
Original file line number Diff line number Diff line change
Expand Up @@ -104,13 +104,13 @@ function! s:tranquilize()
\ 'StatusLine', 'StatusLineNC', 'SignColumn']
" -1 on Vim / '' on GVim
if bg == -1 || empty(bg)
call s:set_color(grp, '', 'NONE')
call s:set_color(grp, 'fg', get(g:, 'goyo_bg', 'black'))
call s:set_color(grp, 'bg', 'NONE')
else
call s:set_color(grp, 'fg', bg)
call s:set_color(grp, 'bg', bg)
endif
call s:set_color(grp, '', 'NONE')
endfor
endfunction

Expand Down Expand Up @@ -244,6 +244,8 @@ function! s:goyo_off()
let goyo_disabled_airline = t:goyo_disabled_airline
let goyo_disabled_powerline = t:goyo_disabled_powerline
let goyo_disabled_lightline = t:goyo_disabled_lightline
let goyo_orig_buffer = t:goyo_master
let [line, col] = [line('.'), col('.')]

if tabpagenr() == 1
tabnew
Expand All @@ -252,6 +254,9 @@ function! s:goyo_off()
endif
tabclose
execute 'normal! '.s:orig_tab.'gt'
if winbufnr(0) == goyo_orig_buffer
execute printf('normal! %dG%d|', line, col)
endif

let wmh = remove(goyo_revert, 'winminheight')
let wh = remove(goyo_revert, 'winheight')
Expand Down
122 changes: 89 additions & 33 deletions sources_non_forked/syntastic/CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,49 +1,105 @@
# Bug reports / Github issues
# CONTRIBUTING
- - -
1\. [Bug reports / GitHub issues](#bugreps)
2\. [Submitting a patch](#patches)
3\. [General style notes](#generalstyle)
4\. [Syntax checker notes](#checkerstyle)
- - -

When reporting a bug make sure you search the existing github issues for the
same/similar issues. If you find one, feel free to add a `+1` comment with any
additional information that may help us solve the issue.
<a name="bugreps"></a>

## 1. Bug reports / GitHub issues

Please note that the preferred channel for posting bug reports is the
[issue tracker at GitHub][0]. Reports posted elsewhere are less likely
to be seen by the core team.

When reporting a bug make sure you search the existing GitHub issues
for the same/similar issues. If you find one, feel free to add a `+1`
comment with any additional information that may help us solve the
issue.

When creating a new issue be sure to state the following:

* Steps to reproduce the bug.
* The version of vim you are using.
* The version of syntastic you are using.
* steps to reproduce the bug;
* the version of Vim you are using (run `:ver` to find out);
* the version of syntastic you are using (see `:SyntasticInfo`).

For syntax checker bugs also state the version of the checker executable
that you are using. Adding debugging information is typically useful
too:

* open a file handled by your checker;
* set `g:syntastic_debug` to 1 or 3;
* run the checker;
* copy the output of `:mes`.

<a name="patches"></a>

## 2. Submitting a patch

For syntax checker bugs also state the version of the checker executable that you are using.
Before you consider adding features to syntastic, _please_ spend a few
minutes (re-)reading the latest version of the [manual][1]. Syntastic
is changing rapidly at times, and it's quite possible that some of the
features you want to add exist already.

# Submitting a patch
To submit a patch:

* Fork the repo on github
* Make a [topic branch](https://github.com/dchelimsky/rspec/wiki/Topic-Branches#using-topic-branches-when-contributing-patches) and start hacking
* Submit a pull request based off your topic branch
* fork the [repo][2] on GitHub;
* make a [topic branch][3] and start hacking;
* submit a pull request based off your topic branch.

Small focused patches are preferred.
Small, focused patches are preferred.

Large changes to the code should be discussed with the core team first. Create an issue and explain your plan and see what we say.
Large changes to the code should be discussed with the core team first.
Create an issue and explain your plan and see what we say.

# General style notes
Also make sure to update the manual whenever applicable. Nobody can use
features that aren't documented.

Following the coding conventions/styles used in the syntastic core:
<a name="generalstyle"></a>

* Use 4 space indents.
* Don't use abbreviated keywords - e.g. use `endfunction`, not `endfun` (there's always room for more fun!).
* Don't use `l:` prefixes for variables unless actually required (i.e. almost never).
* Code for maintainability. We would rather a function be a couple of lines longer and have (for example) some [explaining variables](http://www.refactoring.com/catalog/extractVariable.html) to aid readability.
## 3. General style notes

# Syntax checker style notes
Follow the coding conventions/styles used in the syntastic core:

The preferred style for error format strings is one "clause" per line. E.g.
(from the coffeelint checker):
* use 4 space indents;
* don't use abbreviated keywords - e.g. use `endfunction`, not `endfun`
(there's always room for more fun!);
* don't use `l:` prefixes for variables unless actually required (i.e.
almost never);
* code for maintainability; we would rather a function be a couple of
lines longer and have (for example) some [explaining variables][4] to
aid readability.

```viml
let errorformat = '%E%f:%l:%c: %trror: %m,' .
\ 'Syntax%trror: In %f\, %m on line %l,' .
\ '%EError: In %f\, Parse error on line %l: %m,' .
\ '%EError: In %f\, %m on line %l,' .
\ '%W%f(%l): lint warning: %m,' .
\ '%W%f(%l): warning: %m,' .
\ '%E%f(%l): SyntaxError: %m,' .
\ '%-Z%p^,' .
\ '%-G%.%#'
<a name="checkerstyle"></a>

## 4. Syntax checker notes

Make sure to read the [guide][5] if you plan to add new syntax checkers.

Use the existing checkers as templates, rather than writing everything
from scratch.

The preferred style for error format strings is one "clause" per line.
E.g. (from the `coffee` checker):

```vim
let errorformat =
\ '%E%f:%l:%c: %trror: %m,' .
\ 'Syntax%trror: In %f\, %m on line %l,' .
\ '%EError: In %f\, Parse error on line %l: %m,' .
\ '%EError: In %f\, %m on line %l,' .
\ '%W%f(%l): lint warning: %m,' .
\ '%W%f(%l): warning: %m,' .
\ '%E%f(%l): SyntaxError: %m,' .
\ '%-Z%p^,' .
\ '%-G%.%#'
```

[0]: https://github.com/scrooloose/syntastic/issues
[1]: https://github.com/scrooloose/syntastic/blob/master/doc/syntastic.txt
[2]: https://github.com/scrooloose/syntastic
[3]: https://github.com/dchelimsky/rspec/wiki/Topic-Branches#using-topic-branches-when-contributing-patches
[4]: http://www.refactoring.com/catalog/extractVariable.html
[5]: https://github.com/scrooloose/syntastic/wiki/Syntax-Checker-Guide
17 changes: 10 additions & 7 deletions sources_non_forked/syntastic/README.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,9 @@ the user is notified and is happy because they didn't have to compile their
code or execute their script to find them.

At the time of this writing, syntax checking plugins exist for ActionScript,
Ada, AppleScript, AsciiDoc, ASM, BEMHTML, Bourne shell, C, C++, C#, Chef,
CoffeeScript, Coco, Coq, CSS, Cucumber, CUDA, D, Dart, DocBook, Dust, Elixir,
Erlang, eRuby, Fortran, Gentoo metadata, GLSL, Go, Haml, Haskell, Haxe,
Ada, AppleScript, AsciiDoc, ASM, BEMHTML, Bro, Bourne shell, C, C++, C#,
Chef, CoffeeScript, Coco, Coq, CSS, Cucumber, CUDA, D, Dart, DocBook, Dust,
Elixir, Erlang, eRuby, Fortran, Gentoo metadata, GLSL, Go, Haml, Haskell, Haxe,
Handlebars, HSS, HTML, Java, JavaScript, JSON, JSX, LESS, Lex, Limbo, LISP,
LLVM intermediate language, Lua, MATLAB, NASM, Objective-C, Objective-C++,
OCaml, Perl, Perl POD, PHP, gettext Portable Object, OS X and iOS property
Expand Down Expand Up @@ -77,8 +77,8 @@ install syntastic. Do this in your terminal so that you get the `pathogen.vim`
file and the directories it needs:
```sh
mkdir -p ~/.vim/autoload ~/.vim/bundle; \
curl -so ~/.vim/autoload/pathogen.vim \
https://raw.github.com/tpope/vim-pathogen/master/autoload/pathogen.vim
curl -LSso ~/.vim/autoload/pathogen.vim \
https://raw.githubusercontent.com/tpope/vim-pathogen/master/autoload/pathogen.vim
```
Next you *need* to add this to your `~/.vimrc`:
```vim
Expand Down Expand Up @@ -272,8 +272,10 @@ cabbrev <silent> bd lclose\|bdelete
## 4\. Other resources

The preferred place for posting suggestions, reporting bugs, and general
discussions related to syntastic is the [issue tracker at GitHub][4]. There
are also a [google group][5], and a [syntastic tag at StackOverflow][6].
discussions related to syntastic is the [issue tracker at GitHub][4].
A guide for writing syntax checkers can be found in the [wiki][11].
There are also a dedicated [google group][5], and a
[syntastic tag at StackOverflow][6].

Syntastic aims to provide a common interface to syntax checkers for as many
languages as possible. For particular languages, there are, of course, other
Expand All @@ -291,3 +293,4 @@ a look at [jedi-vim][7], [python-mode][8], or [YouCompleteMe][9].
[8]: https://github.com/klen/python-mode
[9]: http://valloric.github.io/YouCompleteMe/
[10]: http://perldoc.perl.org/perlrun.html#*-c*
[11]: https://github.com/scrooloose/syntastic/wiki/Syntax-Checker-Guide
2 changes: 2 additions & 0 deletions sources_non_forked/syntastic/autoload/syntastic/log.vim
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,7 @@ function! s:isDebugEnabled_dumb(level) " {{{2
endfunction " }}}2

let s:isDebugEnabled = function(exists('*and') ? 's:isDebugEnabled_smart' : 's:isDebugEnabled_dumb')
lockvar s:isDebugEnabled

function! s:logRedirect(on) " {{{2
if exists("g:syntastic_debug_file")
Expand All @@ -138,6 +139,7 @@ function! s:logTimestamp_dumb() " {{{2
endfunction " }}}2

let s:logTimestamp = function(has('reltime') ? 's:logTimestamp_smart' : 's:logTimestamp_dumb')
lockvar s:logTimestamp

function! s:formatVariable(name) " {{{2
let vals = []
Expand Down
Loading

0 comments on commit 03eb0e7

Please sign in to comment.