diff --git a/README.md b/README.md index 9ba1275a..b7b09cb8 100644 --- a/README.md +++ b/README.md @@ -64,6 +64,7 @@ Just do a git rebase! cd ~/.vim_runtime git pull --rebase + python update_plugins.py ## Some screenshots @@ -97,7 +98,7 @@ 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 @@ -105,6 +106,7 @@ I recommend reading the docs of these plugins to understand them better. Each pl * [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 `` it means `,`. -### Plugin related mappings - -Open [bufexplorer](https://github.com/vim-scripts/bufexplorer.zip) to see and manage the current buffers (`o`): - - map o :BufExplorer - -Open [MRU.vim](https://github.com/vim-scripts/mru.vim) to see the recently open files (`f`): - - map f :MRU - -Open [ctrlp.vim](https://github.com/kien/ctrlp.vim) plugin to quickly find a file or a buffer (`j` or `f`): - - let g:ctrlp_map = '' - -[NERD Tree](https://github.com/scrooloose/nerdtree) mappings: - - map nn :NERDTreeToggle - map nb :NERDTreeFromBookmark - map nf :NERDTreeFind - -[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. (`z`) - - map z :Goyo - - ### Normal mode mappings Fast saving of a buffer (`w`): @@ -179,7 +160,7 @@ Fast saving of a buffer (`w`): Map `` to `/` (search) and `+` to `?` (backwards search): map / - map ? + map ? map :noh Disable highlights when you press ``: @@ -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 te :tabedit =expand("%:p:h")/ + map te :tabedit =expand("%:p:h")/ 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 =strftime("%d/%m/%y %H:%M:%S") + iab xdate =strftime("%d/%m/%y %H:%M:%S") ### 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 (`o`): + + map o :BufExplorer + +Open [MRU.vim](https://github.com/vim-scripts/mru.vim) to see the recently open files (`f`): + + map f :MRU + +Open [ctrlp.vim](https://github.com/kien/ctrlp.vim) plugin to quickly find a file or a buffer (`j` or `f`): + + let g:ctrlp_map = '' + +[NERD Tree](https://github.com/scrooloose/nerdtree) mappings: + + map nn :NERDTreeToggle + map nb :NERDTreeFromBookmark + map nf :NERDTreeFind + +[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. (`z`) + + map z :Goyo + +[vim-multiple-cursors](https://github.com/terryma/vim-multiple-cursors) mappings to manage multiple cursors at once: + + let g:multi_cursor_start_word_key = '' + let g:multi_cursor_select_all_word_key = '' + let g:multi_cursor_start_key = 'g' + let g:multi_cursor_select_all_key = 'g' + let g:multi_cursor_next_key = '' + let g:multi_cursor_prev_key = '' + let g:multi_cursor_skip_key = '' + let g:multi_cursor_quit_key = '' + +[vim-yankstack](https://github.com/maxbrunsfeld/vim-yankstack) mappings to manage the kill-ring (clipboard): + + nmap yankstack_substitute_older_paste + nmap 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 = '' + map j :CtrlP + map :CtrlPBuffer + +[vim-snipmate](https://github.com/garbas/vim-snipmate) mappings to autocomplete via snippets: + + ino =snipMate#TriggerSnippet() + snor i=snipMate#TriggerSnippet() + +[vim-surround](https://github.com/tpope/vim-surround) mappings to easily surround a string with `_()` gettext annotation: + + vmap Si S(i_f) + au FileType mako vmap Si S"i${ _(2f"a) } + +[ale](https://github.com/dense-analysis/ale) to easily go to the next Ale syntax/lint error: + + nmap a (ale_next_wrap) + + ### Spell checking Pressing `ss` will toggle spell checking: diff --git a/install_awesome_vimrc.sh b/install_awesome_vimrc.sh old mode 100644 new mode 100755 diff --git a/install_basic_vimrc.sh b/install_basic_vimrc.sh old mode 100644 new mode 100755 diff --git a/sources_forked/peaksea/colors/peaksea.vim b/sources_forked/peaksea/colors/peaksea.vim index 06924bc1..da2fdef7 100644 --- a/sources_forked/peaksea/colors/peaksea.vim +++ b/sources_forked/peaksea/colors/peaksea.vim @@ -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 diff --git a/sources_non_forked/ale/ale_linters/c/clangd.vim b/sources_non_forked/ale/ale_linters/c/clangd.vim index 79b600fa..c42d4497 100644 --- a/sources_non_forked/ale/ale_linters/c/clangd.vim +++ b/sources_non_forked/ale/ale_linters/c/clangd.vim @@ -3,9 +3,14 @@ call ale#Set('c_clangd_executable', 'clangd') call ale#Set('c_clangd_options', '') +call ale#Set('c_build_dir', '') function! ale_linters#c#clangd#GetCommand(buffer) abort - return '%e' . ale#Pad(ale#Var(a:buffer, 'c_clangd_options')) + let l:build_dir = ale#c#GetBuildDirectory(a:buffer) + + return '%e' + \ . ale#Pad(ale#Var(a:buffer, 'c_clangd_options')) + \ . (!empty(l:build_dir) ? ' -compile-commands-dir=' . ale#Escape(l:build_dir) : '') endfunction call ale#linter#Define('c', { diff --git a/sources_non_forked/ale/ale_linters/c/clangtidy.vim b/sources_non_forked/ale/ale_linters/c/clangtidy.vim index f998866a..0dc6ea08 100644 --- a/sources_non_forked/ale/ale_linters/c/clangtidy.vim +++ b/sources_non_forked/ale/ale_linters/c/clangtidy.vim @@ -19,14 +19,20 @@ call ale#Set('c_clangtidy_options', '') call ale#Set('c_clangtidy_extra_options', '') call ale#Set('c_build_dir', '') -function! ale_linters#c#clangtidy#GetCommand(buffer) abort +function! ale_linters#c#clangtidy#GetCommand(buffer, output) abort let l:checks = join(ale#Var(a:buffer, 'c_clangtidy_checks'), ',') let l:build_dir = ale#c#GetBuildDirectory(a:buffer) + let l:options = '' " Get the extra options if we couldn't find a build directory. - let l:options = empty(l:build_dir) - \ ? ale#Var(a:buffer, 'c_clangtidy_options') - \ : '' + if empty(l:build_dir) + let l:options = ale#Var(a:buffer, 'c_clangtidy_options') + let l:cflags = ale#c#GetCFlags(a:buffer, a:output) + let l:options .= !empty(l:options) ? ale#Pad(l:cflags) : l:cflags + endif + + " Get the options to pass directly to clang-tidy + let l:extra_options = ale#Var(a:buffer, 'c_clangtidy_extra_options') " Get the options to pass directly to clang-tidy let l:extra_options = ale#Var(a:buffer, 'c_clangtidy_extra_options') @@ -43,7 +49,7 @@ call ale#linter#Define('c', { \ 'name': 'clangtidy', \ 'output_stream': 'stdout', \ 'executable': {b -> ale#Var(b, 'c_clangtidy_executable')}, -\ 'command': function('ale_linters#c#clangtidy#GetCommand'), +\ 'command': {b -> ale#c#RunMakeCommand(b, function('ale_linters#c#clangtidy#GetCommand'))}, \ 'callback': 'ale#handlers#gcc#HandleGCCFormat', \ 'lint_file': 1, \}) diff --git a/sources_non_forked/ale/ale_linters/cpp/clangcheck.vim b/sources_non_forked/ale/ale_linters/cpp/clangcheck.vim index 7d32a57c..4cb04864 100644 --- a/sources_non_forked/ale/ale_linters/cpp/clangcheck.vim +++ b/sources_non_forked/ale/ale_linters/cpp/clangcheck.vim @@ -20,7 +20,7 @@ function! ale_linters#cpp#clangcheck#GetCommand(buffer) abort " being generated. These are only added if no build directory can be " detected. return '%e -analyze %s' - \ . (empty(l:build_dir) ? ' -extra-arg -Xclang -extra-arg -analyzer-output=text' : '') + \ . (empty(l:build_dir) ? ' --extra-arg=-Xclang --extra-arg=-analyzer-output=text --extra-arg=-fno-color-diagnostics': '') \ . ale#Pad(l:user_options) \ . (!empty(l:build_dir) ? ' -p ' . ale#Escape(l:build_dir) : '') endfunction diff --git a/sources_non_forked/ale/ale_linters/cpp/clangd.vim b/sources_non_forked/ale/ale_linters/cpp/clangd.vim index fab605f4..14f3fe55 100644 --- a/sources_non_forked/ale/ale_linters/cpp/clangd.vim +++ b/sources_non_forked/ale/ale_linters/cpp/clangd.vim @@ -3,9 +3,14 @@ call ale#Set('cpp_clangd_executable', 'clangd') call ale#Set('cpp_clangd_options', '') +call ale#Set('c_build_dir', '') function! ale_linters#cpp#clangd#GetCommand(buffer) abort - return '%e' . ale#Pad(ale#Var(a:buffer, 'cpp_clangd_options')) + let l:build_dir = ale#c#GetBuildDirectory(a:buffer) + + return '%e' + \ . ale#Pad(ale#Var(a:buffer, 'cpp_clangd_options')) + \ . (!empty(l:build_dir) ? ' -compile-commands-dir=' . ale#Escape(l:build_dir) : '') endfunction call ale#linter#Define('cpp', { diff --git a/sources_non_forked/ale/ale_linters/cpp/clangtidy.vim b/sources_non_forked/ale/ale_linters/cpp/clangtidy.vim index 085bc332..212e0ab2 100644 --- a/sources_non_forked/ale/ale_linters/cpp/clangtidy.vim +++ b/sources_non_forked/ale/ale_linters/cpp/clangtidy.vim @@ -13,14 +13,20 @@ call ale#Set('cpp_clangtidy_options', '') call ale#Set('cpp_clangtidy_extra_options', '') call ale#Set('c_build_dir', '') -function! ale_linters#cpp#clangtidy#GetCommand(buffer) abort +function! ale_linters#cpp#clangtidy#GetCommand(buffer, output) abort let l:checks = join(ale#Var(a:buffer, 'cpp_clangtidy_checks'), ',') let l:build_dir = ale#c#GetBuildDirectory(a:buffer) + let l:options = '' " Get the extra options if we couldn't find a build directory. - let l:options = empty(l:build_dir) - \ ? ale#Var(a:buffer, 'cpp_clangtidy_options') - \ : '' + if empty(l:build_dir) + let l:options = ale#Var(a:buffer, 'cpp_clangtidy_options') + let l:cflags = ale#c#GetCFlags(a:buffer, a:output) + let l:options .= !empty(l:options) ? ale#Pad(l:cflags) : l:cflags + endif + + " Get the options to pass directly to clang-tidy + let l:extra_options = ale#Var(a:buffer, 'cpp_clangtidy_extra_options') " Get the options to pass directly to clang-tidy let l:extra_options = ale#Var(a:buffer, 'cpp_clangtidy_extra_options') @@ -37,7 +43,7 @@ call ale#linter#Define('cpp', { \ 'name': 'clangtidy', \ 'output_stream': 'stdout', \ 'executable': {b -> ale#Var(b, 'cpp_clangtidy_executable')}, -\ 'command': function('ale_linters#cpp#clangtidy#GetCommand'), +\ 'command': {b -> ale#c#RunMakeCommand(b, function('ale_linters#cpp#clangtidy#GetCommand'))}, \ 'callback': 'ale#handlers#gcc#HandleGCCFormat', \ 'lint_file': 1, \}) diff --git a/sources_non_forked/ale/ale_linters/crystal/crystal.vim b/sources_non_forked/ale/ale_linters/crystal/crystal.vim index 3c2fefb7..8a905b12 100644 --- a/sources_non_forked/ale/ale_linters/crystal/crystal.vim +++ b/sources_non_forked/ale/ale_linters/crystal/crystal.vim @@ -5,6 +5,10 @@ function! ale_linters#crystal#crystal#Handle(buffer, lines) abort let l:output = [] for l:error in ale#util#FuzzyJSONDecode(a:lines, []) + if !has_key(l:error, 'file') + continue + endif + call add(l:output, { \ 'lnum': l:error.line + 0, \ 'col': l:error.column + 0, diff --git a/sources_non_forked/ale/ale_linters/elm/elm_ls.vim b/sources_non_forked/ale/ale_linters/elm/elm_ls.vim new file mode 100644 index 00000000..2fa71adb --- /dev/null +++ b/sources_non_forked/ale/ale_linters/elm/elm_ls.vim @@ -0,0 +1,40 @@ +" Author: antew - https://github.com/antew +" Description: elm-language-server integration for elm (diagnostics, formatting, and more) + +call ale#Set('elm_ls_executable', 'elm-language-server') +call ale#Set('elm_ls_use_global', get(g:, 'ale_use_global_executables', 1)) + +" elm-language-server will search for local and global binaries, if empty +call ale#Set('elm_ls_elm_path', '') +call ale#Set('elm_ls_elm_format_path', '') +call ale#Set('elm_ls_elm_test_path', '') +call ale#Set('elm_ls_elm_analyse_trigger', 'change') + +function! elm_ls#GetRootDir(buffer) abort + let l:elm_json = ale#path#FindNearestFile(a:buffer, 'elm.json') + + return !empty(l:elm_json) ? fnamemodify(l:elm_json, ':p:h') : '' +endfunction + +function! elm_ls#GetOptions(buffer) abort + return { + \ 'elmPath': ale#Var(a:buffer, 'elm_ls_elm_path'), + \ 'elmFormatPath': ale#Var(a:buffer, 'elm_ls_elm_format_path'), + \ 'elmTestPath': ale#Var(a:buffer, 'elm_ls_elm_test_path'), + \ 'elmAnalyseTrigger': ale#Var(a:buffer, 'elm_ls_elm_analyse_trigger'), + \} +endfunction + +call ale#linter#Define('elm', { +\ 'name': 'elm_ls', +\ 'lsp': 'stdio', +\ 'executable': {b -> ale#node#FindExecutable(b, 'elm_ls', [ +\ 'node_modules/.bin/elm-language-server', +\ 'node_modules/.bin/elm-lsp', +\ 'elm-lsp' +\ ])}, +\ 'command': '%e --stdio', +\ 'project_root': function('elm_ls#GetRootDir'), +\ 'language': 'elm', +\ 'initialization_options': function('elm_ls#GetOptions') +\}) diff --git a/sources_non_forked/ale/ale_linters/elm/elm_lsp.vim b/sources_non_forked/ale/ale_linters/elm/elm_lsp.vim deleted file mode 100644 index 2259286f..00000000 --- a/sources_non_forked/ale/ale_linters/elm/elm_lsp.vim +++ /dev/null @@ -1,22 +0,0 @@ -" Author: antew - https://github.com/antew -" Description: LSP integration for elm, currently supports diagnostics (linting) - -call ale#Set('elm_lsp_executable', 'elm-lsp') -call ale#Set('elm_lsp_use_global', get(g:, 'ale_use_global_executables', 0)) - -function! elm_lsp#GetRootDir(buffer) abort - let l:elm_json = ale#path#FindNearestFile(a:buffer, 'elm.json') - - return !empty(l:elm_json) ? fnamemodify(l:elm_json, ':p:h') : '' -endfunction - -call ale#linter#Define('elm', { -\ 'name': 'elm_lsp', -\ 'lsp': 'stdio', -\ 'executable': {b -> ale#node#FindExecutable(b, 'elm_lsp', [ -\ 'node_modules/.bin/elm-lsp', -\ ])}, -\ 'command': '%e --stdio', -\ 'project_root': function('elm_lsp#GetRootDir'), -\ 'language': 'elm' -\}) diff --git a/sources_non_forked/ale/ale_linters/erlang/dialyzer.vim b/sources_non_forked/ale/ale_linters/erlang/dialyzer.vim index 7af64c4f..fd03a06d 100644 --- a/sources_non_forked/ale/ale_linters/erlang/dialyzer.vim +++ b/sources_non_forked/ale/ale_linters/erlang/dialyzer.vim @@ -15,10 +15,17 @@ endfunction function! ale_linters#erlang#dialyzer#FindPlt(buffer) abort let l:plt_file = '' let l:rebar3_profile = ale_linters#erlang#dialyzer#GetRebar3Profile(a:buffer) +<<<<<<< HEAD let l:plt_file_directory = ale#path#FindNearestDirectory(a:buffer, '_build' . l:rebar3_profile) if !empty(l:plt_file_directory) let l:plt_file = split(globpath(l:plt_file_directory, '/*_plt'), '\n') +======= + let l:plt_file_directory = ale#path#FindNearestDirectory(a:buffer, '_build/' . l:rebar3_profile) + + if !empty(l:plt_file_directory) + let l:plt_file = globpath(l:plt_file_directory, '*_plt', 0, 1) +>>>>>>> 27ad0d07862847896f691309a544a206783c94d6 endif if !empty(l:plt_file) diff --git a/sources_non_forked/ale/ale_linters/eruby/ruumba.vim b/sources_non_forked/ale/ale_linters/eruby/ruumba.vim index e68bb51d..2e84acf7 100644 --- a/sources_non_forked/ale/ale_linters/eruby/ruumba.vim +++ b/sources_non_forked/ale/ale_linters/eruby/ruumba.vim @@ -8,7 +8,7 @@ call ale#Set('eruby_ruumba_options', '') function! ale_linters#eruby#ruumba#GetCommand(buffer) abort let l:executable = ale#Var(a:buffer, 'eruby_ruumba_executable') - return ale#handlers#ruby#EscapeExecutable(l:executable, 'ruumba') + return ale#ruby#EscapeExecutable(l:executable, 'ruumba') \ . ' --format json --force-exclusion ' \ . ale#Var(a:buffer, 'eruby_ruumba_options') \ . ' --stdin ' . ale#Escape(expand('#' . a:buffer . ':p')) diff --git a/sources_non_forked/ale/ale_linters/go/bingo.vim b/sources_non_forked/ale/ale_linters/go/bingo.vim index e446bdcc..1e43f8e4 100644 --- a/sources_non_forked/ale/ale_linters/go/bingo.vim +++ b/sources_non_forked/ale/ale_linters/go/bingo.vim @@ -5,11 +5,13 @@ call ale#Set('go_bingo_executable', 'bingo') call ale#Set('go_bingo_options', '--mode stdio') function! ale_linters#go#bingo#GetCommand(buffer) abort - return '%e' . ale#Pad(ale#Var(a:buffer, 'go_bingo_options')) + return ale#go#EnvString(a:buffer) . '%e' . ale#Pad(ale#Var(a:buffer, 'go_bingo_options')) endfunction function! ale_linters#go#bingo#FindProjectRoot(buffer) abort - let l:project_root = ale#path#FindNearestFile(a:buffer, 'go.mod') + let l:go_modules_off = ale#Var(a:buffer, 'go_go111module') is# 'off' + let l:project_root = l:go_modules_off ? + \ '' : ale#path#FindNearestFile(a:buffer, 'go.mod') let l:mods = ':h' if empty(l:project_root) diff --git a/sources_non_forked/ale/ale_linters/go/gobuild.vim b/sources_non_forked/ale/ale_linters/go/gobuild.vim index 374ded35..1dfb6daa 100644 --- a/sources_non_forked/ale/ale_linters/go/gobuild.vim +++ b/sources_non_forked/ale/ale_linters/go/gobuild.vim @@ -11,6 +11,7 @@ function! ale_linters#go#gobuild#GetCommand(buffer) abort " Run go test in local directory with relative path return ale#path#BufferCdString(a:buffer) + \ . ale#go#EnvString(a:buffer) \ . ale#Var(a:buffer, 'go_go_executable') . ' test' \ . (!empty(l:options) ? ' ' . l:options : '') \ . ' -c -o /dev/null ./' diff --git a/sources_non_forked/ale/ale_linters/go/gofmt.vim b/sources_non_forked/ale/ale_linters/go/gofmt.vim index 337deef8..a233b422 100644 --- a/sources_non_forked/ale/ale_linters/go/gofmt.vim +++ b/sources_non_forked/ale/ale_linters/go/gofmt.vim @@ -1,10 +1,16 @@ " Author: neersighted " Description: gofmt for Go files +function! ale_linters#go#gofmt#GetCommand(buffer) abort + return ale#go#EnvString(a:buffer) + \ . '%e -e %t' +endfunction + + call ale#linter#Define('go', { \ 'name': 'gofmt', \ 'output_stream': 'stderr', \ 'executable': 'gofmt', -\ 'command': 'gofmt -e %t', +\ 'command': function('ale_linters#go#gofmt#GetCommand'), \ 'callback': 'ale#handlers#unix#HandleAsError', \}) diff --git a/sources_non_forked/ale/ale_linters/go/golangci_lint.vim b/sources_non_forked/ale/ale_linters/go/golangci_lint.vim index 357f7949..dd0e975a 100644 --- a/sources_non_forked/ale/ale_linters/go/golangci_lint.vim +++ b/sources_non_forked/ale/ale_linters/go/golangci_lint.vim @@ -10,13 +10,16 @@ function! ale_linters#go#golangci_lint#GetCommand(buffer) abort let l:options = ale#Var(a:buffer, 'go_golangci_lint_options') let l:lint_package = ale#Var(a:buffer, 'go_golangci_lint_package') + if l:lint_package return ale#path#BufferCdString(a:buffer) + \ . ale#go#EnvString(a:buffer) \ . '%e run ' \ . l:options endif return ale#path#BufferCdString(a:buffer) + \ . ale#go#EnvString(a:buffer) \ . '%e run ' \ . ale#Escape(l:filename) \ . ' ' . l:options diff --git a/sources_non_forked/ale/ale_linters/go/golint.vim b/sources_non_forked/ale/ale_linters/go/golint.vim index 765e1477..79bfaeb5 100644 --- a/sources_non_forked/ale/ale_linters/go/golint.vim +++ b/sources_non_forked/ale/ale_linters/go/golint.vim @@ -7,7 +7,7 @@ call ale#Set('go_golint_options', '') function! ale_linters#go#golint#GetCommand(buffer) abort let l:options = ale#Var(a:buffer, 'go_golint_options') - return '%e' + return ale#go#EnvString(a:buffer) . '%e' \ . (!empty(l:options) ? ' ' . l:options : '') \ . ' %t' endfunction diff --git a/sources_non_forked/ale/ale_linters/go/gometalinter.vim b/sources_non_forked/ale/ale_linters/go/gometalinter.vim index 19d70a81..eed9550a 100644 --- a/sources_non_forked/ale/ale_linters/go/gometalinter.vim +++ b/sources_non_forked/ale/ale_linters/go/gometalinter.vim @@ -14,11 +14,13 @@ function! ale_linters#go#gometalinter#GetCommand(buffer) abort " be calculated to absolute paths in the Handler if l:lint_package return ale#path#BufferCdString(a:buffer) + \ . ale#go#EnvString(a:buffer) \ . '%e' \ . (!empty(l:options) ? ' ' . l:options : '') . ' .' endif return ale#path#BufferCdString(a:buffer) + \ . ale#go#EnvString(a:buffer) \ . '%e' \ . ' --include=' . ale#Escape(ale#util#EscapePCRE(l:filename)) \ . (!empty(l:options) ? ' ' . l:options : '') . ' .' diff --git a/sources_non_forked/ale/ale_linters/go/gopls.vim b/sources_non_forked/ale/ale_linters/go/gopls.vim index c411dc2b..dcff5ec7 100644 --- a/sources_non_forked/ale/ale_linters/go/gopls.vim +++ b/sources_non_forked/ale/ale_linters/go/gopls.vim @@ -6,11 +6,15 @@ call ale#Set('go_gopls_executable', 'gopls') call ale#Set('go_gopls_options', '--mode stdio') function! ale_linters#go#gopls#GetCommand(buffer) abort - return '%e' . ale#Pad(ale#Var(a:buffer, 'go_gopls_options')) + return ale#go#EnvString(a:buffer) + \ . '%e' + \ . ale#Pad(ale#Var(a:buffer, 'go_gopls_options')) endfunction function! ale_linters#go#gopls#FindProjectRoot(buffer) abort - let l:project_root = ale#path#FindNearestFile(a:buffer, 'go.mod') + let l:go_modules_off = ale#Var(a:buffer, 'go_go111module') is# 'off' + let l:project_root = l:go_modules_off ? + \ '' : ale#path#FindNearestFile(a:buffer, 'go.mod') let l:mods = ':h' if empty(l:project_root) diff --git a/sources_non_forked/ale/ale_linters/go/gosimple.vim b/sources_non_forked/ale/ale_linters/go/gosimple.vim index 281a0e53..ad52c621 100644 --- a/sources_non_forked/ale/ale_linters/go/gosimple.vim +++ b/sources_non_forked/ale/ale_linters/go/gosimple.vim @@ -2,7 +2,8 @@ " Description: gosimple for Go files function! ale_linters#go#gosimple#GetCommand(buffer) abort - return ale#path#BufferCdString(a:buffer) . ' gosimple .' + return ale#path#BufferCdString(a:buffer) . ' ' + \ . ale#go#EnvString(a:buffer) . 'gosimple .' endfunction call ale#linter#Define('go', { diff --git a/sources_non_forked/ale/ale_linters/go/gotype.vim b/sources_non_forked/ale/ale_linters/go/gotype.vim index d5d563aa..6a5149ca 100644 --- a/sources_non_forked/ale/ale_linters/go/gotype.vim +++ b/sources_non_forked/ale/ale_linters/go/gotype.vim @@ -6,7 +6,8 @@ function! ale_linters#go#gotype#GetCommand(buffer) abort return '' endif - return ale#path#BufferCdString(a:buffer) . ' gotype -e .' + return ale#path#BufferCdString(a:buffer) . ' ' + \ . ale#go#EnvString(a:buffer) . 'gotype -e .' endfunction call ale#linter#Define('go', { diff --git a/sources_non_forked/ale/ale_linters/go/govet.vim b/sources_non_forked/ale/ale_linters/go/govet.vim index bb81d5d0..dddafe17 100644 --- a/sources_non_forked/ale/ale_linters/go/govet.vim +++ b/sources_non_forked/ale/ale_linters/go/govet.vim @@ -11,6 +11,7 @@ function! ale_linters#go#govet#GetCommand(buffer) abort let l:options = ale#Var(a:buffer, 'go_govet_options') return ale#path#BufferCdString(a:buffer) . ' ' + \ . ale#go#EnvString(a:buffer) \ . ale#Var(a:buffer, 'go_go_executable') . ' vet ' \ . (!empty(l:options) ? ' ' . l:options : '') \ . ' .' diff --git a/sources_non_forked/ale/ale_linters/go/langserver.vim b/sources_non_forked/ale/ale_linters/go/langserver.vim index 776186c7..7130db40 100644 --- a/sources_non_forked/ale/ale_linters/go/langserver.vim +++ b/sources_non_forked/ale/ale_linters/go/langserver.vim @@ -15,8 +15,9 @@ function! ale_linters#go#langserver#GetCommand(buffer) abort endif let l:options = uniq(sort(l:options)) + let l:env = ale#go#EnvString(a:buffer) - return join(extend(l:executable, l:options), ' ') + return l:env . join(extend(l:executable, l:options), ' ') endfunction call ale#linter#Define('go', { diff --git a/sources_non_forked/ale/ale_linters/go/staticcheck.vim b/sources_non_forked/ale/ale_linters/go/staticcheck.vim index 26fe0193..ed40c6c2 100644 --- a/sources_non_forked/ale/ale_linters/go/staticcheck.vim +++ b/sources_non_forked/ale/ale_linters/go/staticcheck.vim @@ -8,17 +8,18 @@ function! ale_linters#go#staticcheck#GetCommand(buffer) abort let l:filename = expand('#' . a:buffer . ':t') let l:options = ale#Var(a:buffer, 'go_staticcheck_options') let l:lint_package = ale#Var(a:buffer, 'go_staticcheck_lint_package') + let l:env = ale#go#EnvString(a:buffer) " BufferCdString is used so that we can be sure the paths output from " staticcheck can be calculated to absolute paths in the Handler if l:lint_package return ale#path#BufferCdString(a:buffer) - \ . 'staticcheck' + \ . l:env . 'staticcheck' \ . (!empty(l:options) ? ' ' . l:options : '') . ' .' endif return ale#path#BufferCdString(a:buffer) - \ . 'staticcheck' + \ . l:env . 'staticcheck' \ . (!empty(l:options) ? ' ' . l:options : '') \ . ' ' . ale#Escape(l:filename) endfunction diff --git a/sources_non_forked/ale/ale_linters/graphql/eslint.vim b/sources_non_forked/ale/ale_linters/graphql/eslint.vim index 654b8c17..aed1a371 100644 --- a/sources_non_forked/ale/ale_linters/graphql/eslint.vim +++ b/sources_non_forked/ale/ale_linters/graphql/eslint.vim @@ -5,5 +5,5 @@ call ale#linter#Define('graphql', { \ 'name': 'eslint', \ 'executable': function('ale#handlers#eslint#GetExecutable'), \ 'command': function('ale#handlers#eslint#GetCommand'), -\ 'callback': 'ale#handlers#eslint#Handle', +\ 'callback': 'ale#handlers#eslint#HandleJSON', \}) diff --git a/sources_non_forked/ale/ale_linters/ink/ls.vim b/sources_non_forked/ale/ale_linters/ink/ls.vim new file mode 100644 index 00000000..1cc93583 --- /dev/null +++ b/sources_non_forked/ale/ale_linters/ink/ls.vim @@ -0,0 +1,35 @@ +" Author: Andreww Hayworth +" Description: Integrate ALE with ink-language-server + +call ale#Set('ink_ls_executable', 'ink-language-server') +call ale#Set('ink_ls_use_global', get(g:, 'ale_use_global_executables', 0)) +call ale#Set('ink_ls_initialization_options', {}) + +function! ale_linters#ink#ls#GetExecutable(buffer) abort + return ale#node#FindExecutable(a:buffer, 'ink_ls', [ + \ 'ink-language-server', + \ 'node_modules/.bin/ink-language-server', + \]) +endfunction + +function! ale_linters#ink#ls#GetCommand(buffer) abort + let l:executable = ale_linters#ink#ls#GetExecutable(a:buffer) + + return ale#Escape(l:executable) . ' --stdio' +endfunction + +function! ale_linters#ink#ls#FindProjectRoot(buffer) abort + let l:main_file = get(ale#Var(a:buffer, 'ink_ls_initialization_options'), 'mainStoryPath', 'main.ink') + let l:config = ale#path#ResolveLocalPath(a:buffer, l:main_file, expand('#' . a:buffer . ':p')) + + return ale#path#Dirname(l:config) +endfunction + +call ale#linter#Define('ink', { +\ 'name': 'ink-language-server', +\ 'lsp': 'stdio', +\ 'executable': function('ale_linters#ink#ls#GetExecutable'), +\ 'command': function('ale_linters#ink#ls#GetCommand'), +\ 'project_root': function('ale_linters#ink#ls#FindProjectRoot'), +\ 'initialization_options': {b -> ale#Var(b, 'ink_ls_initialization_options')}, +\}) diff --git a/sources_non_forked/ale/ale_linters/javascript/standard.vim b/sources_non_forked/ale/ale_linters/javascript/standard.vim index 4cd2c303..1990adce 100644 --- a/sources_non_forked/ale/ale_linters/javascript/standard.vim +++ b/sources_non_forked/ale/ale_linters/javascript/standard.vim @@ -7,7 +7,9 @@ call ale#Set('javascript_standard_options', '') function! ale_linters#javascript#standard#GetExecutable(buffer) abort return ale#node#FindExecutable(a:buffer, 'javascript_standard', [ + \ 'node_modules/standardx/bin/cmd.js', \ 'node_modules/standard/bin/cmd.js', + \ 'node_modules/semistandard/bin/cmd.js', \ 'node_modules/.bin/standard', \]) endfunction diff --git a/sources_non_forked/ale/ale_linters/markdown/mdl.vim b/sources_non_forked/ale/ale_linters/markdown/mdl.vim index 305f5359..fd44de6e 100644 --- a/sources_non_forked/ale/ale_linters/markdown/mdl.vim +++ b/sources_non_forked/ale/ale_linters/markdown/mdl.vim @@ -17,18 +17,17 @@ function! ale_linters#markdown#mdl#GetCommand(buffer) abort let l:options = ale#Var(a:buffer, 'markdown_mdl_options') return ale#Escape(l:executable) . l:exec_args - \ . (!empty(l:options) ? ' ' . l:options : '') + \ . ' -j' . (!empty(l:options) ? ' ' . l:options : '') endfunction function! ale_linters#markdown#mdl#Handle(buffer, lines) abort - " matches: '(stdin):173: MD004 Unordered list style' - let l:pattern = ':\(\d*\): \(.*\)$' let l:output = [] - for l:match in ale#util#GetMatches(a:lines, l:pattern) + for l:error in ale#util#FuzzyJSONDecode(a:lines, []) call add(l:output, { - \ 'lnum': l:match[1] + 0, - \ 'text': l:match[2], + \ 'lnum': l:error['line'], + \ 'code': l:error['rule'] . '/' . join(l:error['aliases'], '/'), + \ 'text': l:error['description'], \ 'type': 'W', \}) endfor diff --git a/sources_non_forked/ale/ale_linters/nim/nimcheck.vim b/sources_non_forked/ale/ale_linters/nim/nimcheck.vim index b5796dcd..b739ca04 100644 --- a/sources_non_forked/ale/ale_linters/nim/nimcheck.vim +++ b/sources_non_forked/ale/ale_linters/nim/nimcheck.vim @@ -1,6 +1,15 @@ " Author: Baabelfish " Description: Typechecking for nim files +let s:end_col_patterns = [ +\ '\v''([^'']+)'' is declared but not used.*', +\ '\videntifier expected, but found ''([^'']+)''', +\ '\vimported and not used: ''([^'']+)''.*', +\ '\vundeclared identifier: ''([^'']+)''', +\ '\v''([^'']+)'' cannot be assigned to', +\ '\vredefinition of ''([^'']+)'';', +\] + function! ale_linters#nim#nimcheck#Handle(buffer, lines) abort let l:buffer_filename = fnamemodify(bufname(a:buffer), ':p:t') let l:pattern = '^\(.\+\.nim\)(\(\d\+\), \(\d\+\)) \(.\+\)' @@ -43,6 +52,11 @@ function! ale_linters#nim#nimcheck#Handle(buffer, lines) abort let l:item.code = l:code_match[2] endif + " Find position end_col. + for l:col_match in ale#util#GetMatches(l:item.text, s:end_col_patterns) + let l:item.end_col = l:item.col + len(l:col_match[1]) - 1 + endfor + call add(l:output, l:item) endfor diff --git a/sources_non_forked/ale/ale_linters/nim/nimlsp.vim b/sources_non_forked/ale/ale_linters/nim/nimlsp.vim new file mode 100644 index 00000000..5d041043 --- /dev/null +++ b/sources_non_forked/ale/ale_linters/nim/nimlsp.vim @@ -0,0 +1,33 @@ +" Author: jeremija +" Description: Support for nimlsp (language server for nim) + +call ale#Set('nim_nimlsp_nim_sources', '') + +function! ale_linters#nim#nimlsp#GetProjectRoot(buffer) abort + let l:project_root = ale#path#FindNearestDirectory(a:buffer, '.git') + + if !empty(l:project_root) + return fnamemodify(l:project_root, ':h:h') + endif + + return '' +endfunction + +function! ale_linters#nim#nimlsp#GetCommand(buffer) abort + let l:nim_sources = ale#Var(a:buffer, 'nim_nimlsp_nim_sources') + + if !empty(l:nim_sources) + let l:nim_sources = ale#Escape(l:nim_sources) + endif + + return '%e' . ale#Pad(l:nim_sources) +endfunction + +call ale#linter#Define('nim', { +\ 'name': 'nimlsp', +\ 'lsp': 'stdio', +\ 'executable': 'nimlsp', +\ 'command': function('ale_linters#nim#nimlsp#GetCommand'), +\ 'language': 'nim', +\ 'project_root': function('ale_linters#nim#nimlsp#GetProjectRoot'), +\}) diff --git a/sources_non_forked/ale/ale_linters/php/psalm.vim b/sources_non_forked/ale/ale_linters/php/psalm.vim index 3cdb026a..ab4dbbc9 100644 --- a/sources_non_forked/ale/ale_linters/php/psalm.vim +++ b/sources_non_forked/ale/ale_linters/php/psalm.vim @@ -1,7 +1,8 @@ " Author: Matt Brown " Description: plugin for Psalm, static analyzer for PHP -call ale#Set('psalm_langserver_executable', 'psalm-language-server') +call ale#Set('psalm_langserver_executable', 'psalm') +call ale#Set('psalm_langserver_options', '') call ale#Set('psalm_langserver_use_global', get(g:, 'ale_use_global_executables', 0)) function! ale_linters#php#psalm#GetProjectRoot(buffer) abort @@ -10,12 +11,16 @@ function! ale_linters#php#psalm#GetProjectRoot(buffer) abort return !empty(l:git_path) ? fnamemodify(l:git_path, ':h:h') : '' endfunction +function! ale_linters#php#psalm#GetCommand(buffer) abort + return '%e --language-server' . ale#Pad(ale#Var(a:buffer, 'psalm_langserver_options')) +endfunction + call ale#linter#Define('php', { \ 'name': 'psalm', \ 'lsp': 'stdio', \ 'executable': {b -> ale#node#FindExecutable(b, 'psalm_langserver', [ -\ 'vendor/bin/psalm-language-server', +\ 'vendor/bin/psalm', \ ])}, -\ 'command': '%e', +\ 'command': function('ale_linters#php#psalm#GetCommand'), \ 'project_root': function('ale_linters#php#psalm#GetProjectRoot'), \}) diff --git a/sources_non_forked/ale/ale_linters/powershell/powershell.vim b/sources_non_forked/ale/ale_linters/powershell/powershell.vim index a63191fd..5f49f72c 100644 --- a/sources_non_forked/ale/ale_linters/powershell/powershell.vim +++ b/sources_non_forked/ale/ale_linters/powershell/powershell.vim @@ -12,6 +12,7 @@ endfunction " https://rkeithhill.wordpress.com/2007/10/30/powershell-quicktip-preparsing-scripts-to-check-for-syntax-errors/ function! ale_linters#powershell#powershell#GetCommand(buffer) abort let l:script = ['Param($Script); + \ $ErrorView = "Normal"; \ trap {$_;continue} & { \ $Contents = Get-Content -Path $Script; \ $Contents = [string]::Join([Environment]::NewLine, $Contents); diff --git a/sources_non_forked/ale/ale_linters/python/mypy.vim b/sources_non_forked/ale/ale_linters/python/mypy.vim index c4c6507f..94dfae7d 100644 --- a/sources_non_forked/ale/ale_linters/python/mypy.vim +++ b/sources_non_forked/ale/ale_linters/python/mypy.vim @@ -3,6 +3,7 @@ call ale#Set('python_mypy_executable', 'mypy') call ale#Set('python_mypy_ignore_invalid_syntax', 0) +call ale#Set('python_mypy_show_notes', 1) call ale#Set('python_mypy_options', '') call ale#Set('python_mypy_use_global', get(g:, 'ale_use_global_executables', 0)) call ale#Set('python_mypy_auto_pipenv', 0) @@ -18,6 +19,15 @@ endfunction " The directory to change to before running mypy function! s:GetDir(buffer) abort + " If we find a directory with "mypy.ini" in it use that, + " else try and find the "python project" root, or failing + " that, run from the same folder as the current file + for l:path in ale#path#Upwards(expand('#' . a:buffer . ':p:h')) + if filereadable(l:path . '/mypy.ini') + return l:path + endif + endfor + let l:project_root = ale#python#FindProjectRoot(a:buffer) return !empty(l:project_root) @@ -51,7 +61,16 @@ function! ale_linters#python#mypy#Handle(buffer, lines) abort " Lines like these should be ignored below: " " file.py:4: note: (Stub files are from https://github.com/python/typeshed) - let l:pattern = '\v^([a-zA-Z]?:?[^:]+):(\d+):?(\d+)?: (error|warning): (.+)$' + + let l:types = 'error|warning' + + if ale#Var(a:buffer, 'python_mypy_show_notes') + let l:types = 'error|warning|note' + endif + + let l:pattern = '\v^([a-zA-Z]?:?[^:]+):(\d+):?(\d+)?: (' + \ . l:types + \ . '): (.+)$' let l:output = [] for l:match in ale#util#GetMatches(a:lines, l:pattern) @@ -65,7 +84,7 @@ function! ale_linters#python#mypy#Handle(buffer, lines) abort \ 'filename': ale#path#GetAbsPath(l:dir, l:match[1]), \ 'lnum': l:match[2] + 0, \ 'col': l:match[3] + 0, - \ 'type': l:match[4] is# 'error' ? 'E' : 'W', + \ 'type': l:match[4] is# 'error' ? 'E' : (l:match[4] is# 'note' ? 'I': 'W'), \ 'text': l:match[5], \}) endfor @@ -78,4 +97,5 @@ call ale#linter#Define('python', { \ 'executable': function('ale_linters#python#mypy#GetExecutable'), \ 'command': function('ale_linters#python#mypy#GetCommand'), \ 'callback': 'ale_linters#python#mypy#Handle', +\ 'output_stream': 'both' \}) diff --git a/sources_non_forked/ale/ale_linters/ruby/brakeman.vim b/sources_non_forked/ale/ale_linters/ruby/brakeman.vim index a8088080..2dc48740 100644 --- a/sources_non_forked/ale/ale_linters/ruby/brakeman.vim +++ b/sources_non_forked/ale/ale_linters/ruby/brakeman.vim @@ -36,7 +36,7 @@ function! ale_linters#ruby#brakeman#GetCommand(buffer) abort let l:executable = ale#Var(a:buffer, 'ruby_brakeman_executable') - return ale#handlers#ruby#EscapeExecutable(l:executable, 'brakeman') + return ale#ruby#EscapeExecutable(l:executable, 'brakeman') \ . ' -f json -q ' \ . ale#Var(a:buffer, 'ruby_brakeman_options') \ . ' -p ' . ale#Escape(l:rails_root) diff --git a/sources_non_forked/ale/ale_linters/ruby/debride.vim b/sources_non_forked/ale/ale_linters/ruby/debride.vim new file mode 100644 index 00000000..3b2cc443 --- /dev/null +++ b/sources_non_forked/ale/ale_linters/ruby/debride.vim @@ -0,0 +1,42 @@ +" Author: Eddie Lebow https://github.com/elebow +" Description: debride, a dead method detector for Ruby files + +call ale#Set('ruby_debride_executable', 'debride') +call ale#Set('ruby_debride_options', '') + +function! ale_linters#ruby#debride#GetCommand(buffer) abort + let l:executable = ale#Var(a:buffer, 'ruby_debride_executable') + + return ale#ruby#EscapeExecutable(l:executable, 'debride') + \ . ale#Var(a:buffer, 'ruby_debride_options') + \ . ' %s' +endfunction + +function! ale_linters#ruby#debride#HandleOutput(buffer, lines) abort + let l:output = [] + + for l:line in a:lines + if l:line !~# '^ ' + continue + endif + + let l:elements = split(l:line) + let l:method_name = l:elements[0] + let l:lnum = split(l:elements[1], ':')[1] + + call add(l:output, { + \ 'lnum': 0 + l:lnum, + \ 'text': 'Possible unused method: ' . l:method_name, + \ 'type': 'W', + \}) + endfor + + return l:output +endfunction + +call ale#linter#Define('ruby', { +\ 'name': 'debride', +\ 'executable': {b -> ale#Var(b, 'ruby_debride_executable')}, +\ 'command': function('ale_linters#ruby#debride#GetCommand'), +\ 'callback': 'ale_linters#ruby#debride#HandleOutput', +\}) diff --git a/sources_non_forked/ale/ale_linters/ruby/rails_best_practices.vim b/sources_non_forked/ale/ale_linters/ruby/rails_best_practices.vim index a94fb671..36646647 100644 --- a/sources_non_forked/ale/ale_linters/ruby/rails_best_practices.vim +++ b/sources_non_forked/ale/ale_linters/ruby/rails_best_practices.vim @@ -33,7 +33,7 @@ function! ale_linters#ruby#rails_best_practices#GetCommand(buffer) abort let l:output_file = has('win32') ? '%t ' : '/dev/stdout ' let l:cat_file = has('win32') ? '; type %t' : '' - return ale#handlers#ruby#EscapeExecutable(l:executable, 'rails_best_practices') + return ale#ruby#EscapeExecutable(l:executable, 'rails_best_practices') \ . ' --silent -f json --output-file ' . l:output_file \ . ale#Var(a:buffer, 'ruby_rails_best_practices_options') \ . ale#Escape(l:rails_root) diff --git a/sources_non_forked/ale/ale_linters/ruby/reek.vim b/sources_non_forked/ale/ale_linters/ruby/reek.vim index e39e366f..226b452e 100644 --- a/sources_non_forked/ale/ale_linters/ruby/reek.vim +++ b/sources_non_forked/ale/ale_linters/ruby/reek.vim @@ -14,7 +14,7 @@ function! ale_linters#ruby#reek#GetCommand(buffer, version) abort \ ? ' --stdin-filename %s' \ : '' - return ale#handlers#ruby#EscapeExecutable(l:executable, 'reek') + return ale#ruby#EscapeExecutable(l:executable, 'reek') \ . ' -f json --no-progress --no-color --force-exclusion' \ . l:display_name_args endfunction diff --git a/sources_non_forked/ale/ale_linters/ruby/rubocop.vim b/sources_non_forked/ale/ale_linters/ruby/rubocop.vim index 8b9e9c84..410ed0ea 100644 --- a/sources_non_forked/ale/ale_linters/ruby/rubocop.vim +++ b/sources_non_forked/ale/ale_linters/ruby/rubocop.vim @@ -7,7 +7,7 @@ call ale#Set('ruby_rubocop_options', '') function! ale_linters#ruby#rubocop#GetCommand(buffer) abort let l:executable = ale#Var(a:buffer, 'ruby_rubocop_executable') - return ale#handlers#ruby#EscapeExecutable(l:executable, 'rubocop') + return ale#ruby#EscapeExecutable(l:executable, 'rubocop') \ . ' --format json --force-exclusion ' \ . ale#Var(a:buffer, 'ruby_rubocop_options') \ . ' --stdin ' . ale#Escape(expand('#' . a:buffer . ':p')) diff --git a/sources_non_forked/ale/ale_linters/ruby/sorbet.vim b/sources_non_forked/ale/ale_linters/ruby/sorbet.vim new file mode 100644 index 00000000..cae0683c --- /dev/null +++ b/sources_non_forked/ale/ale_linters/ruby/sorbet.vim @@ -0,0 +1,23 @@ +call ale#Set('ruby_sorbet_executable', 'srb') +call ale#Set('ruby_sorbet_options', '') + +function! ale_linters#ruby#sorbet#GetCommand(buffer) abort + let l:executable = ale#Var(a:buffer, 'ruby_sorbet_executable') + let l:options = ale#Var(a:buffer, 'ruby_sorbet_options') + + return ale#ruby#EscapeExecutable(l:executable, 'srb') + \ . ' tc' + \ . (!empty(l:options) ? ' ' . l:options : '') + \ . ' --lsp --disable-watchman' +endfunction + +call ale#linter#Define('ruby', { +\ 'name': 'sorbet', +\ 'aliases': ['srb'], +\ 'lsp': 'stdio', +\ 'language': 'ruby', +\ 'executable': {b -> ale#Var(b, 'ruby_sorbet_executable')}, +\ 'command': function('ale_linters#ruby#sorbet#GetCommand'), +\ 'project_root': function('ale#ruby#FindProjectRoot') +\}) + diff --git a/sources_non_forked/ale/ale_linters/ruby/standardrb.vim b/sources_non_forked/ale/ale_linters/ruby/standardrb.vim index f075a7d5..f751e803 100644 --- a/sources_non_forked/ale/ale_linters/ruby/standardrb.vim +++ b/sources_non_forked/ale/ale_linters/ruby/standardrb.vim @@ -8,7 +8,7 @@ call ale#Set('ruby_standardrb_options', '') function! ale_linters#ruby#standardrb#GetCommand(buffer) abort let l:executable = ale#Var(a:buffer, 'ruby_standardrb_executable') - return ale#handlers#ruby#EscapeExecutable(l:executable, 'standardrb') + return ale#ruby#EscapeExecutable(l:executable, 'standardrb') \ . ' --format json --force-exclusion ' \ . ale#Var(a:buffer, 'ruby_standardrb_options') \ . ' --stdin ' . ale#Escape(expand('#' . a:buffer . ':p')) diff --git a/sources_non_forked/ale/ale_linters/rust/cargo.vim b/sources_non_forked/ale/ale_linters/rust/cargo.vim index f98dee9b..99178585 100644 --- a/sources_non_forked/ale/ale_linters/rust/cargo.vim +++ b/sources_non_forked/ale/ale_linters/rust/cargo.vim @@ -25,14 +25,11 @@ endfunction function! ale_linters#rust#cargo#GetCommand(buffer, version) abort let l:use_check = ale#Var(a:buffer, 'rust_cargo_use_check') \ && ale#semver#GTE(a:version, [0, 17, 0]) - let l:use_all_targets = l:use_check - \ && ale#Var(a:buffer, 'rust_cargo_check_all_targets') + let l:use_all_targets = ale#Var(a:buffer, 'rust_cargo_check_all_targets') \ && ale#semver#GTE(a:version, [0, 22, 0]) - let l:use_examples = l:use_check - \ && ale#Var(a:buffer, 'rust_cargo_check_examples') + let l:use_examples = ale#Var(a:buffer, 'rust_cargo_check_examples') \ && ale#semver#GTE(a:version, [0, 22, 0]) - let l:use_tests = l:use_check - \ && ale#Var(a:buffer, 'rust_cargo_check_tests') + let l:use_tests = ale#Var(a:buffer, 'rust_cargo_check_tests') \ && ale#semver#GTE(a:version, [0, 22, 0]) let l:include_features = ale#Var(a:buffer, 'rust_cargo_include_features') @@ -69,7 +66,15 @@ function! ale_linters#rust#cargo#GetCommand(buffer, version) abort if ale#Var(a:buffer, 'rust_cargo_use_clippy') let l:subcommand = 'clippy' - let l:clippy_options = ' ' . ale#Var(a:buffer, 'rust_cargo_clippy_options') + let l:clippy_options = ale#Var(a:buffer, 'rust_cargo_clippy_options') + + if l:clippy_options =~# '^-- ' + let l:clippy_options = join(split(l:clippy_options, '-- ')) + endif + + if l:clippy_options isnot# '' + let l:clippy_options = ' -- ' . l:clippy_options + endif endif return l:nearest_cargo_prefix . 'cargo ' diff --git a/sources_non_forked/ale/ale_linters/scala/metals.vim b/sources_non_forked/ale/ale_linters/scala/metals.vim new file mode 100644 index 00000000..f78c7119 --- /dev/null +++ b/sources_non_forked/ale/ale_linters/scala/metals.vim @@ -0,0 +1,48 @@ +" Author: Jeffrey Lau - https://github.com/zoonfafer +" Description: Metals Language Server for Scala https://scalameta.org/metals/ + +call ale#Set('scala_metals_executable', 'metals-vim') +call ale#Set('scala_metals_project_root', '') + +function! ale_linters#scala#metals#GetProjectRoot(buffer) abort + let l:project_root = ale#Var(a:buffer, 'scala_metals_project_root') + + if !empty(l:project_root) + return l:project_root + endif + + let l:potential_roots = [ + \ 'build.sc', + \ 'build.sbt', + \ '.bloop', + \ '.metals', + \] + + for l:root in l:potential_roots + let l:project_root = ale#path#ResolveLocalPath( + \ a:buffer, + \ l:root, + \ '' + \) + + if !empty(l:project_root) + return fnamemodify( + \ l:project_root, + \ ':h', + \) + endif + endfor +endfunction + +function! ale_linters#scala#metals#GetCommand(buffer) abort + return '%e' . ale#Pad('stdio') +endfunction + +call ale#linter#Define('scala', { +\ 'name': 'metals', +\ 'lsp': 'stdio', +\ 'language': 'scala', +\ 'executable': {b -> ale#Var(b, 'scala_metals_executable')}, +\ 'command': function('ale_linters#scala#metals#GetCommand'), +\ 'project_root': function('ale_linters#scala#metals#GetProjectRoot'), +\}) diff --git a/sources_non_forked/ale/ale_linters/sh/shell.vim b/sources_non_forked/ale/ale_linters/sh/shell.vim index 189dc21d..171fe64e 100644 --- a/sources_non_forked/ale/ale_linters/sh/shell.vim +++ b/sources_non_forked/ale/ale_linters/sh/shell.vim @@ -34,8 +34,10 @@ function! ale_linters#sh#shell#Handle(buffer, lines) abort " Matches patterns line the following: " " bash: line 13: syntax error near unexpected token `d' + " bash:行0: 未预期的符号“done”附近有语法错误 + " bash: 列 90: 尋找匹配的「"」時遇到了未預期的檔案結束符 " sh: 11: Syntax error: "(" unexpected - let l:pattern = '\v(line |: ?)(\d+): (.+)$' + let l:pattern = '\v([^:]+:\D*)(\d+): (.+)$' let l:output = [] for l:match in ale#util#GetMatches(a:lines, l:pattern) diff --git a/sources_non_forked/ale/ale_linters/solidity/solc.vim b/sources_non_forked/ale/ale_linters/solidity/solc.vim new file mode 100644 index 00000000..e4f220ac --- /dev/null +++ b/sources_non_forked/ale/ale_linters/solidity/solc.vim @@ -0,0 +1,35 @@ +" Author: Karl Bartel - http://karl.berlin/ +" Description: Report solc compiler errors in Solidity code + +call ale#Set('solidity_solc_options', '') + +function! ale_linters#solidity#solc#Handle(buffer, lines) abort + " Matches patterns like the following: + " /path/to/file/file.sol:1:10: Error: Identifier not found or not unique. + let l:pattern = '\v^[^:]+:(\d+):(\d+): (Error|Warning): (.*)$' + let l:output = [] + + for l:match in ale#util#GetMatches(a:lines, l:pattern) + let l:isError = l:match[3] is? 'error' + call add(l:output, { + \ 'lnum': l:match[1] + 0, + \ 'col': l:match[2] + 0, + \ 'text': l:match[4], + \ 'type': l:isError ? 'E' : 'W', + \}) + endfor + + return l:output +endfunction + +function! ale_linters#solidity#solc#GetCommand(buffer) abort + return 'solc' . ale#Pad(ale#Var(a:buffer, 'solidity_solc_options')) . ' %s' +endfunction + +call ale#linter#Define('solidity', { +\ 'name': 'solc', +\ 'executable': 'solc', +\ 'command': function('ale_linters#solidity#solc#GetCommand'), +\ 'callback': 'ale_linters#solidity#solc#Handle', +\ 'output_stream': 'stderr', +\}) diff --git a/sources_non_forked/ale/ale_linters/terraform/tflint.vim b/sources_non_forked/ale/ale_linters/terraform/tflint.vim index 6d54a8b1..f57ee6b6 100644 --- a/sources_non_forked/ale/ale_linters/terraform/tflint.vim +++ b/sources_non_forked/ale/ale_linters/terraform/tflint.vim @@ -9,23 +9,69 @@ call ale#Set('terraform_tflint_executable', 'tflint') function! ale_linters#terraform#tflint#Handle(buffer, lines) abort let l:output = [] + let l:pattern = '\v^(.*):(\d+),(\d+)-(\d+)?,?(\d+): (.{-1,}); (.+)$' + let l:json = ale#util#FuzzyJSONDecode(a:lines, {}) - for l:error in ale#util#FuzzyJSONDecode(a:lines, []) - if l:error.type is# 'ERROR' - let l:type = 'E' - elseif l:error.type is# 'NOTICE' - let l:type = 'I' - else - let l:type = 'W' - endif + " This is a rough test for tflint's output format + " On versions prior to 0.11 it outputs all errors as a single level list + if type(l:json) is v:t_list + for l:error in l:json + if l:error.type is# 'ERROR' + let l:type = 'E' + elseif l:error.type is# 'NOTICE' + let l:type = 'I' + else + let l:type = 'W' + endif - call add(l:output, { - \ 'lnum': l:error.line, - \ 'text': l:error.message, - \ 'type': l:type, - \ 'code': l:error.detector, - \}) - endfor + call add(l:output, { + \ 'lnum': l:error.line, + \ 'text': l:error.message, + \ 'type': l:type, + \ 'code': l:error.detector, + \}) + endfor + else + for l:error in get(l:json, 'errors', []) + for l:match in ale#util#GetMatches(l:error.message, [l:pattern]) + if l:match[4] is# '' + let l:match[4] = l:match[2] + endif + + call add(l:output, { + \ 'filename': l:match[1], + \ 'lnum': str2nr(l:match[2]), + \ 'col': str2nr(l:match[3]), + \ 'end_lnum': str2nr(l:match[4]), + \ 'end_col': str2nr(l:match[5]), + \ 'text': l:match[7], + \ 'code': l:match[6], + \ 'type': 'E', + \}) + endfor + endfor + + for l:error in get(l:json, 'issues', []) + if l:error.rule.severity is# 'ERROR' + let l:type = 'E' + elseif l:error.rule.severity is# 'NOTICE' + let l:type = 'I' + else + let l:type = 'W' + endif + + call add(l:output, { + \ 'filename': l:error.range.filename, + \ 'lnum': l:error.range.start.line, + \ 'col': l:error.range.start.column, + \ 'end_lnum': l:error.range.end.line, + \ 'end_col': l:error.range.end.column, + \ 'text': l:error.message, + \ 'code': l:error.rule.name, + \ 'type': l:type, + \}) + endfor + endif return l:output endfunction diff --git a/sources_non_forked/ale/ale_linters/typescript/standard.vim b/sources_non_forked/ale/ale_linters/typescript/standard.vim new file mode 100644 index 00000000..da8f14eb --- /dev/null +++ b/sources_non_forked/ale/ale_linters/typescript/standard.vim @@ -0,0 +1,31 @@ +" Author: Ahmed El Gabri <@ahmedelgabri> +" Description: standardjs for typescript files + +call ale#Set('typescript_standard_executable', 'standard') +call ale#Set('typescript_standard_use_global', get(g:, 'ale_use_global_executables', 0)) +call ale#Set('typescript_standard_options', '') + +function! ale_linters#typescript#standard#GetExecutable(buffer) abort + return ale#node#FindExecutable(a:buffer, 'typescript_standard', [ + \ 'node_modules/standardx/bin/cmd.js', + \ 'node_modules/standard/bin/cmd.js', + \ 'node_modules/.bin/standard', + \]) +endfunction + +function! ale_linters#typescript#standard#GetCommand(buffer) abort + let l:executable = ale_linters#typescript#standard#GetExecutable(a:buffer) + let l:options = ale#Var(a:buffer, 'typescript_standard_options') + + return ale#node#Executable(a:buffer, l:executable) + \ . (!empty(l:options) ? ' ' . l:options : '') + \ . ' --stdin %s' +endfunction + +" standard uses eslint and the output format is the same +call ale#linter#Define('typescript', { +\ 'name': 'standard', +\ 'executable': function('ale_linters#typescript#standard#GetExecutable'), +\ 'command': function('ale_linters#typescript#standard#GetCommand'), +\ 'callback': 'ale#handlers#eslint#Handle', +\}) diff --git a/sources_non_forked/ale/ale_linters/verilog/vlog.vim b/sources_non_forked/ale/ale_linters/verilog/vlog.vim index 37d21c4c..951e2037 100644 --- a/sources_non_forked/ale/ale_linters/verilog/vlog.vim +++ b/sources_non_forked/ale/ale_linters/verilog/vlog.vim @@ -24,6 +24,20 @@ function! ale_linters#verilog#vlog#Handle(buffer, lines) abort \}) endfor + "Matches patterns like the following: + "** Warning: (vlog-2623) add.v(7): Undefined variable: C. + "** Error: (vlog-13294) file.v(1): Identifier must be declared with a port mode: C. + " let l:pattern = '^**\s\(\w*\):[a-zA-Z0-9\-\.\_\/ ]\+(\(\d\+\)):\s\+\(.*\)' + let l:pattern = '^**\s\(\w*\):\s\([^)]*)\)[a-zA-Z0-9\-\.\_\/ ]\+(\(\d\+\)):\s\+\(.*\)' + + for l:match in ale#util#GetMatches(a:lines, l:pattern) + call add(l:output, { + \ 'lnum': l:match[3] + 0, + \ 'type': l:match[1] is? 'Error' ? 'E' : 'W', + \ 'text': l:match[2] . ' ' . l:match[4], + \}) + endfor + return l:output endfunction diff --git a/sources_non_forked/ale/autoload/ale.vim b/sources_non_forked/ale/autoload/ale.vim index 3a4e79c8..755647e3 100644 --- a/sources_non_forked/ale/autoload/ale.vim +++ b/sources_non_forked/ale/autoload/ale.vim @@ -5,11 +5,18 @@ " Strings used for severity in the echoed message let g:ale_echo_msg_error_str = get(g:, 'ale_echo_msg_error_str', 'Error') let g:ale_echo_msg_info_str = get(g:, 'ale_echo_msg_info_str', 'Info') +let g:ale_echo_msg_log_str = get(g:, 'ale_echo_msg_log_str', 'Log') let g:ale_echo_msg_warning_str = get(g:, 'ale_echo_msg_warning_str', 'Warning') " Ignoring linters, for disabling some, or ignoring LSP diagnostics. let g:ale_linters_ignore = get(g:, 'ale_linters_ignore', {}) let g:ale_disable_lsp = get(g:, 'ale_disable_lsp', 0) +" LSP window/showMessage format +let g:ale_lsp_show_message_format = get(g:, 'ale_lsp_show_message_format', '%severity%:%linter%: %s') +" Valid values mimic LSP definitions (error, warning and information; log is +" never shown) +let g:ale_lsp_show_message_severity = get(g:, 'ale_lsp_show_message_severity', 'error') + let s:lint_timer = -1 let s:getcmdwintype_exists = exists('*getcmdwintype') @@ -156,7 +163,11 @@ function! ale#Queue(delay, ...) abort endif endfunction +<<<<<<< HEAD let s:current_ale_version = [2, 5, 0] +======= +let s:current_ale_version = [2, 6, 0] +>>>>>>> 27ad0d07862847896f691309a544a206783c94d6 " A function used to check for ALE features in files outside of the project. function! ale#Has(feature) abort diff --git a/sources_non_forked/ale/autoload/ale/assert.vim b/sources_non_forked/ale/autoload/ale/assert.vim index dac5efb7..291edcee 100644 --- a/sources_non_forked/ale/autoload/ale/assert.vim +++ b/sources_non_forked/ale/autoload/ale/assert.vim @@ -267,14 +267,22 @@ function! ale#assert#TearDownLinterTest() abort endif endfunction -function! ale#assert#SetUpFixerTest(filetype, name) abort +function! ale#assert#SetUpFixerTest(filetype, name, ...) abort + " If the suffix of the option names format is different, an additional + " argument can be used for that instead. + if a:0 > 1 + throw 'Too many arguments' + endif + " Set up a marker so ALE doesn't create real random temporary filenames. let g:ale_create_dummy_temporary_file = 1 let l:function_name = ale#fix#registry#GetFunc(a:name) let s:FixerFunction = function(l:function_name) - let l:prefix = 'ale_' . a:filetype . '_' . a:name + let l:option_suffix = get(a:000, 0, a:name) + let l:prefix = 'ale_' . a:filetype . '_' + \ . substitute(l:option_suffix, '-', '_', 'g') let b:filter_expr = 'v:val[: len(l:prefix) - 1] is# l:prefix' for l:key in filter(keys(g:), b:filter_expr) @@ -286,7 +294,7 @@ function! ale#assert#SetUpFixerTest(filetype, name) abort unlet b:[l:key] endfor - execute 'runtime autoload/ale/fixers/' . a:name . '.vim' + execute 'runtime autoload/ale/fixers/' . substitute(a:name, '-', '_', 'g') . '.vim' if !exists('g:dir') call ale#test#SetDirectory('/testplugin/test/fixers') diff --git a/sources_non_forked/ale/autoload/ale/c.vim b/sources_non_forked/ale/autoload/ale/c.vim index 2d2083da..9b428700 100644 --- a/sources_non_forked/ale/autoload/ale/c.vim +++ b/sources_non_forked/ale/autoload/ale/c.vim @@ -28,76 +28,107 @@ function! ale#c#GetBuildDirectory(buffer) abort return ale#path#Dirname(l:json_file) endfunction -function! ale#c#AreSpecialCharsBalanced(option) abort - " Escape \" - let l:option_escaped = substitute(a:option, '\\"', '', 'g') - - " Retain special chars only - let l:special_chars = substitute(l:option_escaped, '[^"''()`]', '', 'g') - let l:special_chars = split(l:special_chars, '\zs') - - " Check if they are balanced +function! ale#c#ShellSplit(line) abort let l:stack = [] + let l:args = [''] + let l:prev = '' - for l:char in l:special_chars - if l:char is# ')' - if len(l:stack) == 0 || get(l:stack, -1) isnot# '(' - return 0 - endif - - call remove(l:stack, -1) - elseif l:char is# '(' - call add(l:stack, l:char) - else - if len(l:stack) > 0 && get(l:stack, -1) is# l:char + for l:char in split(a:line, '\zs') + if l:char is# '''' + if len(l:stack) > 0 && get(l:stack, -1) is# '''' call remove(l:stack, -1) - else + elseif (len(l:stack) == 0 || get(l:stack, -1) isnot# '"') && l:prev isnot# '\' call add(l:stack, l:char) endif + elseif (l:char is# '"' || l:char is# '`') && l:prev isnot# '\' + if len(l:stack) > 0 && get(l:stack, -1) is# l:char + call remove(l:stack, -1) + elseif len(l:stack) == 0 || get(l:stack, -1) isnot# '''' + call add(l:stack, l:char) + endif + elseif (l:char is# '(' || l:char is# '[' || l:char is# '{') && l:prev isnot# '\' + if len(l:stack) == 0 || get(l:stack, -1) isnot# '''' + call add(l:stack, l:char) + endif + elseif (l:char is# ')' || l:char is# ']' || l:char is# '}') && l:prev isnot# '\' + if len(l:stack) > 0 && get(l:stack, -1) is# {')': '(', ']': '[', '}': '{'}[l:char] + call remove(l:stack, -1) + endif + elseif l:char is# ' ' && len(l:stack) == 0 + if len(get(l:args, -1)) > 0 + call add(l:args, '') + endif + + continue endif + + let l:args[-1] = get(l:args, -1) . l:char endfor - return len(l:stack) == 0 + return l:args endfunction function! ale#c#ParseCFlags(path_prefix, cflag_line) abort - let l:split_lines = split(a:cflag_line) + let l:cflags_list = [] + + let l:split_lines = ale#c#ShellSplit(a:cflag_line) let l:option_index = 0 while l:option_index < len(l:split_lines) - let l:next_option_index = l:option_index + 1 - - " Join space-separated option - while l:next_option_index < len(l:split_lines) - \&& stridx(l:split_lines[l:next_option_index], '-') != 0 - let l:next_option_index += 1 - endwhile - - let l:option = join(l:split_lines[l:option_index : l:next_option_index-1], ' ') - call remove(l:split_lines, l:option_index, l:next_option_index-1) - call insert(l:split_lines, l:option, l:option_index) - - " Ignore invalid or conflicting options - if stridx(l:option, '-') != 0 - \|| stridx(l:option, '-o') == 0 - \|| stridx(l:option, '-c') == 0 - call remove(l:split_lines, l:option_index) - let l:option_index = l:option_index - 1 - " Fix relative path - elseif stridx(l:option, '-I') == 0 - if !(stridx(l:option, ':') == 2+1 || stridx(l:option, '/') == 2+0) - let l:option = '-I' . a:path_prefix . s:sep . l:option[2:] - call remove(l:split_lines, l:option_index) - call insert(l:split_lines, l:option, l:option_index) - endif - endif - + let l:option = l:split_lines[l:option_index] let l:option_index = l:option_index + 1 + + " Include options, that may need relative path fix + if stridx(l:option, '-I') == 0 + \ || stridx(l:option, '-iquote') == 0 + \ || stridx(l:option, '-isystem') == 0 + \ || stridx(l:option, '-idirafter') == 0 + if stridx(l:option, '-I') == 0 && l:option isnot# '-I' + let l:arg = join(split(l:option, '\zs')[2:], '') + let l:option = '-I' + else + let l:arg = l:split_lines[l:option_index] + let l:option_index = l:option_index + 1 + endif + + " Fix relative paths if needed + if stridx(l:arg, s:sep) != 0 && stridx(l:arg, '/') != 0 + let l:rel_path = substitute(l:arg, '"', '', 'g') + let l:rel_path = substitute(l:rel_path, '''', '', 'g') + let l:arg = ale#Escape(a:path_prefix . s:sep . l:rel_path) + endif + + call add(l:cflags_list, l:option) + call add(l:cflags_list, l:arg) + " Options with arg that can be grouped with the option or separate + elseif stridx(l:option, '-D') == 0 || stridx(l:option, '-B') == 0 + call add(l:cflags_list, l:option) + + if l:option is# '-D' || l:option is# '-B' + call add(l:cflags_list, l:split_lines[l:option_index]) + let l:option_index = l:option_index + 1 + endif + " Options that have an argument (always separate) + elseif l:option is# '-iprefix' || stridx(l:option, '-iwithprefix') == 0 + \ || l:option is# '-isysroot' || l:option is# '-imultilib' + call add(l:cflags_list, l:option) + call add(l:cflags_list, l:split_lines[l:option_index]) + let l:option_index = l:option_index + 1 + " Options without argument + elseif (stridx(l:option, '-W') == 0 && stridx(l:option, '-Wa,') != 0 && stridx(l:option, '-Wl,') != 0 && stridx(l:option, '-Wp,') != 0) + \ || l:option is# '-w' || stridx(l:option, '-pedantic') == 0 + \ || l:option is# '-ansi' || stridx(l:option, '-std=') == 0 + \ || (stridx(l:option, '-f') == 0 && stridx(l:option, '-fdump') != 0 && stridx(l:option, '-fdiagnostics') != 0 && stridx(l:option, '-fno-show-column') != 0) + \ || stridx(l:option, '-O') == 0 + \ || l:option is# '-C' || l:option is# '-CC' || l:option is# '-trigraphs' + \ || stridx(l:option, '-nostdinc') == 0 || stridx(l:option, '-iplugindir=') == 0 + \ || stridx(l:option, '--sysroot=') == 0 || l:option is# '--no-sysroot-suffix' + \ || stridx(l:option, '-m') == 0 + call add(l:cflags_list, l:option) + endif endwhile - call uniq(l:split_lines) - - return join(l:split_lines, ' ') + return join(l:cflags_list, ' ') endfunction function! ale#c#ParseCFlagsFromMakeOutput(buffer, make_output) abort @@ -234,6 +265,16 @@ function! s:GetLookupFromCompileCommandsFile(compile_commands_file) abort return l:empty endfunction +function! ale#c#GetCompileCommand(json_item) abort + if has_key(a:json_item, 'command') + return a:json_item.command + elseif has_key(a:json_item, 'arguments') + return join(a:json_item.arguments, ' ') + endif + + return '' +endfunction + function! ale#c#ParseCompileCommandsFlags(buffer, file_lookup, dir_lookup) abort " Search for an exact file match first. let l:basename = tolower(expand('#' . a:buffer . ':t')) @@ -256,15 +297,14 @@ function! ale#c#ParseCompileCommandsFlags(buffer, file_lookup, dir_lookup) abort for l:item in l:file_list " Load the flags for this file, or for a source file matching the " header file. - if has_key(l:item, 'command') - \&& ( + if ( \ bufnr(l:item.file) is a:buffer \ || ( \ !empty(l:source_file) \ && l:item.file[-len(l:source_file):] is? l:source_file \ ) \) - return ale#c#ParseCFlags(l:item.directory, l:item.command) + return ale#c#ParseCFlags(l:item.directory, ale#c#GetCompileCommand(l:item)) endif endfor @@ -276,8 +316,7 @@ function! ale#c#ParseCompileCommandsFlags(buffer, file_lookup, dir_lookup) abort for l:item in l:dir_list if ale#path#Simplify(fnamemodify(l:item.file, ':h')) is? l:dir - \&& has_key(l:item, 'command') - return ale#c#ParseCFlags(l:item.directory, l:item.command) + return ale#c#ParseCFlags(l:item.directory, ale#c#GetCompileCommand(l:item)) endif endfor diff --git a/sources_non_forked/ale/autoload/ale/code_action.vim b/sources_non_forked/ale/autoload/ale/code_action.vim new file mode 100644 index 00000000..0af1bb70 --- /dev/null +++ b/sources_non_forked/ale/autoload/ale/code_action.vim @@ -0,0 +1,163 @@ +" Author: Jerko Steiner +" Description: Code action support for LSP / tsserver + +function! ale#code_action#HandleCodeAction(code_action) abort + let l:current_buffer = bufnr('') + let l:changes = a:code_action.changes + + for l:file_code_edit in l:changes + let l:buf = bufnr(l:file_code_edit.fileName) + + if l:buf != -1 && l:buf != l:current_buffer && getbufvar(l:buf, '&mod') + call ale#util#Execute('echom ''Aborting action, file is unsaved''') + + return + endif + endfor + + for l:file_code_edit in l:changes + call ale#code_action#ApplyChanges( + \ l:file_code_edit.fileName, l:file_code_edit.textChanges) + endfor +endfunction + +function! ale#code_action#ApplyChanges(filename, changes) abort + let l:current_buffer = bufnr('') + " The buffer is used to determine the fileformat, if available. + let l:buffer = bufnr(a:filename) + let l:is_current_buffer = l:buffer > 0 && l:buffer == l:current_buffer + + if l:buffer > 0 + let l:lines = getbufline(l:buffer, 1, '$') + else + let l:lines = readfile(a:filename, 'b') + endif + + if l:is_current_buffer + let l:pos = getpos('.')[1:2] + else + let l:pos = [1, 1] + endif + + " We have to keep track of how many lines we have added, and offset + " changes accordingly. + let l:line_offset = 0 + let l:column_offset = 0 + let l:last_end_line = 0 + + for l:code_edit in a:changes + if l:code_edit.start.line isnot l:last_end_line + let l:column_offset = 0 + endif + + let l:line = l:code_edit.start.line + l:line_offset + let l:column = l:code_edit.start.offset + l:column_offset + let l:end_line = l:code_edit.end.line + l:line_offset + let l:end_column = l:code_edit.end.offset + l:column_offset + let l:text = l:code_edit.newText + + let l:cur_line = l:pos[0] + let l:cur_column = l:pos[1] + + let l:last_end_line = l:end_line + + " Adjust the ends according to previous edits. + if l:end_line > len(l:lines) + let l:end_line_len = 0 + else + let l:end_line_len = len(l:lines[l:end_line - 1]) + endif + + let l:insertions = split(l:text, '\n', 1) + + if l:line is 1 + " Same logic as for column below. Vimscript's slice [:-1] will not + " be an empty list. + let l:start = [] + else + let l:start = l:lines[: l:line - 2] + endif + + if l:column is 1 + " We need to handle column 1 specially, because we can't slice an + " empty string ending on index 0. + let l:middle = [l:insertions[0]] + else + let l:middle = [l:lines[l:line - 1][: l:column - 2] . l:insertions[0]] + endif + + call extend(l:middle, l:insertions[1:]) + let l:middle[-1] .= l:lines[l:end_line - 1][l:end_column - 1 :] + + let l:lines_before_change = len(l:lines) + let l:lines = l:start + l:middle + l:lines[l:end_line :] + + let l:current_line_offset = len(l:lines) - l:lines_before_change + let l:line_offset += l:current_line_offset + let l:column_offset = len(l:middle[-1]) - l:end_line_len + + let l:pos = s:UpdateCursor(l:pos, + \ [l:line, l:column], + \ [l:end_line, l:end_column], + \ [l:current_line_offset, l:column_offset]) + endfor + + if l:lines[-1] is# '' + call remove(l:lines, -1) + endif + + call ale#util#Writefile(l:buffer, l:lines, a:filename) + + if l:is_current_buffer + call ale#util#Execute(':e!') + call setpos('.', [0, l:pos[0], l:pos[1], 0]) + endif +endfunction + +function! s:UpdateCursor(cursor, start, end, offset) abort + let l:cur_line = a:cursor[0] + let l:cur_column = a:cursor[1] + let l:line = a:start[0] + let l:column = a:start[1] + let l:end_line = a:end[0] + let l:end_column = a:end[1] + let l:line_offset = a:offset[0] + let l:column_offset = a:offset[1] + + if l:end_line < l:cur_line + " both start and end lines are before the cursor. only line offset + " needs to be updated + let l:cur_line += l:line_offset + elseif l:end_line == l:cur_line + " end line is at the same location as cursor, which means + " l:line <= l:cur_line + if l:line < l:cur_line || l:column <= l:cur_column + " updates are happening either before or around the cursor + if l:end_column < l:cur_column + " updates are happening before the cursor, update the + " column offset for cursor + let l:cur_line += l:line_offset + let l:cur_column += l:column_offset + else + " updates are happening around the cursor, move the cursor + " to the end of the changes + let l:cur_line += l:line_offset + let l:cur_column = l:end_column + l:column_offset + endif + " else is not necessary, it means modifications are happening + " after the cursor so no cursor updates need to be done + endif + else + " end line is after the cursor + if l:line < l:cur_line || l:line == l:cur_line && l:column <= l:cur_column + " changes are happening around the cursor, move the cursor + " to the end of the changes + let l:cur_line = l:end_line + l:line_offset + let l:cur_column = l:end_column + l:column_offset + " else is not necesary, it means modifications are happening + " after the cursor so no cursor updates need to be done + endif + endif + + return [l:cur_line, l:cur_column] +endfunction diff --git a/sources_non_forked/ale/autoload/ale/completion.vim b/sources_non_forked/ale/autoload/ale/completion.vim index 43d84ea6..80684a30 100644 --- a/sources_non_forked/ale/autoload/ale/completion.vim +++ b/sources_non_forked/ale/autoload/ale/completion.vim @@ -1,5 +1,6 @@ " Author: w0rp " Description: Completion support for LSP linters +scriptencoding utf-8 " The omnicompletion menu is shown through a special Plug mapping which is " only valid in Insert mode. This way, feedkeys() won't send these keys if you @@ -15,29 +16,107 @@ onoremap (ale_show_completion_menu) let g:ale_completion_delay = get(g:, 'ale_completion_delay', 100) let g:ale_completion_excluded_words = get(g:, 'ale_completion_excluded_words', []) let g:ale_completion_max_suggestions = get(g:, 'ale_completion_max_suggestions', 50) +let g:ale_completion_tsserver_autoimport = get(g:, 'ale_completion_tsserver_autoimport', 0) let s:timer_id = -1 let s:last_done_pos = [] " CompletionItemKind values from the LSP protocol. -let s:LSP_COMPLETION_TEXT_KIND = 1 -let s:LSP_COMPLETION_METHOD_KIND = 2 -let s:LSP_COMPLETION_FUNCTION_KIND = 3 -let s:LSP_COMPLETION_CONSTRUCTOR_KIND = 4 -let s:LSP_COMPLETION_FIELD_KIND = 5 -let s:LSP_COMPLETION_VARIABLE_KIND = 6 -let s:LSP_COMPLETION_CLASS_KIND = 7 -let s:LSP_COMPLETION_INTERFACE_KIND = 8 -let s:LSP_COMPLETION_MODULE_KIND = 9 -let s:LSP_COMPLETION_PROPERTY_KIND = 10 -let s:LSP_COMPLETION_UNIT_KIND = 11 -let s:LSP_COMPLETION_VALUE_KIND = 12 -let s:LSP_COMPLETION_ENUM_KIND = 13 -let s:LSP_COMPLETION_KEYWORD_KIND = 14 -let s:LSP_COMPLETION_SNIPPET_KIND = 15 -let s:LSP_COMPLETION_COLOR_KIND = 16 -let s:LSP_COMPLETION_FILE_KIND = 17 -let s:LSP_COMPLETION_REFERENCE_KIND = 18 +let g:ale_lsp_types = { +\ 1: 'text', +\ 2: 'method', +\ 3: 'function', +\ 4: 'constructor', +\ 5: 'field', +\ 6: 'variable', +\ 7: 'class', +\ 8: 'interface', +\ 9: 'module', +\ 10: 'property', +\ 11: 'unit', +\ 12: 'value', +\ 13: 'enum', +\ 14: 'keyword', +\ 15: 'snippet', +\ 16: 'color', +\ 17: 'file', +\ 18: 'reference', +\ 19: 'folder', +\ 20: 'enum_member', +\ 21: 'constant', +\ 22: 'struct', +\ 23: 'event', +\ 24: 'operator', +\ 25: 'type_parameter', +\ } + +" from https://github.com/microsoft/TypeScript/blob/29becf05012bfa7ba20d50b0d16813971e46b8a6/lib/protocol.d.ts#L2472 +let g:ale_tsserver_types = { +\ 'warning': 'text', +\ 'keyword': 'keyword', +\ 'script': 'file', +\ 'module': 'module', +\ 'class': 'class', +\ 'local class': 'class', +\ 'interface': 'interface', +\ 'type': 'class', +\ 'enum': 'enum', +\ 'enum member': 'enum_member', +\ 'var': 'variable', +\ 'local var': 'variable', +\ 'function': 'function', +\ 'local function': 'function', +\ 'method': 'method', +\ 'getter': 'property', +\ 'setter': 'method', +\ 'property': 'property', +\ 'constructor': 'constructor', +\ 'call': 'method', +\ 'index': 'index', +\ 'construct': 'constructor', +\ 'parameter': 'parameter', +\ 'type parameter': 'type_parameter', +\ 'primitive type': 'unit', +\ 'label': 'text', +\ 'alias': 'class', +\ 'const': 'constant', +\ 'let': 'variable', +\ 'directory': 'folder', +\ 'external module name': 'text', +\ 'JSX attribute': 'parameter', +\ 'string': 'text' +\ } + +" For compatibility reasons, we only use built in VIM completion kinds +" See :help complete-items for Vim completion kinds +let g:ale_completion_symbols = get(g:, 'ale_completion_symbols', { +\ 'text': 'v', +\ 'method': 'f', +\ 'function': 'f', +\ 'constructor': 'f', +\ 'field': 'm', +\ 'variable': 'v', +\ 'class': 't', +\ 'interface': 't', +\ 'module': 'd', +\ 'property': 'm', +\ 'unit': 'v', +\ 'value': 'v', +\ 'enum': 't', +\ 'keyword': 'v', +\ 'snippet': 'v', +\ 'color': 'v', +\ 'file': 'v', +\ 'reference': 'v', +\ 'folder': 'v', +\ 'enum_member': 'm', +\ 'constant': 'm', +\ 'struct': 't', +\ 'event': 'v', +\ 'operator': 'f', +\ 'type_parameter': 'p', +\ '': 'v' +\ }) let s:LSP_INSERT_TEXT_FORMAT_PLAIN = 1 let s:LSP_INSERT_TEXT_FORMAT_SNIPPET = 2 @@ -60,7 +139,8 @@ let s:omni_start_map = { \ '': '\v[a-zA-Z$_][a-zA-Z$_0-9]*$', \} -" A map of exact characters for triggering LSP completions. +" A map of exact characters for triggering LSP completions. Do not forget to +" update self.input_patterns in ale.py in updating entries in this map. let s:trigger_character_map = { \ '': ['.'], \ 'typescript': ['.', '''', '"'], @@ -181,6 +261,8 @@ function! s:ReplaceCompletionOptions() abort if &l:completeopt =~# 'preview' let &l:completeopt = 'menu,menuone,preview,noselect,noinsert' + elseif &l:completeopt =~# 'popup' + let &l:completeopt = 'menu,menuone,popup,noselect,noinsert' else let &l:completeopt = 'menu,menuone,noselect,noinsert' endif @@ -217,6 +299,10 @@ function! ale#completion#GetCompletionPosition() abort return l:column - len(l:match) - 1 endfunction +function! ale#completion#GetCompletionPositionForDeoplete(input) abort + return match(a:input, '\k*$') +endfunction + function! ale#completion#GetCompletionResult() abort if exists('b:ale_completion_result') return b:ale_completion_result @@ -262,6 +348,35 @@ function! ale#completion#Show(result) abort \ {-> ale#util#FeedKeys("\(ale_show_completion_menu)")} \) endif + + if l:source is# 'ale-callback' + call b:CompleteCallback(b:ale_completion_result) + endif +endfunction + +function! ale#completion#GetAllTriggers() abort + return deepcopy(s:trigger_character_map) +endfunction + +function! ale#completion#GetCompletionKind(kind) abort + let l:lsp_symbol = get(g:ale_lsp_types, a:kind, '') + + if !empty(l:lsp_symbol) + return l:lsp_symbol + endif + + return get(g:ale_tsserver_types, a:kind, '') +endfunction + +function! ale#completion#GetCompletionSymbols(kind) abort + let l:kind = ale#completion#GetCompletionKind(a:kind) + let l:symbol = get(g:ale_completion_symbols, l:kind, '') + + if !empty(l:symbol) + return l:symbol + endif + + return get(g:ale_completion_symbols, '', 'v') endfunction function! s:CompletionStillValid(request_id) abort @@ -273,8 +388,8 @@ function! s:CompletionStillValid(request_id) abort \&& b:ale_completion_info.line == l:line \&& ( \ b:ale_completion_info.column == l:column - \ || b:ale_completion_info.source is# 'deoplete' \ || b:ale_completion_info.source is# 'ale-omnifunc' + \ || b:ale_completion_info.source is# 'ale-callback' \) endfunction @@ -282,7 +397,10 @@ function! ale#completion#ParseTSServerCompletions(response) abort let l:names = [] for l:suggestion in a:response.body - call add(l:names, l:suggestion.name) + call add(l:names, { + \ 'word': l:suggestion.name, + \ 'source': get(l:suggestion, 'source', ''), + \}) endfor return l:names @@ -296,6 +414,10 @@ function! ale#completion#ParseTSServerCompletionEntryDetails(response) abort for l:suggestion in a:response.body let l:displayParts = [] + for l:action in get(l:suggestion, 'codeActions', []) + call add(l:displayParts, l:action.description . ' ') + endfor + for l:part in l:suggestion.displayParts call add(l:displayParts, l:part.text) endfor @@ -307,22 +429,23 @@ function! ale#completion#ParseTSServerCompletionEntryDetails(response) abort call add(l:documentationParts, l:part.text) endfor - if l:suggestion.kind is# 'className' - let l:kind = 'f' - elseif l:suggestion.kind is# 'parameterName' - let l:kind = 'f' - else - let l:kind = 'v' - endif - " See :help complete-items - call add(l:results, { + let l:result = { \ 'word': l:suggestion.name, - \ 'kind': l:kind, + \ 'kind': ale#completion#GetCompletionSymbols(l:suggestion.kind), \ 'icase': 1, \ 'menu': join(l:displayParts, ''), + \ 'dup': g:ale_completion_tsserver_autoimport, \ 'info': join(l:documentationParts, ''), - \}) + \} + + if has_key(l:suggestion, 'codeActions') + let l:result.user_data = json_encode({ + \ 'codeActions': l:suggestion.codeActions, + \ }) + endif + + call add(l:results, l:result) endfor let l:names = getbufvar(l:buffer, 'ale_tsserver_completion_names', []) @@ -331,12 +454,12 @@ function! ale#completion#ParseTSServerCompletionEntryDetails(response) abort let l:names_with_details = map(copy(l:results), 'v:val.word') let l:missing_names = filter( \ copy(l:names), - \ 'index(l:names_with_details, v:val) < 0', + \ 'index(l:names_with_details, v:val.word) < 0', \) for l:name in l:missing_names call add(l:results, { - \ 'word': l:name, + \ 'word': l:name.word, \ 'kind': 'v', \ 'icase': 1, \ 'menu': '', @@ -394,23 +517,6 @@ function! ale#completion#ParseLSPCompletions(response) abort continue endif - " See :help complete-items for Vim completion kinds - if !has_key(l:item, 'kind') - let l:kind = 'v' - elseif l:item.kind is s:LSP_COMPLETION_METHOD_KIND - let l:kind = 'm' - elseif l:item.kind is s:LSP_COMPLETION_CONSTRUCTOR_KIND - let l:kind = 'm' - elseif l:item.kind is s:LSP_COMPLETION_FUNCTION_KIND - let l:kind = 'f' - elseif l:item.kind is s:LSP_COMPLETION_CLASS_KIND - let l:kind = 'f' - elseif l:item.kind is s:LSP_COMPLETION_INTERFACE_KIND - let l:kind = 'f' - else - let l:kind = 'v' - endif - let l:doc = get(l:item, 'documentation', '') if type(l:doc) is v:t_dict && has_key(l:doc, 'value') @@ -419,7 +525,7 @@ function! ale#completion#ParseLSPCompletions(response) abort call add(l:results, { \ 'word': l:word, - \ 'kind': l:kind, + \ 'kind': ale#completion#GetCompletionSymbols(get(l:item, 'kind', '')), \ 'icase': 1, \ 'menu': get(l:item, 'detail', ''), \ 'info': (type(l:doc) is v:t_string ? l:doc : ''), @@ -458,13 +564,29 @@ function! ale#completion#HandleTSServerResponse(conn_id, response) abort call setbufvar(l:buffer, 'ale_tsserver_completion_names', l:names) if !empty(l:names) + let l:identifiers = [] + + for l:name in l:names + let l:identifier = { + \ 'name': l:name.word, + \} + let l:source = get(l:name, 'source', '') + + " Empty source results in no details for the completed item + if !empty(l:source) + call extend(l:identifier, { 'source': l:source }) + endif + + call add(l:identifiers, l:identifier) + endfor + let b:ale_completion_info.request_id = ale#lsp#Send( \ b:ale_completion_info.conn_id, \ ale#lsp#tsserver_message#CompletionEntryDetails( \ l:buffer, \ b:ale_completion_info.line, \ b:ale_completion_info.column, - \ l:names, + \ l:identifiers, \ ), \) endif @@ -511,6 +633,7 @@ function! s:OnReady(linter, lsp_details) abort \ b:ale_completion_info.line, \ b:ale_completion_info.column, \ b:ale_completion_info.prefix, + \ g:ale_completion_tsserver_autoimport, \) else " Send a message saying the buffer has changed first, otherwise @@ -555,12 +678,25 @@ endfunction " This function can be used to manually trigger autocomplete, even when " g:ale_completion_enabled is set to false -function! ale#completion#GetCompletions(source) abort +function! ale#completion#GetCompletions(...) abort + let l:source = get(a:000, 0, '') + let l:options = get(a:000, 1, {}) + + if len(a:000) > 2 + throw 'Too many arguments!' + endif + + let l:CompleteCallback = get(l:options, 'callback', v:null) + + if l:CompleteCallback isnot v:null + let b:CompleteCallback = l:CompleteCallback + endif + let [l:line, l:column] = getpos('.')[1:2] let l:prefix = ale#completion#GetPrefix(&filetype, l:line, l:column) - if a:source is# 'ale-automatic' && empty(l:prefix) + if l:source is# 'ale-automatic' && empty(l:prefix) return 0 endif @@ -573,7 +709,7 @@ function! ale#completion#GetCompletions(source) abort \ 'prefix': l:prefix, \ 'conn_id': 0, \ 'request_id': 0, - \ 'source': a:source, + \ 'source': l:source, \} unlet! b:ale_completion_result @@ -665,6 +801,32 @@ function! ale#completion#Queue() abort let s:timer_id = timer_start(g:ale_completion_delay, function('s:TimerHandler')) endfunction +function! ale#completion#HandleUserData(completed_item) abort + let l:source = get(get(b:, 'ale_completion_info', {}), 'source', '') + + if l:source isnot# 'ale-automatic' + \&& l:source isnot# 'ale-manual' + \&& l:source isnot# 'ale-callback' + return + endif + + let l:user_data_json = get(a:completed_item, 'user_data', '') + + if empty(l:user_data_json) + return + endif + + let l:user_data = json_decode(l:user_data_json) + + if type(l:user_data) isnot v:t_dict + return + endif + + for l:code_action in get(l:user_data, 'codeActions', []) + call ale#code_action#HandleCodeAction(l:code_action) + endfor +endfunction + function! ale#completion#Done() abort silent! pclose @@ -673,6 +835,10 @@ function! ale#completion#Done() abort let s:last_done_pos = getpos('.')[1:2] endfunction +augroup ALECompletionActions + autocmd CompleteDone * call ale#completion#HandleUserData(v:completed_item) +augroup END + function! s:Setup(enabled) abort augroup ALECompletionGroup autocmd! diff --git a/sources_non_forked/ale/autoload/ale/debugging.vim b/sources_non_forked/ale/autoload/ale/debugging.vim index 7cdbabaa..4e134f8c 100644 --- a/sources_non_forked/ale/autoload/ale/debugging.vim +++ b/sources_non_forked/ale/autoload/ale/debugging.vim @@ -50,6 +50,7 @@ let s:global_variable_list = [ \ 'ale_sign_style_error', \ 'ale_sign_style_warning', \ 'ale_sign_warning', +\ 'ale_sign_highlight_linenrs', \ 'ale_statusline_format', \ 'ale_type_map', \ 'ale_use_global_executables', @@ -62,7 +63,7 @@ function! s:Echo(message) abort execute 'echo a:message' endfunction -function! s:GetLinterVariables(filetype, linter_names) abort +function! s:GetLinterVariables(filetype, exclude_linter_names) abort let l:variable_list = [] let l:filetype_parts = split(a:filetype, '\.') @@ -73,7 +74,7 @@ function! s:GetLinterVariables(filetype, linter_names) abort " Include matching variables. if !empty(l:match) \&& index(l:filetype_parts, l:match[1]) >= 0 - \&& index(a:linter_names, l:match[2]) >= 0 + \&& index(a:exclude_linter_names, l:match[2]) == -1 call add(l:variable_list, l:key) endif endfor @@ -211,10 +212,11 @@ function! ale#debugging#Info() abort let l:all_names = map(copy(l:all_linters), 'v:val[''name'']') let l:enabled_names = map(copy(l:enabled_linters), 'v:val[''name'']') + let l:exclude_names = filter(copy(l:all_names), 'index(l:enabled_names, v:val) == -1') " Load linter variables to display " This must be done after linters are loaded. - let l:variable_list = s:GetLinterVariables(l:filetype, l:enabled_names) + let l:variable_list = s:GetLinterVariables(l:filetype, l:exclude_names) let l:fixers = ale#fix#registry#SuggestedFixers(l:filetype) let l:fixers = uniq(sort(l:fixers[0] + l:fixers[1])) diff --git a/sources_non_forked/ale/autoload/ale/fix.vim b/sources_non_forked/ale/autoload/ale/fix.vim index 9987fbdd..dad9e2bc 100644 --- a/sources_non_forked/ale/autoload/ale/fix.vim +++ b/sources_non_forked/ale/autoload/ale/fix.vim @@ -47,7 +47,7 @@ function! ale#fix#ApplyQueuedFixes(buffer) abort set nomodified endif else - call writefile(l:new_lines, expand(a:buffer . ':p')) " no-custom-checks + call writefile(l:new_lines, expand('#' . a:buffer . ':p')) " no-custom-checks call setbufvar(a:buffer, '&modified', 0) endif endif @@ -74,7 +74,7 @@ endfunction function! ale#fix#ApplyFixes(buffer, output) abort let l:data = g:ale_fix_buffer_data[a:buffer] let l:data.output = a:output - let l:data.changes_made = l:data.lines_before != l:data.output + let l:data.changes_made = l:data.lines_before !=# l:data.output " no-custom-checks let l:data.done = 1 call ale#command#RemoveManagedFiles(a:buffer) diff --git a/sources_non_forked/ale/autoload/ale/fix/registry.vim b/sources_non_forked/ale/autoload/ale/fix/registry.vim index 121a33bd..1b3ca1a8 100644 --- a/sources_non_forked/ale/autoload/ale/fix/registry.vim +++ b/sources_non_forked/ale/autoload/ale/fix/registry.vim @@ -27,6 +27,11 @@ let s:default_registry = { \ 'suggested_filetypes': ['python'], \ 'description': 'Fix PEP8 issues with black.', \ }, +\ 'dfmt': { +\ 'function': 'ale#fixers#dfmt#Fix', +\ 'suggested_filetypes': ['d'], +\ 'description': 'Fix D files with dfmt.', +\ }, \ 'fecs': { \ 'function': 'ale#fixers#fecs#Fix', \ 'suggested_filetypes': ['javascript', 'css', 'html'], @@ -49,6 +54,11 @@ let s:default_registry = { \ 'description': 'Apply elm-format to a file.', \ 'aliases': ['format'], \ }, +\ 'nimpretty': { +\ 'function': 'ale#fixers#nimpretty#Fix', +\ 'suggested_filetypes': ['nim'], +\ 'description': 'Apply nimpretty to a file.', +\ }, \ 'eslint': { \ 'function': 'ale#fixers#eslint#Fix', \ 'suggested_filetypes': ['javascript', 'typescript'], @@ -115,6 +125,11 @@ let s:default_registry = { \ 'suggested_filetypes': ['scala'], \ 'description': 'Fix Scala files using scalafmt', \ }, +\ 'sorbet': { +\ 'function': 'ale#fixers#sorbet#Fix', +\ 'suggested_filetypes': ['ruby'], +\ 'description': 'Fix ruby files with srb tc --autocorrect.', +\ }, \ 'standard': { \ 'function': 'ale#fixers#standard#Fix', \ 'suggested_filetypes': ['javascript'], @@ -210,6 +225,11 @@ let s:default_registry = { \ 'suggested_filetypes': ['haskell'], \ 'description': 'Fix Haskell files with brittany.', \ }, +\ 'hindent': { +\ 'function': 'ale#fixers#hindent#Fix', +\ 'suggested_filetypes': ['haskell'], +\ 'description': 'Fix Haskell files with hindent.', +\ }, \ 'hlint': { \ 'function': 'ale#fixers#hlint#Fix', \ 'suggested_filetypes': ['haskell'], @@ -220,6 +240,11 @@ let s:default_registry = { \ 'suggested_filetypes': ['haskell'], \ 'description': 'Refactor Haskell files with stylish-haskell.', \ }, +\ 'purty': { +\ 'function': 'ale#fixers#purty#Fix', +\ 'suggested_filetypes': ['purescript'], +\ 'description': 'Format PureScript files with purty.', +\ }, \ 'ocamlformat': { \ 'function': 'ale#fixers#ocamlformat#Fix', \ 'suggested_filetypes': ['ocaml'], @@ -245,6 +270,11 @@ let s:default_registry = { \ 'suggested_filetypes': ['sql'], \ 'description': 'Fix SQL files with sqlfmt.', \ }, +\ 'sqlformat': { +\ 'function': 'ale#fixers#sqlformat#Fix', +\ 'suggested_filetypes': ['sql'], +\ 'description': 'Fix SQL files with sqlformat.', +\ }, \ 'google_java_format': { \ 'function': 'ale#fixers#google_java_format#Fix', \ 'suggested_filetypes': ['java'], @@ -302,7 +332,7 @@ let s:default_registry = { \ }, \ 'styler': { \ 'function': 'ale#fixers#styler#Fix', -\ 'suggested_filetypes': ['r', 'rmarkdown'], +\ 'suggested_filetypes': ['r', 'rmarkdown', 'rmd'], \ 'description': 'Fix R files with styler.', \ }, \ 'latexindent': { @@ -320,6 +350,21 @@ let s:default_registry = { \ 'suggested_filetypes': ['python'], \ 'description': 'Sort Python imports with reorder-python-imports.', \ }, +\ 'gnatpp': { +\ 'function': 'ale#fixers#gnatpp#Fix', +\ 'suggested_filetypes': ['ada'], +\ 'description': 'Format Ada files with gnatpp.', +\ }, +\ 'nixpkgs-fmt': { +\ 'function': 'ale#fixers#nixpkgsfmt#Fix', +\ 'suggested_filetypes': ['nix'], +\ 'description': 'A formatter for Nix code', +\ }, +\ 'html-beautify': { +\ 'function': 'ale#fixers#html_beautify#Fix', +\ 'suggested_filetypes': ['html', 'htmldjango'], +\ 'description': 'Fix HTML files with html-beautify.', +\ }, \} " Reset the function registry to the default entries. diff --git a/sources_non_forked/ale/autoload/ale/fixers/black.vim b/sources_non_forked/ale/autoload/ale/fixers/black.vim index 367b8d52..fba6c3b4 100644 --- a/sources_non_forked/ale/autoload/ale/fixers/black.vim +++ b/sources_non_forked/ale/autoload/ale/fixers/black.vim @@ -29,6 +29,10 @@ function! ale#fixers#black#Fix(buffer) abort let l:options = ale#Var(a:buffer, 'python_black_options') + if expand('#' . a:buffer . ':e') is? 'pyi' + let l:options .= '--pyi' + endif + return { \ 'command': l:cd_string . ale#Escape(l:executable) . l:exec_args \ . (!empty(l:options) ? ' ' . l:options : '') diff --git a/sources_non_forked/ale/autoload/ale/fixers/clangformat.vim b/sources_non_forked/ale/autoload/ale/fixers/clangformat.vim index eae1a7b4..ea5743a5 100644 --- a/sources_non_forked/ale/autoload/ale/fixers/clangformat.vim +++ b/sources_non_forked/ale/autoload/ale/fixers/clangformat.vim @@ -13,10 +13,15 @@ function! ale#fixers#clangformat#GetExecutable(buffer) abort endfunction function! ale#fixers#clangformat#Fix(buffer) abort + let l:executable = ale#Escape(ale#fixers#clangformat#GetExecutable(a:buffer)) + let l:filename = ale#Escape(bufname(a:buffer)) let l:options = ale#Var(a:buffer, 'c_clangformat_options') - return { - \ 'command': ale#Escape(ale#fixers#clangformat#GetExecutable(a:buffer)) - \ . ' ' . l:options, - \} + let l:command = l:executable . ' --assume-filename=' . l:filename + + if l:options isnot# '' + let l:command .= ' ' . l:options + endif + + return {'command': l:command} endfunction diff --git a/sources_non_forked/ale/autoload/ale/fixers/dfmt.vim b/sources_non_forked/ale/autoload/ale/fixers/dfmt.vim new file mode 100644 index 00000000..0072e045 --- /dev/null +++ b/sources_non_forked/ale/autoload/ale/fixers/dfmt.vim @@ -0,0 +1,18 @@ +" Author: theoldmoon0602 +" Description: Integration of dfmt with ALE. + +call ale#Set('d_dfmt_executable', 'dfmt') +call ale#Set('d_dfmt_options', '') + +function! ale#fixers#dfmt#Fix(buffer) abort + let l:executable = ale#Var(a:buffer, 'd_dfmt_executable') + let l:options = ale#Var(a:buffer, 'd_dfmt_options') + + return { + \ 'command': ale#Escape(l:executable) + \ . ' -i' + \ . (empty(l:options) ? '' : ' ' . l:options) + \ . ' %t', + \ 'read_temporary_file': 1, + \} +endfunction diff --git a/sources_non_forked/ale/autoload/ale/fixers/gnatpp.vim b/sources_non_forked/ale/autoload/ale/fixers/gnatpp.vim new file mode 100644 index 00000000..bf3d484e --- /dev/null +++ b/sources_non_forked/ale/autoload/ale/fixers/gnatpp.vim @@ -0,0 +1,17 @@ +" Author: tim +" Description: Fix files with gnatpp. + +call ale#Set('ada_gnatpp_executable', 'gnatpp') +call ale#Set('ada_gnatpp_options', '') + +function! ale#fixers#gnatpp#Fix(buffer) abort + let l:executable = ale#Var(a:buffer, 'ada_gnatpp_executable') + let l:options = ale#Var(a:buffer, 'ada_gnatpp_options') + + return { + \ 'command': ale#Escape(l:executable) + \ . (!empty(l:options) ? ' ' . l:options : '') + \ . ' %t', + \ 'read_temporary_file': 1, + \} +endfunction diff --git a/sources_non_forked/ale/autoload/ale/fixers/gofmt.vim b/sources_non_forked/ale/autoload/ale/fixers/gofmt.vim index 66b67a9e..d5a539b9 100644 --- a/sources_non_forked/ale/autoload/ale/fixers/gofmt.vim +++ b/sources_non_forked/ale/autoload/ale/fixers/gofmt.vim @@ -7,9 +7,10 @@ call ale#Set('go_gofmt_options', '') function! ale#fixers#gofmt#Fix(buffer) abort let l:executable = ale#Var(a:buffer, 'go_gofmt_executable') let l:options = ale#Var(a:buffer, 'go_gofmt_options') + let l:env = ale#go#EnvString(a:buffer) return { - \ 'command': ale#Escape(l:executable) + \ 'command': l:env . ale#Escape(l:executable) \ . ' -l -w' \ . (empty(l:options) ? '' : ' ' . l:options) \ . ' %t', diff --git a/sources_non_forked/ale/autoload/ale/fixers/goimports.vim b/sources_non_forked/ale/autoload/ale/fixers/goimports.vim index 783d0206..65f0fd98 100644 --- a/sources_non_forked/ale/autoload/ale/fixers/goimports.vim +++ b/sources_non_forked/ale/autoload/ale/fixers/goimports.vim @@ -7,13 +7,14 @@ call ale#Set('go_goimports_options', '') function! ale#fixers#goimports#Fix(buffer) abort let l:executable = ale#Var(a:buffer, 'go_goimports_executable') let l:options = ale#Var(a:buffer, 'go_goimports_options') + let l:env = ale#go#EnvString(a:buffer) if !executable(l:executable) return 0 endif return { - \ 'command': ale#Escape(l:executable) + \ 'command': l:env . ale#Escape(l:executable) \ . ' -l -w -srcdir %s' \ . (empty(l:options) ? '' : ' ' . l:options) \ . ' %t', diff --git a/sources_non_forked/ale/autoload/ale/fixers/gomod.vim b/sources_non_forked/ale/autoload/ale/fixers/gomod.vim index 68895f9b..ee8c46c9 100644 --- a/sources_non_forked/ale/autoload/ale/fixers/gomod.vim +++ b/sources_non_forked/ale/autoload/ale/fixers/gomod.vim @@ -2,9 +2,10 @@ call ale#Set('go_go_executable', 'go') function! ale#fixers#gomod#Fix(buffer) abort let l:executable = ale#Var(a:buffer, 'go_go_executable') + let l:env = ale#go#EnvString(a:buffer) return { - \ 'command': ale#Escape(l:executable) . ' mod edit -fmt %t', + \ 'command': l:env . ale#Escape(l:executable) . ' mod edit -fmt %t', \ 'read_temporary_file': 1, \} endfunction diff --git a/sources_non_forked/ale/autoload/ale/fixers/hindent.vim b/sources_non_forked/ale/autoload/ale/fixers/hindent.vim new file mode 100644 index 00000000..b6009a2c --- /dev/null +++ b/sources_non_forked/ale/autoload/ale/fixers/hindent.vim @@ -0,0 +1,20 @@ +" Author: AlexeiDrake +" Description: Integration of hindent formatting with ALE. +" +call ale#Set('haskell_hindent_executable', 'hindent') + +function! ale#fixers#hindent#GetExecutable(buffer) abort + let l:executable = ale#Var(a:buffer, 'haskell_hindent_executable') + + return ale#handlers#haskell_stack#EscapeExecutable(l:executable, 'hindent') +endfunction + +function! ale#fixers#hindent#Fix(buffer) abort + let l:executable = ale#fixers#hindent#GetExecutable(a:buffer) + + return { + \ 'command': l:executable + \ . ' %t', + \ 'read_temporary_file': 1, + \} +endfunction diff --git a/sources_non_forked/ale/autoload/ale/fixers/html_beautify.vim b/sources_non_forked/ale/autoload/ale/fixers/html_beautify.vim new file mode 100644 index 00000000..236cb6ec --- /dev/null +++ b/sources_non_forked/ale/autoload/ale/fixers/html_beautify.vim @@ -0,0 +1,21 @@ +" Author: WhyNotHugo +" Description: Lint HTML files with html-beautify. +" +call ale#Set('html_beautify_executable', 'html-beautify') +call ale#Set('html_beautify_use_global', get(g:, 'ale_use_global_executables', 0)) +call ale#Set('html_beautify_options', '') +call ale#Set('html_beautify_change_directory', 1) + +function! ale#fixers#html_beautify#Fix(buffer) abort + let l:executable = ale#python#FindExecutable( + \ a:buffer, + \ 'html_beautify', + \ ['html-beautify'] + \) + + let l:options = ale#Var(a:buffer, 'html_beautify_options') + + return { + \ 'command': ale#Escape(l:executable). ' ' . l:options . ' -', + \} +endfunction diff --git a/sources_non_forked/ale/autoload/ale/fixers/nimpretty.vim b/sources_non_forked/ale/autoload/ale/fixers/nimpretty.vim new file mode 100644 index 00000000..fe2e7136 --- /dev/null +++ b/sources_non_forked/ale/autoload/ale/fixers/nimpretty.vim @@ -0,0 +1,15 @@ +" Author: Nhan +" Description: Integration of nimpretty with ALE. + +call ale#Set('nim_nimpretty_executable', 'nimpretty') +call ale#Set('nim_nimpretty_options', '--maxLineLen:80') + +function! ale#fixers#nimpretty#Fix(buffer) abort + let l:executable = ale#Var(a:buffer, 'nim_nimpretty_executable') + let l:options = ale#Var(a:buffer, 'nim_nimpretty_options') + + return { + \ 'command': ale#Escape(l:executable) . ' %t' . ale#Pad(l:options), + \ 'read_temporary_file': 1, + \} +endfunction diff --git a/sources_non_forked/ale/autoload/ale/fixers/nixpkgsfmt.vim b/sources_non_forked/ale/autoload/ale/fixers/nixpkgsfmt.vim new file mode 100644 index 00000000..403ce798 --- /dev/null +++ b/sources_non_forked/ale/autoload/ale/fixers/nixpkgsfmt.vim @@ -0,0 +1,12 @@ +call ale#Set('nix_nixpkgsfmt_executable', 'nixpkgs-fmt') +call ale#Set('nix_nixpkgsfmt_options', '') + +function! ale#fixers#nixpkgsfmt#Fix(buffer) abort + let l:executable = ale#Var(a:buffer, 'nix_nixpkgsfmt_executable') + let l:options = ale#Var(a:buffer, 'nix_nixpkgsfmt_options') + + return { + \ 'command': ale#Escape(l:executable) + \ . (empty(l:options) ? '' : ' ' . l:options), + \} +endfunction diff --git a/sources_non_forked/ale/autoload/ale/fixers/purty.vim b/sources_non_forked/ale/autoload/ale/fixers/purty.vim new file mode 100644 index 00000000..46d2cacd --- /dev/null +++ b/sources_non_forked/ale/autoload/ale/fixers/purty.vim @@ -0,0 +1,22 @@ +" Author: iclanzan +" Description: Integration of purty with ALE. + +call ale#Set('purescript_purty_executable', 'purty') + +function! ale#fixers#purty#GetExecutable(buffer) abort + let l:executable = ale#Var(a:buffer, 'purescript_purty_executable') + + return ale#Escape(l:executable) +endfunction + +function! ale#fixers#purty#Fix(buffer) abort + let l:executable = ale#fixers#purty#GetExecutable(a:buffer) + + return { + \ 'command': l:executable + \ . ' --write' + \ . ' %t', + \ 'read_temporary_file': 1, + \} +endfunction + diff --git a/sources_non_forked/ale/autoload/ale/fixers/rubocop.vim b/sources_non_forked/ale/autoload/ale/fixers/rubocop.vim index 33ba6887..0c7441e4 100644 --- a/sources_non_forked/ale/autoload/ale/fixers/rubocop.vim +++ b/sources_non_forked/ale/autoload/ale/fixers/rubocop.vim @@ -6,7 +6,7 @@ function! ale#fixers#rubocop#GetCommand(buffer) abort let l:config = ale#path#FindNearestFile(a:buffer, '.rubocop.yml') let l:options = ale#Var(a:buffer, 'ruby_rubocop_options') - return ale#handlers#ruby#EscapeExecutable(l:executable, 'rubocop') + return ale#ruby#EscapeExecutable(l:executable, 'rubocop') \ . (!empty(l:config) ? ' --config ' . ale#Escape(l:config) : '') \ . (!empty(l:options) ? ' ' . l:options : '') \ . ' --auto-correct --force-exclusion %t' diff --git a/sources_non_forked/ale/autoload/ale/fixers/sorbet.vim b/sources_non_forked/ale/autoload/ale/fixers/sorbet.vim new file mode 100644 index 00000000..7c12fa1e --- /dev/null +++ b/sources_non_forked/ale/autoload/ale/fixers/sorbet.vim @@ -0,0 +1,19 @@ +call ale#Set('ruby_sorbet_executable', 'srb') +call ale#Set('ruby_sorbet_options', '') + +function! ale#fixers#sorbet#GetCommand(buffer) abort + let l:executable = ale#Var(a:buffer, 'ruby_sorbet_executable') + let l:options = ale#Var(a:buffer, 'ruby_sorbet_options') + + return ale#ruby#EscapeExecutable(l:executable, 'srb') + \ . ' tc' + \ . (!empty(l:options) ? ' ' . l:options : '') + \ . ' --autocorrect --file %t' +endfunction + +function! ale#fixers#sorbet#Fix(buffer) abort + return { + \ 'command': ale#fixers#sorbet#GetCommand(a:buffer), + \ 'read_temporary_file': 1, + \} +endfunction diff --git a/sources_non_forked/ale/autoload/ale/fixers/sqlformat.vim b/sources_non_forked/ale/autoload/ale/fixers/sqlformat.vim new file mode 100644 index 00000000..6319c1ac --- /dev/null +++ b/sources_non_forked/ale/autoload/ale/fixers/sqlformat.vim @@ -0,0 +1,16 @@ +" Author: Cluas +" Description: Fixing files with sqlformat. + +call ale#Set('sql_sqlformat_executable', 'sqlformat') +call ale#Set('sql_sqlformat_options', '') + +function! ale#fixers#sqlformat#Fix(buffer) abort + let l:executable = ale#Var(a:buffer, 'sql_sqlformat_executable') + let l:options = ale#Var(a:buffer, 'sql_sqlformat_options') + + return { + \ 'command': ale#Escape(l:executable) + \ . (!empty(l:options) ? ' ' . l:options : '') + \ . ' -' + \} +endfunction diff --git a/sources_non_forked/ale/autoload/ale/fixers/standard.vim b/sources_non_forked/ale/autoload/ale/fixers/standard.vim index 77712d40..cffa9f9d 100644 --- a/sources_non_forked/ale/autoload/ale/fixers/standard.vim +++ b/sources_non_forked/ale/autoload/ale/fixers/standard.vim @@ -7,6 +7,7 @@ call ale#Set('javascript_standard_options', '') function! ale#fixers#standard#GetExecutable(buffer) abort return ale#node#FindExecutable(a:buffer, 'javascript_standard', [ + \ 'node_modules/standardx/bin/cmd.js', \ 'node_modules/standard/bin/cmd.js', \ 'node_modules/.bin/standard', \]) @@ -14,7 +15,14 @@ endfunction function! ale#fixers#standard#Fix(buffer) abort let l:executable = ale#fixers#standard#GetExecutable(a:buffer) - let l:options = ale#Var(a:buffer, 'javascript_standard_options') + let l:filetype = getbufvar(a:buffer, '&filetype') + let l:options_type = 'javascript_standard_options' + + if l:filetype =~# 'typescript' + let l:options_type = 'typescript_standard_options' + endif + + let l:options = ale#Var(a:buffer, l:options_type) return { \ 'command': ale#node#Executable(a:buffer, l:executable) diff --git a/sources_non_forked/ale/autoload/ale/fixers/standardrb.vim b/sources_non_forked/ale/autoload/ale/fixers/standardrb.vim index fab1e2bc..54330a37 100644 --- a/sources_non_forked/ale/autoload/ale/fixers/standardrb.vim +++ b/sources_non_forked/ale/autoload/ale/fixers/standardrb.vim @@ -9,7 +9,7 @@ function! ale#fixers#standardrb#GetCommand(buffer) abort let l:config = ale#path#FindNearestFile(a:buffer, '.standard.yml') let l:options = ale#Var(a:buffer, 'ruby_standardrb_options') - return ale#handlers#ruby#EscapeExecutable(l:executable, 'standardrb') + return ale#ruby#EscapeExecutable(l:executable, 'standardrb') \ . (!empty(l:config) ? ' --config ' . ale#Escape(l:config) : '') \ . (!empty(l:options) ? ' ' . l:options : '') \ . ' --fix --force-exclusion %t' diff --git a/sources_non_forked/ale/autoload/ale/fixers/stylelint.vim b/sources_non_forked/ale/autoload/ale/fixers/stylelint.vim index 6bfb2fde..6f4cf177 100644 --- a/sources_non_forked/ale/autoload/ale/fixers/stylelint.vim +++ b/sources_non_forked/ale/autoload/ale/fixers/stylelint.vim @@ -3,6 +3,7 @@ call ale#Set('stylelint_executable', 'stylelint') call ale#Set('stylelint_use_global', get(g:, 'ale_use_global_executables', 0)) +call ale#Set('stylelint_options', '') function! ale#fixers#stylelint#GetExecutable(buffer) abort return ale#node#FindExecutable(a:buffer, 'stylelint', [ @@ -13,10 +14,14 @@ endfunction function! ale#fixers#stylelint#Fix(buffer) abort let l:executable = ale#fixers#stylelint#GetExecutable(a:buffer) + let l:options = ale#Var(a:buffer, 'stylelint_options') return { - \ 'command': ale#node#Executable(a:buffer, l:executable) - \ . ' --fix %t', + \ 'command': ale#path#BufferCdString(a:buffer) + \ . ale#node#Executable(a:buffer, l:executable) + \ . ' %t' + \ . ale#Pad(l:options) + \ . ' --fix', \ 'read_temporary_file': 1, \} endfunction diff --git a/sources_non_forked/ale/autoload/ale/fixers/styler.vim b/sources_non_forked/ale/autoload/ale/fixers/styler.vim index 7ff3275c..1c7607bd 100644 --- a/sources_non_forked/ale/autoload/ale/fixers/styler.vim +++ b/sources_non_forked/ale/autoload/ale/fixers/styler.vim @@ -2,13 +2,13 @@ " Description: Fixing R files with styler. call ale#Set('r_styler_executable', 'Rscript') -call ale#Set('r_styler_options', 'tidyverse_style') +call ale#Set('r_styler_options', 'tidyverse_style()') function! ale#fixers#styler#Fix(buffer) abort return { \ 'command': 'Rscript --vanilla -e ' \ . '"suppressPackageStartupMessages(library(styler));' - \ . 'style_file(commandArgs(TRUE), style = ' + \ . 'style_file(commandArgs(TRUE), transformers = ' \ . ale#Var(a:buffer, 'r_styler_options') . ')"' \ . ' %t', \ 'read_temporary_file': 1, diff --git a/sources_non_forked/ale/autoload/ale/go.vim b/sources_non_forked/ale/autoload/ale/go.vim index cd7d9503..4a21e596 100644 --- a/sources_non_forked/ale/autoload/ale/go.vim +++ b/sources_non_forked/ale/autoload/ale/go.vim @@ -25,3 +25,20 @@ function! ale#go#FindProjectRoot(buffer) abort return '' endfunction + + +call ale#Set('go_go111module', '') + +" Return a string setting Go-specific environment variables +function! ale#go#EnvString(buffer) abort + let l:env = '' + + " GO111MODULE - turn go modules behavior on/off + let l:go111module = ale#Var(a:buffer, 'go_go111module') + + if !empty(l:go111module) + let l:env = ale#Env('GO111MODULE', l:go111module) . l:env + endif + + return l:env +endfunction diff --git a/sources_non_forked/ale/autoload/ale/handlers/eslint.vim b/sources_non_forked/ale/autoload/ale/handlers/eslint.vim index 4d533ff2..8d53bdb7 100644 --- a/sources_non_forked/ale/autoload/ale/handlers/eslint.vim +++ b/sources_non_forked/ale/autoload/ale/handlers/eslint.vim @@ -42,7 +42,18 @@ function! ale#handlers#eslint#GetCommand(buffer) abort let l:options = ale#Var(a:buffer, 'javascript_eslint_options') - return ale#node#Executable(a:buffer, l:executable) + " ESLint 6 loads plugins/configs/parsers from the project root + " By default, the project root is simply the CWD of the running process. + " https://github.com/eslint/rfcs/blob/master/designs/2018-simplified-package-loading/README.md + " https://github.com/dense-analysis/ale/issues/2787 + " Identify project root from presence of node_modules dir. + " Note: If node_modules not present yet, can't load local deps anyway. + let l:modules_dir = ale#path#FindNearestDirectory(a:buffer, 'node_modules') + let l:project_dir = !empty(l:modules_dir) ? fnamemodify(l:modules_dir, ':h:h') : '' + let l:cd_command = !empty(l:project_dir) ? ale#path#CdString(l:project_dir) : '' + + return l:cd_command + \ . ale#node#Executable(a:buffer, l:executable) \ . (!empty(l:options) ? ' ' . l:options : '') \ . ' -f json --stdin --stdin-filename %s' endfunction @@ -84,11 +95,22 @@ function! s:CheckForBadConfig(buffer, lines) abort endfunction function! s:parseJSON(buffer, lines) abort +<<<<<<< HEAD try let l:parsed = json_decode(a:lines[-1]) catch return [] endtry +======= + let l:parsed = [] + + for l:line in a:lines + try + let l:parsed = extend(l:parsed, json_decode(l:line)) + catch + endtry + endfor +>>>>>>> 27ad0d07862847896f691309a544a206783c94d6 if type(l:parsed) != v:t_list || empty(l:parsed) return [] diff --git a/sources_non_forked/ale/autoload/ale/handlers/languagetool.vim b/sources_non_forked/ale/autoload/ale/handlers/languagetool.vim index 10e049df..73974ceb 100644 --- a/sources_non_forked/ale/autoload/ale/handlers/languagetool.vim +++ b/sources_non_forked/ale/autoload/ale/handlers/languagetool.vim @@ -2,6 +2,7 @@ " Description: languagetool for markdown files " call ale#Set('languagetool_executable', 'languagetool') +call ale#Set('languagetool_options', '--autoDetect') function! ale#handlers#languagetool#GetExecutable(buffer) abort return ale#Var(a:buffer, 'languagetool_executable') @@ -9,8 +10,10 @@ endfunction function! ale#handlers#languagetool#GetCommand(buffer) abort let l:executable = ale#handlers#languagetool#GetExecutable(a:buffer) + let l:options = ale#Var(a:buffer, 'languagetool_options') - return ale#Escape(l:executable) . ' --autoDetect %s' + return ale#Escape(l:executable) + \ . (empty(l:options) ? '' : ' ' . l:options) . ' %s' endfunction function! ale#handlers#languagetool#HandleOutput(buffer, lines) abort diff --git a/sources_non_forked/ale/autoload/ale/handlers/ruby.vim b/sources_non_forked/ale/autoload/ale/handlers/ruby.vim index c28b8b75..7a1c5765 100644 --- a/sources_non_forked/ale/autoload/ale/handlers/ruby.vim +++ b/sources_non_forked/ale/autoload/ale/handlers/ruby.vim @@ -36,11 +36,3 @@ endfunction function! ale#handlers#ruby#HandleSyntaxErrors(buffer, lines) abort return s:HandleSyntaxError(a:buffer, a:lines) endfunction - -function! ale#handlers#ruby#EscapeExecutable(executable, bundle_exec) abort - let l:exec_args = a:executable =~? 'bundle' - \ ? ' exec ' . a:bundle_exec - \ : '' - - return ale#Escape(a:executable) . l:exec_args -endfunction diff --git a/sources_non_forked/ale/autoload/ale/highlight.vim b/sources_non_forked/ale/autoload/ale/highlight.vim index cb7911e1..82ad57e0 100644 --- a/sources_non_forked/ale/autoload/ale/highlight.vim +++ b/sources_non_forked/ale/autoload/ale/highlight.vim @@ -26,6 +26,25 @@ endif let s:MAX_POS_VALUES = 8 let s:MAX_COL_SIZE = 1073741824 " pow(2, 30) +let s:has_nvim_highlight = exists('*nvim_buf_add_highlight') && exists('*nvim_buf_clear_namespace') + +if s:has_nvim_highlight + let s:ns_id = nvim_create_namespace('ale_highlight') +endif + +" Wrappers are necessary to test this functionality by faking the calls in tests. +function! ale#highlight#nvim_buf_add_highlight(buffer, ns_id, hl_group, line, col_start, col_end) abort + " Ignore all errors for adding highlights. + try + call nvim_buf_add_highlight(a:buffer, a:ns_id, a:hl_group, a:line, a:col_start, a:col_end) + catch + endtry +endfunction + +function! ale#highlight#nvim_buf_clear_namespace(buffer, ns_id, line_start, line_end) abort + call nvim_buf_clear_namespace(a:buffer, a:ns_id, a:line_start, a:line_end) +endfunction + function! ale#highlight#CreatePositions(line, col, end_line, end_col) abort if a:line >= a:end_line " For single lines, just return the one position. @@ -51,15 +70,53 @@ endfunction " except these which have matching loclist item entries. function! ale#highlight#RemoveHighlights() abort - for l:match in getmatches() - if l:match.group =~? '\v^ALE(Style)?(Error|Warning|Info)(Line)?$' - call matchdelete(l:match.id) - endif - endfor + if s:has_nvim_highlight + call ale#highlight#nvim_buf_clear_namespace(bufnr(''), s:ns_id, 0, -1) + else + for l:match in getmatches() + if l:match.group =~? '\v^ALE(Style)?(Error|Warning|Info)(Line)?$' + call matchdelete(l:match.id) + endif + endfor + endif +endfunction + +" Same semantics of matchaddpos but will use nvim_buf_add_highlight if +" available. This involves iterating over the position list, switching from +" 1-based indexing to 0-based indexing, and translating the multiple ways +" that position can be specified for matchaddpos into line + col_start + +" col_end. +function! s:matchaddpos(group, pos_list) abort + if s:has_nvim_highlight + for l:pos in a:pos_list + let l:line = type(l:pos) == v:t_number + \ ? l:pos - 1 + \ : l:pos[0] - 1 + + if type(l:pos) == v:t_number || len(l:pos) == 1 + let l:col_start = 0 + let l:col_end = s:MAX_COL_SIZE + else + let l:col_start = l:pos[1] - 1 + let l:col_end = l:col_start + get(l:pos, 2, 1) + endif + + call ale#highlight#nvim_buf_add_highlight( + \ bufnr(''), + \ s:ns_id, + \ a:group, + \ l:line, + \ l:col_start, + \ l:col_end, + \) + endfor + else + call matchaddpos(a:group, a:pos_list) + endif endfunction function! s:highlight_line(bufnr, lnum, group) abort - call matchaddpos(a:group, [a:lnum]) + call s:matchaddpos(a:group, [a:lnum]) endfunction function! s:highlight_range(bufnr, range, group) abort @@ -72,7 +129,7 @@ function! s:highlight_range(bufnr, range, group) abort \ a:range.end_lnum, \ a:range.end_col \ ), - \ 'matchaddpos(a:group, v:val)' + \ 's:matchaddpos(a:group, v:val)' \) endfunction diff --git a/sources_non_forked/ale/autoload/ale/hover.vim b/sources_non_forked/ale/autoload/ale/hover.vim index 2af35aa4..8fdd288c 100644 --- a/sources_non_forked/ale/autoload/ale/hover.vim +++ b/sources_non_forked/ale/autoload/ale/hover.vim @@ -42,6 +42,11 @@ function! ale#hover#HandleTSServerResponse(conn_id, response) abort \&& exists('*balloon_show') \&& ale#Var(l:options.buffer, 'set_balloons') call balloon_show(a:response.body.displayString) + elseif g:ale_hover_to_preview + call ale#preview#Show(split(a:response.body.displayString, "\n"), { + \ 'filetype': 'ale-preview.message', + \ 'stay_here': 1, + \}) else call ale#util#ShowMessage(a:response.body.displayString) endif @@ -98,6 +103,11 @@ function! ale#hover#HandleLSPResponse(conn_id, response) abort \&& exists('*balloon_show') \&& ale#Var(l:options.buffer, 'set_balloons') call balloon_show(l:str) + elseif g:ale_hover_to_preview + call ale#preview#Show(split(l:str, "\n"), { + \ 'filetype': 'ale-preview.message', + \ 'stay_here': 1, + \}) else call ale#util#ShowMessage(l:str) endif diff --git a/sources_non_forked/ale/autoload/ale/linter.vim b/sources_non_forked/ale/autoload/ale/linter.vim index 78dcd3a2..52cf1c0e 100644 --- a/sources_non_forked/ale/autoload/ale/linter.vim +++ b/sources_non_forked/ale/autoload/ale/linter.vim @@ -12,9 +12,15 @@ let s:linters = {} let s:default_ale_linter_aliases = { \ 'Dockerfile': 'dockerfile', \ 'csh': 'sh', +\ 'javascriptreact': ['javascript', 'jsx'], \ 'plaintex': 'tex', \ 'rmarkdown': 'r', +<<<<<<< HEAD +======= +\ 'rmd': 'r', +>>>>>>> 27ad0d07862847896f691309a544a206783c94d6 \ 'systemverilog': 'verilog', +\ 'typescriptreact': ['typescript', 'tsx'], \ 'verilog_systemverilog': ['verilog_systemverilog', 'verilog'], \ 'vimwiki': 'markdown', \ 'vue': ['vue', 'javascript'], diff --git a/sources_non_forked/ale/autoload/ale/list.vim b/sources_non_forked/ale/autoload/ale/list.vim index e9f3f4ec..f02b8f11 100644 --- a/sources_non_forked/ale/autoload/ale/list.vim +++ b/sources_non_forked/ale/autoload/ale/list.vim @@ -103,6 +103,9 @@ function! s:SetListsImpl(timer_id, buffer, loclist) abort endfor endif + " Save the current view before opening/closing any window + call setbufvar(a:buffer, 'ale_winview', winsaveview()) + " Open a window to show the problems if we need to. " " We'll check if the current buffer's List is not empty here, so the @@ -141,6 +144,8 @@ function! s:SetListsImpl(timer_id, buffer, loclist) abort normal! "\" endif endif + + call s:RestoreViewIfNeeded(a:buffer) endif " If ALE isn't currently checking for more problems, close the window if @@ -151,6 +156,30 @@ function! s:SetListsImpl(timer_id, buffer, loclist) abort endif endfunction +" Try to restore the window view after closing any of the lists to avoid making +" the it moving around, especially useful when on insert mode +function! s:RestoreViewIfNeeded(buffer) abort + let l:saved_view = getbufvar(a:buffer, 'ale_winview', {}) + + " Saved view is empty, can't do anything + if empty(l:saved_view) + return + endif + + " Check wether the cursor has moved since linting was actually requested. If + " the user has indeed moved lines, do nothing + let l:current_view = winsaveview() + + if l:current_view['lnum'] != l:saved_view['lnum'] + return + endif + + " Anchor view by topline if the list is set to open horizontally + if ale#Var(a:buffer, 'list_vertical') == 0 + call winrestview({'topline': l:saved_view['topline']}) + endif +endfunction + function! ale#list#SetLists(buffer, loclist) abort if get(g:, 'ale_set_lists_synchronously') == 1 \|| getbufvar(a:buffer, 'ale_save_event_fired', 0) @@ -174,12 +203,15 @@ function! s:CloseWindowIfNeeded(buffer) abort return endif + let l:did_close_any_list = 0 + try " Only close windows if the quickfix list or loclist is completely empty, " including errors set through other means. if g:ale_set_quickfix if empty(getqflist()) cclose + let l:did_close_any_list = 1 endif else let l:win_ids = s:WinFindBuf(a:buffer) @@ -187,10 +219,18 @@ function! s:CloseWindowIfNeeded(buffer) abort for l:win_id in l:win_ids if g:ale_set_loclist && empty(getloclist(l:win_id)) lclose +<<<<<<< HEAD +======= + let l:did_close_any_list = 1 +>>>>>>> 27ad0d07862847896f691309a544a206783c94d6 endif endfor endif " Ignore 'Cannot close last window' errors. catch /E444/ endtry + + if l:did_close_any_list + call s:RestoreViewIfNeeded(a:buffer) + endif endfunction diff --git a/sources_non_forked/ale/autoload/ale/lsp.vim b/sources_non_forked/ale/autoload/ale/lsp.vim index 017096cd..2509174e 100644 --- a/sources_non_forked/ale/autoload/ale/lsp.vim +++ b/sources_non_forked/ale/autoload/ale/lsp.vim @@ -37,6 +37,7 @@ function! ale#lsp#Register(executable_or_address, project, init_options) abort \ 'init_queue': [], \ 'capabilities': { \ 'hover': 0, + \ 'rename': 0, \ 'references': 0, \ 'completion': 0, \ 'completion_trigger_characters': [], @@ -199,6 +200,10 @@ function! s:UpdateCapabilities(conn, capabilities) abort let a:conn.capabilities.references = 1 endif + if get(a:capabilities, 'renameProvider') is v:true + let a:conn.capabilities.rename = 1 + endif + if !empty(get(a:capabilities, 'completionProvider')) let a:conn.capabilities.completion = 1 endif @@ -317,6 +322,7 @@ function! ale#lsp#MarkConnectionAsTsserver(conn_id) abort let l:conn.capabilities.completion_trigger_characters = ['.'] let l:conn.capabilities.definition = 1 let l:conn.capabilities.symbol_search = 1 + let l:conn.capabilities.rename = 1 endfunction function! s:SendInitMessage(conn) abort diff --git a/sources_non_forked/ale/autoload/ale/lsp/message.vim b/sources_non_forked/ale/autoload/ale/lsp/message.vim index b6b14a22..5b0cb8b7 100644 --- a/sources_non_forked/ale/autoload/ale/lsp/message.vim +++ b/sources_non_forked/ale/autoload/ale/lsp/message.vim @@ -162,3 +162,13 @@ function! ale#lsp#message#DidChangeConfiguration(buffer, config) abort \ 'settings': a:config, \}] endfunction + +function! ale#lsp#message#Rename(buffer, line, column, new_name) abort + return [0, 'textDocument/rename', { + \ 'textDocument': { + \ 'uri': ale#path#ToURI(expand('#' . a:buffer . ':p')), + \ }, + \ 'position': {'line': a:line - 1, 'character': a:column - 1}, + \ 'newName': a:new_name, + \}] +endfunction diff --git a/sources_non_forked/ale/autoload/ale/lsp/tsserver_message.vim b/sources_non_forked/ale/autoload/ale/lsp/tsserver_message.vim index d6919516..b9fafaa0 100644 --- a/sources_non_forked/ale/autoload/ale/lsp/tsserver_message.vim +++ b/sources_non_forked/ale/autoload/ale/lsp/tsserver_message.vim @@ -36,12 +36,14 @@ function! ale#lsp#tsserver_message#Geterr(buffer) abort return [1, 'ts@geterr', {'files': [expand('#' . a:buffer . ':p')]}] endfunction -function! ale#lsp#tsserver_message#Completions(buffer, line, column, prefix) abort +function! ale#lsp#tsserver_message#Completions( +\ buffer, line, column, prefix, include_external) abort return [0, 'ts@completions', { \ 'line': a:line, \ 'offset': a:column, \ 'file': expand('#' . a:buffer . ':p'), \ 'prefix': a:prefix, + \ 'includeExternalModuleExports': a:include_external, \}] endfunction @@ -77,3 +79,27 @@ function! ale#lsp#tsserver_message#Quickinfo(buffer, line, column) abort \ 'file': expand('#' . a:buffer . ':p'), \}] endfunction + +function! ale#lsp#tsserver_message#Rename( +\ buffer, line, column, find_in_comments, find_in_strings) abort + return [0, 'ts@rename', { + \ 'line': a:line, + \ 'offset': a:column, + \ 'file': expand('#' . a:buffer . ':p'), + \ 'arguments': { + \ 'findInComments': a:find_in_comments, + \ 'findInStrings': a:find_in_strings, + \ } + \}] +endfunction + +function! ale#lsp#tsserver_message#OrganizeImports(buffer) abort + return [0, 'ts@organizeImports', { + \ 'scope': { + \ 'type': 'file', + \ 'args': { + \ 'file': expand('#' . a:buffer . ':p'), + \ }, + \ }, + \}] +endfunction diff --git a/sources_non_forked/ale/autoload/ale/lsp_linter.vim b/sources_non_forked/ale/autoload/ale/lsp_linter.vim index 190a16b4..e4148ceb 100644 --- a/sources_non_forked/ale/autoload/ale/lsp_linter.vim +++ b/sources_non_forked/ale/autoload/ale/lsp_linter.vim @@ -130,6 +130,12 @@ function! ale#lsp_linter#HandleLSPResponse(conn_id, response) abort call s:HandleLSPErrorMessage(l:linter_name, a:response) elseif l:method is# 'textDocument/publishDiagnostics' call s:HandleLSPDiagnostics(a:conn_id, a:response) + elseif l:method is# 'window/showMessage' + call ale#lsp_window#HandleShowMessage( + \ s:lsp_linter_map[a:conn_id], + \ g:ale_lsp_show_message_format, + \ a:response.params + \) elseif get(a:response, 'type', '') is# 'event' \&& get(a:response, 'event', '') is# 'semanticDiag' call s:HandleTSServerDiagnostics(a:response, 'semantic') diff --git a/sources_non_forked/ale/autoload/ale/lsp_window.vim b/sources_non_forked/ale/autoload/ale/lsp_window.vim new file mode 100644 index 00000000..9a27f2f1 --- /dev/null +++ b/sources_non_forked/ale/autoload/ale/lsp_window.vim @@ -0,0 +1,58 @@ +" Author: suoto +" Description: Handling of window/* LSP methods, although right now only +" handles window/showMessage + +" Constants for message type codes +let s:LSP_MESSAGE_TYPE_DISABLED = 0 +let s:LSP_MESSAGE_TYPE_ERROR = 1 +let s:LSP_MESSAGE_TYPE_WARNING = 2 +let s:LSP_MESSAGE_TYPE_INFORMATION = 3 +let s:LSP_MESSAGE_TYPE_LOG = 4 + +" Translate strings from the user config to a number so we can check +" severities +let s:CFG_TO_LSP_SEVERITY = { +\ 'disabled': s:LSP_MESSAGE_TYPE_DISABLED, +\ 'error': s:LSP_MESSAGE_TYPE_ERROR, +\ 'warning': s:LSP_MESSAGE_TYPE_WARNING, +\ 'information': s:LSP_MESSAGE_TYPE_INFORMATION, +\ 'info': s:LSP_MESSAGE_TYPE_INFORMATION, +\ 'log': s:LSP_MESSAGE_TYPE_LOG +\} + +" Handle window/showMessage response. +" - details: dict containing linter name and format (g:ale_lsp_show_message_format) +" - params: dict with the params for the call in the form of {type: number, message: string} +function! ale#lsp_window#HandleShowMessage(linter_name, format, params) abort + let l:message = a:params.message + let l:type = a:params.type + + " Get the configured severity level threshold and check if the message + " should be displayed or not + let l:configured_severity = tolower(get(g:, 'ale_lsp_show_message_severity', 'error')) + " If the user has configured with a value we can't find on the conversion + " dict, fall back to warning + let l:cfg_severity_threshold = get(s:CFG_TO_LSP_SEVERITY, l:configured_severity, s:LSP_MESSAGE_TYPE_WARNING) + + if l:type > l:cfg_severity_threshold + return + endif + + " Severity will depend on the message type + if l:type is# s:LSP_MESSAGE_TYPE_ERROR + let l:severity = g:ale_echo_msg_error_str + elseif l:type is# s:LSP_MESSAGE_TYPE_INFORMATION + let l:severity = g:ale_echo_msg_info_str + elseif l:type is# s:LSP_MESSAGE_TYPE_LOG + let l:severity = g:ale_echo_msg_log_str + else + " Default to warning just in case + let l:severity = g:ale_echo_msg_warning_str + endif + + let l:string = substitute(a:format, '\V%severity%', l:severity, 'g') + let l:string = substitute(l:string, '\V%linter%', a:linter_name, 'g') + let l:string = substitute(l:string, '\V%s\>', l:message, 'g') + + call ale#util#ShowMessage(l:string) +endfunction diff --git a/sources_non_forked/ale/autoload/ale/organize_imports.vim b/sources_non_forked/ale/autoload/ale/organize_imports.vim new file mode 100644 index 00000000..bc9b829e --- /dev/null +++ b/sources_non_forked/ale/autoload/ale/organize_imports.vim @@ -0,0 +1,59 @@ +" Author: Jerko Steiner +" Description: Organize imports support for tsserver +" +function! ale#organize_imports#HandleTSServerResponse(conn_id, response) abort + if get(a:response, 'command', '') isnot# 'organizeImports' + return + endif + + if get(a:response, 'success', v:false) isnot v:true + return + endif + + let l:file_code_edits = a:response.body + + call ale#code_action#HandleCodeAction({ + \ 'description': 'Organize Imports', + \ 'changes': l:file_code_edits, + \}) +endfunction + +function! s:OnReady(linter, lsp_details) abort + let l:id = a:lsp_details.connection_id + + if a:linter.lsp isnot# 'tsserver' + call ale#util#Execute('echom ''OrganizeImports currently only works with tsserver''') + + return + endif + + let l:buffer = a:lsp_details.buffer + + let l:Callback = function('ale#organize_imports#HandleTSServerResponse') + + call ale#lsp#RegisterCallback(l:id, l:Callback) + + let l:message = ale#lsp#tsserver_message#OrganizeImports(l:buffer) + + let l:request_id = ale#lsp#Send(l:id, l:message) +endfunction + +function! s:OrganizeImports(linter) abort + let l:buffer = bufnr('') + let [l:line, l:column] = getpos('.')[1:2] + + if a:linter.lsp isnot# 'tsserver' + let l:column = min([l:column, len(getline(l:line))]) + endif + + let l:Callback = function('s:OnReady') + call ale#lsp_linter#StartLSP(l:buffer, a:linter, l:Callback) +endfunction + +function! ale#organize_imports#Execute() abort + for l:linter in ale#linter#Get(&filetype) + if !empty(l:linter.lsp) + call s:OrganizeImports(l:linter) + endif + endfor +endfunction diff --git a/sources_non_forked/ale/autoload/ale/path.vim b/sources_non_forked/ale/autoload/ale/path.vim index 84c26d0a..30550503 100644 --- a/sources_non_forked/ale/autoload/ale/path.vim +++ b/sources_non_forked/ale/autoload/ale/path.vim @@ -54,14 +54,14 @@ function! ale#path#FindNearestDirectory(buffer, directory_name) abort return '' endfunction -" Given a buffer, a string to search for, an a global fallback for when +" Given a buffer, a string to search for, and a global fallback for when " the search fails, look for a file in parent paths, and if that fails, " use the global fallback path instead. function! ale#path#ResolveLocalPath(buffer, search_string, global_fallback) abort " Search for a locally installed file first. let l:path = ale#path#FindNearestFile(a:buffer, a:search_string) - " If the serach fails, try the global executable instead. + " If the search fails, try the global executable instead. if empty(l:path) let l:path = a:global_fallback endif diff --git a/sources_non_forked/ale/autoload/ale/rename.vim b/sources_non_forked/ale/autoload/ale/rename.vim new file mode 100644 index 00000000..02b7b579 --- /dev/null +++ b/sources_non_forked/ale/autoload/ale/rename.vim @@ -0,0 +1,225 @@ +" Author: Jerko Steiner +" Description: Rename symbol support for LSP / tsserver + +let s:rename_map = {} + +" Used to get the rename map in tests. +function! ale#rename#GetMap() abort + return deepcopy(s:rename_map) +endfunction + +" Used to set the rename map in tests. +function! ale#rename#SetMap(map) abort + let s:rename_map = a:map +endfunction + +function! ale#rename#ClearLSPData() abort + let s:rename_map = {} +endfunction + +let g:ale_rename_tsserver_find_in_comments = get(g:, 'ale_rename_tsserver_find_in_comments') +let g:ale_rename_tsserver_find_in_strings = get(g:, 'ale_rename_tsserver_find_in_strings') + +function! s:message(message) abort + call ale#util#Execute('echom ' . string(a:message)) +endfunction + +function! ale#rename#HandleTSServerResponse(conn_id, response) abort + if get(a:response, 'command', '') isnot# 'rename' + return + endif + + if !has_key(s:rename_map, a:response.request_seq) + return + endif + + let l:old_name = s:rename_map[a:response.request_seq].old_name + let l:new_name = s:rename_map[a:response.request_seq].new_name + call remove(s:rename_map, a:response.request_seq) + + if get(a:response, 'success', v:false) is v:false + let l:message = get(a:response, 'message', 'unknown') + call s:message('Error renaming "' . l:old_name . '" to: "' . l:new_name + \ . '". Reason: ' . l:message) + + return + endif + + let l:changes = [] + + for l:response_item in a:response.body.locs + let l:filename = l:response_item.file + let l:text_changes = [] + + for l:loc in l:response_item.locs + call add(l:text_changes, { + \ 'start': { + \ 'line': l:loc.start.line, + \ 'offset': l:loc.start.offset, + \ }, + \ 'end': { + \ 'line': l:loc.end.line, + \ 'offset': l:loc.end.offset, + \ }, + \ 'newText': l:new_name, + \}) + endfor + + call add(l:changes, { + \ 'fileName': l:filename, + \ 'textChanges': l:text_changes, + \}) + endfor + + if empty(l:changes) + call s:message('Error renaming "' . l:old_name . '" to: "' . l:new_name . '"') + + return + endif + + call ale#code_action#HandleCodeAction({ + \ 'description': 'rename', + \ 'changes': l:changes, + \}) +endfunction + +function! ale#rename#HandleLSPResponse(conn_id, response) abort + if has_key(a:response, 'id') + \&& has_key(s:rename_map, a:response.id) + call remove(s:rename_map, a:response.id) + + if !has_key(a:response, 'result') + call s:message('No rename result received from server') + + return + endif + + let l:workspace_edit = a:response.result + + if !has_key(l:workspace_edit, 'changes') || empty(l:workspace_edit.changes) + call s:message('No changes received from server') + + return + endif + + let l:changes = [] + + for l:file_name in keys(l:workspace_edit.changes) + let l:text_edits = l:workspace_edit.changes[l:file_name] + let l:text_changes = [] + + for l:edit in l:text_edits + let l:range = l:edit.range + let l:new_text = l:edit.newText + + call add(l:text_changes, { + \ 'start': { + \ 'line': l:range.start.line + 1, + \ 'offset': l:range.start.character + 1, + \ }, + \ 'end': { + \ 'line': l:range.end.line + 1, + \ 'offset': l:range.end.character + 1, + \ }, + \ 'newText': l:new_text, + \}) + endfor + + call add(l:changes, { + \ 'fileName': ale#path#FromURI(l:file_name), + \ 'textChanges': l:text_changes, + \}) + endfor + + call ale#code_action#HandleCodeAction({ + \ 'description': 'rename', + \ 'changes': l:changes, + \}) + endif +endfunction + +function! s:OnReady(line, column, old_name, new_name, linter, lsp_details) abort + let l:id = a:lsp_details.connection_id + + if !ale#lsp#HasCapability(l:id, 'rename') + return + endif + + let l:buffer = a:lsp_details.buffer + + let l:Callback = a:linter.lsp is# 'tsserver' + \ ? function('ale#rename#HandleTSServerResponse') + \ : function('ale#rename#HandleLSPResponse') + + call ale#lsp#RegisterCallback(l:id, l:Callback) + + if a:linter.lsp is# 'tsserver' + let l:message = ale#lsp#tsserver_message#Rename( + \ l:buffer, + \ a:line, + \ a:column, + \ g:ale_rename_tsserver_find_in_comments, + \ g:ale_rename_tsserver_find_in_strings, + \) + else + " Send a message saying the buffer has changed first, or the + " rename position probably won't make sense. + call ale#lsp#NotifyForChanges(l:id, l:buffer) + + let l:message = ale#lsp#message#Rename( + \ l:buffer, + \ a:line, + \ a:column, + \ a:new_name + \) + endif + + let l:request_id = ale#lsp#Send(l:id, l:message) + + let s:rename_map[l:request_id] = { + \ 'new_name': a:new_name, + \ 'old_name': a:old_name, + \} +endfunction + +function! s:ExecuteRename(linter, old_name, new_name) abort + let l:buffer = bufnr('') + let [l:line, l:column] = getpos('.')[1:2] + + if a:linter.lsp isnot# 'tsserver' + let l:column = min([l:column, len(getline(l:line))]) + endif + + let l:Callback = function( + \ 's:OnReady', [l:line, l:column, a:old_name, a:new_name]) + call ale#lsp_linter#StartLSP(l:buffer, a:linter, l:Callback) +endfunction + +function! ale#rename#Execute() abort + let l:lsp_linters = [] + + for l:linter in ale#linter#Get(&filetype) + if !empty(l:linter.lsp) + call add(l:lsp_linters, l:linter) + endif + endfor + + if empty(l:lsp_linters) + call s:message('No active LSPs') + + return + endif + + let l:old_name = expand('') + let l:new_name = ale#util#Input('New name: ', l:old_name) + + if empty(l:new_name) + call s:message('New name cannot be empty!') + + return + endif + + for l:lsp_linter in l:lsp_linters + call s:ExecuteRename(l:lsp_linter, l:old_name, l:new_name) + endfor +endfunction diff --git a/sources_non_forked/ale/autoload/ale/ruby.vim b/sources_non_forked/ale/autoload/ale/ruby.vim index 15e835c9..d941bb2c 100644 --- a/sources_non_forked/ale/autoload/ale/ruby.vim +++ b/sources_non_forked/ale/autoload/ale/ruby.vim @@ -74,3 +74,10 @@ function! ale#ruby#HandleRubocopOutput(buffer, lines) abort return l:output endfunction +function! ale#ruby#EscapeExecutable(executable, bundle_exec) abort + let l:exec_args = a:executable =~? 'bundle' + \ ? ' exec ' . a:bundle_exec + \ : '' + + return ale#Escape(a:executable) . l:exec_args +endfunction diff --git a/sources_non_forked/ale/autoload/ale/sign.vim b/sources_non_forked/ale/autoload/ale/sign.vim index 7395b0e2..db0e1ab6 100644 --- a/sources_non_forked/ale/autoload/ale/sign.vim +++ b/sources_non_forked/ale/autoload/ale/sign.vim @@ -14,12 +14,16 @@ let g:ale_sign_style_error = get(g:, 'ale_sign_style_error', g:ale_sign_error) let g:ale_sign_warning = get(g:, 'ale_sign_warning', '--') let g:ale_sign_style_warning = get(g:, 'ale_sign_style_warning', g:ale_sign_warning) let g:ale_sign_info = get(g:, 'ale_sign_info', g:ale_sign_warning) +let g:ale_sign_priority = get(g:, 'ale_sign_priority', 30) " This variable sets an offset which can be set for sign IDs. " This ID can be changed depending on what IDs are set for other plugins. " The dummy sign will use the ID exactly equal to the offset. let g:ale_sign_offset = get(g:, 'ale_sign_offset', 1000000) " This flag can be set to 1 to keep sign gutter always open let g:ale_sign_column_always = get(g:, 'ale_sign_column_always', 0) +let g:ale_sign_highlight_linenrs = get(g:, 'ale_sign_highlight_linenrs', 0) + +let s:supports_sign_groups = has('nvim-0.4.2') || (v:version >= 801 && has('patch614')) if !hlexists('ALEErrorSign') highlight link ALEErrorSign error @@ -82,6 +86,34 @@ execute 'sign define ALEInfoSign text=' . s:EscapeSignText(g:ale_sign_info) \ . ' texthl=ALEInfoSign linehl=ALEInfoLine' sign define ALEDummySign +if g:ale_sign_highlight_linenrs && has('nvim-0.3.2') + if !hlexists('ALEErrorSignLineNr') + highlight link ALEErrorSignLineNr CursorLineNr + endif + + if !hlexists('ALEStyleErrorSignLineNr') + highlight link ALEStyleErrorSignLineNr CursorLineNr + endif + + if !hlexists('ALEWarningSignLineNr') + highlight link ALEWarningSignLineNr CursorLineNr + endif + + if !hlexists('ALEStyleWarningSignLineNr') + highlight link ALEStyleWarningSignLineNr CursorLineNr + endif + + if !hlexists('ALEInfoSignLineNr') + highlight link ALEInfoSignLineNr CursorLineNr + endif + + sign define ALEErrorSign numhl=ALEErrorSignLineNr + sign define ALEStyleErrorSign numhl=ALEStyleErrorSignLineNr + sign define ALEWarningSign numhl=ALEWarningSignLineNr + sign define ALEStyleWarningSign numhl=ALEStyleWarningSignLineNr + sign define ALEInfoSign numhl=ALEInfoSignLineNr +endif + function! ale#sign#GetSignName(sublist) abort let l:priority = g:ale#util#style_warning_priority @@ -118,24 +150,59 @@ function! ale#sign#GetSignName(sublist) abort return 'ALEErrorSign' endfunction +function! s:PriorityCmd() abort + if s:supports_sign_groups + return ' priority=' . g:ale_sign_priority . ' ' + else + return '' + endif +endfunction + +function! s:GroupCmd() abort + if s:supports_sign_groups + return ' group=ale ' + else + return ' ' + endif +endfunction + " Read sign data for a buffer to a list of lines. function! ale#sign#ReadSigns(buffer) abort redir => l:output - silent execute 'sign place buffer=' . a:buffer + silent execute 'sign place ' . s:GroupCmd() . s:PriorityCmd() + \ . ' buffer=' . a:buffer redir end return split(l:output, "\n") endfunction +function! ale#sign#ParsePattern() abort + if s:supports_sign_groups + " Matches output like : + " line=4 id=1 group=ale name=ALEErrorSign + " строка=1 id=1000001 группа=ale имя=ALEErrorSign + " 行=1 識別子=1000001 グループ=ale 名前=ALEWarningSign + " línea=12 id=1000001 grupo=ale nombre=ALEWarningSign + " riga=1 id=1000001 gruppo=ale nome=ALEWarningSign + " Zeile=235 id=1000001 Gruppe=ale Name=ALEErrorSign + let l:pattern = '\v^.*\=(\d+).*\=(\d+).*\=ale>.*\=(ALE[a-zA-Z]+Sign)' + else + " Matches output like : + " line=4 id=1 name=ALEErrorSign + " строка=1 id=1000001 имя=ALEErrorSign + " 行=1 識別子=1000001 名前=ALEWarningSign + " línea=12 id=1000001 nombre=ALEWarningSign + " riga=1 id=1000001 nome=ALEWarningSign + " Zeile=235 id=1000001 Name=ALEErrorSign + let l:pattern = '\v^.*\=(\d+).*\=(\d+).*\=(ALE[a-zA-Z]+Sign)' + endif + + return l:pattern +endfunction + " Given a list of lines for sign output, return a List of [line, id, group] function! ale#sign#ParseSigns(line_list) abort - " Matches output like : - " line=4 id=1 name=ALEErrorSign - " строка=1 id=1000001 имя=ALEErrorSign - " 行=1 識別子=1000001 名前=ALEWarningSign - " línea=12 id=1000001 nombre=ALEWarningSign - " riga=1 id=1000001, nome=ALEWarningSign - let l:pattern = '\v^.*\=(\d+).*\=(\d+).*\=(ALE[a-zA-Z]+Sign)' + let l:pattern =ale#sign#ParsePattern() let l:result = [] let l:is_dummy_sign_set = 0 @@ -290,8 +357,10 @@ function! ale#sign#GetSignCommands(buffer, was_sign_set, sign_map) abort if !l:is_dummy_sign_set && (!empty(a:sign_map) || g:ale_sign_column_always) call add(l:command_list, 'sign place ' \ . g:ale_sign_offset - \ . ' line=1 name=ALEDummySign buffer=' - \ . a:buffer + \ . s:GroupCmd() + \ . s:PriorityCmd() + \ . ' line=1 name=ALEDummySign ' + \ . ' buffer=' . a:buffer \) let l:is_dummy_sign_set = 1 endif @@ -308,6 +377,8 @@ function! ale#sign#GetSignCommands(buffer, was_sign_set, sign_map) abort if index(l:info.current_id_list, l:info.new_id) < 0 call add(l:command_list, 'sign place ' \ . (l:info.new_id) + \ . s:GroupCmd() + \ . s:PriorityCmd() \ . ' line=' . l:line_str \ . ' name=' . (l:info.new_name) \ . ' buffer=' . a:buffer @@ -322,6 +393,7 @@ function! ale#sign#GetSignCommands(buffer, was_sign_set, sign_map) abort if l:current_id isnot l:info.new_id call add(l:command_list, 'sign unplace ' \ . l:current_id + \ . s:GroupCmd() \ . ' buffer=' . a:buffer \) endif @@ -332,6 +404,7 @@ function! ale#sign#GetSignCommands(buffer, was_sign_set, sign_map) abort if l:is_dummy_sign_set && !g:ale_sign_column_always call add(l:command_list, 'sign unplace ' \ . g:ale_sign_offset + \ . s:GroupCmd() \ . ' buffer=' . a:buffer \) endif @@ -386,3 +459,12 @@ function! ale#sign#SetSigns(buffer, loclist) abort highlight link SignColumn ALESignColumnWithoutErrors endif endfunction + +" Remove all signs. +function! ale#sign#Clear() abort + if s:supports_sign_groups + sign unplace group=ale * + else + sign unplace * + endif +endfunction diff --git a/sources_non_forked/ale/autoload/ale/util.vim b/sources_non_forked/ale/autoload/ale/util.vim index e7563608..99cd856a 100644 --- a/sources_non_forked/ale/autoload/ale/util.vim +++ b/sources_non_forked/ale/autoload/ale/util.vim @@ -477,3 +477,6 @@ function! ale#util#FindItemAtCursor(buffer) abort return [l:info, l:loc] endfunction +function! ale#util#Input(message, value) abort + return input(a:message, a:value) +endfunction diff --git a/sources_non_forked/ale/autoload/asyncomplete/sources/ale.vim b/sources_non_forked/ale/autoload/asyncomplete/sources/ale.vim new file mode 100644 index 00000000..ce793773 --- /dev/null +++ b/sources_non_forked/ale/autoload/asyncomplete/sources/ale.vim @@ -0,0 +1,26 @@ +function! asyncomplete#sources#ale#get_source_options(...) abort + let l:default = extend({ + \ 'name': 'ale', + \ 'completor': function('asyncomplete#sources#ale#completor'), + \ 'whitelist': ['*'], + \ 'triggers': asyncomplete#sources#ale#get_triggers(), + \ }, a:0 >= 1 ? a:1 : {}) + + return extend(l:default, {'refresh_pattern': '\k\+$'}) +endfunction + +function! asyncomplete#sources#ale#get_triggers() abort + let l:triggers = ale#completion#GetAllTriggers() + let l:triggers['*'] = l:triggers[''] + + return l:triggers +endfunction + +function! asyncomplete#sources#ale#completor(options, context) abort + let l:keyword = matchstr(a:context.typed, '\w\+$') + let l:startcol = a:context.col - len(l:keyword) + + call ale#completion#GetCompletions('ale-callback', { 'callback': {completions -> + \ asyncomplete#complete(a:options.name, a:context, l:startcol, completions) + \ }}) +endfunction diff --git a/sources_non_forked/ale/doc/ale-ada.txt b/sources_non_forked/ale/doc/ale-ada.txt index 93e3261a..2ac30c0a 100644 --- a/sources_non_forked/ale/doc/ale-ada.txt +++ b/sources_non_forked/ale/doc/ale-ada.txt @@ -21,5 +21,16 @@ g:ale_ada_gcc_options *g:ale_ada_gcc_options* This variable can be set to pass additional options to gcc. +=============================================================================== +gnatpp *ale-ada-gnatpp* + +g:ale_ada_gnatpp_options *g:ale_ada_gnatpp_options* + *b:ale_ada_gnatpp_options* + Type: |String| + Default: `''` + + This variable can be set to pass extra options to the gnatpp fixer. + + =============================================================================== vim:tw=78:ts=2:sts=2:sw=2:ft=help:norl: diff --git a/sources_non_forked/ale/doc/ale-cs.txt b/sources_non_forked/ale/doc/ale-cs.txt index abcc43eb..b62de553 100644 --- a/sources_non_forked/ale/doc/ale-cs.txt +++ b/sources_non_forked/ale/doc/ale-cs.txt @@ -11,6 +11,7 @@ csc *ale-cs-csc* The |ale-cs-csc| linter checks for semantic errors when files are opened or saved. +<<<<<<< HEAD See |ale-lint-file-linters| for more information on linters which do not check for problems while you type. @@ -27,6 +28,23 @@ csc *ale-cs-csc* The down is that the csc compiler does not support the -sytax option any more and therefore |ale-cs-csc| linter doese not offer any as you type syntax checking like the |ale-cs-mcsc| linter doesn't. +======= + + See |ale-lint-file-linters| for more information on linters which do not + check for problems while you type. + + The csc linter uses the mono csc compiler, providing full C# 7 and newer + support, to generate a temporary module target file (/t:module). The module + includes all '*.cs' files contained in the directory tree rooted at the path + defined by the |g:ale_cs_csc_source| or |b:ale_cs_csc_source| variable and + all sub directories. + + It will in future replace the |ale-cs-mcs| and |ale-cs-mcsc| linters as both + utilize the mcsc compiler which, according to the mono project, is no longer + actively developed, and only receives maintenance updates. However, because + the csc compiler does not support the -syntax option, this linter does not + offer any as-you-type syntax checking, similar to the |ale-cs-mcsc| linter. +>>>>>>> 27ad0d07862847896f691309a544a206783c94d6 The paths to search for additional assembly files can be specified using the |g:ale_cs_csc_assembly_path| or |b:ale_cs_csc_assembly_path| variables. diff --git a/sources_non_forked/ale/doc/ale-d.txt b/sources_non_forked/ale/doc/ale-d.txt index 55596062..72349a20 100644 --- a/sources_non_forked/ale/doc/ale-d.txt +++ b/sources_non_forked/ale/doc/ale-d.txt @@ -1,6 +1,15 @@ =============================================================================== ALE D Integration *ale-d-options* +=============================================================================== +dfmt *ale-d-dfmt* + +g:ale_d_dfmt_options *g:ale_d_dfmt_options* + *b:ale_d_dfmt_options* + Type: |String| + Default: `''` + +This variable can be set to pass additional options to the dfmt fixer. =============================================================================== dls *ale-d-dls* diff --git a/sources_non_forked/ale/doc/ale-development.txt b/sources_non_forked/ale/doc/ale-development.txt index 16b16483..faa570c1 100644 --- a/sources_non_forked/ale/doc/ale-development.txt +++ b/sources_non_forked/ale/doc/ale-development.txt @@ -184,13 +184,12 @@ tests: https://github.com/junegunn/vader.vim See |ale-development-linter-tests| for more information on how to write linter tests. -When you add new linters or fixers, make sure to add them into the table in -the README, and also into the |ale-support| list in the main help file. If you -forget to keep them both in sync, you should see an error like the following -in Travis CI. > - +When you add new linters or fixers, make sure to add them into the tables in +supported-tools.md and |ale-supported-languages-and-tools.txt|. If you forget to +keep them both in sync, you should see an error like the following in Travis CI. +> ======================================== - diff README.md and doc/ale.txt tables + diff supported-tools.md and doc/ale-supported-languages-and-tools.txt tables ======================================== Differences follow: diff --git a/sources_non_forked/ale/doc/ale-elm.txt b/sources_non_forked/ale/doc/ale-elm.txt index bb7a6132..b1510241 100644 --- a/sources_non_forked/ale/doc/ale-elm.txt +++ b/sources_non_forked/ale/doc/ale-elm.txt @@ -29,23 +29,55 @@ g:ale_elm_format_options *g:ale_elm_format_options* This variable can be set to pass additional options to elm-format. =============================================================================== -elm-lsp *ale-elm-elm-lsp* +elm-ls *ale-elm-elm-ls* -g:ale_elm_lsp_executable *g:ale_elm_lsp_executable* - *b:ale_elm_lsp_executable* +g:ale_elm_ls_executable *g:ale_elm_ls_executable* + *b:ale_elm_ls_executable* Type: |String| - Default: `'elm-lsp'` + Default: `'elm-language-server'` See |ale-integrations-local-executables| -g:ale_elm_lsp_use_global *g:ale_elm_lsp_use_global* - *b:ale_elm_lsp_use_global* +g:ale_elm_ls_use_global *g:ale_elm_ls_use_global* + *b:ale_elm_ls_use_global* Type: |Number| - Default: `get(g:, 'ale_use_global_executables', 0)` + Default: `get(g:, 'ale_use_global_executables', 1)` See |ale-integrations-local-executables| + +g:ale_elm_ls_elm_path *g:ale_elm_ls_elm_path* + *b:ale_elm_ls_elm_path* + Type: |String| + Default: `''` + + See |ale-integrations-local-executables| + + +g:ale_elm_ls_elm_format_path *g:ale_elm_ls_elm_format_path* + *b:ale_elm_ls_elm_format_path* + Type: |String| + Default: `''` + + See |ale-integrations-local-executables| + + +g:ale_elm_ls_elm_test_path *g:ale_elm_ls_elm_test_path* + *b:ale_elm_ls_elm_test_path* + Type: |String| + Default: `''` + + See |ale-integrations-local-executables| + + +g:ale_elm_ls_elm_analyse_trigger *g:ale_elm_ls_elm_analyse_trigger* + *b:ale_elm_ls_elm_analyse_trigger* + Type: |String| + Default: `'change'` + + One of 'change', 'save' or 'never' + =============================================================================== elm-make *ale-elm-elm-make* diff --git a/sources_non_forked/ale/doc/ale-go.txt b/sources_non_forked/ale/doc/ale-go.txt index 611e3fdd..be53783e 100644 --- a/sources_non_forked/ale/doc/ale-go.txt +++ b/sources_non_forked/ale/doc/ale-go.txt @@ -30,6 +30,16 @@ g:ale_go_go_executable *g:ale_go_go_options* the `gomod` fixer. +g:ale_go_go111module *g:ale_go_go111module* + *b:ale_go_go111module* + Type: |String| + Default: `''` + + Override the value of the `$GO111MODULE` environment variable for + golang tools. + + + =============================================================================== bingo *ale-go-bingo* diff --git a/sources_non_forked/ale/doc/ale-haskell.txt b/sources_non_forked/ale/doc/ale-haskell.txt index e2073e37..5dd3ec15 100644 --- a/sources_non_forked/ale/doc/ale-haskell.txt +++ b/sources_non_forked/ale/doc/ale-haskell.txt @@ -12,6 +12,7 @@ g:ale_haskell_brittany_executable *g:ale_haskell_brittany_executable* This variable can be changed to use a different executable for brittany. + =============================================================================== floskell *ale-haskell-floskell* @@ -22,6 +23,7 @@ g:ale_haskell_floskell_executable *g:ale_haskell_floskell_executable* This variable can be changed to use a different executable for floskell. + =============================================================================== ghc *ale-haskell-ghc* @@ -32,6 +34,7 @@ g:ale_haskell_ghc_options *g:ale_haskell_ghc_options* This variable can be changed to modify flags given to ghc. + =============================================================================== ghc-mod *ale-haskell-ghc-mod* @@ -42,6 +45,7 @@ g:ale_haskell_ghc_mod_executable *g:ale_haskell_ghc_mod_executable* This variable can be changed to use a different executable for ghc-mod. + =============================================================================== cabal-ghc *ale-haskell-cabal-ghc* @@ -53,6 +57,7 @@ g:ale_haskell_cabal_ghc_options *g:ale_haskell_cabal_ghc_options* This variable can be changed to modify flags given to ghc through cabal exec. + =============================================================================== hdevtools *ale-haskell-hdevtools* @@ -87,6 +92,18 @@ g:ale_haskell_hfmt_executable *g:ale_haskell_hfmt_executable* This variable can be changed to use a different executable for hfmt. + +=============================================================================== +hindent *ale-haskell-hindent* + +g:ale_haskell_hindent_executable *g:ale_haskell_hindent_executable* + *b:ale_haskell_hindent_executable* + Type: |String| + Default: `'hindent'` + + This variable can be changed to use a different executable for hindent. + + =============================================================================== hlint *ale-haskell-hlint* @@ -106,6 +123,7 @@ g:ale_haskell_hlint_options g:ale_haskell_hlint_options This variable can be used to pass extra options to the underlying hlint executable. + =============================================================================== stack-build *ale-haskell-stack-build* @@ -117,6 +135,7 @@ g:ale_haskell_stack_build_options *g:ale_haskell_stack_build_options* We default to using `'--fast'`. Since Stack generates binaries, your programs will be slower unless you separately rebuild them outside of ALE. + =============================================================================== stack-ghc *ale-haskell-stack-ghc* @@ -128,6 +147,7 @@ g:ale_haskell_stack_ghc_options *g:ale_haskell_stack_ghc_options* This variable can be changed to modify flags given to ghc through `stack ghc` + =============================================================================== stylish-haskell *ale-haskell-stylish-haskell* @@ -139,6 +159,7 @@ g:ale_haskell_stylish_haskell_executable This variable can be changed to use a different executable for stylish-haskell. + =============================================================================== hie *ale-haskell-hie* @@ -150,5 +171,6 @@ g:ale_haskell_hie_executable *g:ale_haskell_hie_executable* This variable can be changed to use a different executable for the haskell ide engine. i.e. `'hie-wrapper'` + =============================================================================== vim:tw=78:ts=2:sts=2:sw=2:ft=help:norl: diff --git a/sources_non_forked/ale/doc/ale-html.txt b/sources_non_forked/ale/doc/ale-html.txt index 5d6b20e2..c78dc4cd 100644 --- a/sources_non_forked/ale/doc/ale-html.txt +++ b/sources_non_forked/ale/doc/ale-html.txt @@ -9,6 +9,16 @@ fecs *ale-html-fecs* and both of them reads `./.fecsrc` as the default configuration file. See: |ale-javascript-fecs|. +=============================================================================== +html-beautify *ale-html-beautify* + +g:ale_html_beautify_options *g:ale_html_beautify_options* + *b:ale_html_beautify_options* + Type: |String| + Default: `''` + + This variable can be changed to modify flags given to html-beautify. + =============================================================================== htmlhint *ale-html-htmlhint* diff --git a/sources_non_forked/ale/doc/ale-ink.txt b/sources_non_forked/ale/doc/ale-ink.txt new file mode 100644 index 00000000..9412a09f --- /dev/null +++ b/sources_non_forked/ale/doc/ale-ink.txt @@ -0,0 +1,40 @@ +=============================================================================== +ALE Ink Integration *ale-ink-options* + + +=============================================================================== +ink-language-server *ale-ink-language-server* + +Ink Language Server + (https://github.com/ephraim/ink-language-server) + +g:ale_ink_ls_executable g:ale_ink_ls_executable + b:ale_ink_ls_executable + Type: |String| + Default: `'ink-language-server'` + + Ink language server executable. + +g:ale_ink_ls_initialization_options + g:ale_ink_ls_initialization_options + b:ale_ink_ls_initialization_options + Type: |Dictionary| + Default: `{}` + + Dictionary containing configuration settings that will be passed to the + language server at startup. For certain platforms and certain story + structures, the defaults will suffice. However, many projects will need to + change these settings - see the ink-language-server website for more + information. + + An example of setting non-default options: + { + \ 'ink': { + \ 'mainStoryPath': 'init.ink', + \ 'inklecateExecutablePath': '/usr/local/bin/inklecate', + \ 'runThroughMono': v:false + \ } + \} + +=============================================================================== + vim:tw=78:ts=2:sts=2:sw=2:ft=help:norl: diff --git a/sources_non_forked/ale/doc/ale-nim.txt b/sources_non_forked/ale/doc/ale-nim.txt new file mode 100644 index 00000000..8985aeb8 --- /dev/null +++ b/sources_non_forked/ale/doc/ale-nim.txt @@ -0,0 +1,45 @@ +=============================================================================== +ALE Nim Integration *ale-nim-options* + + +=============================================================================== +nimcheck *ale-nim-nimcheck* + + ALE does not provide additional configuration options for `nimcheck` at this + point. + + +=============================================================================== +nimlsp *ale-nim-nimlsp* + +g:nim_nimlsp_nim_sources *g:nim_nimlsp_nim_sources* + + Type: |String| + Default: `''` + + Sets the path to Nim source repository as the first argument to `nimlsp` + command. + + +=============================================================================== +nimpretty *ale-nim-nimpretty* + + +g:ale_nim_nimpretty_executable *g:ale_nim_nimpretty_executable* + *b:ale_nim_nimpretty_executable* + Type: |String| + Default: `'nimpretty'` + + This variable can be changed to use a different executable for nimpretty. + + +g:ale_nim_nimpretty_options *g:ale_nim_nimpretty_options* + *b:ale_nim_nimpretty_options* + Type: |String| + Default: `'--maxLineLen:80'` + + This variable can be changed to modify flags given to nimpretty. + + +=============================================================================== + vim:tw=78:ts=2:sts=2:sw=2:ft=help:norl: diff --git a/sources_non_forked/ale/doc/ale-nix.txt b/sources_non_forked/ale/doc/ale-nix.txt new file mode 100644 index 00000000..5b2bd6cb --- /dev/null +++ b/sources_non_forked/ale/doc/ale-nix.txt @@ -0,0 +1,24 @@ +=============================================================================== +ALE Nix Integration *ale-nix-options* + + +=============================================================================== +nixpkgs-fmt *ale-nix-nixpkgs-fmt* + +g:ale_nix_nixpkgsfmt_executable *g:ale_nix_nixpkgsfmt_executable* + *b:ale_nix_nixpkgsfmt_executable* + Type: |String| + Default: `'nixpkgs-fmt'` + + This variable sets executable used for nixpkgs-fmt. + +g:ale_nix_nixpkgsfmt_options *g:ale_nix_nixpkgsfmt_options* + *b:ale_nix_nixpkgsfmt_options* + Type: |String| + Default: `''` + + This variable can be set to pass additional options to the nixpkgs-fmt fixer. + + +=============================================================================== + vim:tw=78:ts=2:sts=2:sw=2:ft=help:norl: diff --git a/sources_non_forked/ale/doc/ale-php.txt b/sources_non_forked/ale/doc/ale-php.txt index d41fb50d..645decd7 100644 --- a/sources_non_forked/ale/doc/ale-php.txt +++ b/sources_non_forked/ale/doc/ale-php.txt @@ -157,9 +157,9 @@ g:ale_php_phpstan_level *g:ale_php_phpstan_level* Type: |String| Default: `''` - This variable controls the rule levels. 0 is the loosest and 4 is the + This variable controls the rule levels. 0 is the loosest and 7 is the strictest. If this option isn't set, the rule level will be controlled by - the configuration file. If no configuration file can be detected, `'4'` will + the configuration file. If no configuration file can be detected, `'7'` will be used instead. @@ -189,6 +189,13 @@ g:ale_php_psalm_executable *g:ale_php_psalm_executable* This variable sets the executable used for psalm. +g:ale_psalm_langserver_options *g:ale_psalm_langserver_options* + *b:ale_psalm_langserver_options* + Type: |String| + Default: `''` + + This variable can be set to pass additional options to psalm. + =============================================================================== php-cs-fixer *ale-php-php-cs-fixer* diff --git a/sources_non_forked/ale/doc/ale-purescript.txt b/sources_non_forked/ale/doc/ale-purescript.txt index 33fd2429..d30f731a 100644 --- a/sources_non_forked/ale/doc/ale-purescript.txt +++ b/sources_non_forked/ale/doc/ale-purescript.txt @@ -30,4 +30,16 @@ g:ale_purescript_ls_config g:ale_purescript_ls_config \ } \} =============================================================================== +<<<<<<< HEAD +======= +purty *ale-purescript-purty* + +g:ale_purescript_purty_executable *g:ale_purescript_purty_executable* + *b:ale_purescript_purty_executable* + Type: |String| + Default: `'purty'` + + This variable can be changed to use a different executable for purty. +=============================================================================== +>>>>>>> 27ad0d07862847896f691309a544a206783c94d6 vim:tw=78:ts=2:sts=2:sw=2:ft=help:norl: diff --git a/sources_non_forked/ale/doc/ale-python.txt b/sources_non_forked/ale/doc/ale-python.txt index 9d5846d2..93f1d668 100644 --- a/sources_non_forked/ale/doc/ale-python.txt +++ b/sources_non_forked/ale/doc/ale-python.txt @@ -145,8 +145,8 @@ g:ale_python_black_use_global *g:ale_python_black_use_global* See |ale-integrations-local-executables| -g:ale_python_black_auto_pipenv *g:ale_python_black_auto_pipenv* - *b:ale_python_black_auto_pipenv* +g:ale_python_black_auto_pipenv *g:ale_python_black_auto_pipenv* + *b:ale_python_black_auto_pipenv* Type: |Number| Default: `0` @@ -263,6 +263,15 @@ to check for errors while you type. `mypy` will be run from a detected project root, per |ale-python-root|. +g:ale_python_mypy_auto_pipenv *g:ale_python_mypy_auto_pipenv* + *b:ale_python_mypy_auto_pipenv* + Type: |Number| + Default: `0` + + Detect whether the file is inside a pipenv, and set the executable to `pipenv` + if true. This is overridden by a manually-set executable. + + g:ale_python_mypy_executable *g:ale_python_mypy_executable* *b:ale_python_mypy_executable* Type: |String| @@ -272,6 +281,7 @@ g:ale_python_mypy_executable *g:ale_python_mypy_executable* Set this to `'pipenv'` to invoke `'pipenv` `run` `mypy'`. + g:ale_python_mypy_ignore_invalid_syntax *g:ale_python_mypy_ignore_invalid_syntax* *b:ale_python_mypy_ignore_invalid_syntax* @@ -292,6 +302,14 @@ g:ale_python_mypy_options *g:ale_python_mypy_options* invocation. +g:ale_python_mypy_show_notes *g:ale_python_mypy_show_notes* + *b:ale_python_mypy_show_notes* + Type: |Number| + Default: `1` + + If enabled, notes on lines will be displayed as 'I' (info) messages. + + g:ale_python_mypy_use_global *g:ale_python_mypy_use_global* *b:ale_python_mypy_use_global* Type: |Number| @@ -300,14 +318,6 @@ g:ale_python_mypy_use_global *g:ale_python_mypy_use_global* See |ale-integrations-local-executables| -g:ale_python_mypy_auto_pipenv *g:ale_python_mypy_auto_pipenv* - *b:ale_python_mypy_auto_pipenv* - Type: |Number| - Default: `0` - - Detect whether the file is inside a pipenv, and set the executable to `pipenv` - if true. This is overridden by a manually-set executable. - =============================================================================== prospector *ale-python-prospector* diff --git a/sources_non_forked/ale/doc/ale-ruby.txt b/sources_non_forked/ale/doc/ale-ruby.txt index bf971e7c..a27a20b2 100644 --- a/sources_non_forked/ale/doc/ale-ruby.txt +++ b/sources_non_forked/ale/doc/ale-ruby.txt @@ -21,6 +21,26 @@ g:ale_ruby_brakeman_options *g:ale_ruby_brakeman_options* The contents of this variable will be passed through to brakeman. +=============================================================================== +debride *ale-ruby-debride* + +g:ale_ruby_debride_executable *g:ale_ruby_debride_executable* + *b:ale_ruby_debride_executable* + Type: String + Default: `'debride'` + + Override the invoked debride binary. Set this to `'bundle'` to invoke + `'bundle` `exec` debride'. + + +g:ale_ruby_debride_options *g:ale_ruby_debride_options* + *b:ale_ruby_debride_options* + Type: |String| + Default: `''` + + This variable can be changed to modify flags given to debride. + + =============================================================================== rails_best_practices *ale-ruby-rails_best_practices* @@ -91,7 +111,7 @@ g:ale_ruby_rubocop_options *g:ale_ruby_rubocop_options* Type: |String| Default: `''` - This variable can be change to modify flags given to rubocop. + This variable can be changed to modify flags given to rubocop. =============================================================================== @@ -129,6 +149,26 @@ g:ale_ruby_solargraph_executable *g:ale_ruby_solargraph_executable* from binstubs or a bundle. +=============================================================================== +sorbet *ale-ruby-sorbet* + +g:ale_ruby_sorbet_executable *g:ale_ruby_sorbet_executable* + *b:ale_ruby_sorbet_executable* + Type: String + Default: `'srb'` + + Override the invoked sorbet binary. Set this to `'bundle'` to invoke + `'bundle` `exec` srb'. + + +g:ale_ruby_sorbet_options *g:ale_ruby_sorbet_options* + *b:ale_ruby_sorbet_options* + Type: |String| + Default: `''` + + This variable can be changed to modify flags given to sorbet. + + =============================================================================== standardrb *ale-ruby-standardrb* @@ -146,7 +186,7 @@ g:ale_ruby_standardrb_options *g:ale_ruby_standardrb_options* Type: |String| Default: `''` - This variable can be change to modify flags given to standardrb. + This variable can be changed to modify flags given to standardrb. =============================================================================== diff --git a/sources_non_forked/ale/doc/ale-scala.txt b/sources_non_forked/ale/doc/ale-scala.txt index ff43cd6c..c9638baf 100644 --- a/sources_non_forked/ale/doc/ale-scala.txt +++ b/sources_non_forked/ale/doc/ale-scala.txt @@ -2,6 +2,32 @@ ALE Scala Integration *ale-scala-options* +=============================================================================== +metals *ale-scala-metals* + +`metals` requires either an SBT project, a Mill project, or a running Bloop +server. + + +g:ale_scala_metals_executable *g:ale_scala_metals_executable* + *b:ale_scala_metals_executable* + Type: |String| + Default: `'metals-vim'` + + Override the invoked `metals` binary. + + +g:ale_scala_metals_project_root *g:ale_scala_metals_project_root* + *b:ale_scala_metals_project_root* + Type: |String| + Default: `''` + + By default the project root is found by searching upwards for `build.sbt`, + `build.sc`, `.bloop` or `.metals`. + If the project root is elsewhere, you can override the project root + directory. + + =============================================================================== sbtserver *ale-scala-sbtserver* diff --git a/sources_non_forked/ale/doc/ale-solidity.txt b/sources_non_forked/ale/doc/ale-solidity.txt index 4b74a27a..b6e48675 100644 --- a/sources_non_forked/ale/doc/ale-solidity.txt +++ b/sources_non_forked/ale/doc/ale-solidity.txt @@ -2,6 +2,18 @@ ALE Solidity Integration *ale-solidity-options* +=============================================================================== +solc *ale-solidity-solc* + + +g:ale_solidity_solc_options *g:ale_solidity_solc_options* + *b:ale_solidity_solc_options* + Type: |String| + Default: `''` + + This variable can be set to pass extra options to solc. + + =============================================================================== solhint *ale-solidity-solhint* diff --git a/sources_non_forked/ale/doc/ale-sql.txt b/sources_non_forked/ale/doc/ale-sql.txt index f9bc6ac2..2807271b 100644 --- a/sources_non_forked/ale/doc/ale-sql.txt +++ b/sources_non_forked/ale/doc/ale-sql.txt @@ -39,5 +39,23 @@ g:ale_sql_sqlfmt_options *g:ale_sql_sqlfmt_options* At this time only the -u flag is available to format with upper-case. +=============================================================================== +sqlformat *ale-sql-sqlformat* + +g:ale_sql_sqlformat_executable *g:ale_sql_sqlformat_executable* + *b:ale_sql_sqlformat_executable* + Type: |String| + Default: `'sqlformat'` + + This variable sets executable used for sqlformat. + +g:ale_sql_sqlformat_options *g:ale_sql_sqlformat_options* + *b:ale_sql_sqlformat_options* + Type: |String| + Default: `''` + + This variable can be set to pass additional options to the sqlformat fixer. + + =============================================================================== vim:tw=78:ts=2:sts=2:sw=2:ft=help:norl: diff --git a/sources_non_forked/ale/doc/ale-supported-languages-and-tools.txt b/sources_non_forked/ale/doc/ale-supported-languages-and-tools.txt index ec04d175..365f9fb4 100644 --- a/sources_non_forked/ale/doc/ale-supported-languages-and-tools.txt +++ b/sources_non_forked/ale/doc/ale-supported-languages-and-tools.txt @@ -14,6 +14,7 @@ Notes: * Ada * `gcc` + * `gnatpp` * Ansible * `ansible-lint` * API Blueprint @@ -102,6 +103,7 @@ Notes: * Cython (pyrex filetype) * `cython` * D + * `dfmt` * `dls` * `dmd` * `uncrustify` @@ -122,7 +124,7 @@ Notes: * `mix`!! * Elm * `elm-format` - * `elm-lsp` + * `elm-ls` * `elm-make` * Erb * `erb` @@ -182,6 +184,7 @@ Notes: * `hdevtools` * `hfmt` * `hie` + * `hindent` * `hlint` * `stack-build`!! * `stack-ghc` @@ -191,6 +194,7 @@ Notes: * HTML * `alex`!! * `fecs` + * `html-beautify` * `HTMLHint` * `prettier` * `proselint` @@ -198,6 +202,8 @@ Notes: * `write-good` * Idris * `idris` +* Ink + * `ink-language-server` * ISPC * `ispc`!! * Java @@ -277,8 +283,11 @@ Notes: * `nasm`!! * Nim * `nim check`!! + * `nimlsp` + * `nimpretty` * nix * `nix-instantiate` + * `nixpkgs-fmt` * nroff * `alex`!! * `proselint` @@ -341,6 +350,10 @@ Notes: * `puppet-lint` * PureScript * `purescript-language-server` +<<<<<<< HEAD +======= + * `purty` +>>>>>>> 27ad0d07862847896f691309a544a206783c94d6 * Python * `autopep8` * `bandit` @@ -386,12 +399,14 @@ Notes: * `rpmlint` * Ruby * `brakeman` + * `debride` * `rails_best_practices`!! * `reek` * `rubocop` * `ruby` * `rufo` * `solargraph` + * `sorbet` * `standardrb` * Rust * `cargo`!! @@ -403,6 +418,7 @@ Notes: * `stylelint` * Scala * `fsc` + * `metals` * `sbtserver` * `scalac` * `scalafmt` @@ -417,11 +433,13 @@ Notes: * SML * `smlnj` * Solidity + * `solc` * `solhint` * `solium` * SQL * `pgformatter` * `sqlfmt` + * `sqlformat` * `sqlint` * Stylus * `stylelint` @@ -454,6 +472,7 @@ Notes: * `eslint` * `fecs` * `prettier` + * `standard` * `tslint` * `tsserver` * `typecheck` diff --git a/sources_non_forked/ale/doc/ale-typescript.txt b/sources_non_forked/ale/doc/ale-typescript.txt index 7dc59820..2c50d119 100644 --- a/sources_non_forked/ale/doc/ale-typescript.txt +++ b/sources_non_forked/ale/doc/ale-typescript.txt @@ -16,6 +16,33 @@ prettier *ale-typescript-prettier* See |ale-javascript-prettier| for information about the available options. +=============================================================================== +standard *ale-typescript-standard* + +g:ale_typescript_standard_executable *g:ale_typescript_standard_executable* + *b:ale_typescript_standard_executable* + Type: |String| + Default: `'standard'` + + See |ale-integrations-local-executables| + + +g:ale_typescript_standard_options *g:ale_typescript_standard_options* + *b:ale_typescript_standard_options* + Type: |String| + Default: `''` + + This variable can be set to pass additional options to standard. + + +g:ale_typescript_standard_use_global *g:ale_typescript_standard_use_global* + *b:ale_typescript_standard_use_global* + Type: |Number| + Default: `get(g:, 'ale_use_global_executables', 0)` + + See |ale-integrations-local-executables| + + =============================================================================== tslint *ale-typescript-tslint* diff --git a/sources_non_forked/ale/doc/ale.txt b/sources_non_forked/ale/doc/ale.txt index c1dab120..eafbc119 100644 --- a/sources_non_forked/ale/doc/ale.txt +++ b/sources_non_forked/ale/doc/ale.txt @@ -9,7 +9,8 @@ CONTENTS *ale-contents* 1. Introduction.........................|ale-introduction| 2. Supported Languages & Tools..........|ale-support| 3. Linting..............................|ale-lint| - 3.1 Other Sources.....................|ale-lint-other-sources| + 3.1 Adding Language Servers...........|ale-lint-language-servers| + 3.2 Other Sources.....................|ale-lint-other-sources| 4. Fixing Problems......................|ale-fix| 5. Language Server Protocol Support.....|ale-lsp| 5.1 Completion........................|ale-completion| @@ -147,7 +148,48 @@ ALE offers several options for controlling which linters are run. ------------------------------------------------------------------------------- -3.1 Other Sources *ale-lint-other-sources* +3.1 Adding Language Servers *ale-lint-language-servers* + +ALE comes with many default configurations for language servers, so they can +be detected and run automatically. ALE can connect to other language servers +by defining a new linter for a filetype. New linters can be defined in |vimrc|, +in plugin files, or `ale_linters` directories in |runtimepath|. + +See |ale-linter-loading-behavior| for more information on loading linters. + +A minimal configuration for a language server linter might look so. > + + call ale#linter#Define('filetype_here', { + \ 'name': 'any_name_you_want', + \ 'lsp': 'stdio', + \ 'executable': '/path/to/executable', + \ 'command': '%e run', + \ 'project_root': '/path/to/root_of_project', + \}) +< +For language servers that use a TCP socket connection, you should define the +address to connect to instead. > + + call ale#linter#Define('filetype_here', { + \ 'name': 'any_name_you_want', + \ 'lsp': 'socket', + \ 'address': 'servername:1234', + \ 'project_root': '/path/to/root_of_project', + \}) +< + Most of the options for a language server can be replaced with a |Funcref| + for a function accepting a buffer number for dynamically computing values + such as the executable path, the project path, the server address, etc, + most of which can also be determined based on executing some other + asynchronous task. See |ale#command#Run()| for computing linter options + based on asynchronous results. + + See |ale#linter#Define()| for a detailed explanation of all of the options + for configuring linters. + + +------------------------------------------------------------------------------- +3.2 Other Sources *ale-lint-other-sources* Problems for a buffer can be taken from other sources and rendered by ALE. This allows ALE to be used in combination with other plugins which also want @@ -341,6 +383,17 @@ completion source for Deoplete is named `'ale'`, and should enabled automatically if Deoplete is enabled and configured correctly. Deoplete integration should not be combined with ALE's own implementation. + *ale-asyncomplete-integration* + +ALE additionally integrates with asyncomplete.vim for offering automatic +completion data. ALE's asyncomplete source requires registration and should +use the defaults provided by the|asyncomplete#sources#ale#get_source_options| function > + + " Use ALE's function for asyncomplete defaults + au User asyncomplete_setup call asyncomplete#register_source(asyncomplete#sources#ale#get_source_options({ + \ 'priority': 10, " Provide your own overrides here + \ })) +> ALE also offers its own completion implementation, which does not require any other plugins. Suggestions will be made while you type after completion is enabled. ALE's own completion implementation can be enabled by setting @@ -365,6 +418,10 @@ The |ALEComplete| command can be used to show completion suggestions manually, even when |g:ale_completion_enabled| is set to `0`. For manually requesting completion information with Deoplete, consult Deoplete's documentation. +When working with TypeScript files, ALE by can support automatic imports +from external modules. This behavior can be enabled by setting the +|g:ale_completion_tsserver_autoimport| variable to `1`. + *ale-completion-completeopt-bug* ALE Automatic completion implementation replaces |completeopt| before opening @@ -376,6 +433,46 @@ vimrc, and your issues should go away. > set completeopt=menu,menuone,preview,noselect,noinsert < +Or alternatively, if you want to show documentation in popups: > + + set completeopt=menu,menuone,popup,noselect,noinsert +< + *ale-symbols* + +ALE provides a set of basic completion symbols. If you want to replace those +symbols with others, you can set the variable |g:ale_completion_symbols| with +a mapping of the type of completion to the symbol or other string that you +would like to use. An example here shows the available options for symbols > + + let g:ale_completion_symbols = { + \ 'text': '', + \ 'method': '', + \ 'function': '', + \ 'constructor': '', + \ 'field': '', + \ 'variable': '', + \ 'class': '', + \ 'interface': '', + \ 'module': '', + \ 'property': '', + \ 'unit': 'unit', + \ 'value': 'val', + \ 'enum': '', + \ 'keyword': 'keyword', + \ 'snippet': '', + \ 'color': 'color', + \ 'file': '', + \ 'reference': 'ref', + \ 'folder': '', + \ 'enum member': '', + \ 'constant': '', + \ 'struct': '', + \ 'event': 'event', + \ 'operator': '', + \ 'type_parameter': 'type param', + \ '': 'v' + \ } +< ------------------------------------------------------------------------------- 5.2 Go To Definition *ale-go-to-definition* @@ -433,6 +530,9 @@ the mouse over a symbol in a buffer. Diagnostic information will take priority over hover information for balloons. If a line contains a problem, that problem will be displayed in a balloon instead of hover information. +Hover information can be displayed in the preview window instead by setting +|g:ale_hover_to_preview| to `1`. + For Vim 8.1+ terminals, mouse hovering is disabled by default. Enabling |balloonexpr| commands in terminals can cause scrolling issues in terminals, so ALE will not attempt to show balloons unless |g:ale_set_balloons| is set to @@ -586,6 +686,16 @@ b:ale_completion_enabled *b:ale_completion_enabled* See |ale-completion| +g:ale_completion_tsserver_autoimport *g:ale_completion_tsserver_autoimport* + + Type: Number + Default: `0` + + When this option is set to `0`, ALE will not try to automatically import + completion results from external modules. It can be enabled by setting it + to `1`. + + g:ale_completion_excluded_words *g:ale_completion_excluded_words* *b:ale_completion_excluded_words* Type: |List| @@ -604,6 +714,47 @@ g:ale_completion_excluded_words *g:ale_completion_excluded_words* let b:ale_completion_excluded_words = ['it', 'describe'] < +g:ale_completion_symbols *g:ale_completion_symbols* + + Type: |Dictionary| + + + A mapping from completion types to symbols for completions. See + |ale-symbols| for more information. + + By default, this mapping only uses built in Vim completion kinds, but it can + be updated to use any unicode character for the completion kind. For + example: > + let g:ale_completion_symbols = { + \ 'text': '', + \ 'method': '', + \ 'function': '', + \ 'constructor': '', + \ 'field': '', + \ 'variable': '', + \ 'class': '', + \ 'interface': '', + \ 'module': '', + \ 'property': '', + \ 'unit': 'v', + \ 'value': 'v', + \ 'enum': 't', + \ 'keyword': 'v', + \ 'snippet': 'v', + \ 'color': 'v', + \ 'file': 'v', + \ 'reference': 'v', + \ 'folder': 'v', + \ 'enum_member': 'm', + \ 'constant': 'm', + \ 'struct': 't', + \ 'event': 'v', + \ 'operator': 'f', + \ 'type_parameter': 'p', + \ '': 'v' + \ }) +< + g:ale_completion_max_suggestions *g:ale_completion_max_suggestions* Type: |Number| @@ -734,6 +885,15 @@ g:ale_echo_msg_info_str *g:ale_echo_msg_info_str* The string used for `%severity%` for info. See |g:ale_echo_msg_format| +g:ale_echo_msg_log_str *g:ale_echo_msg_log_str* + + Type: |String| + Default: `'Log'` + + The string used for `%severity%` for log, used only for handling LSP show + message requests. See |g:ale_lsp_show_message_format| + + g:ale_echo_msg_warning_str *g:ale_echo_msg_warning_str* Type: |String| @@ -871,6 +1031,16 @@ g:ale_history_log_output *g:ale_history_log_output* if you want to save on some memory usage. +g:ale_hover_to_preview *g:ale_hover_to_preview* + *b:ale_hover_to_preview* + + Type: |Number| + Default: `0` + + If set to `1`, hover messages will be displayed in the preview window, + instead of in balloons or the message line. + + g:ale_keep_list_window_open *g:ale_keep_list_window_open* *b:ale_keep_list_window_open* Type: |Number| @@ -1016,9 +1186,12 @@ g:ale_linter_aliases *g:ale_linter_aliases* { \ 'Dockerfile': 'dockerfile', \ 'csh': 'sh', + \ 'javascriptreact': ['javascript', 'jsx'], \ 'plaintex': 'tex', \ 'rmarkdown': 'r', + \ 'rmd': 'r', \ 'systemverilog': 'verilog', + \ 'typescriptreact': ['typescript', 'tsx'], \ 'verilog_systemverilog': ['verilog_systemverilog', 'verilog'], \ 'vimwiki': 'markdown', \ 'vue': ['vue', 'javascript'], @@ -1181,6 +1354,47 @@ b:ale_loclist_msg_format *b:ale_loclist_msg_format* The strings for configuring `%severity%` are also used for this option. + +g:ale_lsp_show_message_format *g:ale_lsp_show_message_format* + + Type: |String| + Default: `'%severity%:%linter%: %s'` + + This variable defines the format that messages received from an LSP will + have when echoed. The following sequences of characters will be replaced. + + `%s` - replaced with the message text + `%linter%` - replaced with the name of the linter + `%severity%` - replaced with the severity of the message + + The strings for `%severity%` levels "error", "info" and "warning" are shared + with |g:ale_echo_msg_format|. Severity "log" is unique to + |g:ale_lsp_show_message_format| and it can be configured via + + |g:ale_echo_msg_log_str| - Defaults to `'Log'` + + Please note that |g:ale_lsp_show_message_format| *can not* be configured + separately for each buffer like |g:ale_echo_msg_format| can. + + +g:ale_lsp_show_message_severity *g:ale_lsp_show_message_severity* + + Type: |String| + Default: `'error'` + + This variable defines the minimum severity level an LSP message needs to be + displayed. Messages below this level are discarded; please note that + messages with `Log` severity level are always discarded. + + Possible values follow the LSP spec `MessageType` definition: + + `'error'` - Displays only errors. + `'warning'` - Displays errors and warnings. + `'information'` - Displays errors, warnings and infos + `'log'` - Same as `'information'` + `'disabled'` - Doesn't display any information at all. + + g:ale_lsp_root *g:ale_lsp_root* b:ale_lsp_root *b:ale_lsp_root* @@ -1306,6 +1520,27 @@ g:ale_pattern_options_enabled *g:ale_pattern_options_enabled* will not set buffer variables per |g:ale_pattern_options|. +g:ale_rename_tsserver_find_in_comments *g:ale_rename_tsserver_find_in_comments* + + Type: |Number| + Default: `0` + + If enabled, this option will tell tsserver to find and replace text in + comments when calling |ALERename|. It can be enabled by settings the value + to `1`. + + +g:ale_rename_tsserver_find_in_strings *g:ale_rename_tsserver_find_in_strings* + + + Type: |Number| + Default: `0` + + If enabled, this option will tell tsserver to find and replace text in + strings when calling |ALERename|. It can be enabled by settings the value to + `1`. + + g:ale_set_balloons *g:ale_set_balloons* *b:ale_set_balloons* @@ -1426,6 +1661,18 @@ g:ale_set_signs *g:ale_set_signs* |ALEWarningLine| - All items with `'type': 'W'` |ALEInfoLine| - All items with `'type': 'I'` + With Neovim 0.3.2 or higher, ALE can use the `numhl` option to highlight the + 'number' column. It uses the following highlight groups. + + |ALEErrorSignLineNr| - Items with `'type': 'E'` + |ALEWarningSignLineNr| - Items with `'type': 'W'` + |ALEInfoSignLineNr| - Items with `'type': 'I'` + |ALEStyleErrorSignLineNr| - Items with `'type': 'E'` and `'sub_type': 'style'` + |ALEStyleWarningSignLineNr| - Items with `'type': 'W'` and `'sub_type': 'style'` + + To enable line number highlighting |g:ale_sign_highlight_linenrs| must be + set to `1` before ALE is loaded. + The markers for the highlights can be customized with the following options: |g:ale_sign_error| @@ -1440,6 +1687,16 @@ g:ale_set_signs *g:ale_set_signs* To limit the number of signs ALE will set, see |g:ale_max_signs|. +g:ale_sign_priority *g:ale_sign_priority* + + Type: |Number| + Default: `30` + + From Neovim 0.4.0 and Vim 8.1, ALE can set sign priority to all signs. The + larger this value is, the higher priority ALE signs have over other plugin + signs. See |sign-priority| for further details on how priority works. + + g:ale_shell *g:ale_shell* Type: |String| @@ -1532,6 +1789,16 @@ g:ale_sign_warning *g:ale_sign_warning* The sign for warnings in the sign gutter. +g:ale_sign_highlight_linenrs *g:ale_sign_highlight_linenrs* + + Type: |Number| + Default: `0` + + When set to `1`, this option enables highlighting problems on the 'number' + column in Vim versions that support `numhl` highlights. This option must be + configured before ALE is loaded. + + g:ale_update_tagstack *g:ale_update_tagstack* *b:ale_update_tagstack* Type: |Number| @@ -1586,6 +1853,8 @@ g:ale_virtualtext_cursor *g:ale_virtualtext_cursor* Type: |Number| Default: `0` + This option only has any effect in NeoVim. + When this option is set to `1`, a message will be shown when a cursor is near a warning or error. ALE will attempt to find the warning or error at a column nearest to the cursor when the cursor is resting on a line which @@ -1710,6 +1979,15 @@ ALEErrorSign *ALEErrorSign* The highlight for error signs. See |g:ale_set_signs|. +ALEErrorSignLineNr *ALEErrorSignLineNr* + + Default: `highlight link ALEErrorSignLineNr CursorLineNr` + + The highlight for error signs. See |g:ale_set_signs|. + + NOTE: This highlight is only available on Neovim 0.3.2 or higher. + + ALEInfo *ALEInfo.* *ALEInfo-highlight* Default: `highlight link ALEInfo ALEWarning` @@ -1734,6 +2012,15 @@ ALEInfoLine *ALEInfoLine* See |g:ale_set_signs| and |g:ale_set_highlights|. +ALEInfoSignLineNr *ALEInfoSignLineNr* + + Default: `highlight link ALEInfoSignLineNr CursorLineNr` + + The highlight for error signs. See |g:ale_set_signs|. + + NOTE: This highlight is only available on Neovim 0.3.2 or higher. + + ALEStyleError *ALEStyleError* Default: `highlight link ALEStyleError ALEError` @@ -1748,6 +2035,15 @@ ALEStyleErrorSign *ALEStyleErrorSign* The highlight for style error signs. See |g:ale_set_signs|. +ALEStyleErrorSignLineNr *ALEStyleErrorSignLineNr* + + Default: `highlight link ALEStyleErrorSignLineNr CursorLineNr` + + The highlight for error signs. See |g:ale_set_signs|. + + NOTE: This highlight is only available on Neovim 0.3.2 or higher. + + ALEStyleWarning *ALEStyleWarning* Default: `highlight link ALEStyleWarning ALEError` @@ -1762,6 +2058,15 @@ ALEStyleWarningSign *ALEStyleWarningSign* The highlight for style warning signs. See |g:ale_set_signs|. +ALEStyleWarningSignLineNr *ALEStyleWarningSignLineNr* + + Default: `highlight link ALEStyleWarningSignLineNr CursorLineNr` + + The highlight for error signs. See |g:ale_set_signs|. + + NOTE: This highlight is only available on Neovim 0.3.2 or higher. + + ALEVirtualTextError *ALEVirtualTextError* Default: `highlight link ALEVirtualTextError ALEError` @@ -1821,6 +2126,15 @@ ALEWarningSign *ALEWarningSign* The highlight for warning signs. See |g:ale_set_signs|. +ALEWarningSignLineNr *ALEWarningSignLineNr* + + Default: `highlight link ALEWarningSignLineNr CursorLineNr` + + The highlight for error signs. See |g:ale_set_signs|. + + NOTE: This highlight is only available on Neovim 0.3.2 or higher. + + =============================================================================== 7. Linter/Fixer Options *ale-integration-options* @@ -1889,6 +2203,14 @@ g:ale_languagetool_executable *g:ale_languagetool_executable* The executable to run for languagetool. +g:ale_languagetool_options *g:ale_languagetool_options* + *b:ale_languagetool_options* + Type: |String| + Default: `'--autoDetect'` + + This variable can be set to pass additional options to languagetool. + + ------------------------------------------------------------------------------- 7.3. Options for write-good *ale-write-good-options* @@ -1927,6 +2249,7 @@ documented in additional help files. ada.....................................|ale-ada-options| gcc...................................|ale-ada-gcc| + gnatpp................................|ale-ada-gnatpp| ansible.................................|ale-ansible-options| ansible-lint..........................|ale-ansible-ansible-lint| asciidoc................................|ale-asciidoc-options| @@ -1987,6 +2310,7 @@ documented in additional help files. nvcc..................................|ale-cuda-nvcc| clang-format..........................|ale-cuda-clangformat| d.......................................|ale-d-options| + dfmt..................................|ale-d-dfmt| dls...................................|ale-d-dls| uncrustify............................|ale-d-uncrustify| dart....................................|ale-dart-options| @@ -2003,7 +2327,7 @@ documented in additional help files. credo.................................|ale-elixir-credo| elm.....................................|ale-elm-options| elm-format............................|ale-elm-elm-format| - elm-lsp...............................|ale-elm-elm-lsp| + elm-ls................................|ale-elm-elm-ls| elm-make..............................|ale-elm-elm-make| erlang..................................|ale-erlang-options| dialyzer..............................|ale-erlang-dialyzer| @@ -2053,6 +2377,7 @@ documented in additional help files. cabal-ghc.............................|ale-haskell-cabal-ghc| hdevtools.............................|ale-haskell-hdevtools| hfmt..................................|ale-haskell-hfmt| + hindent...............................|ale-haskell-hindent| hlint.................................|ale-haskell-hlint| stack-build...........................|ale-haskell-stack-build| stack-ghc.............................|ale-haskell-stack-ghc| @@ -2062,6 +2387,7 @@ documented in additional help files. terraform-fmt.........................|ale-hcl-terraform-fmt| html....................................|ale-html-options| fecs..................................|ale-html-fecs| + html-beautify.........................|ale-html-beautify| htmlhint..............................|ale-html-htmlhint| tidy..................................|ale-html-tidy| prettier..............................|ale-html-prettier| @@ -2069,6 +2395,8 @@ documented in additional help files. write-good............................|ale-html-write-good| idris...................................|ale-idris-options| idris.................................|ale-idris-idris| + ink.....................................|ale-ink-options| + ink-language-server...................|ale-ink-language-server| ispc....................................|ale-ispc-options| ispc..................................|ale-ispc-ispc| java....................................|ale-java-options| @@ -2124,6 +2452,12 @@ documented in additional help files. mmc...................................|ale-mercury-mmc| nasm....................................|ale-nasm-options| nasm..................................|ale-nasm-nasm| + nim.....................................|ale-nim-options| + nimcheck..............................|ale-nim-nimcheck| + nimlsp................................|ale-nim-nimlsp| + nimpretty.............................|ale-nim-nimpretty| + nix.....................................|ale-nix-options| + nixpkgs-fmt...........................|ale-nix-nixpkgs-fmt| nroff...................................|ale-nroff-options| write-good............................|ale-nroff-write-good| objc....................................|ale-objc-options| @@ -2179,6 +2513,7 @@ documented in additional help files. puppet-languageserver.................|ale-puppet-languageserver| purescript..............................|ale-purescript-options| purescript-language-server............|ale-purescript-language-server| + purty.................................|ale-purescript-purty| pyrex (cython)..........................|ale-pyrex-options| cython................................|ale-pyrex-cython| python..................................|ale-python-options| @@ -2214,12 +2549,14 @@ documented in additional help files. write-good............................|ale-restructuredtext-write-good| ruby....................................|ale-ruby-options| brakeman..............................|ale-ruby-brakeman| + debride...............................|ale-ruby-debride| rails_best_practices..................|ale-ruby-rails_best_practices| reek..................................|ale-ruby-reek| rubocop...............................|ale-ruby-rubocop| ruby..................................|ale-ruby-ruby| rufo..................................|ale-ruby-rufo| solargraph............................|ale-ruby-solargraph| + sorbet................................|ale-ruby-sorbet| standardrb............................|ale-ruby-standardrb| rust....................................|ale-rust-options| cargo.................................|ale-rust-cargo| @@ -2230,6 +2567,7 @@ documented in additional help files. sasslint..............................|ale-sass-sasslint| stylelint.............................|ale-sass-stylelint| scala...................................|ale-scala-options| + metals................................|ale-scala-metals| sbtserver.............................|ale-scala-sbtserver| scalafmt..............................|ale-scala-scalafmt| scalastyle............................|ale-scala-scalastyle| @@ -2245,6 +2583,7 @@ documented in additional help files. sml.....................................|ale-sml-options| smlnj.................................|ale-sml-smlnj| solidity................................|ale-solidity-options| + solc..................................|ale-solidity-solc| solhint...............................|ale-solidity-solhint| solium................................|ale-solidity-solium| spec....................................|ale-spec-options| @@ -2252,6 +2591,7 @@ documented in additional help files. sql.....................................|ale-sql-options| pgformatter...........................|ale-sql-pgformatter| sqlfmt................................|ale-sql-sqlfmt| + sqlformat.............................|ale-sql-sqlformat| stylus..................................|ale-stylus-options| stylelint.............................|ale-stylus-stylelint| sugarss.................................|ale-sugarss-options| @@ -2279,6 +2619,7 @@ documented in additional help files. typescript..............................|ale-typescript-options| eslint................................|ale-typescript-eslint| prettier..............................|ale-typescript-prettier| + standard..............................|ale-typescript-standard| tslint................................|ale-typescript-tslint| tsserver..............................|ale-typescript-tsserver| vala....................................|ale-vala-options| @@ -2453,6 +2794,18 @@ ALEHover *ALEHover* A plug mapping `(ale_hover)` is defined for this command. +ALEOrganizeImports *ALEOrganizeImports* + + Organize imports using tsserver. Currently not implemented for LSPs. + + +ALERename *ALERename* + + Rename a symbol using TypeScript server or Language Server. + + The user will be prompted for a new name. + + ALESymbolSearch `` *ALESymbolSearch* Search for symbols in the workspace, taken from any available LSP linters. @@ -3370,7 +3723,7 @@ snazzy looking ale glass logo. Cheers, Mark! 11. Contact *ale-contact* If you like this plugin, and wish to get in touch, check out the GitHub -page for issues and more at https://github.com/w0rp/ale +page for issues and more at https://github.com/dense-analysis/ale If you wish to contact the author of this plugin directly, please feel free to send an email to devw0rp@gmail.com. diff --git a/sources_non_forked/ale/plugin/ale.vim b/sources_non_forked/ale/plugin/ale.vim index 7edf9a50..8fea3bb4 100644 --- a/sources_non_forked/ale/plugin/ale.vim +++ b/sources_non_forked/ale/plugin/ale.vim @@ -125,6 +125,9 @@ let g:ale_close_preview_on_insert = get(g:, 'ale_close_preview_on_insert', 0) " This flag can be set to 0 to disable balloon support. let g:ale_set_balloons = get(g:, 'ale_set_balloons', has('balloon_eval') && has('gui_running')) +" Use preview window for hover messages. +let g:ale_hover_to_preview = get(g:, 'ale_hover_to_preview', 0) + " This flag can be set to 0 to disable warnings for trailing whitespace let g:ale_warn_about_trailing_whitespace = get(g:, 'ale_warn_about_trailing_whitespace', 1) " This flag can be set to 0 to disable warnings for trailing blank lines @@ -142,6 +145,9 @@ let g:ale_completion_enabled = get(g:, 'ale_completion_enabled', 0) " Enable automatic detection of pipenv for Python linters. let g:ale_python_auto_pipenv = get(g:, 'ale_python_auto_pipenv', 0) +" This variable can be overridden to set the GO111MODULE environment variable. +let g:ale_go_go111module = get(g:, 'ale_go_go111module', '') + if g:ale_set_balloons call ale#balloon#Enable() endif @@ -218,6 +224,12 @@ command! -nargs=1 ALESymbolSearch :call ale#symbol#Search() command! -bar ALEComplete :call ale#completion#GetCompletions('ale-manual') +" Rename symbols using tsserver and LSP +command! -bar ALERename :call ale#rename#Execute() + +" Organize import statements using tsserver +command! -bar ALEOrganizeImports :call ale#organize_imports#Execute() + " mappings for commands nnoremap (ale_previous) :ALEPrevious nnoremap (ale_previous_wrap) :ALEPreviousWrap @@ -256,6 +268,7 @@ nnoremap (ale_find_references) :ALEFindReferences nnoremap (ale_hover) :ALEHover nnoremap (ale_documentation) :ALEDocumentation inoremap (ale_complete) :ALEComplete +nnoremap (ale_rename) :ALERename " Set up autocmd groups now. call ale#events#Init() diff --git a/sources_non_forked/ale/rplugin/python3/deoplete/sources/ale.py b/sources_non_forked/ale/rplugin/python3/deoplete/sources/ale.py index 7f1c1d60..ae1f4039 100644 --- a/sources_non_forked/ale/rplugin/python3/deoplete/sources/ale.py +++ b/sources_non_forked/ale/rplugin/python3/deoplete/sources/ale.py @@ -24,31 +24,37 @@ class Source(Base): self.rank = 1000 self.is_bytepos = True self.min_pattern_length = 1 + self.is_volatile = True + # Do not forget to update s:trigger_character_map in completion.vim in + # updating entries in this map. + self.input_patterns = { + '_': r'\.\w*$', + 'rust': r'(\.|::)\w*$', + 'typescript': r'(\.|\'|")\w*$', + 'cpp': r'(\.|::|->)\w*$', + } # Returns an integer for the start position, as with omnifunc. - def get_completion_position(self): - return self.vim.call('ale#completion#GetCompletionPosition') + def get_complete_position(self, context): + return self.vim.call( + 'ale#completion#GetCompletionPositionForDeoplete', context['input'] + ) def gather_candidates(self, context): # Stop early if ALE can't provide completion data for this buffer. if not self.vim.call('ale#completion#CanProvideCompletions'): return None - if context.get('is_refresh'): - context['is_async'] = False + event = context.get('event') - if context['is_async']: - # Result is the same as for omnifunc, or None. + if event == 'Async': result = self.vim.call('ale#completion#GetCompletionResult') + return result or [] - if result is not None: - context['is_async'] = False - - return result - else: - context['is_async'] = True - - # Request some completion results. - self.vim.call('ale#completion#GetCompletions', 'deoplete') + if context.get('is_refresh'): + self.vim.command( + "call ale#completion#GetCompletions('ale-callback', " + \ + "{'callback': {completions -> deoplete#auto_complete() }})" + ) return [] diff --git a/sources_non_forked/ale/supported-tools.md b/sources_non_forked/ale/supported-tools.md index 802054cd..0abc6b75 100644 --- a/sources_non_forked/ale/supported-tools.md +++ b/sources_non_forked/ale/supported-tools.md @@ -23,6 +23,7 @@ formatting. * Ada * [gcc](https://gcc.gnu.org) + * [gnatpp](https://docs.adacore.com/gnat_ugn-docs/html/gnat_ugn/gnat_ugn/gnat_utility_programs.html#the-gnat-pretty-printer-gnatpp) :floppy_disk: * Ansible * [ansible-lint](https://github.com/willthames/ansible-lint) * API Blueprint @@ -111,6 +112,7 @@ formatting. * Cython (pyrex filetype) * [cython](http://cython.org/) * D + * [dfmt](https://github.com/dlang-community/dfmt) * [dls](https://github.com/d-language-server/dls) * [dmd](https://dlang.org/dmd-linux.html) * [uncrustify](https://github.com/uncrustify/uncrustify) @@ -125,13 +127,13 @@ formatting. * [hadolint](https://github.com/hadolint/hadolint) * Elixir * [credo](https://github.com/rrrene/credo) - * [dialyxir](https://github.com/jeremyjh/dialyxir) - * [dogma](https://github.com/lpil/dogma) + * [dialyxir](https://github.com/jeremyjh/dialyxir) :floppy_disk: + * [dogma](https://github.com/lpil/dogma) :floppy_disk: * [elixir-ls](https://github.com/JakeBecker/elixir-ls) :warning: * [mix](https://hexdocs.pm/mix/Mix.html) :warning: :floppy_disk: * Elm * [elm-format](https://github.com/avh4/elm-format) - * [elm-lsp](https://github.com/antew/elm-lsp) + * [elm-ls](https://github.com/elm-tooling/elm-language-server) * [elm-make](https://github.com/elm/compiler) * Erb * [erb](https://apidock.com/ruby/ERB) @@ -191,6 +193,7 @@ formatting. * [hdevtools](https://hackage.haskell.org/package/hdevtools) * [hfmt](https://github.com/danstiner/hfmt) * [hie](https://github.com/haskell/haskell-ide-engine) + * [hindent](https://hackage.haskell.org/package/hindent) * [hlint](https://hackage.haskell.org/package/hlint) * [stack-build](https://haskellstack.org/) :floppy_disk: * [stack-ghc](https://haskellstack.org/) @@ -200,6 +203,7 @@ formatting. * HTML * [alex](https://github.com/wooorm/alex) :floppy_disk: * [fecs](http://fecs.baidu.com/) + * [html-beautify](https://beautifier.io/) * [HTMLHint](http://htmlhint.com/) * [prettier](https://github.com/prettier/prettier) * [proselint](http://proselint.com/) @@ -207,6 +211,8 @@ formatting. * [write-good](https://github.com/btford/write-good) * Idris * [idris](http://www.idris-lang.org/) +* Ink + * [ink-language-server](https://github.com/ephread/ink-language-server) * ISPC * [ispc](https://ispc.github.io/) :floppy_disk: * Java @@ -221,7 +227,7 @@ formatting. * [eslint](http://eslint.org/) * [fecs](http://fecs.baidu.com/) * [flow](https://flowtype.org/) - * [jscs](http://jscs.info/) + * [jscs](https://jscs-dev.github.io/) * [jshint](http://jshint.com/) * [prettier](https://github.com/prettier/prettier) * [prettier-eslint](https://github.com/prettier/prettier-eslint-cli) @@ -246,7 +252,7 @@ formatting. * [lacheck](https://www.ctan.org/pkg/lacheck) * [proselint](http://proselint.com/) * [redpen](http://redpen.cc/) - * [texlab](https://texlab.netlify.com) ([Rust rewrite](https://github.com/latex-lsp/texlab/tree/rust)) + * [texlab](https://texlab.netlify.com) * [textlint](https://textlint.github.io/) * [vale](https://github.com/ValeLint/vale) * [write-good](https://github.com/btford/write-good) @@ -286,8 +292,11 @@ formatting. * [nasm](https://www.nasm.us/) :floppy_disk: * Nim * [nim check](https://nim-lang.org/docs/nimc.html) :floppy_disk: + * [nimlsp](https://github.com/PMunch/nimlsp) + * nimpretty * nix * [nix-instantiate](http://nixos.org/nix/manual/#sec-nix-instantiate) + * [nixpkgs-fmt](https://github.com/nix-community/nixpkgs-fmt) * nroff * [alex](https://github.com/wooorm/alex) :floppy_disk: * [proselint](http://proselint.com/) @@ -336,8 +345,8 @@ formatting. * Pony * [ponyc](https://github.com/ponylang/ponyc) * PowerShell - * [powershell](https://github.com/PowerShell/PowerShell) :floppy_disk - * [psscriptanalyzer](https://github.com/PowerShell/PSScriptAnalyzer) :floppy_disk + * [powershell](https://github.com/PowerShell/PowerShell) :floppy_disk: + * [psscriptanalyzer](https://github.com/PowerShell/PSScriptAnalyzer) :floppy_disk: * Prolog * [swipl](https://github.com/SWI-Prolog/swipl-devel) * proto @@ -350,6 +359,7 @@ formatting. * [puppet-lint](https://puppet-lint.com) * PureScript * [purescript-language-server](https://github.com/nwolverson/purescript-language-server) + * [purty](https://gitlab.com/joneshf/purty) * Python * [autopep8](https://github.com/hhatto/autopep8) * [bandit](https://github.com/PyCQA/bandit) :warning: @@ -395,12 +405,14 @@ formatting. * [rpmlint](https://github.com/rpm-software-management/rpmlint) :warning: (see `:help ale-integration-spec`) * Ruby * [brakeman](http://brakemanscanner.org/) :floppy_disk: + * [debride](https://github.com/seattlerb/debride) :floppy_disk: * [rails_best_practices](https://github.com/flyerhzm/rails_best_practices) :floppy_disk: * [reek](https://github.com/troessner/reek) * [rubocop](https://github.com/bbatsov/rubocop) * [ruby](https://www.ruby-lang.org) * [rufo](https://github.com/ruby-formatter/rufo) * [solargraph](https://solargraph.org) + * [sorbet](https://github.com/sorbet/sorbet) * [standardrb](https://github.com/testdouble/standard) * Rust * [cargo](https://github.com/rust-lang/cargo) :floppy_disk: (see `:help ale-integration-rust` for configuration instructions) @@ -412,6 +424,7 @@ formatting. * [stylelint](https://github.com/stylelint/stylelint) * Scala * [fsc](https://www.scala-lang.org/old/sites/default/files/linuxsoft_archives/docu/files/tools/fsc.html) + * [metals](https://scalameta.org/metals/) * [sbtserver](https://www.scala-sbt.org/1.x/docs/sbt-server.html) * [scalac](http://scala-lang.org) * [scalafmt](https://scalameta.org/scalafmt/) @@ -426,11 +439,13 @@ formatting. * SML * [smlnj](http://www.smlnj.org/) * Solidity + * [solc](https://solidity.readthedocs.io/) * [solhint](https://github.com/protofire/solhint) * [solium](https://github.com/duaraghav8/Solium) * SQL * [pgformatter](https://github.com/darold/pgFormatter) * [sqlfmt](https://github.com/jackc/sqlfmt) + * [sqlformat](https://github.com/andialbrecht/sqlparse) * [sqlint](https://github.com/purcell/sqlint) * Stylus * [stylelint](https://github.com/stylelint/stylelint) @@ -463,6 +478,7 @@ formatting. * [eslint](http://eslint.org/) * [fecs](http://fecs.baidu.com/) * [prettier](https://github.com/prettier/prettier) + * [standard](http://standardjs.com/) * [tslint](https://github.com/palantir/tslint) * [tsserver](https://github.com/Microsoft/TypeScript/wiki/Standalone-Server-%28tsserver%29) * typecheck diff --git a/sources_non_forked/bufexplorer/.gitignore b/sources_non_forked/bufexplorer/.gitignore new file mode 100644 index 00000000..42d5d592 --- /dev/null +++ b/sources_non_forked/bufexplorer/.gitignore @@ -0,0 +1,6 @@ +# Ignore generated tags +/doc/tags +dist.bat +*.zip +tags +*.sw[a-p] diff --git a/sources_non_forked/bufexplorer/LICENSE b/sources_non_forked/bufexplorer/LICENSE new file mode 100644 index 00000000..28d7bc4b --- /dev/null +++ b/sources_non_forked/bufexplorer/LICENSE @@ -0,0 +1,27 @@ +Copyright (c) 2001-2013, Jeff Lanzarotta +All rights reserved. + +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: + +* Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. + +* Redistributions in binary form must reproduce the above copyright notice, this + list of conditions and the following disclaimer in the documentation and/or + other materials provided with the distribution. + +* Neither the name of the {organization} nor the names of its + contributors may be used to endorse or promote products derived from + this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON +ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/sources_non_forked/bufexplorer/README.md b/sources_non_forked/bufexplorer/README.md index f34dab5e..5ee9346e 100644 --- a/sources_non_forked/bufexplorer/README.md +++ b/sources_non_forked/bufexplorer/README.md @@ -1,39 +1,95 @@ -created by ---------- -[jeff lanzarotta](http://www.vim.org/account/profile.php?user_id=97) - -script type ----------- -utility - -description ------------ -With bufexplorer, you can quickly and easily switch between buffers by using the one of the default public interfaces: +bufexplorer +=========== - '\be' (normal open) or - '\bs' (force horizontal split open) or - '\bv' (force vertical split open) +BufExplorer Plugin for Vim -Once the bufexplorer window is open you can use the normal movement keys (hjkl) to move around and then use or to select the buffer you would like to open. If you would like to have the selected buffer opened in a new tab, simply press either or 't'. Please note that when opening a buffer in a tab, that if the buffer is already in another tab, bufexplorer can switch to that tab automatically for you if you would like. More about that in the supplied VIM help. +With bufexplorer, you can quickly and easily switch between buffers by using the one of the default public interfaces: -Bufexplorer also offers various options including: + '\be' (normal open) or + '\bt' (toggle open / close) or + '\bs' (force horizontal split open) or + '\bv' (force vertical split open) -* Display the list of buffers in various sort orders including: - * Most Recently Used (MRU) which is the default - * Buffer number - * File name - * File extension - * Full file path name -* Delete buffer from list +Once the bufexplorer window is open you can use the normal movement keys (hjkl) to move around and then use or to select the buffer you would like to open. If you would like to have the selected buffer opened in a new tab, simply press either or 't'. Please note that when opening a buffer in a tab, that if the buffer is already in another tab, bufexplorer can switch to that tab automatically for you if you would like. More about that in the supplied VIM help. + +Bufexplorer also offers various options including: +- Display the list of buffers in various sort orders including: + - Most Recently Used (MRU) which is the default + - Buffer number + - File name + - File extension + - Full file path name +- Delete buffer from list For more about options, sort orders, configuration options, etc. please see the supplied VIM help. - -install details ---------------- -Simply unzip bufexplorer.zip into a directory in your 'runtimepath', usually ~/.vim or c:\vimfiles, and restart Vim. This zip file contains plugin\bufexplorer.vim, and doc\bufexplorer.txt. See ':help add-local-help' on how to add bufexplorer.txt to vim's help system. -NOTE ----- -Version 7.0.12 and above will ONLY work with 7.0 and above of Vim. +## vim.org +This plugin can also be found at http://www.vim.org/scripts/script.php?script_id=42. -**IMPORTANT**: If you have a version prior to 7.1.2 that contains an autoload\bufexplorer.vim file, please REMOVE the autoload\bufexlorer.vim AND the plugin\bufexplorer.vim files before installing a new version. +## Installation +### Manually +1. If you do not want to use one of the the bundle handlers, you can take the + zip file from vim.org and unzip it and copy the plugin to your vimfiles\plugin + directory and the txt file to your vimfiles\doc directory. If you do that, + make sure you generate the help by executing + + `:helptag /doc` + + Once help tags have been generated, you can view the manual with + `:help bufexplorer`. + +### Vundle (https://github.com/gmarik/Vundle.vim) +1. Add the following configuration to your `.vimrc`. + + Plugin 'jlanzarotta/bufexplorer' + +2. Install with `:BundleInstall`. + +### NeoBundle (https://github.com/Shougo/neobundle.vim) +1. Add the following configuration to your `.vimrc`. + + NeoBundle 'jlanzarotta/bufexplorer' + +2. Install with `:NeoBundleInstall`. + +### Plug (https://github.com/junegunn/vim-plug) +1. Add the following configuration to your `.vimrc`. + + Plug 'jlanzarotta/bufexplorer' + +2. Install with `:PlugInstall`. + +### Pathogen +1. Install with the following command. + + git clone https://github.com/jlanzarotta/bufexplorer.git ~/.vim/bundle/bufexplorer.vim + +## License +Copyright (c) 2001-2020, Jeff Lanzarotta + +All rights reserved. + +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: + +* Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. + +* Redistributions in binary form must reproduce the above copyright notice, this + list of conditions and the following disclaimer in the documentation and/or + other materials provided with the distribution. + +* Neither the name of the {organization} nor the names of its + contributors may be used to endorse or promote products derived from + this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON +ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/sources_non_forked/bufexplorer/doc/bufexplorer.txt b/sources_non_forked/bufexplorer/doc/bufexplorer.txt index 06e92237..fd52fb58 100644 --- a/sources_non_forked/bufexplorer/doc/bufexplorer.txt +++ b/sources_non_forked/bufexplorer/doc/bufexplorer.txt @@ -1,9 +1,9 @@ -*bufexplorer.txt* Buffer Explorer Last Change: 22 Oct 2010 +*bufexplorer.txt* Buffer Explorer Last Change: 08 Dec 2018 Buffer Explorer *buffer-explorer* *bufexplorer* - Version 7.2.8 + Version 7.4.21 -Plugin for easily exploring (or browsing) Vim |:buffers|. +Plugin for easily exploring (or browsing) Vim|:buffers|. |bufexplorer-installation| Installation |bufexplorer-usage| Usage @@ -12,6 +12,7 @@ Plugin for easily exploring (or browsing) Vim |:buffers|. |bufexplorer-changelog| Change Log |bufexplorer-todo| Todo |bufexplorer-credits| Credits +|bufexplorer-copyright| Copyright For Vim version 7.0 and above. This plugin is only available if 'compatible' is not set. @@ -22,7 +23,10 @@ This plugin is only available if 'compatible' is not set. INSTALLATION *bufexplorer-installation* To install: - - Download the bufexplorer.zip. + - Download the bufexplorer.zip from one of the following places: + https://github.com/jlanzarotta/bufexplorer + http://www.vim.org/scripts/script.php?script_id=42 + or use a package manager like Vundle. - Extract the zip archive into your runtime directory. The archive contains plugin/bufexplorer.vim, and doc/bufexplorer.txt. - Start Vim or goto an existing instance of Vim. @@ -37,14 +41,24 @@ To install: USAGE *bufexplorer-usage* To start exploring in the current window, use: > - \be or :BufExplorer + be or :BufExplorer or Your custom key mapping +To toggle bufexplorer on or off in the current window, use: > + bt or :ToggleBufExplorer or Your custom key mapping To start exploring in a newly split horizontal window, use: > - \bs or :BufExplorerHorizontalSplit + bs or :BufExplorerHorizontalSplit or Your custom key mapping To start exploring in a newly split vertical window, use: > - \bv or :BufExplorerVerticalSplit + bv or :BufExplorerVerticalSplit or Your custom key mapping -If you would like to use something other than '\', you may simply change the -leader (see |mapleader|). +If you would like to use something other than the default leader key - '\' - +you may simply change the leader (see |mapleader|). + +When bs or bv is issued, bufexplorer opens in either a +horizontally or vertically split window. By issuing either of these commands, +the user is telling bufexplorer that they want to split the window and have +bufexplorer show the buffer they are about to select (from the bufexplorer +windows) in the newly split window. When be is issued, bufexplorer +opens the bufexplorer contents in the current window and the buffer the user +selects is opened in the current window. Note: If the current buffer is modified when bufexplorer started, the current window is always split and the new bufexplorer is displayed in that new @@ -58,32 +72,43 @@ Commands to use once exploring: Opens the buffer that is under the cursor into the current window. Opens the buffer that is under the cursor in another tab. - d |:delete|the buffer under the cursor from the list. The + a Toggles whether you are taken to the active window when + selecting a buffer or not. + b Fast buffer switching with b. + B Works in association with the |ShowTabBuffer| option. If + |ShowTabBuffer| is set to 1, this toggles if BufExplorer is to + only store the most recent tab for this buffer or not. + d |:delete| the buffer under the cursor from the list. The buffer's 'buflisted' is cleared. This allows for the buffer to be displayed again using the 'show unlisted' command. - R Toggles relative path/absolute path. - T Toggles to show only buffers for this tab or not. - D |:wipeout|the buffer under the cursor from the list. When a - buffers is wiped, it will not be shown when unlisted buffer are + D |:wipeout| the buffer under the cursor from the list. When a + buffer is wiped, it will not be shown when unlisted buffers are displayed. - f Toggles whether you are taken to the active window when - selecting a buffer or not. + F Open selected buffer in another window above the current. + f Open selected buffer in another window below the current. o Opens the buffer that is under the cursor into the current window. p Toggles the showing of a split filename/pathname. - q Quit exploring. + q Exit/Close bufexplorer. r Reverses the order the buffers are listed in. - s Selects the order the buffers are listed in. Either by buffer + R Toggles relative path/absolute path. + s Cycle thru how the buffers are listed. Either by buffer number, file name, file extension, most recently used (MRU), or full path. + S Cycle thru how the buffers are listed, in reverse order. + Either by buffer number, file name, file extension, most + recently used (MRU), or full path. t Opens the buffer that is under the cursor in another tab. + T Toggles to show only buffers for this tab or not. u Toggles the showing of "unlisted" buffers. + V Open the selected buffer in another window on the left of the current. + v Open the selected buffer in another window on the right of the current. Once invoked, Buffer Explorer displays a sorted list (MRU is the default sort method) of all the buffers that are currently opened. You are then able to move the cursor to the line containing the buffer's name you are wanting to act upon. Once you have selected the buffer you would like, -you can then either open it, close it(delete), resort the list, reverse +you can then either open it, close it (delete), resort the list, reverse the sort, quit exploring and so on... =============================================================================== @@ -93,19 +118,28 @@ WINDOW LAYOUT *bufexplorer-windowlayout* " Press for Help " Sorted by mru | Locate buffer | Absolute Split path "= - 01 %a bufexplorer.txt C:\Vim\vimfiles\doc line 87 - 02 # bufexplorer.vim c:\Vim\vimfiles\plugin line 1 + 1 %a bufexplorer.txt C:\Vim\vimfiles\doc line 87 + 2 # bufexplorer.vim c:\Vim\vimfiles\plugin line 1 ------------------------------------------------------------------------------- | | | | | | | | | +-- Current Line #. | | | +-- Relative/Full Path | | +-- Buffer Name. - | +-- Buffer Attributes. See|:buffers|for more information. - +-- Buffer Number. See|:buffers|for more information. + | +-- Buffer Attributes. See |:buffers| for more information. + +-- Buffer Number. See |:buffers| for more information. =============================================================================== CUSTOMIZATION *bufexplorer-customization* +If you do not like the default key mappings of be, bs, and +bv, you can override bufexplorer's default mappings by setting up +something like the following in your vimrc file: + + nnoremap :BufExplorer + nnoremap :ToggleBufExplorer + nnoremap :BufExplorerHorizontalSplit + nnoremap :BufExplorerVerticalSplit + *g:bufExplorerChgWin* If set, bufexplorer will bring up the selected buffer in the window specified by g:bufExplorerChgWin. @@ -116,6 +150,12 @@ To control whether the default help is displayed or not, use: > let g:bufExplorerDefaultHelp=1 " Show default help. The default is to show the default help. + *g:bufExplorerDisableDefaultKeyMapping* +To control whether the default key mappings are enabled or not, use: > + let g:bufExplorerDisableDefaultKeyMapping=0 " Do not disable mapping. + let g:bufExplorerDisableDefaultKeyMapping=1 " Disable mapping. +The default is NOT to disable the default key mapping. + *g:bufExplorerDetailedHelp* To control whether detailed help is display by, use: > let g:bufExplorerDetailedHelp=0 " Do not show detailed help. @@ -142,10 +182,16 @@ The default is NOT to sort in reverse order. *g:bufExplorerShowDirectories* Directories usually show up in the list from using a command like ":e .". To control whether to show directories in the buffer list or not, use: > + let g:bufExplorerShowDirectories=0 " Do not show directories. let g:bufExplorerShowDirectories=1 " Show directories. - let g:bufExplorerShowDirectories=0 " Don't show directories. The default is to show directories. + *g:bufExplorerShowNoName* +To control whether to show "No Name" buffers or not, use: > + let g:bufExplorerShowNoName=0 " Do not "No Name" buffers. + let g:bufExplorerShowNoName=1 " Show "No Name" buffers. +The default is to NOT show "No Name buffers. + *g:bufExplorerShowRelativePath* To control whether to show absolute paths or relative to the current directory, use: > @@ -154,13 +200,13 @@ directory, use: > The default is to show absolute paths. *g:bufExplorerShowTabBuffer* -To control weither or not to show buffers on for the specific tab or not, use: > +To control whether or not to show buffers on for the specific tab or not, use: > let g:bufExplorerShowTabBuffer=0 " No. let g:bufExplorerShowTabBuffer=1 " Yes. The default is not to show. *g:bufExplorerShowUnlisted* -To control whether to show unlisted buffer or not, use: > +To control whether to show unlisted buffers or not, use: > let g:bufExplorerShowUnlisted=0 " Do not show unlisted buffers. let g:bufExplorerShowUnlisted=1 " Show unlisted buffers. The default is to NOT show unlisted buffers. @@ -179,9 +225,15 @@ To control where the new split window will be placed above or below the current window, use: > let g:bufExplorerSplitBelow=1 " Split new window below current. let g:bufExplorerSplitBelow=0 " Split new window above current. -The default is to use what ever is set by the global &splitbelow +The default is to use whatever is set by the global &splitbelow variable. + *g:bufExplorerSplitHorzSize* +To control the size of the new horizontal split window. use: > + let g:bufExplorerSplitHorzSize=n " New split window is n rows high. + let g:bufExplorerSplitHorzSize=0 " New split window size set by Vim. +The default is 0, so that the size is set by Vim. + *g:bufExplorerSplitOutPathName* To control whether to split out the path and file name or not, use: > let g:bufExplorerSplitOutPathName=1 " Split the path and file name. @@ -196,313 +248,523 @@ current window, use: > let g:bufExplorerSplitRight=1 " Split right. The default is to use the global &splitright. + *g:bufExplorerSplitVertSize* +To control the size of the new vertical split window, use: > + let g:bufExplorerSplitVertSize=n " New split window is n columns wide. + let g:bufExplorerSplitVertSize=0 " New split windows size set by Vim. +The default is 0, so that the size is set by Vim. + + *g:bufExplorerVersionWarn* +To control whether to warning about Vim version or not, use: > + let g:bufExplorerVersionWarn=1 " Warn if version conflict. + let g:bufExplorerVersionWarn=0 " Do not warn if version conflict. +The default is 1. + =============================================================================== CHANGE LOG *bufexplorer-changelog* -7.2.8 - Enhancements: - * Thanks to Charles Campbell for integrating bufexplorer with GDBMGR. - http://mysite.verizon.net/astronaut/vim/index.html#GDBMGR -7.2.7 - Fix: - * My 1st attempt to fix the "cache" issue where buffers information - has changed but the cache/display does not reflect those changes. - More work still needs to be done. -7.2.6 - Fix: - * Thanks to Michael Henry for pointing out that I totally forgot to - update the inline help to reflect the previous change to the 'd' - and 'D' keys. Opps! -7.2.5 - Fix: - * Philip Morant suggested switching the command (bwipe) associated - with the 'd' key with the command (bdelete) associated with the 'D' - key. This made sense since the 'd' key is more likely to be used - compared to the 'D' key. -7.2.4 - Fix: - * I did not implement the patch provided by Godefroid Chapelle - correctly. I missed one line which happened to be the most - important one :) -7.2.3 - Enhancements: - * Thanks to David Fishburn for helping me out with a much needed - code overhaul as well as some awesome performance enhancements. - He also reworked the handling of tabs. - * Thanks to Vladimir Dobriakov for making the suggestions on - enhancing the documentation to include a better explaination of - what is contained in the main bufexplorer window. - * Thanks to Yuriy Ershov for added code that when the bufexplorer - window is opened, the cursor is now positioned at the line with the - active buffer (useful in non-MRU sort modes). - * Yuriy also added the abiltiy to cycle through the sort fields in - reverse order. - Fixes: - * Thanks to Michael Henry for supplying a patch that allows - bufexplorer to be opened even when there is one buffer or less. - * Thanks to Godefroid Chapelle for supplying a patch that fixed - MRU sort order after loading a session. -7.2.2 - Fixes: - * Thanks to David L. Dight for spotting and fixing an issue when - using ctrl^. bufexplorer would incorrectly handle the previous - buffer so that when ctrl^ was pressed the incorrect file was opened. -7.2.1 - Fixes: - * Thanks to Dimitar for spotting and fixing a feature that was - inadvertently left out of the previous version. The feature was - when bufexplorer was used together with WinManager, you could use - the tab key to open a buffer in a split window. -7.2.0 - Enhancements: - * For all those missing the \bs and \bv commands, these have now - returned. Thanks to Phil O'Connell for asking for the return of - these missing features and helping test out this version. - Fixes: - * Fixed problem with the bufExplorerFindActive code not working - correctly. - * Fixed an incompatibility between bufexplorer and netrw that caused - buffers to be incorrectly removed from the MRU list. -7.1.7 - Fixes: - * TaCahiroy fixed several issues related to opening a buffer in a - tab. -7.1.6 - Fixes: - * Removed ff=unix from modeline in bufexplorer.txt. Found by Bill - McCarthy. -7.1.5 - Fixes: - * Could not open unnamed buffers. Fixed by TaCahiroy. -7.1.4 - Fixes: - * Sometimes when a file's path has 'white space' in it, extra buffers - would be created containing each piece of the path. i.e: - opening c:\document and settings\test.txt would create a buffer - named "and" and a buffer named "Documents". This was reported and - fixed by TaCa Yoss. -7.1.3 - Fixes: - * Added code to allow only one instance of the plugin to run at a - time. Thanks Dennis Hostetler. -7.1.2 - Fixes: - * Fixed a jumplist issue spotted by JiangJun. I overlooked the - 'jumplist' and with a couple calls to 'keepjumps', everything is - fine again. - * Went back to just having a plugin file, no autoload file. By having - the autoload, WinManager was no longer working and without really - digging into the cause, it was easier to go back to using just a - plugin file. -7.1.1 - Fixes: - * A problem spotted by Thomas Arendsen Hein. - When running Vim (7.1.94), error E493 was being thrown. - Enhancements: - * Added 'D' for 'delete' buffer as the 'd' command was a 'wipe' - buffer. -7.1.0 - Another 'major' update, some by Dave Larson, some by me. - * Making use of 'autoload' now to make the plugin load quicker. - * Removed '\bs' and '\bv'. These are now controlled by the user. The - user can issue a ':sp' or ':vs' to create a horizontal or vertical - split window and then issue a '\be' - * Added handling of tabs. -7.0.17 - Fixed issue with 'drop' command. - Various enhancements and improvements. -7.0.16 - Fixed issue reported by Liu Jiaping on non Windows systems, which was - ... - Open file1, open file2, modify file1, open bufexplorer, you get the - following error: +7.4.21 December 8, 2018 + - Merged in changes from adelarsq that introduced ryanoasis/vim-devicons + support. If the global g:loaded_webdevicons has been set, bufexplorer + will now load the associated dev icons for each buffer. +7.4.20 January 18, 2017 + - Thanks to jpflouret for supplying code that can remove the warning + messages if you using this plugin on an older version of Vim. The + global variable is g:bufExplorerVersionWarn. +7.4.19 September 18, 2017 + - Merged all changes from github back into this version and tried to sync + to the correct version number. +7.4.18 - Github. +7.4.17 - Github. +7.4.16 August 14, 2017 + - Thanks to Yubo Su for the patch that adds 'f, F, V, and v' commands. + With this change, the original 'f' command was remapped to 'a'. - --------8<-------- - Error detected while processing function - 14_StartBufExplorer..14_SplitOpen: - line 4: - E37: No write since last change (add ! to override) + The set of commands that can be used during exploring are: + F - Open selected buffer in another window above the current. + f - Open selected buffer in another window below the current. + V - Open the selected buffer in another window on the left of the + current. + v - Open the selected buffer in another window on the right of the + current. +7.4.15 May 01, 2017 + - Finally applied the patch submitted by justfalter. This patch is a + backward-compatible fix for the "invalid tab range" bug. +7.4.14 April 10, 2017 + - As suggested by adelarsq way back on January 5th, 2016, a filetype has + been added. There is now 'filetype=bufexplorer'. +7.4.13 March 08, 2017 + - Thanks to devakivamsi for pointing out that even though bufexplorer + turns off line numbers by default within its own window, this did not + work correctly when using WinManager. This has now been corrected. +7.4.12 September 30, 2016 + - Thanks again to Martin Vuille for several more fixes related to making + bufexplorer more tab-friendly. +7.4.11 September, 20, 2016 + - Thanks to Martin Vuille for reworking the per-tab buffer listing code. + Fix for g:bufExplorerShowTabBuffer is not working correctly and other + "gliches" when the ShotTabBuffer option is enabled. For example old + code would not correctly handle adding/deleting a tab that wasn't the + highest-numbered tab. +7.4.10 August 26, 2016 + - Thanks to buddylindsey for fixing a misspelling in the docs. +7.4.9 April 01, 2016 + - Thanks to ivegotasthma for supplying a patch to fix a major issue with + plugin performance when lots of buffers are open. + - Thanks to ershov for the patch to fix grouping of files in ambiguous + sort modes. + - Thanks to PhilRunninger for changing documentation to use , in + place of '\'. +7.4.8 January 27, 2015 + - Thanks to Marius Gedminas for fixing up the documentation and correcting + various typos. +7.4.7 January 20, 2015 + - Thanks goes out to Phil Runninger for added the ability to toggle the + bufexplorer list on and off using the :ToggleBufExplorer command, the + map bt, and the function ToggleBufExplorer(). +7.4.6 November 03, 2014 + - Not sure how, but the file format was converted to Dos instead of Unix. + I converted the file back to Unix. +7.4.5 October 24, 2014 + - Dr Michael Henry suggested to change all noremap commands to nnoremap. + Using noremap is unnecessarily broad and can cause problems, especially + for select mode. +7.4.4 August 19, 2014 + - Revert change where bufexplorer windows was closed even if the target + buffer has not been loaded yet. +7.4.3 August 13, 2014 + - Ivan Ukhov fixed issue with deleting the last window. This update also + fixes as well as another. If you have say, NERDtree open on the left + side and bufexplorer on the right, that bufexplorer would close NERDtree + erroneously thinking that it is closing itself. + - Radoslaw Burny fixed a few bugs that surfaced when bufexplorer is used + within winmanager. +7.4.2 October 22, 2013 + - Added global option g:bufExplorerDisableDefaultKeyMapping. This option + controls weather the default key mappings (\be, \bs, and \bv) are + enabled or not. See documentation for more information. +7.4.1 October 11, 2013 + - First update related to Vim 7.4. + - Changed license text. + - Fixed issue with 'hidden'. If 'hidden' is set, make sure that + g:bufExplorerFindActive is set to 0. Otherwise, when using \bs or \bv, + and selecting a buffer, the original buffer will be switched to instead + of being opened in the newly created windows. + - Added new 'b' mapping when the bufExplorer window is opened. When 'b' + is pressed, the user is prompted for the buffer number to switch to, and + is is then switched to when is pressed. This allows for somewhat + faster buffer switching instead of using the j and k keys or the mouse + to select the buffer to switch to. + - Removed 'set nolist' from the Initialize() function as well as the + restore of the 'list' setting in the CleanUp() function. These were + causing issues when multiple new files were opened from the command + line. Furthermore, there was really no reason, that I can remember, to + why the 'list' setting was saved, modified, and restored anyways. + - Fixed issue with WinManager integration code not working correctly + anymore. + - Brought back the xnoremap setup for the 'd' and 'D' keys. These were + removed for some reason after version 7.2.8. + - Thanks to all the contributors and testers. +7.3.6 May 06, 2013 + - Removed the 'drop' window command that was causing issue with the + argument-list being modified after the BufExplorer windows was + displayed. +7.3.5 February 08, 2013 + - Michael Henry added the ability to view "No Name" buffers. This + functionality was lost since version 7.3.0. He also did some removal of + "dead" code and cleaned up the code to handle filenames with embedded + '"'. +7.3.4 January 28, 2013 + - Thanks go out to John Szakmeister for finding and fixing a bug in the + RebuildBufferList method. The keepjumps line that clears the list could + potentially reference a backwards range. +7.3.3 January 14, 2013 + - Major cleanup and reorganization of the change log. + - We welcome the return of g:bufExplorerSplitHorzSize and + g:bufExplorerSplitVertSize. When setting these values, anything less + than or equal to 0 causes the split windows size to be determined by + Vim. If for example you want your new horizontal split window 10 rows + high, set g:bufExplorerSplitHorzSize = 10 in your .vimrc. Similar would + be done if wanting a vertical split except you would use the + g:bufExplorerSplitVertSize variable instead. +7.3.2 December 24, 2012 + - Thanks go out to Michael Henry for pointing out that I completely + missed yet another function, ReverseSortSelect(), during the + refactoring. This function has now returned. +7.3.1 December 06, 2012 + - Thanks go out to Brett Rasmussen for pointing out that the feature + added way back in version 7.2.3 by Yuriy Ershov to automatically + reposition the cursor to the line containing the active buffer, was + no longer in the plugin. That bit of code has been re-added and + all is well. +7.3.0 October 09, 2012 + - It has been quite a while since I published a new version and this + is the first version since Vim 7.3 was released. I have put some + time into reworking and cleaning up the code as well as various bug + fixes. Overall, I am hopeful that I not forgotten or lost a feature. + - Thanks to Tim Johnson for testing out this new version. + - I have hopefully allowed for better mapping of the main public + methods as is explained in the |bufexplorer-customization| section + of the documentation. + - Add new 'B', 'o', and 'S' key mappings. +7.2.8 November 08, 2010 + - Thanks to Charles Campbell for integrating bufexplorer with GDBMGR. + http://mysite.verizon.net/astronaut/vim/index.html#GDBMGR +7.2.7 April 26, 2010 + - My 1st attempt to fix the "cache" issue where buffers information + has changed but the cache/display does not reflect those changes. + More work still needs to be done. +7.2.6 February 12, 2010 + - Thanks to Michael Henry for pointing out that I totally forgot to + update the inline help to reflect the previous change to the 'd' + and 'D' keys. Opps! +7.2.5 February 10, 2010 + - Philip Morant suggested switching the command (bwipe) associated + with the 'd' key with the command (bdelete) associated with the 'D' + key. This made sense since the 'd' key is more likely to be used + compared to the 'D' key. +7.2.4 January 14, 2010 + - I did not implement the patch provided by Godefroid Chapelle + correctly. I missed one line which happened to be the most important + one :) +7.2.3 December 15, 2009 + - Hopefully I have not left anyone or anything out :) + - Thanks to David Fishburn for helping me out with a much needed + code overhaul as well as some awesome performance enhancements. + - David also reworked the handling of tabs. + - Thanks to Vladimir Dobriakov for making the suggestions on + enhancing the documentation to include a better explaination of + what is contained in the main bufexplorer window. + - Thanks to Yuriy Ershov for added code that when the bufexplorer + window is opened, the cursor is now positioned at the line with the + active buffer (useful in non-MRU sort modes). + - Yuriy also added the abiltiy to cycle through the sort fields in + reverse order. + - Thanks to Michael Henry for supplying a patch that allows + bufexplorer to be opened even when there is one buffer or less. + - Thanks to Godefroid Chapelle for supplying a patch that fixed + MRU sort order after loading a session. +7.2.2 November 19, 2008 + - Thanks to David L. Dight for spotting and fixing an issue when using + ctrl^. bufexplorer would incorrectly handle the previous buffer so + that when ctrl^ was pressed the incorrect file was opened. +7.2.1 September 03, 2008 + - Thanks to Dimitar for spotting and fixing a feature that was + inadvertently left out of the previous version. The feature was when + bufexplorer was used together with WinManager, you could use the tab + key to open a buffer in a split window. +7.2.0 August 15, 2008 + - For all those missing the \bs and \bv commands, these have now + returned. Thanks to Phil O'Connell for asking for the return of + these missing features and helping test out this version. + - Fixed problem with the bufExplorerFindActive code not working + correctly. + - Fixed an incompatibility between bufexplorer and netrw that caused + buffers to be incorrectly removed from the MRU list. +7.1.7 December 21, 2007 + - TaCahiroy fixed several issues related to opening a buffer in a tab. +7.1.6 December 01, 2007 + - Removed ff=unix from modeline in bufexplorer.txt. Found by Bill + McCarthy. +7.1.5 November 30, 2007 + - Could not open unnamed buffers. Fixed by TaCahiroy. +7.1.4 November 16, 2007 + - Sometimes when a file's path has 'white space' in it, extra buffers + would be created containing each piece of the path. i.e: + opening c:\document and settings\test.txt would create a buffer + named "and" and a buffer named "Documents". This was reported and + fixed by TaCa Yoss. +7.1.3 November 15, 2007 + - Added code to allow only one instance of the plugin to run at a time. + Thanks Dennis Hostetler. +7.1.2 November 07, 2007 + - Dave Larson added handling of tabs. + - Dave Larson removed \bs and \bv commands because these are easier for + the used to create horizontal and vertical windows. + - Fixed a jumplist issue spotted by JiangJun. I overlooked the + 'jumplist' and with a couple calls to 'keepjumps', everything is fine + again. + - Went back to using just a plugin file, instead of both an autoload + and plugin file. The splitting of the file caused issues with other + plugins. So if you have a prior version of bufexplorer that has an + autoload file, please remove autoload\bufexplorer and + plugin\bufexplorer before installing this new version. + - Fixed E493 error spotted by Thomas Arendsen Hein. + - Minor cosmetic changes. + - Minor help file changes. +7.1.1 August 02, 2007 + - A problem spotted by Thomas Arendsen Hein. When running Vim + (7.1.94), error E493 was being thrown. + * Added 'D' for 'delete' buffer as the 'd' command was a 'wipe' buffer. +7.1.0 August 01, 2007 + - Another 'major' update, some by Dave Larson, some by me. + - Making use of 'autoload' now to make the plugin load quicker. + - Removed '\bs' and '\bv'. These are now controlled by the user. The + user can issue a ':sp' or ':vs' to create a horizontal or vertical + split window and then issue a '\be' + - Added handling of tabs. +7.0.17 July 24, 2007 + - Fixed issue with 'drop' command. + - Various enhancements and improvements. +7.0.16 May 15, 2007 + - Fixed issue reported by Liu Jiaping on non Windows systems, which was + ... + Open file1, open file2, modify file1, open bufexplorer, you get the + following error: - But the worse thing is, when I want to save the current buffer and - type ':w', I get another error message: - E382: Cannot write, 'buftype' option is set - --------8<-------- + --------8<-------- + Error detected while processing function + 14_StartBufExplorer..14_SplitOpen: + line 4: + E37: No write since last change (add ! to override) -7.0.15 - Thanks to Mark Smithfield for suggesting bufexplorer needed to handle - the ':args' command. -7.0.14 - Thanks to Randall Hansen for removing the requirement of terminal - versions to be recompiled with 'gui' support so the 'drop' command - would work. The 'drop' command is really not needed in terminal - versions. -7.0.13 - Fixed integration with WinManager. - Thanks to Dave Eggum for another update. - - Fix: The detailed help didn't display the mapping for toggling - the split type, even though the split type is displayed. - - Fixed incorrect description in the detailed help for toggling - relative or full paths. - - Deprecated s:ExtractBufferNbr(). Vim's str2nr() does the same - thing. - - Created a s:Set() function that sets a variable only if it hasn't - already been defined. It's useful for initializing all those - default settings. - - Removed checks for repetitive command definitions. They were - unnecessary. - - Made the help highlighting a little more fancy. - - Minor reverse compatibility issue: Changed ambiguous setting - names to be more descriptive of what they do (also makes the code - easier to follow): - Changed bufExplorerSortDirection to bufExplorerReverseSort - Changed bufExplorerSplitType to bufExplorerSplitVertical - Changed bufExplorerOpenMode to bufExplorerUseCurrentWindow - - When the BufExplorer window closes, all the file-local marks are - now deleted. This may have the benefit of cleaning up some of the - jumplist. - - Changed the name of the parameter for StartBufExplorer from - "split" to "open". The parameter is a string which specifies how - the buffer will be open, not if it is split or not. - - Deprecated DoAnyMoreBuffersExist() - it is a one line function - only used in one spot. - - Created four functions (SplitOpen(), RebuildBufferList(), - UpdateHelpStatus() and ReSortListing()) all with one purpose - to - reduce repeated code. - - Changed the name of AddHeader() to CreateHelp() to be more - descriptive of what it does. It now returns an array instead of - updating the window directly. This has the benefit of making the - code more efficient since the text the function returns is used a - little differently in the two places the function is called. - - Other minor simplifications. -7.0.12 - MAJOR Update. - This version will ONLY run with Vim version 7.0 or greater. - Dave Eggum has made some 'significant' updates to this latest - version: - - Added BufExplorerGetAltBuf() global function to be used in the - users rulerformat. - - Added g:bufExplorerSplitRight option. - - Added g:bufExplorerShowRelativePath option with mapping. - - Added current line highlighting. - - The split type can now be changed whether bufexplorer is opened - in split mode or not. - - Various major and minor bug fixes and speed improvements. - - Sort by extension. - Other improvements/changes: - - Changed the help key from '?' to to be more 'standard'. - - Fixed splitting of vertical bufexplorer window. - Hopefully I have not forgot something :) -7.0.11 - Fixed a couple of highlighting bugs, reported by David Eggum. He also - changed passive voice to active on a couple of warning messages. -7.0.10 - Fixed bug report by Xiangjiang Ma. If the 'ssl' option is set, - the slash character used when displaying the path was incorrect. -7.0.9 - Martin Grenfell found and eliminated an annoying bug in the - bufexplorer/winmanager integration. The bug was were an - annoying message would be displayed when a window was split or - a new file was opened in a new window. Thanks Martin! -7.0.8 - Thanks to Mike Li for catching a bug in the WinManager integration. - The bug was related to the incorrect displaying of the buffer - explorer's window title. -7.0.7 - Thanks to Jeremy Cowgar for adding a new enhancement. This - enhancement allows the user to press 'S', that is capital S, which - will open the buffer under the cursor in a newly created split - window. -7.0.6 - Thanks to Larry Zhang for finding a bug in the "split" buffer code. - If you force set g:bufExplorerSplitType='v' in your vimrc, and if you - tried to do a \bs to split the bufexplorer window, it would always - split horizontal, not vertical. He also found that I had a typeo in - that the variable g:bufExplorerSplitVertSize was all lower case in - the documentation which was incorrect. -7.0.5 - Thanks to Mun Johl for pointing out a bug that if a buffer was - modified, the '+' was not showing up correctly. -7.0.4 - Fixed a problem discovered first by Xiangjiang Ma. Well since I've - been using vim 7.0 and not 6.3, I started using a function (getftype) - that is not in 6.3. So for backward compatibility, I conditionaly use - this function now. Thus, the g:bufExplorerShowDirectories feature is - only available when using vim 7.0 and above. -7.0.3 - Thanks to Erwin Waterlander for finding a problem when the last - buffer was deleted. This issue got me to rewrite the buffer display - logic (which I've wanted to do for sometime now). - Also great thanks to Dave Eggum for coming up with idea for - g:bufExplorerShowDirectories. Read the above information about this - feature. -7.0.2 - Thanks to Thomas Arendsen Hein for finding a problem when a user - has the default help turned off and then brought up the explorer. An - E493 would be displayed. -7.0.1 - Thanks to Erwin Waterlander for finding a couple problems. - The first problem allowed a modified buffer to be deleted. Opps! The - second problem occurred when several files were opened, BufExplorer - was started, the current buffer was deleted using the 'd' option, and - then BufExplorer was exited. The deleted buffer was still visible - while it is not in the buffers list. Opps again! -7.0.0 - Thanks to Shankar R. for suggesting to add the ability to set - the fixed width (g:bufExplorerSplitVertSize) of a new window - when opening bufexplorer vertically and fixed height - (g:bufExplorerSplitHorzSize) of a new window when opening - bufexplorer horizontally. By default, the windows are normally - split to use half the existing width or height. -6.3.0 - Added keepjumps so that the jumps list would not get cluttered with - bufexplorer related stuff. -6.2.3 - Thanks to Jay Logan for finding a bug in the vertical split position - of the code. When selecting that the window was to be split - vertically by doing a '\bv', from then on, all splits, i.e. '\bs', - were split vertically, even though g:bufExplorerSplitType was not set - to 'v'. -6.2.2 - Thanks to Patrik Modesto for adding a small improvement. For some - reason his bufexplorer window was always showing up folded. He added - 'setlocal nofoldenable' and it was fixed. -6.2.1 - Thanks goes out to Takashi Matsuo for added the 'fullPath' sorting - logic and option. -6.2.0 - Thanks goes out to Simon Johann-Ganter for spotting and fixing a - problem in that the last search pattern is overridden by the search - pattern for blank lines. -6.1.6 - Thanks to Artem Chuprina for finding a pesky bug that has been around - for sometime now. The key mapping was causing the buffer - explored to close prematurely when vim was run in an xterm. The - key mapping is now removed. -6.1.5 - Thanks to Khorev Sergey. Added option to show default help or not. -6.1.4 - Thanks goes out to Valery Kondakoff for suggesting the addition of - setlocal nonumber and foldcolumn=0. This allows for line numbering - and folding to be turned off temporarily while in the explorer. -6.1.3 - Added folding. Did some code cleanup. Added the ability to force the - newly split window to be temporarily vertical, which was suggested by - Thomas Glanzmann. -6.1.2 - Now pressing the key will quit, just like 'q'. - Added folds to hide winmanager configuration. - If anyone had the 'C' option in their cpoptions they would receive - a E10 error on startup of BufExplorer. cpo is now saved, updated and - restored. Thanks to Charles E Campbell, Jr. - Attempted to make sure there can only be one BufExplorer window open - at a time. -6.1.1 - Thanks to Brian D. Goodwin for adding toupper to FileNameCmp. This - way buffers sorted by name will be in the correct order regardless of - case. -6.0.16 - Thanks to Andre Pang for the original patch/idea to get bufexplorer - to work in insertmode/modeless mode (evim). Added Initialize - and Cleanup autocommands to handle commands that need to be - performed when starting or leaving bufexplorer. -6.0.15 - Srinath Avadhanulax added a patch for winmanager.vim. -6.0.14 - Fix a few more bug that I thought I already had fixed. Thanks - to Eric Bloodworth for adding 'Open Mode/Edit in Place'. Added - vertical splitting. -6.0.13 - Thanks to Charles E Campbell, Jr. for pointing out some embarrassing - typos that I had in the documentation. I guess I need to run - the spell checker more :o) -6.0.12 - Thanks to Madoka Machitani, for the tip on adding the augroup command - around the MRUList autocommands. -6.0.11 - Fixed bug report by Xiangjiang Ma. '"=' was being added to the - search history which messed up hlsearch. -6.0.10 - Added the necessary hooks so that the Srinath Avadhanula's - winmanager.vim script could more easily integrate with this script. - Tried to improve performance. -6.0.9 - Added MRU (Most Recently Used) sort ordering. -6.0.8 - Was not resetting the showcmd command correctly. - Added nifty help file. -6.0.7 - Thanks to Brett Carlane for some great enhancements. Some are added, - some are not, yet. Added highlighting of current and alternate - filenames. Added splitting of path/filename toggle. Reworked - ShowBuffers(). - Changed my email address. -6.0.6 - Copyright notice added. Needed this so that it could be distributed - with Debian Linux. Fixed problem with the SortListing() function - failing when there was only one buffer to display. -6.0.5 - Fixed problems reported by David Pascoe, in that you where unable to - hit 'd' on a buffer that belonged to a files that no longer existed - and that the 'yank' buffer was being overridden by the help text when - the bufexplorer was opened. -6.0.4 - Thanks to Charles Campbell, Jr. for making this plugin more plugin - *compliant*, adding default keymappings of be and bs - as well as fixing the 'w:sortDirLabel not being defined' bug. -6.0.3 - Added sorting capabilities. Sort taken from explorer.vim. -6.0.2 - Can't remember. (2001-07-25) -6.0.1 - Initial release. + But the worse thing is, when I want to save the current buffer and + type ':w', I get another error message: + E382: Cannot write, 'buftype' option is set + --------8<-------- + +7.0.15 April 27, 2007 + - Thanks to Mark Smithfield for suggesting bufexplorer needed to handle + the ':args' command. +7.0.14 March 23, 2007 + - Thanks to Randall Hansen for removing the requirement of terminal + versions to be recompiled with 'gui' support so the 'drop' command + would work. The 'drop' command is really not needed in terminal + versions. +7.0.13 February 23, 2007 + - Fixed integration with WinManager. + - Thanks to Dave Eggum for another update. + * Fix: The detailed help didn't display the mapping for toggling + the split type, even though the split type is displayed. + * Fixed incorrect description in the detailed help for toggling + relative or full paths. + * Deprecated s:ExtractBufferNbr(). Vim's str2nr() does the same + thing. + * Created a s:Set() function that sets a variable only if it hasn't + already been defined. It's useful for initializing all those + default settings. + * Removed checks for repetitive command definitions. They were + unnecessary. + * Made the help highlighting a little more fancy. + * Minor reverse compatibility issue: Changed ambiguous setting + names to be more descriptive of what they do (also makes the code + easier to follow): + Changed bufExplorerSortDirection to bufExplorerReverseSort + Changed bufExplorerSplitType to bufExplorerSplitVertical + Changed bufExplorerOpenMode to bufExplorerUseCurrentWindow + * When the BufExplorer window closes, all the file-local marks are + now deleted. This may have the benefit of cleaning up some of the + jumplist. + * Changed the name of the parameter for StartBufExplorer from + "split" to "open". The parameter is a string which specifies how + the buffer will be open, not if it is split or not. + * Deprecated DoAnyMoreBuffersExist() - it is a one line function + only used in one spot. + * Created four functions (SplitOpen(), RebuildBufferList(), + UpdateHelpStatus() and ReSortListing()) all with one purpose - to + reduce repeated code. + * Changed the name of AddHeader() to CreateHelp() to be more + descriptive of what it does. It now returns an array instead of + updating the window directly. This has the benefit of making the + code more efficient since the text the function returns is used a + little differently in the two places the function is called. + * Other minor simplifications. +7.0.12 November 30, 2006 + - MAJOR Update. This version will ONLY run with Vim version 7.0 or + greater. + - Dave Eggum has made some 'significant' updates to this latest + version: + * Added BufExplorerGetAltBuf() global function to be used in the + user's rulerformat. + * Added g:bufExplorerSplitRight option. + * Added g:bufExplorerShowRelativePath option with mapping. + * Added current line highlighting. + * The split type can now be changed whether bufexplorer is opened + in split mode or not. + * Various major and minor bug fixes and speed improvements. + * Sort by extension. + - Other improvements/changes: + * Changed the help key from '?' to to be more 'standard'. + * Fixed splitting of vertical bufexplorer window. + - Hopefully I have not forgot something :) +7.0.11 March 10, 2006 + - Fixed a couple of highlighting bugs, reported by David Eggum. + - Dave Eggum also changed passive voice to active on a couple of + warning messages. +7.0.10 March 02, 2006 + - Fixed bug report by Xiangjiang Ma. If the 'ssl' option is set, + the slash character used when displaying the path was incorrect. +7.0.9 February 28, 2006 + - Martin Grenfell found and eliminated an annoying bug in the + bufexplorer/winmanager integration. The bug was were an + annoying message would be displayed when a window was split or + a new file was opened in a new window. Thanks Martin! +7.0.8 January 18, 2006 + - Thanks to Mike Li for catching a bug in the WinManager integration. + The bug was related to the incorrect displaying of the buffer + explorer's window title. +7.0.7 December 19, 2005 + - Thanks to Jeremy Cowgar for adding a new enhancement. This + enhancement allows the user to press 'S', that is capital S, which + will open the buffer under the cursor in a newly created split + window. +7.0.6 November 18, 2005 + - Thanks to Larry Zhang for finding a bug in the "split" buffer code. + If you force set g:bufExplorerSplitType='v' in your vimrc, and if you + tried to do a \bs to split the bufexplorer window, it would always + split horizontal, not vertical. + - Larry Zhang also found that I had a typeo in that the variable + g:bufExplorerSplitVertSize was all lower case in the documentation + which was incorrect. +7.0.5 October 18, 2005 + - Thanks to Mun Johl for pointing out a bug that if a buffer was + modified, the '+' was not showing up correctly. +7.0.4 October 03, 2005 + - Fixed a problem discovered first by Xiangjiang Ma. Well since I've + been using vim 7.0 and not 6.3, I started using a function (getftype) + that is not in 6.3. So for backward compatibility, I conditionaly use + this function now. Thus, the g:bufExplorerShowDirectories feature is + only available when using vim 7.0 and above. +7.0.3 September 30, 2005 + - Thanks to Erwin Waterlander for finding a problem when the last + buffer was deleted. This issue got me to rewrite the buffer display + logic (which I've wanted to do for sometime now). + - Also great thanks to Dave Eggum for coming up with idea for + g:bufExplorerShowDirectories. Read the above information about this + feature. +7.0.2 March 25, 2005 + - Thanks to Thomas Arendsen Hein for finding a problem when a user + has the default help turned off and then brought up the explorer. An + E493 would be displayed. +7.0.1 March 10, 2005 + - Thanks to Erwin Waterlander for finding a couple problems. + The first problem allowed a modified buffer to be deleted. Opps! The + second problem occurred when several files were opened, BufExplorer + was started, the current buffer was deleted using the 'd' option, and + then BufExplorer was exited. The deleted buffer was still visible + while it is not in the buffers list. Opps again! +7.0.0 March 10, 205 + - Thanks to Shankar R. for suggesting to add the ability to set + the fixed width (g:bufExplorerSplitVertSize) of a new window + when opening bufexplorer vertically and fixed height + (g:bufExplorerSplitHorzSize) of a new window when opening + bufexplorer horizontally. By default, the windows are normally + split to use half the existing width or height. +6.3.0 July 23, 2004 + - Added keepjumps so that the jumps list would not get cluttered with + bufexplorer related stuff. +6.2.3 April 15, 2004 + - Thanks to Jay Logan for finding a bug in the vertical split position + of the code. When selecting that the window was to be split + vertically by doing a '\bv', from then on, all splits, i.e. '\bs', + were split vertically, even though g:bufExplorerSplitType was not set + to 'v'. +6.2.2 January 09, 2004 + - Thanks to Patrik Modesto for adding a small improvement. For some + reason his bufexplorer window was always showing up folded. He added + 'setlocal nofoldenable' and it was fixed. +6.2.1 October 09, 2003 + - Thanks goes out to Takashi Matsuo for added the 'fullPath' sorting + logic and option. +6.2.0 June 13, 2003 + - Thanks goes out to Simon Johann-Ganter for spotting and fixing a + problem in that the last search pattern is overridden by the search + pattern for blank lines. +6.1.6 May 05, 2003 + - Thanks to Artem Chuprina for finding a pesky bug that has been around + for sometime now. The key mapping was causing the buffer + explored to close prematurely when vim was run in an xterm. The + key mapping is now removed. +6.1.5 April 28, 2003 + - Thanks to Khorev Sergey. Added option to show default help or not. +6.1.4 March 18, 2003 + - Thanks goes out to Valery Kondakoff for suggesting the addition of + setlocal nonumber and foldcolumn=0. This allows for line numbering + and folding to be turned off temporarily while in the explorer. +6.1.3 March 11, 2003 + - Added folding. + - Did some code cleanup. + - Added the ability to force the newly split window to be temporarily + vertical, which was suggested by Thomas Glanzmann. +6.1.2 November 05, 2002 + - Now pressing the key will quit, just like 'q'. + - Added folds to hide winmanager configuration. + - If anyone had the 'C' option in their cpoptions they would receive + a E10 error on startup of BufExplorer. cpo is now saved, updated and + restored. Thanks to Charles E Campbell, Jr. + - Attempted to make sure there can only be one BufExplorer window open + at a time. +6.1.1 March 28, 2002 + - Thanks to Brian D. Goodwin for adding toupper to FileNameCmp. This + way buffers sorted by name will be in the correct order regardless of + case. +6.0.16 March 14, 2002 + - Thanks to Andre Pang for the original patch/idea to get bufexplorer + to work in insertmode/modeless mode (evim). + - Added Initialize and Cleanup autocommands to handle commands that + need to be performed when starting or leaving bufexplorer. +6.0.15 February 20, 2002 + - Srinath Avadhanulax added a patch for winmanager.vim. +6.0.14 February 19, 2002 + - Fix a few more bug that I thought I already had fixed. + - Thanks to Eric Bloodworth for adding 'Open Mode/Edit in Place'. + - Added vertical splitting. +6.0.13 February 05, 2002 + - Thanks to Charles E Campbell, Jr. for pointing out some embarrassing + typos that I had in the documentation. I guess I need to run the + spell checker more :o) +6.0.12 February 04, 2002 + - Thanks to Madoka Machitani, for the tip on adding the augroup command + around the MRUList autocommands. +6.0.11 January 26, 2002 + - Fixed bug report by Xiangjiang Ma. '"=' was being added to the search + history which messed up hlsearch. +6.0.10 January 14, 2002 + - Added the necessary hooks so that the Srinath Avadhanula's + winmanager.vim script could more easily integrate with this script. + - Tried to improve performance. +6.0.9 December 17, 2001 + - Added MRU (Most Recently Used) sort ordering. +6.0.8 December 03, 2001 + - Was not resetting the showcmd command correctly. + - Added nifty help file. +6.0.7 November 19, 2001 + - Thanks to Brett Carlane for some great enhancements. Some are added, + some are not, yet. Added highlighting of current and alternate + filenames. Added splitting of path/filename toggle. Reworked + ShowBuffers(). + - Changed my email address. +6.0.6 September 05, 2001 + - Copyright notice added. Needed this so that it could be distributed + with Debian Linux. + - Fixed problem with the SortListing() function failing when there was + only one buffer to display. +6.0.5 August 10, 2001 + - Fixed problems reported by David Pascoe, in that you where unable to + hit 'd' on a buffer that belonged to a files that no longer existed + and that the 'yank' buffer was being overridden by the help text when + the bufexplorer was opened. +6.0.4 July, 31, 2001 + - Thanks to Charles Campbell, Jr. for making this plugin more plugin + *compliant*, adding default keymappings of be and bs + as well as fixing the 'w:sortDirLabel not being defined' bug. +6.0.3 July 30, 2001 + - Added sorting capabilities. Sort taken from explorer.vim. +6.0.2 July 25, 2001 + - Can't remember. +6.0.1 Sometime before July 25, 2001 + - Initial release. =============================================================================== TODO *bufexplorer-todo* -- Nothing as of now, buf if you have any suggestions, drop me an email. +- Add ability to open a buffer in a horizontal or vertical split after the + initial bufexplorer window is opened. =============================================================================== CREDITS *bufexplorer-credits* -Author: Jeff Lanzarotta +Author: Jeff Lanzarotta Credit must go out to Bram Moolenaar and all the Vim developers for making the world's best editor (IMHO). I also want to thank everyone who @@ -510,4 +772,35 @@ helped and gave me suggestions. I wouldn't want to leave anyone out so I won't list names. =============================================================================== -vim:tw=78:noet:wrap:ts=8:ft=help:norl: +COPYRIGHT *bufexplorer-copyright* + +Copyright (c) 2001-2017, Jeff Lanzarotta +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + +* Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. + +* Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + +* Neither the name of the {organization} nor the names of its contributors may + be used to endorse or promote products derived from this software without + specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE +FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +=============================================================================== +vim:tw=78:noet:wrap:ts=4:ft=help:norl: diff --git a/sources_non_forked/bufexplorer/plugin/bufexplorer.vim b/sources_non_forked/bufexplorer/plugin/bufexplorer.vim index 87913639..6a7ef4f0 100644 --- a/sources_non_forked/bufexplorer/plugin/bufexplorer.vim +++ b/sources_non_forked/bufexplorer/plugin/bufexplorer.vim @@ -1,675 +1,767 @@ -"============================================================================== -" Copyright: Copyright (C) 2001-2010 Jeff Lanzarotta -" Permission is hereby granted to use and distribute this code, -" with or without modifications, provided that this copyright -" notice is copied with it. Like anything else that's free, -" bufexplorer.vim is provided *as is* and comes with no -" warranty of any kind, either expressed or implied. In no -" event will the copyright holder be liable for any damages -" resulting from the use of this software. +"============================================================================ +" Copyright: Copyright (c) 2001-2018, Jeff Lanzarotta +" All rights reserved. +" +" Redistribution and use in source and binary forms, with or +" without modification, are permitted provided that the +" following conditions are met: +" +" * Redistributions of source code must retain the above +" copyright notice, this list of conditions and the following +" disclaimer. +" +" * Redistributions in binary form must reproduce the above +" copyright notice, this list of conditions and the following +" disclaimer in the documentation and/or other materials +" provided with the distribution. +" +" * Neither the name of the {organization} nor the names of its +" contributors may be used to endorse or promote products +" derived from this software without specific prior written +" permission. +" +" THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND +" CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, +" INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +" MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +" DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR +" CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +" SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +" NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +" LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +" OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, +" EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. " Name Of File: bufexplorer.vim " Description: Buffer Explorer Vim Plugin -" Maintainer: Jeff Lanzarotta (delux256-vim at yahoo dot com) -" Last Changed: Friday, 22 October 2010 +" Maintainer: Jeff Lanzarotta (delux256-vim at outlook dot com) +" Last Changed: Saturday, 08 December 2018 " Version: See g:bufexplorer_version for version number. " Usage: This file should reside in the plugin directory and be " automatically sourced. " " You may use the default keymappings of " -" be - Opens BE. -" bs - Opens horizontally window BE. -" bv - Opens vertically window BE. +" be - Opens BufExplorer +" bt - Toggles BufExplorer open or closed +" bs - Opens horizontally split window BufExplorer +" bv - Opens vertically split window BufExplorer +" +" Or you can override the defaults and define your own mapping +" in your vimrc file, for example: +" +" nnoremap :BufExplorer +" nnoremap :ToggleBufExplorer +" nnoremap :BufExplorerHorizontalSplit +" nnoremap :BufExplorerVerticalSplit " " Or you can use " -" ":BufExplorer" - Opens BE. -" ":BufExplorerHorizontalSplit" - Opens horizontally window BE. -" ":BufExplorerVerticalSplit" - Opens vertically window BE. +" ":BufExplorer" - Opens BufExplorer +" ":ToggleBufExplorer" - Opens/Closes BufExplorer +" ":BufExplorerHorizontalSplit" - Opens horizontally window BufExplorer +" ":BufExplorerVerticalSplit" - Opens vertically split window BufExplorer " " For more help see supplied documentation. " History: See supplied documentation. -"============================================================================== +"============================================================================= " Exit quickly if already running or when 'compatible' is set. {{{1 if exists("g:bufexplorer_version") || &cp - finish + finish endif "1}}} " Version number -let g:bufexplorer_version = "7.2.8" +let g:bufexplorer_version = "7.4.21" + +" Plugin Code {{{1 +" Check for Vim version {{{2 +if !exists("g:bufExplorerVersionWarn") + let g:bufExplorerVersionWarn = 1 +endif -" Check for Vim version 700 or greater {{{1 if v:version < 700 - echo "Sorry, bufexplorer ".g:bufexplorer_version."\nONLY runs with Vim 7.0 and greater." - finish + if g:bufExplorerVersionWarn + echohl WarningMsg + echo "Sorry, bufexplorer ".g:bufexplorer_version." required Vim 7.0 or greater." + echohl None + endif + finish +endif +" Check to see if the version of Vim has the correct patch applied, if not, do +" not used . +if v:version > 703 || v:version == 703 && has('patch1261') && has('patch1264') + " We are good to go. +else + if g:bufExplorerVersionWarn + echohl WarningMsg + echo "Sorry, bufexplorer ".g:bufexplorer_version." required Vim 7.3 or greater with patch1261 and patch1264." + echohl None + endif + finish endif -" Public Interface {{{1 -if maparg("be") =~ 'BufExplorer' - nunmap be -endif - -if maparg("bs") =~ 'BufExplorerHorizontalSplit' - nunmap bs -endif - -if maparg("bv") =~ 'BufExplorerVerticalSplit' - nunmap bv -endif - -nmap ${2} diff --git a/sources_non_forked/snipmate-snippets/html/script/inline_script.snippet b/sources_non_forked/snipmate-snippets/html/script/inline_script.snippet deleted file mode 100644 index 35e078b3..00000000 --- a/sources_non_forked/snipmate-snippets/html/script/inline_script.snippet +++ /dev/null @@ -1,5 +0,0 @@ - diff --git a/sources_non_forked/snipmate-snippets/html/select.snippet b/sources_non_forked/snipmate-snippets/html/select.snippet deleted file mode 100644 index 252e3f77..00000000 --- a/sources_non_forked/snipmate-snippets/html/select.snippet +++ /dev/null @@ -1,3 +0,0 @@ - diff --git a/sources_non_forked/snipmate-snippets/html/skel/basic.snippet b/sources_non_forked/snipmate-snippets/html/skel/basic.snippet deleted file mode 100644 index 61ec2444..00000000 --- a/sources_non_forked/snipmate-snippets/html/skel/basic.snippet +++ /dev/null @@ -1,13 +0,0 @@ - - - - - ${1:Page Title} - - - - - ${2} - - diff --git a/sources_non_forked/snipmate-snippets/html/skel/basic_with_meta.snippet b/sources_non_forked/snipmate-snippets/html/skel/basic_with_meta.snippet deleted file mode 100644 index b6de9f8d..00000000 --- a/sources_non_forked/snipmate-snippets/html/skel/basic_with_meta.snippet +++ /dev/null @@ -1,15 +0,0 @@ - - - - - ${1:Page Title} - - - - - - - ${2} - - diff --git a/sources_non_forked/snipmate-snippets/html/style.snippet b/sources_non_forked/snipmate-snippets/html/style.snippet deleted file mode 100644 index 26ae0fe9..00000000 --- a/sources_non_forked/snipmate-snippets/html/style.snippet +++ /dev/null @@ -1,3 +0,0 @@ - diff --git a/sources_non_forked/snipmate-snippets/html/t.snippet b/sources_non_forked/snipmate-snippets/html/t.snippet deleted file mode 100644 index ef504276..00000000 --- a/sources_non_forked/snipmate-snippets/html/t.snippet +++ /dev/null @@ -1,3 +0,0 @@ -<${1:div}${2}> - ${3} -${4} diff --git a/sources_non_forked/snipmate-snippets/html/table/basic.snippet b/sources_non_forked/snipmate-snippets/html/table/basic.snippet deleted file mode 100644 index 2100d13d..00000000 --- a/sources_non_forked/snipmate-snippets/html/table/basic.snippet +++ /dev/null @@ -1,3 +0,0 @@ - - ${2} -
diff --git a/sources_non_forked/snipmate-snippets/html/table/hardcore.snippet b/sources_non_forked/snipmate-snippets/html/table/hardcore.snippet deleted file mode 100644 index 35fa01ae..00000000 --- a/sources_non_forked/snipmate-snippets/html/table/hardcore.snippet +++ /dev/null @@ -1,9 +0,0 @@ -+>> - - <++> - - - - - - diff --git a/sources_non_forked/snipmate-snippets/html/textarea.snippet b/sources_non_forked/snipmate-snippets/html/textarea.snippet deleted file mode 100644 index 0b3fb84b..00000000 --- a/sources_non_forked/snipmate-snippets/html/textarea.snippet +++ /dev/null @@ -1 +0,0 @@ - diff --git a/sources_non_forked/snipmate-snippets/java/class/basic+constructor+main.snippet b/sources_non_forked/snipmate-snippets/java/class/basic+constructor+main.snippet deleted file mode 100644 index 3bd770e2..00000000 --- a/sources_non_forked/snipmate-snippets/java/class/basic+constructor+main.snippet +++ /dev/null @@ -1,17 +0,0 @@ -/** - * class $2 - * @author ${4:`g:snips_author`} - */ -${1:public} class ${2:`Snippet_JavaClassNameFromFilename()`}${3} { - - /** - * Constructor for $2 - */ - public $2(${4}) { - ${5} - } - - public static void main(String args[]) { - } - -} diff --git a/sources_non_forked/snipmate-snippets/java/class/basic+constructor.snippet b/sources_non_forked/snipmate-snippets/java/class/basic+constructor.snippet deleted file mode 100644 index 05eabefa..00000000 --- a/sources_non_forked/snipmate-snippets/java/class/basic+constructor.snippet +++ /dev/null @@ -1,14 +0,0 @@ -/** - * class $2 - * @author ${4:`g:snips_author`} - */ -${1:public} class ${2:`Snippet_JavaClassNameFromFilename()`}${3} { - - /** - * Constructor for $2 - */ - public $2(${5}){ - ${6} - } - -} diff --git a/sources_non_forked/snipmate-snippets/java/class/basic.snippet b/sources_non_forked/snipmate-snippets/java/class/basic.snippet deleted file mode 100644 index 05eabefa..00000000 --- a/sources_non_forked/snipmate-snippets/java/class/basic.snippet +++ /dev/null @@ -1,14 +0,0 @@ -/** - * class $2 - * @author ${4:`g:snips_author`} - */ -${1:public} class ${2:`Snippet_JavaClassNameFromFilename()`}${3} { - - /** - * Constructor for $2 - */ - public $2(${5}){ - ${6} - } - -} diff --git a/sources_non_forked/snipmate-snippets/java/for.snippet b/sources_non_forked/snipmate-snippets/java/for.snippet deleted file mode 100644 index 70a41086..00000000 --- a/sources_non_forked/snipmate-snippets/java/for.snippet +++ /dev/null @@ -1,3 +0,0 @@ -for(${1:int i=0}; ${2:condition}; ${3:i++}){ - ${4} -} diff --git a/sources_non_forked/snipmate-snippets/java/gs.snippet b/sources_non_forked/snipmate-snippets/java/gs.snippet deleted file mode 100644 index 954a9a09..00000000 --- a/sources_non_forked/snipmate-snippets/java/gs.snippet +++ /dev/null @@ -1,9 +0,0 @@ -//getter for $3 -public ${2:variable_type} get${1:VariableName}() { - return ${3:variableName}; -} - -//setter for $3 -public void set$1($2 $3) { - this.$3 = $3; -}${4} diff --git a/sources_non_forked/snipmate-snippets/java/if.snippet b/sources_non_forked/snipmate-snippets/java/if.snippet deleted file mode 100644 index b9d1c5c3..00000000 --- a/sources_non_forked/snipmate-snippets/java/if.snippet +++ /dev/null @@ -1,3 +0,0 @@ -if(${1}){ - ${2} -} diff --git a/sources_non_forked/snipmate-snippets/java/ife.snippet b/sources_non_forked/snipmate-snippets/java/ife.snippet deleted file mode 100644 index a7e43d09..00000000 --- a/sources_non_forked/snipmate-snippets/java/ife.snippet +++ /dev/null @@ -1,4 +0,0 @@ -if(${1}){ - ${2} -}else{ -} diff --git a/sources_non_forked/snipmate-snippets/java/log.snippet b/sources_non_forked/snipmate-snippets/java/log.snippet deleted file mode 100644 index abb7c7d6..00000000 --- a/sources_non_forked/snipmate-snippets/java/log.snippet +++ /dev/null @@ -1 +0,0 @@ -System.${1:out}.println(${2}); diff --git a/sources_non_forked/snipmate-snippets/java/m.snippet b/sources_non_forked/snipmate-snippets/java/m.snippet deleted file mode 100644 index 67bf3fb0..00000000 --- a/sources_non_forked/snipmate-snippets/java/m.snippet +++ /dev/null @@ -1,8 +0,0 @@ -/** - * ${7:Method Description} - * ${5} - * @return ${6} - */ -${1:public} ${2:void} ${3:methodName}(${4}) { - ${8} -} diff --git a/sources_non_forked/snipmate-snippets/javascript-jquery/add.snippet b/sources_non_forked/snipmate-snippets/javascript-jquery/add.snippet deleted file mode 100644 index 3bf9756d..00000000 --- a/sources_non_forked/snipmate-snippets/javascript-jquery/add.snippet +++ /dev/null @@ -1 +0,0 @@ -${1:obj}.add('${2:selector expression}')${3} diff --git a/sources_non_forked/snipmate-snippets/javascript-jquery/addClass.snippet b/sources_non_forked/snipmate-snippets/javascript-jquery/addClass.snippet deleted file mode 100644 index 68007744..00000000 --- a/sources_non_forked/snipmate-snippets/javascript-jquery/addClass.snippet +++ /dev/null @@ -1 +0,0 @@ -${1:obj}.addClass('${2:class name}')${3} diff --git a/sources_non_forked/snipmate-snippets/javascript-jquery/after.snippet b/sources_non_forked/snipmate-snippets/javascript-jquery/after.snippet deleted file mode 100644 index 34d1956d..00000000 --- a/sources_non_forked/snipmate-snippets/javascript-jquery/after.snippet +++ /dev/null @@ -1 +0,0 @@ -${1:obj}.after('${2:Some text and bold!}')${3} diff --git a/sources_non_forked/snipmate-snippets/javascript-jquery/ajax.snippet b/sources_non_forked/snipmate-snippets/javascript-jquery/ajax.snippet deleted file mode 100644 index 5453a257..00000000 --- a/sources_non_forked/snipmate-snippets/javascript-jquery/ajax.snippet +++ /dev/null @@ -1,18 +0,0 @@ -$.ajax({ - url: "${1:mydomain.com/url}", - type: "${2:POST}", - dataType: "${3:xml/html/script/json}", - data: $.param( $("${4:Element or Expression}") ), - - complete: function() { - ${5://called when complete} - }, - - success: function() { - ${6://called when successful} - }, - - error: function() { - ${7://called when there is an error} - }, -}); diff --git a/sources_non_forked/snipmate-snippets/javascript-jquery/ajaxerror.snippet b/sources_non_forked/snipmate-snippets/javascript-jquery/ajaxerror.snippet deleted file mode 100644 index 0f8ccdaf..00000000 --- a/sources_non_forked/snipmate-snippets/javascript-jquery/ajaxerror.snippet +++ /dev/null @@ -1,4 +0,0 @@ -.ajaxError(function(${1:request, settings}) { - ${2://stuff to do when an AJAX call returns an error}; -}); -${3} diff --git a/sources_non_forked/snipmate-snippets/javascript-jquery/ajaxget.snippet b/sources_non_forked/snipmate-snippets/javascript-jquery/ajaxget.snippet deleted file mode 100644 index 1489859a..00000000 --- a/sources_non_forked/snipmate-snippets/javascript-jquery/ajaxget.snippet +++ /dev/null @@ -1,3 +0,0 @@ -$.get('${1:/test/ajax-test.xml}', function(xml){ - ${2:alert( ("title",xml).text() ) //optional stuff to do after get;} -}); diff --git a/sources_non_forked/snipmate-snippets/javascript-jquery/ajaxgetif.snippet b/sources_non_forked/snipmate-snippets/javascript-jquery/ajaxgetif.snippet deleted file mode 100644 index 0f4d1ef0..00000000 --- a/sources_non_forked/snipmate-snippets/javascript-jquery/ajaxgetif.snippet +++ /dev/null @@ -1,3 +0,0 @@ -$.getIfModified('${1:/test/test.cgi}', function(data){ - ${2:alert( "Data loaded: " + data ) //optional stuff to do after get;} -}); diff --git a/sources_non_forked/snipmate-snippets/javascript-jquery/ajaxpost.snippet b/sources_non_forked/snipmate-snippets/javascript-jquery/ajaxpost.snippet deleted file mode 100644 index f62bf102..00000000 --- a/sources_non_forked/snipmate-snippets/javascript-jquery/ajaxpost.snippet +++ /dev/null @@ -1,5 +0,0 @@ -$.post('<+/path/to/file.cgi+>',{ - <+<+param1+>: "<+value1+>", <+param2+>: "<+value2+>"+>}, - function(){ - <+//stuff to do after event occurs;+> -}); diff --git a/sources_non_forked/snipmate-snippets/javascript-jquery/ajaxsend.snippet b/sources_non_forked/snipmate-snippets/javascript-jquery/ajaxsend.snippet deleted file mode 100644 index 4b74cd98..00000000 --- a/sources_non_forked/snipmate-snippets/javascript-jquery/ajaxsend.snippet +++ /dev/null @@ -1,4 +0,0 @@ -.ajaxSend(function(${1:request, settings}) { - ${2://stuff to do when an AJAX call returns an error}; -}); -${3} diff --git a/sources_non_forked/snipmate-snippets/javascript-jquery/ajaxsetup.snippet b/sources_non_forked/snipmate-snippets/javascript-jquery/ajaxsetup.snippet deleted file mode 100644 index c5b4ad02..00000000 --- a/sources_non_forked/snipmate-snippets/javascript-jquery/ajaxsetup.snippet +++ /dev/null @@ -1,18 +0,0 @@ -$.ajaxSetup({ - url: "${1:mydomain.com/url}", - type: "${2:POST}", - dataType: "${3:xml/html/script/json}", - data: $.param( $("${4:Element or Expression}") ), - - complete: function() { - ${5://called when complete} - }, - - success: function() { - ${6://called when successful} - }, - - error: function() { - ${7://called when there is an error} - }, -}); diff --git a/sources_non_forked/snipmate-snippets/javascript-jquery/ajaxstart.snippet b/sources_non_forked/snipmate-snippets/javascript-jquery/ajaxstart.snippet deleted file mode 100644 index 3caafd58..00000000 --- a/sources_non_forked/snipmate-snippets/javascript-jquery/ajaxstart.snippet +++ /dev/null @@ -1,4 +0,0 @@ -$.ajaxStart(function() { - ${1://stuff to do when an AJAX call is started and no other AJAX calls are in progress}; -}); -${2} diff --git a/sources_non_forked/snipmate-snippets/javascript-jquery/ajaxstop.snippet b/sources_non_forked/snipmate-snippets/javascript-jquery/ajaxstop.snippet deleted file mode 100644 index 6088a9f5..00000000 --- a/sources_non_forked/snipmate-snippets/javascript-jquery/ajaxstop.snippet +++ /dev/null @@ -1,4 +0,0 @@ -$.ajaxStop(function() { - ${1://stuff to do when an AJAX call is started and no other AJAX calls are in progress}; -}); -${2} diff --git a/sources_non_forked/snipmate-snippets/javascript-jquery/ajaxsuccess.snippet b/sources_non_forked/snipmate-snippets/javascript-jquery/ajaxsuccess.snippet deleted file mode 100644 index ba2247dc..00000000 --- a/sources_non_forked/snipmate-snippets/javascript-jquery/ajaxsuccess.snippet +++ /dev/null @@ -1,4 +0,0 @@ -$.ajaxSuccess(function() { - ${1://stuff to do when an AJAX call is started and no other AJAX calls are in progress}; -}); -${2} diff --git a/sources_non_forked/snipmate-snippets/javascript-jquery/animate.snippet b/sources_non_forked/snipmate-snippets/javascript-jquery/animate.snippet deleted file mode 100644 index 19135327..00000000 --- a/sources_non_forked/snipmate-snippets/javascript-jquery/animate.snippet +++ /dev/null @@ -1 +0,0 @@ -${1:obj}.animate({${2:param1: value1, param2: value2}}, ${3:speed})${4} diff --git a/sources_non_forked/snipmate-snippets/javascript-jquery/append.snippet b/sources_non_forked/snipmate-snippets/javascript-jquery/append.snippet deleted file mode 100644 index bc4ff4d3..00000000 --- a/sources_non_forked/snipmate-snippets/javascript-jquery/append.snippet +++ /dev/null @@ -1 +0,0 @@ -${1:obj}.append('${2:Some text and bold!}')${3} diff --git a/sources_non_forked/snipmate-snippets/javascript-jquery/appendTo.snippet b/sources_non_forked/snipmate-snippets/javascript-jquery/appendTo.snippet deleted file mode 100644 index 97883710..00000000 --- a/sources_non_forked/snipmate-snippets/javascript-jquery/appendTo.snippet +++ /dev/null @@ -1 +0,0 @@ -${1:obj}.appendTo('${2:selector expression}')${3} diff --git a/sources_non_forked/snipmate-snippets/javascript-jquery/attr.snippet b/sources_non_forked/snipmate-snippets/javascript-jquery/attr.snippet deleted file mode 100644 index fb7e2f42..00000000 --- a/sources_non_forked/snipmate-snippets/javascript-jquery/attr.snippet +++ /dev/null @@ -1 +0,0 @@ -${1:obj}.attr('${2:attribute}', '${3:value}')${4} diff --git a/sources_non_forked/snipmate-snippets/javascript-jquery/attrm.snippet b/sources_non_forked/snipmate-snippets/javascript-jquery/attrm.snippet deleted file mode 100644 index 15685512..00000000 --- a/sources_non_forked/snipmate-snippets/javascript-jquery/attrm.snippet +++ /dev/null @@ -1 +0,0 @@ -${1:obj}.attr({'${2:attr1}': '${3:value1}', '${4:attr2}': '${5:value2}'})${6} diff --git a/sources_non_forked/snipmate-snippets/javascript-jquery/before.snippet b/sources_non_forked/snipmate-snippets/javascript-jquery/before.snippet deleted file mode 100644 index e12c4aed..00000000 --- a/sources_non_forked/snipmate-snippets/javascript-jquery/before.snippet +++ /dev/null @@ -1 +0,0 @@ -${1:obj}.before('${2:Some text and bold!}')${3} diff --git a/sources_non_forked/snipmate-snippets/javascript-jquery/bind.snippet b/sources_non_forked/snipmate-snippets/javascript-jquery/bind.snippet deleted file mode 100644 index dda284d9..00000000 --- a/sources_non_forked/snipmate-snippets/javascript-jquery/bind.snippet +++ /dev/null @@ -1,3 +0,0 @@ -${1:obj}.bind('${2:event name}', function(${3:event}) { - ${4:// Act on the event} -}); diff --git a/sources_non_forked/snipmate-snippets/javascript-jquery/blur.snippet b/sources_non_forked/snipmate-snippets/javascript-jquery/blur.snippet deleted file mode 100644 index 674623db..00000000 --- a/sources_non_forked/snipmate-snippets/javascript-jquery/blur.snippet +++ /dev/null @@ -1,3 +0,0 @@ -${1:obj}.blur(function() { - ${2:// Act on the event} -}); diff --git a/sources_non_forked/snipmate-snippets/javascript-jquery/change.snippet b/sources_non_forked/snipmate-snippets/javascript-jquery/change.snippet deleted file mode 100644 index 184f8a99..00000000 --- a/sources_non_forked/snipmate-snippets/javascript-jquery/change.snippet +++ /dev/null @@ -1,3 +0,0 @@ -${1:obj}.change(function() { - ${2:// Act on the event} -}); diff --git a/sources_non_forked/snipmate-snippets/javascript-jquery/children.snippet b/sources_non_forked/snipmate-snippets/javascript-jquery/children.snippet deleted file mode 100644 index 2db688b1..00000000 --- a/sources_non_forked/snipmate-snippets/javascript-jquery/children.snippet +++ /dev/null @@ -1 +0,0 @@ -${1:obj}.children('${2:selector expression}')${3} diff --git a/sources_non_forked/snipmate-snippets/javascript-jquery/click.snippet b/sources_non_forked/snipmate-snippets/javascript-jquery/click.snippet deleted file mode 100644 index d17a047e..00000000 --- a/sources_non_forked/snipmate-snippets/javascript-jquery/click.snippet +++ /dev/null @@ -1,3 +0,0 @@ -${1:obj}.click(function() { - ${2:// Act on the event} -}); diff --git a/sources_non_forked/snipmate-snippets/javascript-jquery/clone.snippet b/sources_non_forked/snipmate-snippets/javascript-jquery/clone.snippet deleted file mode 100644 index 83b0b421..00000000 --- a/sources_non_forked/snipmate-snippets/javascript-jquery/clone.snippet +++ /dev/null @@ -1 +0,0 @@ -${1:obj}.clone()${2} diff --git a/sources_non_forked/snipmate-snippets/javascript-jquery/contains.snippet b/sources_non_forked/snipmate-snippets/javascript-jquery/contains.snippet deleted file mode 100644 index 2a073948..00000000 --- a/sources_non_forked/snipmate-snippets/javascript-jquery/contains.snippet +++ /dev/null @@ -1 +0,0 @@ -${1:obj}.contains('${2:text to find}')${3} diff --git a/sources_non_forked/snipmate-snippets/javascript-jquery/css.snippet b/sources_non_forked/snipmate-snippets/javascript-jquery/css.snippet deleted file mode 100644 index 408199eb..00000000 --- a/sources_non_forked/snipmate-snippets/javascript-jquery/css.snippet +++ /dev/null @@ -1 +0,0 @@ -${1:obj}.css('${2:attribute}', '${3:value}')${4} diff --git a/sources_non_forked/snipmate-snippets/javascript-jquery/cssm.snippet b/sources_non_forked/snipmate-snippets/javascript-jquery/cssm.snippet deleted file mode 100644 index 7eebe1e4..00000000 --- a/sources_non_forked/snipmate-snippets/javascript-jquery/cssm.snippet +++ /dev/null @@ -1 +0,0 @@ -${1:obj}.css({${2:attribute1}: '${3:value1}', ${4:attribute2}: '${5:value2}'})${6} diff --git a/sources_non_forked/snipmate-snippets/javascript-jquery/dblclick.snippet b/sources_non_forked/snipmate-snippets/javascript-jquery/dblclick.snippet deleted file mode 100644 index 4b2d6b2a..00000000 --- a/sources_non_forked/snipmate-snippets/javascript-jquery/dblclick.snippet +++ /dev/null @@ -1,3 +0,0 @@ -${1:obj}.dblclick(function() { - ${2:// Act on the event} -}); diff --git a/sources_non_forked/snipmate-snippets/javascript-jquery/each.snippet b/sources_non_forked/snipmate-snippets/javascript-jquery/each.snippet deleted file mode 100644 index 05beed2e..00000000 --- a/sources_non_forked/snipmate-snippets/javascript-jquery/each.snippet +++ /dev/null @@ -1,3 +0,0 @@ -${1:obj}.each(function(index) { - ${2:this.innerHTML = this + " is the element, " + index + " is the position";} -}); diff --git a/sources_non_forked/snipmate-snippets/javascript-jquery/el.snippet b/sources_non_forked/snipmate-snippets/javascript-jquery/el.snippet deleted file mode 100644 index d2065238..00000000 --- a/sources_non_forked/snipmate-snippets/javascript-jquery/el.snippet +++ /dev/null @@ -1 +0,0 @@ -$('${1}')${2:} diff --git a/sources_non_forked/snipmate-snippets/javascript-jquery/eltrim.snippet b/sources_non_forked/snipmate-snippets/javascript-jquery/eltrim.snippet deleted file mode 100644 index 9cc0d692..00000000 --- a/sources_non_forked/snipmate-snippets/javascript-jquery/eltrim.snippet +++ /dev/null @@ -1 +0,0 @@ -$.trim('${1:string}')${2} diff --git a/sources_non_forked/snipmate-snippets/javascript-jquery/end.snippet b/sources_non_forked/snipmate-snippets/javascript-jquery/end.snippet deleted file mode 100644 index 293102c4..00000000 --- a/sources_non_forked/snipmate-snippets/javascript-jquery/end.snippet +++ /dev/null @@ -1 +0,0 @@ -${1:obj}.end()${2} diff --git a/sources_non_forked/snipmate-snippets/javascript-jquery/error.snippet b/sources_non_forked/snipmate-snippets/javascript-jquery/error.snippet deleted file mode 100644 index 23b0e650..00000000 --- a/sources_non_forked/snipmate-snippets/javascript-jquery/error.snippet +++ /dev/null @@ -1,3 +0,0 @@ -${1:obj}.error(function() { - ${2:// Act on the event} -}); diff --git a/sources_non_forked/snipmate-snippets/javascript-jquery/fadein.snippet b/sources_non_forked/snipmate-snippets/javascript-jquery/fadein.snippet deleted file mode 100644 index 549d8464..00000000 --- a/sources_non_forked/snipmate-snippets/javascript-jquery/fadein.snippet +++ /dev/null @@ -1 +0,0 @@ -${1:obj}.fadeIn('${2:slow/400/fast}')${3} diff --git a/sources_non_forked/snipmate-snippets/javascript-jquery/fadeinc.snippet b/sources_non_forked/snipmate-snippets/javascript-jquery/fadeinc.snippet deleted file mode 100644 index 9090853e..00000000 --- a/sources_non_forked/snipmate-snippets/javascript-jquery/fadeinc.snippet +++ /dev/null @@ -1,3 +0,0 @@ -${1:obj}.fadeIn('slow/400/fast', function() { - ${2://Stuff to do *after* the animation takes place}; -}); diff --git a/sources_non_forked/snipmate-snippets/javascript-jquery/fadeout.snippet b/sources_non_forked/snipmate-snippets/javascript-jquery/fadeout.snippet deleted file mode 100644 index 24d6c763..00000000 --- a/sources_non_forked/snipmate-snippets/javascript-jquery/fadeout.snippet +++ /dev/null @@ -1 +0,0 @@ -${1:obj}.fadeOut('${2:slow/400/fast}')${3} diff --git a/sources_non_forked/snipmate-snippets/javascript-jquery/fadeoutc.snippet b/sources_non_forked/snipmate-snippets/javascript-jquery/fadeoutc.snippet deleted file mode 100644 index 76d54571..00000000 --- a/sources_non_forked/snipmate-snippets/javascript-jquery/fadeoutc.snippet +++ /dev/null @@ -1,3 +0,0 @@ -${1:obj}.fadeOut('slow/400/fast', function() { - ${2://Stuff to do *after* the animation takes place}; -}); diff --git a/sources_non_forked/snipmate-snippets/javascript-jquery/fadeto.snippet b/sources_non_forked/snipmate-snippets/javascript-jquery/fadeto.snippet deleted file mode 100644 index b0e584aa..00000000 --- a/sources_non_forked/snipmate-snippets/javascript-jquery/fadeto.snippet +++ /dev/null @@ -1 +0,0 @@ -${1:obj}.fadeTo('${2:slow/400/fast}', ${3:0.5})${4} diff --git a/sources_non_forked/snipmate-snippets/javascript-jquery/fadetoc.snippet b/sources_non_forked/snipmate-snippets/javascript-jquery/fadetoc.snippet deleted file mode 100644 index 17243b4c..00000000 --- a/sources_non_forked/snipmate-snippets/javascript-jquery/fadetoc.snippet +++ /dev/null @@ -1,3 +0,0 @@ -${1:obj}.fadeTo('slow/400/fast', ${2:0.5}, function() { - ${3://Stuff to do *after* the animation takes place}; -}); diff --git a/sources_non_forked/snipmate-snippets/javascript-jquery/filter.snippet b/sources_non_forked/snipmate-snippets/javascript-jquery/filter.snippet deleted file mode 100644 index d33fdf2b..00000000 --- a/sources_non_forked/snipmate-snippets/javascript-jquery/filter.snippet +++ /dev/null @@ -1 +0,0 @@ -${1:obj}.filter('${2:selector expression}')${3} diff --git a/sources_non_forked/snipmate-snippets/javascript-jquery/find.snippet b/sources_non_forked/snipmate-snippets/javascript-jquery/find.snippet deleted file mode 100644 index 1791e912..00000000 --- a/sources_non_forked/snipmate-snippets/javascript-jquery/find.snippet +++ /dev/null @@ -1 +0,0 @@ -${1:obj}.find('${2:selector expression}')${3} diff --git a/sources_non_forked/snipmate-snippets/javascript-jquery/focus.snippet b/sources_non_forked/snipmate-snippets/javascript-jquery/focus.snippet deleted file mode 100644 index 3b1b5719..00000000 --- a/sources_non_forked/snipmate-snippets/javascript-jquery/focus.snippet +++ /dev/null @@ -1,3 +0,0 @@ -${1:obj}.focus(function() { - ${2:// Act on the event} -}); diff --git a/sources_non_forked/snipmate-snippets/javascript-jquery/get.snippet b/sources_non_forked/snipmate-snippets/javascript-jquery/get.snippet deleted file mode 100644 index 4374c183..00000000 --- a/sources_non_forked/snipmate-snippets/javascript-jquery/get.snippet +++ /dev/null @@ -1 +0,0 @@ -${1:obj}.get(${2:element index})${3} diff --git a/sources_non_forked/snipmate-snippets/javascript-jquery/getjson.snippet b/sources_non_forked/snipmate-snippets/javascript-jquery/getjson.snippet deleted file mode 100644 index 518d676d..00000000 --- a/sources_non_forked/snipmate-snippets/javascript-jquery/getjson.snippet +++ /dev/null @@ -1,5 +0,0 @@ -$.getJSON('<+/path/to/file.cgi+>',{ - <+<+param1+>: "<+value1+>", <+param2+>: "<+value2+>"+>}, - function(json){ - <+//stuff to do after event occurs;+> -}); diff --git a/sources_non_forked/snipmate-snippets/javascript-jquery/getscript.snippet b/sources_non_forked/snipmate-snippets/javascript-jquery/getscript.snippet deleted file mode 100644 index 0b62d90b..00000000 --- a/sources_non_forked/snipmate-snippets/javascript-jquery/getscript.snippet +++ /dev/null @@ -1,3 +0,0 @@ -$.getScript('${1:somescript.js}', function(){ - ${2://optional stuff to do after getScript;} -}); diff --git a/sources_non_forked/snipmate-snippets/javascript-jquery/height.snippet b/sources_non_forked/snipmate-snippets/javascript-jquery/height.snippet deleted file mode 100644 index 1515d5c6..00000000 --- a/sources_non_forked/snipmate-snippets/javascript-jquery/height.snippet +++ /dev/null @@ -1 +0,0 @@ -${1:obj}.height(${2:integer})${3} diff --git a/sources_non_forked/snipmate-snippets/javascript-jquery/hide.snippet b/sources_non_forked/snipmate-snippets/javascript-jquery/hide.snippet deleted file mode 100644 index c8071cbc..00000000 --- a/sources_non_forked/snipmate-snippets/javascript-jquery/hide.snippet +++ /dev/null @@ -1 +0,0 @@ -${1:obj}.hide('${2:slow/400/fast}')${3} diff --git a/sources_non_forked/snipmate-snippets/javascript-jquery/hidec.snippet b/sources_non_forked/snipmate-snippets/javascript-jquery/hidec.snippet deleted file mode 100644 index 62f2280a..00000000 --- a/sources_non_forked/snipmate-snippets/javascript-jquery/hidec.snippet +++ /dev/null @@ -1,3 +0,0 @@ -${1:obj}.hide('${2:slow/400/fast}', function() { - ${3://Stuff to do *after* the animation takes place} -}); diff --git a/sources_non_forked/snipmate-snippets/javascript-jquery/hover.snippet b/sources_non_forked/snipmate-snippets/javascript-jquery/hover.snippet deleted file mode 100644 index d8468c1a..00000000 --- a/sources_non_forked/snipmate-snippets/javascript-jquery/hover.snippet +++ /dev/null @@ -1,5 +0,0 @@ -${1:obj}.hover(function() { - ${2:// Stuff to do when the mouse enters the element;} -}, function() { - ${3:// Stuff to do when the mouse leaves the element;} -});${4} diff --git a/sources_non_forked/snipmate-snippets/javascript-jquery/html.snippet b/sources_non_forked/snipmate-snippets/javascript-jquery/html.snippet deleted file mode 100644 index 0c5a25e1..00000000 --- a/sources_non_forked/snipmate-snippets/javascript-jquery/html.snippet +++ /dev/null @@ -1 +0,0 @@ -${1:obj}.html('${2:Some text and bold!}')${3} diff --git a/sources_non_forked/snipmate-snippets/javascript-jquery/insertAfter.snippet b/sources_non_forked/snipmate-snippets/javascript-jquery/insertAfter.snippet deleted file mode 100644 index 66c389eb..00000000 --- a/sources_non_forked/snipmate-snippets/javascript-jquery/insertAfter.snippet +++ /dev/null @@ -1 +0,0 @@ -${1:obj}.insertAfter('${2:selector expression}')${3} diff --git a/sources_non_forked/snipmate-snippets/javascript-jquery/insertBefore.snippet b/sources_non_forked/snipmate-snippets/javascript-jquery/insertBefore.snippet deleted file mode 100644 index e7090d4d..00000000 --- a/sources_non_forked/snipmate-snippets/javascript-jquery/insertBefore.snippet +++ /dev/null @@ -1 +0,0 @@ -${1:obj}.insertBefore('${2:selector expression}')${3} diff --git a/sources_non_forked/snipmate-snippets/javascript-jquery/is.snippet b/sources_non_forked/snipmate-snippets/javascript-jquery/is.snippet deleted file mode 100644 index 28eefb02..00000000 --- a/sources_non_forked/snipmate-snippets/javascript-jquery/is.snippet +++ /dev/null @@ -1 +0,0 @@ -${1:obj}.is('${2:selector expression}')${3} diff --git a/sources_non_forked/snipmate-snippets/javascript-jquery/load.snippet b/sources_non_forked/snipmate-snippets/javascript-jquery/load.snippet deleted file mode 100644 index 1f09fbc9..00000000 --- a/sources_non_forked/snipmate-snippets/javascript-jquery/load.snippet +++ /dev/null @@ -1,3 +0,0 @@ -${1:obj}.load(function() { - ${2:// Act on the event} -}); diff --git a/sources_non_forked/snipmate-snippets/javascript-jquery/loadf.snippet b/sources_non_forked/snipmate-snippets/javascript-jquery/loadf.snippet deleted file mode 100644 index 2e7d9c8b..00000000 --- a/sources_non_forked/snipmate-snippets/javascript-jquery/loadf.snippet +++ /dev/null @@ -1,3 +0,0 @@ -<+obj+>.load('<+/path/to/file.htm+>', { <+<+param1+>: "<+value1+>", <+param2+>: "<+value2+>"+> }, function() { - <+// Stuff to do after the page is loaded+> -}); \ No newline at end of file diff --git a/sources_non_forked/snipmate-snippets/javascript-jquery/loadif.snippet b/sources_non_forked/snipmate-snippets/javascript-jquery/loadif.snippet deleted file mode 100644 index fe45d05a..00000000 --- a/sources_non_forked/snipmate-snippets/javascript-jquery/loadif.snippet +++ /dev/null @@ -1,3 +0,0 @@ -<+obj+>.loadIfModified('<+/path/to/file.htm+>', { <+<+param1+>: "<+value1+>", <+param2+>: "<+value2+>"+> }, function() { - <+// Stuff to do after the page is loaded+> -}); \ No newline at end of file diff --git a/sources_non_forked/snipmate-snippets/javascript-jquery/mdown.snippet b/sources_non_forked/snipmate-snippets/javascript-jquery/mdown.snippet deleted file mode 100644 index 3be70e1b..00000000 --- a/sources_non_forked/snipmate-snippets/javascript-jquery/mdown.snippet +++ /dev/null @@ -1,3 +0,0 @@ -${1:obj}.mousedown(function() { - ${2:// Act on the event} -}); diff --git a/sources_non_forked/snipmate-snippets/javascript-jquery/mmove.snippet b/sources_non_forked/snipmate-snippets/javascript-jquery/mmove.snippet deleted file mode 100644 index eb7ac052..00000000 --- a/sources_non_forked/snipmate-snippets/javascript-jquery/mmove.snippet +++ /dev/null @@ -1,3 +0,0 @@ -${1:obj}.mousemove(function() { - ${2:// Act on the event} -}); diff --git a/sources_non_forked/snipmate-snippets/javascript-jquery/mout.snippet b/sources_non_forked/snipmate-snippets/javascript-jquery/mout.snippet deleted file mode 100644 index f2142756..00000000 --- a/sources_non_forked/snipmate-snippets/javascript-jquery/mout.snippet +++ /dev/null @@ -1,3 +0,0 @@ -${1:obj}.mouseout(function() { - ${2:// Act on the event} -}); diff --git a/sources_non_forked/snipmate-snippets/javascript-jquery/mover.snippet b/sources_non_forked/snipmate-snippets/javascript-jquery/mover.snippet deleted file mode 100644 index f1eb19cc..00000000 --- a/sources_non_forked/snipmate-snippets/javascript-jquery/mover.snippet +++ /dev/null @@ -1,3 +0,0 @@ -${1:obj}.mouseover(function() { - ${2:// Act on the event} -}); diff --git a/sources_non_forked/snipmate-snippets/javascript-jquery/mup.snippet b/sources_non_forked/snipmate-snippets/javascript-jquery/mup.snippet deleted file mode 100644 index 04fb36a3..00000000 --- a/sources_non_forked/snipmate-snippets/javascript-jquery/mup.snippet +++ /dev/null @@ -1,3 +0,0 @@ -${1:obj}.mouseup(function() { - ${2:// Act on the event} -}); diff --git a/sources_non_forked/snipmate-snippets/javascript-jquery/next.snippet b/sources_non_forked/snipmate-snippets/javascript-jquery/next.snippet deleted file mode 100644 index b6a65281..00000000 --- a/sources_non_forked/snipmate-snippets/javascript-jquery/next.snippet +++ /dev/null @@ -1 +0,0 @@ -${1:obj}.next('${2:selector expression}')${3} diff --git a/sources_non_forked/snipmate-snippets/javascript-jquery/not.snippet b/sources_non_forked/snipmate-snippets/javascript-jquery/not.snippet deleted file mode 100644 index c6a217f6..00000000 --- a/sources_non_forked/snipmate-snippets/javascript-jquery/not.snippet +++ /dev/null @@ -1 +0,0 @@ -${1:obj}.not('${2:selector expression}')${3} diff --git a/sources_non_forked/snipmate-snippets/javascript-jquery/one.snippet b/sources_non_forked/snipmate-snippets/javascript-jquery/one.snippet deleted file mode 100644 index cacdbfb5..00000000 --- a/sources_non_forked/snipmate-snippets/javascript-jquery/one.snippet +++ /dev/null @@ -1,3 +0,0 @@ -${1:obj}.one('${2:event name}', function(${3:event}) { - ${4:// Act on the event once} -}); diff --git a/sources_non_forked/snipmate-snippets/javascript-jquery/parent.snippet b/sources_non_forked/snipmate-snippets/javascript-jquery/parent.snippet deleted file mode 100644 index 0490f05a..00000000 --- a/sources_non_forked/snipmate-snippets/javascript-jquery/parent.snippet +++ /dev/null @@ -1 +0,0 @@ -${1:obj}.parent('${2:selector expression}')${3} diff --git a/sources_non_forked/snipmate-snippets/javascript-jquery/parents.snippet b/sources_non_forked/snipmate-snippets/javascript-jquery/parents.snippet deleted file mode 100644 index fb0bd131..00000000 --- a/sources_non_forked/snipmate-snippets/javascript-jquery/parents.snippet +++ /dev/null @@ -1 +0,0 @@ -${1:obj}.parents('${2:selector expression}')${3} diff --git a/sources_non_forked/snipmate-snippets/javascript-jquery/prepend.snippet b/sources_non_forked/snipmate-snippets/javascript-jquery/prepend.snippet deleted file mode 100644 index bc41d48f..00000000 --- a/sources_non_forked/snipmate-snippets/javascript-jquery/prepend.snippet +++ /dev/null @@ -1 +0,0 @@ -${1:obj}.prepend('${2:Some text and bold!}')${3} diff --git a/sources_non_forked/snipmate-snippets/javascript-jquery/prependto.snippet b/sources_non_forked/snipmate-snippets/javascript-jquery/prependto.snippet deleted file mode 100644 index e4406957..00000000 --- a/sources_non_forked/snipmate-snippets/javascript-jquery/prependto.snippet +++ /dev/null @@ -1 +0,0 @@ -${1:obj}.prependTo('${2:selector expression}')${3} diff --git a/sources_non_forked/snipmate-snippets/javascript-jquery/prev.snippet b/sources_non_forked/snipmate-snippets/javascript-jquery/prev.snippet deleted file mode 100644 index b7aba645..00000000 --- a/sources_non_forked/snipmate-snippets/javascript-jquery/prev.snippet +++ /dev/null @@ -1 +0,0 @@ -${1:obj}.prev('${2:selector expression}')${3} diff --git a/sources_non_forked/snipmate-snippets/javascript-jquery/ready.snippet b/sources_non_forked/snipmate-snippets/javascript-jquery/ready.snippet deleted file mode 100644 index d0005318..00000000 --- a/sources_non_forked/snipmate-snippets/javascript-jquery/ready.snippet +++ /dev/null @@ -1,3 +0,0 @@ -$(document).ready(function() { - ${1:// Stuff to do as soon as the DOM is ready;} -}); diff --git a/sources_non_forked/snipmate-snippets/javascript-jquery/remove.snippet b/sources_non_forked/snipmate-snippets/javascript-jquery/remove.snippet deleted file mode 100644 index 4c976a17..00000000 --- a/sources_non_forked/snipmate-snippets/javascript-jquery/remove.snippet +++ /dev/null @@ -1 +0,0 @@ -${1:obj}.remove()${2} diff --git a/sources_non_forked/snipmate-snippets/javascript-jquery/removeattr.snippet b/sources_non_forked/snipmate-snippets/javascript-jquery/removeattr.snippet deleted file mode 100644 index 267d584a..00000000 --- a/sources_non_forked/snipmate-snippets/javascript-jquery/removeattr.snippet +++ /dev/null @@ -1 +0,0 @@ -${1:obj}.removeAttr('${2:attribute name}')${3} diff --git a/sources_non_forked/snipmate-snippets/javascript-jquery/removeclass.snippet b/sources_non_forked/snipmate-snippets/javascript-jquery/removeclass.snippet deleted file mode 100644 index f5538030..00000000 --- a/sources_non_forked/snipmate-snippets/javascript-jquery/removeclass.snippet +++ /dev/null @@ -1 +0,0 @@ -${1:obj}.removeClass('${2:class name}')${3} diff --git a/sources_non_forked/snipmate-snippets/javascript-jquery/reset.snippet b/sources_non_forked/snipmate-snippets/javascript-jquery/reset.snippet deleted file mode 100644 index 777af958..00000000 --- a/sources_non_forked/snipmate-snippets/javascript-jquery/reset.snippet +++ /dev/null @@ -1,3 +0,0 @@ -${1:obj}.reset(function() { - ${2:// Act on the event} -}); diff --git a/sources_non_forked/snipmate-snippets/javascript-jquery/resize.snippet b/sources_non_forked/snipmate-snippets/javascript-jquery/resize.snippet deleted file mode 100644 index b46ac0a0..00000000 --- a/sources_non_forked/snipmate-snippets/javascript-jquery/resize.snippet +++ /dev/null @@ -1,3 +0,0 @@ -${1:obj}.resize(function() { - ${2:// Act on the event} -}); diff --git a/sources_non_forked/snipmate-snippets/javascript-jquery/scroll.snippet b/sources_non_forked/snipmate-snippets/javascript-jquery/scroll.snippet deleted file mode 100644 index 7a512442..00000000 --- a/sources_non_forked/snipmate-snippets/javascript-jquery/scroll.snippet +++ /dev/null @@ -1,3 +0,0 @@ -${1:obj}.scroll(function() { - ${2:// Act on the event} -}); diff --git a/sources_non_forked/snipmate-snippets/javascript-jquery/sdown.snippet b/sources_non_forked/snipmate-snippets/javascript-jquery/sdown.snippet deleted file mode 100644 index b39840e9..00000000 --- a/sources_non_forked/snipmate-snippets/javascript-jquery/sdown.snippet +++ /dev/null @@ -1 +0,0 @@ -${1:obj}.slideDown('${2:slow/400/fast}')${3} diff --git a/sources_non_forked/snipmate-snippets/javascript-jquery/sdownc.snippet b/sources_non_forked/snipmate-snippets/javascript-jquery/sdownc.snippet deleted file mode 100644 index 3404b783..00000000 --- a/sources_non_forked/snipmate-snippets/javascript-jquery/sdownc.snippet +++ /dev/null @@ -1,3 +0,0 @@ -${1:obj}.slideDown('${2:slow/400/fast}', function() { - ${3://Stuff to do *after* the animation takes place}; -}); diff --git a/sources_non_forked/snipmate-snippets/javascript-jquery/sdupc.snippet b/sources_non_forked/snipmate-snippets/javascript-jquery/sdupc.snippet deleted file mode 100644 index 873c6657..00000000 --- a/sources_non_forked/snipmate-snippets/javascript-jquery/sdupc.snippet +++ /dev/null @@ -1,3 +0,0 @@ -${1:obj}.slideUp('${2:slow/400/fast}', function() { - ${3://Stuff to do *after* the animation takes place}; -}); diff --git a/sources_non_forked/snipmate-snippets/javascript-jquery/select.snippet b/sources_non_forked/snipmate-snippets/javascript-jquery/select.snippet deleted file mode 100644 index 986437ed..00000000 --- a/sources_non_forked/snipmate-snippets/javascript-jquery/select.snippet +++ /dev/null @@ -1,3 +0,0 @@ -${1:obj}.select(function() { - ${2:// Act on the event} -}); diff --git a/sources_non_forked/snipmate-snippets/javascript-jquery/show.snippet b/sources_non_forked/snipmate-snippets/javascript-jquery/show.snippet deleted file mode 100644 index 31819b1e..00000000 --- a/sources_non_forked/snipmate-snippets/javascript-jquery/show.snippet +++ /dev/null @@ -1 +0,0 @@ -${1:obj}.show('${2:slow/400/fast}')${3} diff --git a/sources_non_forked/snipmate-snippets/javascript-jquery/showc.snippet b/sources_non_forked/snipmate-snippets/javascript-jquery/showc.snippet deleted file mode 100644 index 6dc5bacc..00000000 --- a/sources_non_forked/snipmate-snippets/javascript-jquery/showc.snippet +++ /dev/null @@ -1,3 +0,0 @@ -${1:obj}.show('${2:slow/400/fast}', function() { - ${3://Stuff to do *after* the animation takes place} -}); diff --git a/sources_non_forked/snipmate-snippets/javascript-jquery/sib.snippet b/sources_non_forked/snipmate-snippets/javascript-jquery/sib.snippet deleted file mode 100644 index 014f1f79..00000000 --- a/sources_non_forked/snipmate-snippets/javascript-jquery/sib.snippet +++ /dev/null @@ -1 +0,0 @@ -${1:obj}.siblings('${2:selector expression}')${3} diff --git a/sources_non_forked/snipmate-snippets/javascript-jquery/size.snippet b/sources_non_forked/snipmate-snippets/javascript-jquery/size.snippet deleted file mode 100644 index 1ba15439..00000000 --- a/sources_non_forked/snipmate-snippets/javascript-jquery/size.snippet +++ /dev/null @@ -1 +0,0 @@ -${1:obj}.size()${2} diff --git a/sources_non_forked/snipmate-snippets/javascript-jquery/stoggle.snippet b/sources_non_forked/snipmate-snippets/javascript-jquery/stoggle.snippet deleted file mode 100644 index daba37d2..00000000 --- a/sources_non_forked/snipmate-snippets/javascript-jquery/stoggle.snippet +++ /dev/null @@ -1 +0,0 @@ -${1:obj}.slideToggle('${2:slow/400/fast}')${3} diff --git a/sources_non_forked/snipmate-snippets/javascript-jquery/submit.snippet b/sources_non_forked/snipmate-snippets/javascript-jquery/submit.snippet deleted file mode 100644 index ae98d83e..00000000 --- a/sources_non_forked/snipmate-snippets/javascript-jquery/submit.snippet +++ /dev/null @@ -1,3 +0,0 @@ -${1:obj}.submit(function() { - ${2:// Act on the event once} -}); diff --git a/sources_non_forked/snipmate-snippets/javascript-jquery/sup.snippet b/sources_non_forked/snipmate-snippets/javascript-jquery/sup.snippet deleted file mode 100644 index d844a68e..00000000 --- a/sources_non_forked/snipmate-snippets/javascript-jquery/sup.snippet +++ /dev/null @@ -1 +0,0 @@ -${1:obj}.slideUp('${2:slow/400/fast}')${3} diff --git a/sources_non_forked/snipmate-snippets/javascript-jquery/text.snippet b/sources_non_forked/snipmate-snippets/javascript-jquery/text.snippet deleted file mode 100644 index 5f667c07..00000000 --- a/sources_non_forked/snipmate-snippets/javascript-jquery/text.snippet +++ /dev/null @@ -1 +0,0 @@ -${1:obj}.text(${2:'some text'})${3} diff --git a/sources_non_forked/snipmate-snippets/javascript-jquery/this.snippet b/sources_non_forked/snipmate-snippets/javascript-jquery/this.snippet deleted file mode 100644 index b3cee8d3..00000000 --- a/sources_non_forked/snipmate-snippets/javascript-jquery/this.snippet +++ /dev/null @@ -1 +0,0 @@ -$(this)${1} diff --git a/sources_non_forked/snipmate-snippets/javascript-jquery/tog.snippet b/sources_non_forked/snipmate-snippets/javascript-jquery/tog.snippet deleted file mode 100644 index 54f5f17a..00000000 --- a/sources_non_forked/snipmate-snippets/javascript-jquery/tog.snippet +++ /dev/null @@ -1,6 +0,0 @@ -${1:obj}.toggle(function() { - ${2:// Stuff to do every *odd* time the element is clicked;} -}, function() { - ${3:// Stuff to do every *even* time the element is clicked;} -}); -${4} diff --git a/sources_non_forked/snipmate-snippets/javascript-jquery/togclass.snippet b/sources_non_forked/snipmate-snippets/javascript-jquery/togclass.snippet deleted file mode 100644 index 023a4b7d..00000000 --- a/sources_non_forked/snipmate-snippets/javascript-jquery/togclass.snippet +++ /dev/null @@ -1 +0,0 @@ -${1:obj}.toggleClass('${2:class name}')${3} diff --git a/sources_non_forked/snipmate-snippets/javascript-jquery/togsh.snippet b/sources_non_forked/snipmate-snippets/javascript-jquery/togsh.snippet deleted file mode 100644 index 265a62d0..00000000 --- a/sources_non_forked/snipmate-snippets/javascript-jquery/togsh.snippet +++ /dev/null @@ -1 +0,0 @@ -${1:obj}.toggle('${2:slow/400/fast}')${3} diff --git a/sources_non_forked/snipmate-snippets/javascript-jquery/trig.snippet b/sources_non_forked/snipmate-snippets/javascript-jquery/trig.snippet deleted file mode 100644 index f7105e08..00000000 --- a/sources_non_forked/snipmate-snippets/javascript-jquery/trig.snippet +++ /dev/null @@ -1 +0,0 @@ -${1:obj}.trigger('${2:event name}')${3} diff --git a/sources_non_forked/snipmate-snippets/javascript-jquery/unbind.snippet b/sources_non_forked/snipmate-snippets/javascript-jquery/unbind.snippet deleted file mode 100644 index 0fe423d5..00000000 --- a/sources_non_forked/snipmate-snippets/javascript-jquery/unbind.snippet +++ /dev/null @@ -1 +0,0 @@ -${1:obj}.unbind('${2:event name}')${3} diff --git a/sources_non_forked/snipmate-snippets/javascript-jquery/val.snippet b/sources_non_forked/snipmate-snippets/javascript-jquery/val.snippet deleted file mode 100644 index cafe0b0b..00000000 --- a/sources_non_forked/snipmate-snippets/javascript-jquery/val.snippet +++ /dev/null @@ -1 +0,0 @@ -${1:obj}.val('${2:text}')${3} diff --git a/sources_non_forked/snipmate-snippets/javascript-jquery/width.snippet b/sources_non_forked/snipmate-snippets/javascript-jquery/width.snippet deleted file mode 100644 index 415631c6..00000000 --- a/sources_non_forked/snipmate-snippets/javascript-jquery/width.snippet +++ /dev/null @@ -1 +0,0 @@ -${1:obj}.width(${2:integer})${3} diff --git a/sources_non_forked/snipmate-snippets/javascript-jquery/wrap.snippet b/sources_non_forked/snipmate-snippets/javascript-jquery/wrap.snippet deleted file mode 100644 index 55df53ff..00000000 --- a/sources_non_forked/snipmate-snippets/javascript-jquery/wrap.snippet +++ /dev/null @@ -1 +0,0 @@ -${1:obj}.wrap('${2:<div class="extra-wrapper"></div>}')${3} diff --git a/sources_non_forked/snipmate-snippets/javascript/anon.snippet b/sources_non_forked/snipmate-snippets/javascript/anon.snippet deleted file mode 100644 index d486c430..00000000 --- a/sources_non_forked/snipmate-snippets/javascript/anon.snippet +++ /dev/null @@ -1 +0,0 @@ -function(${1}) { ${2} }; diff --git a/sources_non_forked/snipmate-snippets/javascript/for.snippet b/sources_non_forked/snipmate-snippets/javascript/for.snippet deleted file mode 100644 index 3933153f..00000000 --- a/sources_non_forked/snipmate-snippets/javascript/for.snippet +++ /dev/null @@ -1,3 +0,0 @@ -for (var <+i+>=0; <+i+> < <+<+Things+>.length+>; <+i+>++) { -<+<+Things+>[<+i+>]+> -}; diff --git a/sources_non_forked/snipmate-snippets/javascript/fun.snippet b/sources_non_forked/snipmate-snippets/javascript/fun.snippet deleted file mode 100644 index 064b9593..00000000 --- a/sources_non_forked/snipmate-snippets/javascript/fun.snippet +++ /dev/null @@ -1,3 +0,0 @@ -function ${1:function_name} (${2:argument}) { - ${3:// body} -} diff --git a/sources_non_forked/snipmate-snippets/javascript/if.snippet b/sources_non_forked/snipmate-snippets/javascript/if.snippet deleted file mode 100644 index 931b9f17..00000000 --- a/sources_non_forked/snipmate-snippets/javascript/if.snippet +++ /dev/null @@ -1 +0,0 @@ -if (${1:true}) { ${2} }; diff --git a/sources_non_forked/snipmate-snippets/javascript/ife.snippet b/sources_non_forked/snipmate-snippets/javascript/ife.snippet deleted file mode 100644 index 6b172d07..00000000 --- a/sources_non_forked/snipmate-snippets/javascript/ife.snippet +++ /dev/null @@ -1,4 +0,0 @@ -if (${1:true}) { - ${2} -} else { -}; diff --git a/sources_non_forked/snipmate-snippets/javascript/log.snippet b/sources_non_forked/snipmate-snippets/javascript/log.snippet deleted file mode 100644 index b4cf84fe..00000000 --- a/sources_non_forked/snipmate-snippets/javascript/log.snippet +++ /dev/null @@ -1 +0,0 @@ -console.log(${1}); diff --git a/sources_non_forked/snipmate-snippets/javascript/met.snippet b/sources_non_forked/snipmate-snippets/javascript/met.snippet deleted file mode 100644 index 1c30d617..00000000 --- a/sources_non_forked/snipmate-snippets/javascript/met.snippet +++ /dev/null @@ -1,3 +0,0 @@ -${1:method_name}: function(${2:attribute}){ - ${3} -}${4:, } diff --git a/sources_non_forked/snipmate-snippets/javascript/proto.snippet b/sources_non_forked/snipmate-snippets/javascript/proto.snippet deleted file mode 100644 index 37cd6d49..00000000 --- a/sources_non_forked/snipmate-snippets/javascript/proto.snippet +++ /dev/null @@ -1,3 +0,0 @@ -${1:class_name}.prototype.${2:method_name} = function(${3:first_argument}) { - ${4:// body} -}; diff --git a/sources_non_forked/snipmate-snippets/javascript/timeout.snippet b/sources_non_forked/snipmate-snippets/javascript/timeout.snippet deleted file mode 100644 index 6ea2842c..00000000 --- a/sources_non_forked/snipmate-snippets/javascript/timeout.snippet +++ /dev/null @@ -1 +0,0 @@ -setTimeout(function() { ${1} }, ${2:10}); diff --git a/sources_non_forked/snipmate-snippets/objc/I.snippet b/sources_non_forked/snipmate-snippets/objc/I.snippet deleted file mode 100644 index 0032f65f..00000000 --- a/sources_non_forked/snipmate-snippets/objc/I.snippet +++ /dev/null @@ -1,6 +0,0 @@ -+ (void) initialize -{ - [[NSUserDefaults standardUserDefaults] registerDefaults:[NSDictionary dictionaryWIthObjectsAndKeys: - ${1}@"value", @"key", - nil]]; -} diff --git a/sources_non_forked/snipmate-snippets/objc/Imp.snippet b/sources_non_forked/snipmate-snippets/objc/Imp.snippet deleted file mode 100644 index 91724d3f..00000000 --- a/sources_non_forked/snipmate-snippets/objc/Imp.snippet +++ /dev/null @@ -1 +0,0 @@ -#import "${1:`Filename()`.h}"${2} diff --git a/sources_non_forked/snipmate-snippets/objc/alloc.snippet b/sources_non_forked/snipmate-snippets/objc/alloc.snippet deleted file mode 100644 index e4d15993..00000000 --- a/sources_non_forked/snipmate-snippets/objc/alloc.snippet +++ /dev/null @@ -1 +0,0 @@ -[[${1:foo} alloc] init]${2};${3} diff --git a/sources_non_forked/snipmate-snippets/objc/array.snippet b/sources_non_forked/snipmate-snippets/objc/array.snippet deleted file mode 100644 index 45d3ef01..00000000 --- a/sources_non_forked/snipmate-snippets/objc/array.snippet +++ /dev/null @@ -1 +0,0 @@ -NSMutableArray *${1:array} = [NSMutable array];${2} diff --git a/sources_non_forked/snipmate-snippets/objc/bez.snippet b/sources_non_forked/snipmate-snippets/objc/bez.snippet deleted file mode 100644 index 493aff69..00000000 --- a/sources_non_forked/snipmate-snippets/objc/bez.snippet +++ /dev/null @@ -1 +0,0 @@ -NSBezierPath *${1:path} = [NSBezierPath bezierPath];${2} diff --git a/sources_non_forked/snipmate-snippets/objc/cat.snippet b/sources_non_forked/snipmate-snippets/objc/cat.snippet deleted file mode 100644 index fd57aae3..00000000 --- a/sources_non_forked/snipmate-snippets/objc/cat.snippet +++ /dev/null @@ -1,6 +0,0 @@ -@interface ${1:NSObject} (${2:Category}) -@end - -@implementation $1 ($2) -${3} -@end diff --git a/sources_non_forked/snipmate-snippets/objc/cati.snippet b/sources_non_forked/snipmate-snippets/objc/cati.snippet deleted file mode 100644 index d2852600..00000000 --- a/sources_non_forked/snipmate-snippets/objc/cati.snippet +++ /dev/null @@ -1,3 +0,0 @@ -@interface ${1:NSObject} (${2:Category}) -${3} -@end diff --git a/sources_non_forked/snipmate-snippets/objc/cli.snippet b/sources_non_forked/snipmate-snippets/objc/cli.snippet deleted file mode 100644 index fa896224..00000000 --- a/sources_non_forked/snipmate-snippets/objc/cli.snippet +++ /dev/null @@ -1,5 +0,0 @@ -@interface ${1:ClassName} : ${2:NSObject} -{${3} -} -${4} -@end diff --git a/sources_non_forked/snipmate-snippets/objc/dict.snippet b/sources_non_forked/snipmate-snippets/objc/dict.snippet deleted file mode 100644 index 8b2d7e90..00000000 --- a/sources_non_forked/snipmate-snippets/objc/dict.snippet +++ /dev/null @@ -1 +0,0 @@ -NSMutableDictionary *${1:dict} = [NSMutableDictionary dictionary];${2} diff --git a/sources_non_forked/snipmate-snippets/objc/forarray.snippet b/sources_non_forked/snipmate-snippets/objc/forarray.snippet deleted file mode 100644 index d32215d0..00000000 --- a/sources_non_forked/snipmate-snippets/objc/forarray.snippet +++ /dev/null @@ -1,7 +0,0 @@ -unsigned int ${1:object}Count = [${2:array} count]; - -for (unsigned int index = 0; index < $1Count; index++) -{ - ${3:id} $1 = [$2 $1AtIndex:index]; - ${4} -} diff --git a/sources_non_forked/snipmate-snippets/objc/log.snippet b/sources_non_forked/snipmate-snippets/objc/log.snippet deleted file mode 100644 index 69f9c067..00000000 --- a/sources_non_forked/snipmate-snippets/objc/log.snippet +++ /dev/null @@ -1 +0,0 @@ -NSLog(@"${1}"${2});${3} diff --git a/sources_non_forked/snipmate-snippets/objc/m/class method.snippet b/sources_non_forked/snipmate-snippets/objc/m/class method.snippet deleted file mode 100644 index 191ee160..00000000 --- a/sources_non_forked/snipmate-snippets/objc/m/class method.snippet +++ /dev/null @@ -1,4 +0,0 @@ -+ (${1:id}) ${2:method} -{${3} - return nil; -} diff --git a/sources_non_forked/snipmate-snippets/objc/m/method.snippet b/sources_non_forked/snipmate-snippets/objc/m/method.snippet deleted file mode 100644 index 9f7390e2..00000000 --- a/sources_non_forked/snipmate-snippets/objc/m/method.snippet +++ /dev/null @@ -1,4 +0,0 @@ -- (${1:id}) ${2:method} -{${3} - ${4:return nil;} -} diff --git a/sources_non_forked/snipmate-snippets/objc/objacc.snippet b/sources_non_forked/snipmate-snippets/objc/objacc.snippet deleted file mode 100644 index 840ebfd0..00000000 --- a/sources_non_forked/snipmate-snippets/objc/objacc.snippet +++ /dev/null @@ -1,11 +0,0 @@ -- (${1:id})${2:thing} -{ - return $2; -} - -- (void) set$2:($1) -{ - $1 old$2 = $2; - $2 = [aValue retain]; - [old$2 release]; -} diff --git a/sources_non_forked/snipmate-snippets/objc/objc.snippet b/sources_non_forked/snipmate-snippets/objc/objc.snippet deleted file mode 100644 index d6671487..00000000 --- a/sources_non_forked/snipmate-snippets/objc/objc.snippet +++ /dev/null @@ -1,14 +0,0 @@ -@interface ${1:`Filename('', 'object')`} : ${2:NSObject} -{ -} -@end - -@implementation $1 -- (id) init -{ - if (self = [super init]) - {${3} - } - return self -} -@end diff --git a/sources_non_forked/snipmate-snippets/objc/prop.snippet b/sources_non_forked/snipmate-snippets/objc/prop.snippet deleted file mode 100644 index d77495a6..00000000 --- a/sources_non_forked/snipmate-snippets/objc/prop.snippet +++ /dev/null @@ -1 +0,0 @@ -@property (${1:retain}) ${2:NSSomeClass} *${3:$2};${4} diff --git a/sources_non_forked/snipmate-snippets/objc/rel.snippet b/sources_non_forked/snipmate-snippets/objc/rel.snippet deleted file mode 100644 index 5dea04dd..00000000 --- a/sources_non_forked/snipmate-snippets/objc/rel.snippet +++ /dev/null @@ -1 +0,0 @@ -[${1:foo} release];${2} diff --git a/sources_non_forked/snipmate-snippets/objc/ret.snippet b/sources_non_forked/snipmate-snippets/objc/ret.snippet deleted file mode 100644 index ee8eba46..00000000 --- a/sources_non_forked/snipmate-snippets/objc/ret.snippet +++ /dev/null @@ -1 +0,0 @@ -[${1:foo} retain];${2} diff --git a/sources_non_forked/snipmate-snippets/objc/sel.snippet b/sources_non_forked/snipmate-snippets/objc/sel.snippet deleted file mode 100644 index 4d4996d1..00000000 --- a/sources_non_forked/snipmate-snippets/objc/sel.snippet +++ /dev/null @@ -1 +0,0 @@ -@selector(${1:method}:)${2} diff --git a/sources_non_forked/snipmate-snippets/objc/sm.snippet b/sources_non_forked/snipmate-snippets/objc/sm.snippet deleted file mode 100644 index af139a90..00000000 --- a/sources_non_forked/snipmate-snippets/objc/sm.snippet +++ /dev/null @@ -1,5 +0,0 @@ -- (${1:id}) ${2:method}:(${3:id})${4:anArgument} -{ - $1 res = [super $2:$4];${5} - return res; -} diff --git a/sources_non_forked/snipmate-snippets/objc/syn.snippet b/sources_non_forked/snipmate-snippets/objc/syn.snippet deleted file mode 100644 index eef7581c..00000000 --- a/sources_non_forked/snipmate-snippets/objc/syn.snippet +++ /dev/null @@ -1 +0,0 @@ -@synthesize ${1:NSSomeClass};${2} diff --git a/sources_non_forked/snipmate-snippets/php/array.snippet b/sources_non_forked/snipmate-snippets/php/array.snippet deleted file mode 100644 index 922542e0..00000000 --- a/sources_non_forked/snipmate-snippets/php/array.snippet +++ /dev/null @@ -1 +0,0 @@ -$${1:arrayName} = array('${2}' => ${3});${4} diff --git a/sources_non_forked/snipmate-snippets/php/case.snippet b/sources_non_forked/snipmate-snippets/php/case.snippet deleted file mode 100644 index 8f9e4daf..00000000 --- a/sources_non_forked/snipmate-snippets/php/case.snippet +++ /dev/null @@ -1,3 +0,0 @@ -case '${1:value}': - ${2:// code...} - break;${3} diff --git a/sources_non_forked/snipmate-snippets/php/class.snippet b/sources_non_forked/snipmate-snippets/php/class.snippet deleted file mode 100644 index 4929a955..00000000 --- a/sources_non_forked/snipmate-snippets/php/class.snippet +++ /dev/null @@ -1,11 +0,0 @@ -/** - * ${1} - */ -class ${2:ClassName} -{ - ${3} - function ${4:__construct}(${5:argument}) - { - ${6:// code...} - } -} diff --git a/sources_non_forked/snipmate-snippets/php/classe.snippet b/sources_non_forked/snipmate-snippets/php/classe.snippet deleted file mode 100644 index 2f2b0bc3..00000000 --- a/sources_non_forked/snipmate-snippets/php/classe.snippet +++ /dev/null @@ -1,12 +0,0 @@ -/** - * ${1} - */ -class ${2:ClassName} extends ${3:AnotherClass} -{ - ${4} - function ${5:__construct}(${6:argument}) - { - ${7:// code...} - } -} - diff --git a/sources_non_forked/snipmate-snippets/php/def.snippet b/sources_non_forked/snipmate-snippets/php/def.snippet deleted file mode 100644 index df0f5ebd..00000000 --- a/sources_non_forked/snipmate-snippets/php/def.snippet +++ /dev/null @@ -1 +0,0 @@ -define('${1}'${2});${3} diff --git a/sources_non_forked/snipmate-snippets/php/defd.snippet b/sources_non_forked/snipmate-snippets/php/defd.snippet deleted file mode 100644 index 6758cdad..00000000 --- a/sources_non_forked/snipmate-snippets/php/defd.snippet +++ /dev/null @@ -1 +0,0 @@ -${1}defined('${2}')${3} diff --git a/sources_non_forked/snipmate-snippets/php/do.snippet b/sources_non_forked/snipmate-snippets/php/do.snippet deleted file mode 100644 index e7dd5b06..00000000 --- a/sources_non_forked/snipmate-snippets/php/do.snippet +++ /dev/null @@ -1,3 +0,0 @@ -do { - ${2:// code... } -} while (${1:/* condition */});" diff --git a/sources_non_forked/snipmate-snippets/php/doc_cp.snippet b/sources_non_forked/snipmate-snippets/php/doc_cp.snippet deleted file mode 100644 index d6d1b3fc..00000000 --- a/sources_non_forked/snipmate-snippets/php/doc_cp.snippet +++ /dev/null @@ -1,6 +0,0 @@ -/** - * ${1:undocumented class} - * - * @package ${2:default} - * @author ${3:`g:snips_author`} - **/${4} diff --git a/sources_non_forked/snipmate-snippets/php/doc_f.snippet b/sources_non_forked/snipmate-snippets/php/doc_f.snippet deleted file mode 100644 index a9adbb07..00000000 --- a/sources_non_forked/snipmate-snippets/php/doc_f.snippet +++ /dev/null @@ -1,8 +0,0 @@ -/** - * $2 - * @return ${4:void} - * @author ${5:`g:snips_author`} - **/ -${1:public }function ${2:someFunc}(${3}) -{${6} -} diff --git a/sources_non_forked/snipmate-snippets/php/doc_h.snippet b/sources_non_forked/snipmate-snippets/php/doc_h.snippet deleted file mode 100644 index a0c12e01..00000000 --- a/sources_non_forked/snipmate-snippets/php/doc_h.snippet +++ /dev/null @@ -1,10 +0,0 @@ -/** - * ${1} - * - * @author ${2:`g:snips_author`} - * @version ${3:$Id$} - * @copyright ${4:$2}, `strftime('%d %B, %Y')` - * @package ${5:default} - **/ -/** - * Define DocBlock *// diff --git a/sources_non_forked/snipmate-snippets/php/doc_i.snippet b/sources_non_forked/snipmate-snippets/php/doc_i.snippet deleted file mode 100644 index e62eab72..00000000 --- a/sources_non_forked/snipmate-snippets/php/doc_i.snippet +++ /dev/null @@ -1,8 +0,0 @@ -/** - * $1 - * @package ${2:default} - * @author ${3:`g:snips_author`} - **/ -interface ${1:someClass} -{${4} -} // END interface $1" diff --git a/sources_non_forked/snipmate-snippets/php/ec.snippet b/sources_non_forked/snipmate-snippets/php/ec.snippet deleted file mode 100644 index 489d759b..00000000 --- a/sources_non_forked/snipmate-snippets/php/ec.snippet +++ /dev/null @@ -1 +0,0 @@ -echo "${1:string}"${2}; diff --git a/sources_non_forked/snipmate-snippets/php/else.snippet b/sources_non_forked/snipmate-snippets/php/else.snippet deleted file mode 100644 index b910e982..00000000 --- a/sources_non_forked/snipmate-snippets/php/else.snippet +++ /dev/null @@ -1,3 +0,0 @@ -else { - ${1:// code...} -} diff --git a/sources_non_forked/snipmate-snippets/php/elseif.snippet b/sources_non_forked/snipmate-snippets/php/elseif.snippet deleted file mode 100644 index a57dec80..00000000 --- a/sources_non_forked/snipmate-snippets/php/elseif.snippet +++ /dev/null @@ -1,3 +0,0 @@ -elseif (${1:/* condition */}) { - ${2:// code...} -} diff --git a/sources_non_forked/snipmate-snippets/php/for.snippet b/sources_non_forked/snipmate-snippets/php/for.snippet deleted file mode 100644 index e9bc52aa..00000000 --- a/sources_non_forked/snipmate-snippets/php/for.snippet +++ /dev/null @@ -1,3 +0,0 @@ -for ($${2:i} = 0; $$2 < ${1:count}; $$2${3:++}) { - ${4:// code...} -} diff --git a/sources_non_forked/snipmate-snippets/php/foreach.snippet b/sources_non_forked/snipmate-snippets/php/foreach.snippet deleted file mode 100644 index 5fe47e5b..00000000 --- a/sources_non_forked/snipmate-snippets/php/foreach.snippet +++ /dev/null @@ -1,3 +0,0 @@ -foreach ($${1:variable} as $${2:key}){ - ${3:// code...} -} diff --git a/sources_non_forked/snipmate-snippets/php/foreachk.snippet b/sources_non_forked/snipmate-snippets/php/foreachk.snippet deleted file mode 100644 index f78d57ae..00000000 --- a/sources_non_forked/snipmate-snippets/php/foreachk.snippet +++ /dev/null @@ -1,3 +0,0 @@ -foreach ($${1:variable} as $${2:key} => $${3:value}){ - ${4:// code...} -} diff --git a/sources_non_forked/snipmate-snippets/php/fun.snippet b/sources_non_forked/snipmate-snippets/php/fun.snippet deleted file mode 100644 index 0f5d3534..00000000 --- a/sources_non_forked/snipmate-snippets/php/fun.snippet +++ /dev/null @@ -1,4 +0,0 @@ -${1:public }function ${2:FunctionName}(${3}) -{ - ${4:// code...} -} diff --git a/sources_non_forked/snipmate-snippets/php/get.snippet b/sources_non_forked/snipmate-snippets/php/get.snippet deleted file mode 100644 index af32e0a5..00000000 --- a/sources_non_forked/snipmate-snippets/php/get.snippet +++ /dev/null @@ -1 +0,0 @@ -$_GET['${1}']${2} diff --git a/sources_non_forked/snipmate-snippets/php/globals.snippet b/sources_non_forked/snipmate-snippets/php/globals.snippet deleted file mode 100644 index 6f5b04f3..00000000 --- a/sources_non_forked/snipmate-snippets/php/globals.snippet +++ /dev/null @@ -1 +0,0 @@ -$GLOBALS['${1:variable}']${2: = }${3:something}${4:;}${5} diff --git a/sources_non_forked/snipmate-snippets/php/if.snippet b/sources_non_forked/snipmate-snippets/php/if.snippet deleted file mode 100644 index 69ac0bd6..00000000 --- a/sources_non_forked/snipmate-snippets/php/if.snippet +++ /dev/null @@ -1,3 +0,0 @@ -if (${1:/* condition */}) { - ${2:// code...} -} diff --git a/sources_non_forked/snipmate-snippets/php/ife.snippet b/sources_non_forked/snipmate-snippets/php/ife.snippet deleted file mode 100644 index b8621c1b..00000000 --- a/sources_non_forked/snipmate-snippets/php/ife.snippet +++ /dev/null @@ -1,4 +0,0 @@ -if (${1:/* condition */}) { - ${2:// code...} -} else { -} diff --git a/sources_non_forked/snipmate-snippets/php/inc.snippet b/sources_non_forked/snipmate-snippets/php/inc.snippet deleted file mode 100644 index 8df3966c..00000000 --- a/sources_non_forked/snipmate-snippets/php/inc.snippet +++ /dev/null @@ -1 +0,0 @@ -include '${1:file}';${2} diff --git a/sources_non_forked/snipmate-snippets/php/inc1.snippet b/sources_non_forked/snipmate-snippets/php/inc1.snippet deleted file mode 100644 index ba262818..00000000 --- a/sources_non_forked/snipmate-snippets/php/inc1.snippet +++ /dev/null @@ -1 +0,0 @@ -include_once '${1:file}';${2} diff --git a/sources_non_forked/snipmate-snippets/php/log.snippet b/sources_non_forked/snipmate-snippets/php/log.snippet deleted file mode 100644 index 2b8dcc4b..00000000 --- a/sources_non_forked/snipmate-snippets/php/log.snippet +++ /dev/null @@ -1 +0,0 @@ -error_log(var_export(${1}, true));${2} diff --git a/sources_non_forked/snipmate-snippets/php/php.snippet b/sources_non_forked/snipmate-snippets/php/php.snippet deleted file mode 100644 index ed2ed1ce..00000000 --- a/sources_non_forked/snipmate-snippets/php/php.snippet +++ /dev/null @@ -1,3 +0,0 @@ - diff --git a/sources_non_forked/snipmate-snippets/php/post.snippet b/sources_non_forked/snipmate-snippets/php/post.snippet deleted file mode 100644 index 2de7aa5f..00000000 --- a/sources_non_forked/snipmate-snippets/php/post.snippet +++ /dev/null @@ -1 +0,0 @@ -$_POST['${1}']${2} diff --git a/sources_non_forked/snipmate-snippets/php/req.snippet b/sources_non_forked/snipmate-snippets/php/req.snippet deleted file mode 100644 index c03ea36f..00000000 --- a/sources_non_forked/snipmate-snippets/php/req.snippet +++ /dev/null @@ -1 +0,0 @@ -require '${1:file}';${2} diff --git a/sources_non_forked/snipmate-snippets/php/req1.snippet b/sources_non_forked/snipmate-snippets/php/req1.snippet deleted file mode 100644 index e909c3bc..00000000 --- a/sources_non_forked/snipmate-snippets/php/req1.snippet +++ /dev/null @@ -1 +0,0 @@ -require_once '${1:file}';${2} diff --git a/sources_non_forked/snipmate-snippets/php/request.snippet b/sources_non_forked/snipmate-snippets/php/request.snippet deleted file mode 100644 index 9a839b1b..00000000 --- a/sources_non_forked/snipmate-snippets/php/request.snippet +++ /dev/null @@ -1 +0,0 @@ -$_REQUEST['${1}']${2} diff --git a/sources_non_forked/snipmate-snippets/php/session.snippet b/sources_non_forked/snipmate-snippets/php/session.snippet deleted file mode 100644 index 5e3e11b9..00000000 --- a/sources_non_forked/snipmate-snippets/php/session.snippet +++ /dev/null @@ -1 +0,0 @@ -$_SESSION['${1}']${2} diff --git a/sources_non_forked/snipmate-snippets/php/switch.snippet b/sources_non_forked/snipmate-snippets/php/switch.snippet deleted file mode 100644 index 7fc47c63..00000000 --- a/sources_non_forked/snipmate-snippets/php/switch.snippet +++ /dev/null @@ -1,9 +0,0 @@ -switch ($${1:variable}) { - case '${2:value}': - ${3:// code...} - break; - ${5} - default: - ${4:// code...} - break; -} diff --git a/sources_non_forked/snipmate-snippets/php/t.snippet b/sources_non_forked/snipmate-snippets/php/t.snippet deleted file mode 100644 index e8deae52..00000000 --- a/sources_non_forked/snipmate-snippets/php/t.snippet +++ /dev/null @@ -1 +0,0 @@ -$${1:retVal} = (${2:condition}) ? ${3:a} : ${4:b};${5} diff --git a/sources_non_forked/snipmate-snippets/php/try.snippet b/sources_non_forked/snipmate-snippets/php/try.snippet deleted file mode 100644 index 66a7f651..00000000 --- a/sources_non_forked/snipmate-snippets/php/try.snippet +++ /dev/null @@ -1,6 +0,0 @@ -try { - ${1:// code...} -} catch (${2:Exception} $e) { - ${3:// code...} -} - diff --git a/sources_non_forked/snipmate-snippets/php/var.snippet b/sources_non_forked/snipmate-snippets/php/var.snippet deleted file mode 100644 index 1f8cd08e..00000000 --- a/sources_non_forked/snipmate-snippets/php/var.snippet +++ /dev/null @@ -1 +0,0 @@ -var_export(${1});${2} diff --git a/sources_non_forked/snipmate-snippets/php/wh.snippet b/sources_non_forked/snipmate-snippets/php/wh.snippet deleted file mode 100644 index 36ae0ffc..00000000 --- a/sources_non_forked/snipmate-snippets/php/wh.snippet +++ /dev/null @@ -1,3 +0,0 @@ -while (${1:/* condition */}) { - ${2:// code...} -} diff --git a/sources_non_forked/snipmate-snippets/po/msg.snippet b/sources_non_forked/snipmate-snippets/po/msg.snippet deleted file mode 100644 index 2ad6638a..00000000 --- a/sources_non_forked/snipmate-snippets/po/msg.snippet +++ /dev/null @@ -1,2 +0,0 @@ -msgid "${1}" -msgstr "${2}"${3} diff --git a/sources_non_forked/snipmate-snippets/python/class.snippet b/sources_non_forked/snipmate-snippets/python/class.snippet deleted file mode 100644 index d9e2b8e8..00000000 --- a/sources_non_forked/snipmate-snippets/python/class.snippet +++ /dev/null @@ -1,2 +0,0 @@ -class ${1:``Snippet_PythonClassNameFromFilename()``}(${2:data}): -${3} diff --git a/sources_non_forked/snipmate-snippets/python/def.snippet b/sources_non_forked/snipmate-snippets/python/def.snippet deleted file mode 100644 index c7cc9d38..00000000 --- a/sources_non_forked/snipmate-snippets/python/def.snippet +++ /dev/null @@ -1,2 +0,0 @@ -def ${1:name}(${2:data}): -${3} diff --git a/sources_non_forked/snipmate-snippets/python/for.snippet b/sources_non_forked/snipmate-snippets/python/for.snippet deleted file mode 100644 index fb69c05f..00000000 --- a/sources_non_forked/snipmate-snippets/python/for.snippet +++ /dev/null @@ -1,3 +0,0 @@ -for ${1:var} in ${2:type}: -${3:pass} -${4} diff --git a/sources_non_forked/snipmate-snippets/python/from.snippet b/sources_non_forked/snipmate-snippets/python/from.snippet deleted file mode 100644 index 98d0d825..00000000 --- a/sources_non_forked/snipmate-snippets/python/from.snippet +++ /dev/null @@ -1,2 +0,0 @@ -from ${1:module} import ${2:name} -${3} diff --git a/sources_non_forked/snipmate-snippets/python/get.snippet b/sources_non_forked/snipmate-snippets/python/get.snippet deleted file mode 100644 index bc0bf63d..00000000 --- a/sources_non_forked/snipmate-snippets/python/get.snippet +++ /dev/null @@ -1,3 +0,0 @@ -def get_${1:name}(self): -return self._$1 -${2} diff --git a/sources_non_forked/snipmate-snippets/python/ifmain.snippet b/sources_non_forked/snipmate-snippets/python/ifmain.snippet deleted file mode 100644 index f6e7a262..00000000 --- a/sources_non_forked/snipmate-snippets/python/ifmain.snippet +++ /dev/null @@ -1,2 +0,0 @@ -if __name__ == '__main__': -${1} diff --git a/sources_non_forked/snipmate-snippets/python/import.snippet b/sources_non_forked/snipmate-snippets/python/import.snippet deleted file mode 100644 index 58c9acdc..00000000 --- a/sources_non_forked/snipmate-snippets/python/import.snippet +++ /dev/null @@ -1,2 +0,0 @@ -import ${1:module} -${2} diff --git a/sources_non_forked/snipmate-snippets/python/init.snippet b/sources_non_forked/snipmate-snippets/python/init.snippet deleted file mode 100644 index c1a4f0fa..00000000 --- a/sources_non_forked/snipmate-snippets/python/init.snippet +++ /dev/null @@ -1,2 +0,0 @@ -def __init__(self, ${1:args}): -${2} diff --git a/sources_non_forked/snipmate-snippets/python/set.snippet b/sources_non_forked/snipmate-snippets/python/set.snippet deleted file mode 100644 index 6ab0b5aa..00000000 --- a/sources_non_forked/snipmate-snippets/python/set.snippet +++ /dev/null @@ -1 +0,0 @@ -def set_${1:name}(self, ${2:value}): diff --git a/sources_non_forked/snipmate-snippets/python/try.snippet b/sources_non_forked/snipmate-snippets/python/try.snippet deleted file mode 100644 index fd5f6e59..00000000 --- a/sources_non_forked/snipmate-snippets/python/try.snippet +++ /dev/null @@ -1,4 +0,0 @@ -try: -${1} -except ${2:Exception} -${3} diff --git a/sources_non_forked/snipmate-snippets/ruby-factorygirl/fac.snippet b/sources_non_forked/snipmate-snippets/ruby-factorygirl/fac.snippet deleted file mode 100644 index 05cc3e8e..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-factorygirl/fac.snippet +++ /dev/null @@ -1 +0,0 @@ -Factory(:${1}, ${2})${3} diff --git a/sources_non_forked/snipmate-snippets/ruby-factorygirl/facb.snippet b/sources_non_forked/snipmate-snippets/ruby-factorygirl/facb.snippet deleted file mode 100644 index 299c0335..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-factorygirl/facb.snippet +++ /dev/null @@ -1 +0,0 @@ -Factory.build(:${1}, ${2})${3} diff --git a/sources_non_forked/snipmate-snippets/ruby-factorygirl/facd.snippet b/sources_non_forked/snipmate-snippets/ruby-factorygirl/facd.snippet deleted file mode 100644 index 41d1503c..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-factorygirl/facd.snippet +++ /dev/null @@ -1,4 +0,0 @@ -Factory.define(:${1:model}) do |${2:f}| - ${3} -end -${4} diff --git a/sources_non_forked/snipmate-snippets/ruby-factorygirl/facn.snippet b/sources_non_forked/snipmate-snippets/ruby-factorygirl/facn.snippet deleted file mode 100644 index 7232308c..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-factorygirl/facn.snippet +++ /dev/null @@ -1 +0,0 @@ -Factory.next(:${1:sequence-name})${2} diff --git a/sources_non_forked/snipmate-snippets/ruby-factorygirl/facs.snippet b/sources_non_forked/snipmate-snippets/ruby-factorygirl/facs.snippet deleted file mode 100644 index 13fd5b9d..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-factorygirl/facs.snippet +++ /dev/null @@ -1,4 +0,0 @@ -Factory.sequence :${1:sequence-name} do |${2:m}| - ${3} -end -${4} diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/art.snippet b/sources_non_forked/snipmate-snippets/ruby-rails/art.snippet deleted file mode 100644 index a5a7d34e..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-rails/art.snippet +++ /dev/null @@ -1 +0,0 @@ -assert_redirected_to ${1::action => "${2:index}"} diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/artnp.snippet b/sources_non_forked/snipmate-snippets/ruby-rails/artnp.snippet deleted file mode 100644 index 2c9bfef0..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-rails/artnp.snippet +++ /dev/null @@ -1 +0,0 @@ -assert_redirected_to <+<+parent+>_<+child+>_path(<+@<+parent+>+>, <+@<+child+>+>)+> diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/artnpp.snippet b/sources_non_forked/snipmate-snippets/ruby-rails/artnpp.snippet deleted file mode 100644 index becd79b5..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-rails/artnpp.snippet +++ /dev/null @@ -1 +0,0 @@ -assert_redirected_to <+<+parent+>_<+child+>_path(<+@<+parent+>+>)+> diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/artp.snippet b/sources_non_forked/snipmate-snippets/ruby-rails/artp.snippet deleted file mode 100644 index 55b9204a..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-rails/artp.snippet +++ /dev/null @@ -1 +0,0 @@ -assert_redirected_to <+<+model+>_path(<+@<+model+>+>)+> diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/artpp.snippet b/sources_non_forked/snipmate-snippets/ruby-rails/artpp.snippet deleted file mode 100644 index 1d1d203d..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-rails/artpp.snippet +++ /dev/null @@ -1 +0,0 @@ -assert_redirected_to <+<+model+>s_path+> diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/asd.snippet b/sources_non_forked/snipmate-snippets/ruby-rails/asd.snippet deleted file mode 100644 index 35ab7301..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-rails/asd.snippet +++ /dev/null @@ -1,3 +0,0 @@ -assert_difference "${1:Model}.${2:count}", $1 do - ${3} -end diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/asnd.snippet b/sources_non_forked/snipmate-snippets/ruby-rails/asnd.snippet deleted file mode 100644 index c5124e04..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-rails/asnd.snippet +++ /dev/null @@ -1,3 +0,0 @@ -assert_no_difference "${1:Model}.${2:count}" do - ${3} -end diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/asre.snippet b/sources_non_forked/snipmate-snippets/ruby-rails/asre.snippet deleted file mode 100644 index d0ac6b26..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-rails/asre.snippet +++ /dev/null @@ -1 +0,0 @@ -assert_response :${1:success}, @response.body${2} diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/asrj.snippet b/sources_non_forked/snipmate-snippets/ruby-rails/asrj.snippet deleted file mode 100644 index 6ee13f2d..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-rails/asrj.snippet +++ /dev/null @@ -1 +0,0 @@ -assert_rjs :<+replace+>, <+"<+dom id+>"+> diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/ass.snippet b/sources_non_forked/snipmate-snippets/ruby-rails/ass.snippet deleted file mode 100644 index 4cc696f6..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-rails/ass.snippet +++ /dev/null @@ -1 +0,0 @@ -assert_select '<+path+>'<+, :<+text+> => <+'<+inner_html+>'+>+> <+do<++>+> diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/bf.snippet b/sources_non_forked/snipmate-snippets/ruby-rails/bf.snippet deleted file mode 100644 index ad25cc90..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-rails/bf.snippet +++ /dev/null @@ -1 +0,0 @@ -before_filter :${1:method} diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/bt.snippet b/sources_non_forked/snipmate-snippets/ruby-rails/bt.snippet deleted file mode 100644 index b28e1e62..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-rails/bt.snippet +++ /dev/null @@ -1 +0,0 @@ -belongs_to :${1:association} diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/crw.snippet b/sources_non_forked/snipmate-snippets/ruby-rails/crw.snippet deleted file mode 100644 index 3b1ab619..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-rails/crw.snippet +++ /dev/null @@ -1 +0,0 @@ -cattr_accessor :${1:attr_names} diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/defcreate.snippet b/sources_non_forked/snipmate-snippets/ruby-rails/defcreate.snippet deleted file mode 100644 index e878d3a6..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-rails/defcreate.snippet +++ /dev/null @@ -1,14 +0,0 @@ -def create - @${1:model_class_name} = ${2:ModelClassName}.new(params[:$1]) - - respond_to do |wants| - if @$1.save - flash[:notice] = '$2 was successfully created.' - wants.html { redirect_to(@$1) } - wants.xml { render :xml => @$1, :status => :created, :location => @$1 } - else - wants.html { render :action => "new" } - wants.xml { render :xml => @$1.errors, :status => :unprocessable_entity } - end - end -end${3} diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/defdestroy.snippet b/sources_non_forked/snipmate-snippets/ruby-rails/defdestroy.snippet deleted file mode 100644 index 9c340808..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-rails/defdestroy.snippet +++ /dev/null @@ -1,9 +0,0 @@ -def destroy - @${1:model_class_name} = ${2:ModelClassName}.find(params[:id]) - @$1.destroy - - respond_to do |wants| - wants.html { redirect_to($1s_url) } - wants.xml { head :ok } - end -end${3} diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/defedit.snippet b/sources_non_forked/snipmate-snippets/ruby-rails/defedit.snippet deleted file mode 100644 index 0e80dcb8..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-rails/defedit.snippet +++ /dev/null @@ -1,3 +0,0 @@ -def edit - @${1:model_class_name} = ${2:ModelClassName}.find(params[:id]) -end diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/defindex.snippet b/sources_non_forked/snipmate-snippets/ruby-rails/defindex.snippet deleted file mode 100644 index aa776f9a..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-rails/defindex.snippet +++ /dev/null @@ -1,8 +0,0 @@ -def index - @${1:model_class_name} = ${2:ModelClassName}.all - - respond_to do |wants| - wants.html # index.html.erb - wants.xml { render :xml => @$1s } - end -end${3} diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/defnew.snippet b/sources_non_forked/snipmate-snippets/ruby-rails/defnew.snippet deleted file mode 100644 index 0a4762b9..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-rails/defnew.snippet +++ /dev/null @@ -1,8 +0,0 @@ -def new - @${1:model_class_name} = ${2:ModelClassName}.new - - respond_to do |wants| - wants.html # new.html.erb - wants.xml { render :xml => @$1 } - end -end${3} diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/defshow.snippet b/sources_non_forked/snipmate-snippets/ruby-rails/defshow.snippet deleted file mode 100644 index ba745d52..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-rails/defshow.snippet +++ /dev/null @@ -1,8 +0,0 @@ -def show - @${1:model_class_name} = ${2:ModelClassName}.find(params[:id]) - - respond_to do |wants| - wants.html # show.html.erb - wants.xml { render :xml => @$1 } - end -end${3} diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/defupdate.snippet b/sources_non_forked/snipmate-snippets/ruby-rails/defupdate.snippet deleted file mode 100644 index 0556895c..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-rails/defupdate.snippet +++ /dev/null @@ -1,14 +0,0 @@ -def update - @${1:model_class_name} = ${2:ModelClassName}.find(params[:id]) - - respond_to do |wants| - if @$1.update_attributes(params[:$1]) - flash[:notice] = '$2 was successfully updated.' - wants.html { redirect_to(@$1) } - wants.xml { head :ok } - else - wants.html { render :action => "edit" } - wants.xml { render :xml => @$1.errors, :status => :unprocessable_entity } - end - end -end${3} diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/fina.snippet b/sources_non_forked/snipmate-snippets/ruby-rails/fina.snippet deleted file mode 100644 index af5ec413..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-rails/fina.snippet +++ /dev/null @@ -1 +0,0 @@ -find(:all<+, :conditions => ['<+<+field+> = ?+>', <+true+>]+>) diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/finf.snippet b/sources_non_forked/snipmate-snippets/ruby-rails/finf.snippet deleted file mode 100644 index 24ba2da3..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-rails/finf.snippet +++ /dev/null @@ -1 +0,0 @@ -find(:first<+, :conditions => ['<+<+field+> = ?+>', <+true+>]+>) diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/fini.snippet b/sources_non_forked/snipmate-snippets/ruby-rails/fini.snippet deleted file mode 100644 index 96d68a5f..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-rails/fini.snippet +++ /dev/null @@ -1 +0,0 @@ -find(<+id+>) diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/finl.snippet b/sources_non_forked/snipmate-snippets/ruby-rails/finl.snippet deleted file mode 100644 index 7ee6efec..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-rails/finl.snippet +++ /dev/null @@ -1 +0,0 @@ -find(:last<+, :conditions => ['<+<+field+> = ?+>', <+true+>]+>) diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/flash.snippet b/sources_non_forked/snipmate-snippets/ruby-rails/flash.snippet deleted file mode 100644 index 2a069307..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-rails/flash.snippet +++ /dev/null @@ -1 +0,0 @@ -flash[:${1:notice}] = "${2}" diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/habtm.snippet b/sources_non_forked/snipmate-snippets/ruby-rails/habtm.snippet deleted file mode 100644 index 1b27396a..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-rails/habtm.snippet +++ /dev/null @@ -1 +0,0 @@ -has_and_belongs_to_many :${1:object}, :join_table => "${2:table_name}", :foreign_key => "${3}_id"${4} diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/hm.snippet b/sources_non_forked/snipmate-snippets/ruby-rails/hm.snippet deleted file mode 100644 index 9204df56..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-rails/hm.snippet +++ /dev/null @@ -1 +0,0 @@ -has_many :${1:object} diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/hmd.snippet b/sources_non_forked/snipmate-snippets/ruby-rails/hmd.snippet deleted file mode 100644 index 6aadd73b..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-rails/hmd.snippet +++ /dev/null @@ -1 +0,0 @@ -has_many :<+object+>s<+, :class_name => "<+object+>", :foreign_key => "<+reference+>_id"+>, :dependent => :destroy<++> diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/hmt.snippet b/sources_non_forked/snipmate-snippets/ruby-rails/hmt.snippet deleted file mode 100644 index 4128e037..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-rails/hmt.snippet +++ /dev/null @@ -1 +0,0 @@ -has_many :${1:object}, :through => :${2:object} diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/ho.snippet b/sources_non_forked/snipmate-snippets/ruby-rails/ho.snippet deleted file mode 100644 index 77e14e7a..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-rails/ho.snippet +++ /dev/null @@ -1 +0,0 @@ -has_one :${1:object} diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/i18.snippet b/sources_non_forked/snipmate-snippets/ruby-rails/i18.snippet deleted file mode 100644 index 2a30fae0..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-rails/i18.snippet +++ /dev/null @@ -1 +0,0 @@ -I18n.t('${1:type.key}')${2} diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/ist.snippet b/sources_non_forked/snipmate-snippets/ruby-rails/ist.snippet deleted file mode 100644 index d97d4829..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-rails/ist.snippet +++ /dev/null @@ -1 +0,0 @@ -<%= image_submit_tag("<+agree.png+>"<+<+, :id => "<+id+>"+><+, :name => "<+name+>"+><+, :class => "<+class+>"+><+, :disabled => <+false+>+>+>) %> diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/log.snippet b/sources_non_forked/snipmate-snippets/ruby-rails/log.snippet deleted file mode 100644 index 53360dd5..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-rails/log.snippet +++ /dev/null @@ -1 +0,0 @@ -RAILS_DEFAULT_LOGGER.${1:debug} ${2} diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/logd.snippet b/sources_non_forked/snipmate-snippets/ruby-rails/logd.snippet deleted file mode 100644 index 36236a31..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-rails/logd.snippet +++ /dev/null @@ -1 +0,0 @@ -logger.debug { "${1:message}" }${2} diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/loge.snippet b/sources_non_forked/snipmate-snippets/ruby-rails/loge.snippet deleted file mode 100644 index 4417ad2e..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-rails/loge.snippet +++ /dev/null @@ -1 +0,0 @@ -logger.error { "${1:message}" }${2} diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/logf.snippet b/sources_non_forked/snipmate-snippets/ruby-rails/logf.snippet deleted file mode 100644 index 1bd419c8..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-rails/logf.snippet +++ /dev/null @@ -1 +0,0 @@ -logger.fatal { "${1:message}" }${2} diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/logi.snippet b/sources_non_forked/snipmate-snippets/ruby-rails/logi.snippet deleted file mode 100644 index bf508dc1..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-rails/logi.snippet +++ /dev/null @@ -1 +0,0 @@ -logger.info { "${1:message}" }${2} diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/logw.snippet b/sources_non_forked/snipmate-snippets/ruby-rails/logw.snippet deleted file mode 100644 index 447f6886..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-rails/logw.snippet +++ /dev/null @@ -1 +0,0 @@ -logger.warn { "${1:message}" }${2} diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/mac.snippet b/sources_non_forked/snipmate-snippets/ruby-rails/mac.snippet deleted file mode 100644 index 548d4af0..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-rails/mac.snippet +++ /dev/null @@ -1 +0,0 @@ -add_column :${1:table}, :${2:column}, :${3:type} diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/mapc.snippet b/sources_non_forked/snipmate-snippets/ruby-rails/mapc.snippet deleted file mode 100644 index b14ec4ca..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-rails/mapc.snippet +++ /dev/null @@ -1 +0,0 @@ -${1:map}.${2:connect} '${3:controller/:action/:id}' diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/mapca.snippet b/sources_non_forked/snipmate-snippets/ruby-rails/mapca.snippet deleted file mode 100644 index 9292ffe9..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-rails/mapca.snippet +++ /dev/null @@ -1 +0,0 @@ -${1:map}.catch_all "*${2:anything}", :controller => "${3:default}", :action => "${4:error}"${5} diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/mapr.snippet b/sources_non_forked/snipmate-snippets/ruby-rails/mapr.snippet deleted file mode 100644 index 424805b7..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-rails/mapr.snippet +++ /dev/null @@ -1 +0,0 @@ -${1:map}.resource :${2:resource} diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/maprs.snippet b/sources_non_forked/snipmate-snippets/ruby-rails/maprs.snippet deleted file mode 100644 index a18c4df3..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-rails/maprs.snippet +++ /dev/null @@ -1 +0,0 @@ -${1:map}.resources :${2:resource} diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/mapwo.snippet b/sources_non_forked/snipmate-snippets/ruby-rails/mapwo.snippet deleted file mode 100644 index b3cf7911..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-rails/mapwo.snippet +++ /dev/null @@ -1,3 +0,0 @@ -${1:map}.with_options :${2:controller} => '${3:thing}' do |$3| - ${4} -end diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/mbs.snippet b/sources_non_forked/snipmate-snippets/ruby-rails/mbs.snippet deleted file mode 100644 index a3b34bb3..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-rails/mbs.snippet +++ /dev/null @@ -1 +0,0 @@ -before_save :${1:method} diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/mcc.snippet b/sources_non_forked/snipmate-snippets/ruby-rails/mcc.snippet deleted file mode 100644 index 74dc7af0..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-rails/mcc.snippet +++ /dev/null @@ -1 +0,0 @@ -change_column :${1:table}, :${2:column}, :${3:type} diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/mccc.snippet b/sources_non_forked/snipmate-snippets/ruby-rails/mccc.snippet deleted file mode 100644 index 2915a37f..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-rails/mccc.snippet +++ /dev/null @@ -1 +0,0 @@ -t.column :${1:title}, :${2:string} diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/mcht.snippet b/sources_non_forked/snipmate-snippets/ruby-rails/mcht.snippet deleted file mode 100644 index a71b4731..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-rails/mcht.snippet +++ /dev/null @@ -1,3 +0,0 @@ -change_table :${1:table_name} do |t| - ${2} -end diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/mcol.snippet b/sources_non_forked/snipmate-snippets/ruby-rails/mcol.snippet deleted file mode 100644 index 8a5bd1ff..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-rails/mcol.snippet +++ /dev/null @@ -1 +0,0 @@ -remove_column :${1:table}, :${2:column} diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/mct.snippet b/sources_non_forked/snipmate-snippets/ruby-rails/mct.snippet deleted file mode 100644 index 8dbe1eab..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-rails/mct.snippet +++ /dev/null @@ -1,3 +0,0 @@ -create_table :${1:table_name} do |t| - t.column :${2:name}, :${3:type} -end diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/migration.snippet b/sources_non_forked/snipmate-snippets/ruby-rails/migration.snippet deleted file mode 100644 index 9f54e0b9..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-rails/migration.snippet +++ /dev/null @@ -1,8 +0,0 @@ -class ${1:`Snippet_MigrationNameFromFilename()`} < ActiveRecord::Migration - def self.up - ${2} - end - - def self.down - end -end diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/mp.snippet b/sources_non_forked/snipmate-snippets/ruby-rails/mp.snippet deleted file mode 100644 index 1264a595..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-rails/mp.snippet +++ /dev/null @@ -1 +0,0 @@ -map(&:${1:id}) diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/mrc.snippet b/sources_non_forked/snipmate-snippets/ruby-rails/mrc.snippet deleted file mode 100644 index aaeba258..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-rails/mrc.snippet +++ /dev/null @@ -1 +0,0 @@ -remove_column :${1:column} diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/mrmc.snippet b/sources_non_forked/snipmate-snippets/ruby-rails/mrmc.snippet deleted file mode 100644 index 8a5bd1ff..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-rails/mrmc.snippet +++ /dev/null @@ -1 +0,0 @@ -remove_column :${1:table}, :${2:column} diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/mrnc.snippet b/sources_non_forked/snipmate-snippets/ruby-rails/mrnc.snippet deleted file mode 100644 index 6e167210..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-rails/mrnc.snippet +++ /dev/null @@ -1 +0,0 @@ -rename_column :${1:table}, :${2:old}, :${3:new} diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/mrw.snippet b/sources_non_forked/snipmate-snippets/ruby-rails/mrw.snippet deleted file mode 100644 index 9ef0f8fe..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-rails/mrw.snippet +++ /dev/null @@ -1 +0,0 @@ -mattr_accessor :${1:attr_names} diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/nc.snippet b/sources_non_forked/snipmate-snippets/ruby-rails/nc.snippet deleted file mode 100644 index cfc42ca4..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-rails/nc.snippet +++ /dev/null @@ -1 +0,0 @@ -named_scope :<+name+><+, :joins => :<+table+>+>, :conditions => <+['<+<+field+> = ?+>', <+true+>]+> diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/ncl.snippet b/sources_non_forked/snipmate-snippets/ruby-rails/ncl.snippet deleted file mode 100644 index c420ef2f..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-rails/ncl.snippet +++ /dev/null @@ -1 +0,0 @@ -named_scope :<+name+>, lambda { |<+param+>| { :conditions => <+['<+<+field+> = ?+>', <+param+>]+> } } diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/pa.snippet b/sources_non_forked/snipmate-snippets/ruby-rails/pa.snippet deleted file mode 100644 index 14fa54fb..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-rails/pa.snippet +++ /dev/null @@ -1 +0,0 @@ -params[:${1:id}]${2} diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/ra.snippet b/sources_non_forked/snipmate-snippets/ruby-rails/ra.snippet deleted file mode 100644 index 56a9bbf6..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-rails/ra.snippet +++ /dev/null @@ -1 +0,0 @@ -render :action => "${1:action}" diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/ral.snippet b/sources_non_forked/snipmate-snippets/ruby-rails/ral.snippet deleted file mode 100644 index 0a0b202d..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-rails/ral.snippet +++ /dev/null @@ -1 +0,0 @@ -render :action => "${1:action}", :layout => "${2:layoutname}" diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/rest.snippet b/sources_non_forked/snipmate-snippets/ruby-rails/rest.snippet deleted file mode 100644 index 7938f9d6..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-rails/rest.snippet +++ /dev/null @@ -1,3 +0,0 @@ -respond_to do |wants| - wants.${1:html} <+{ <++> }+> -end diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/rf.snippet b/sources_non_forked/snipmate-snippets/ruby-rails/rf.snippet deleted file mode 100644 index 76fcdb1d..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-rails/rf.snippet +++ /dev/null @@ -1 +0,0 @@ -render :file => "${1:filepath}" diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/rfu.snippet b/sources_non_forked/snipmate-snippets/ruby-rails/rfu.snippet deleted file mode 100644 index c0bb72bf..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-rails/rfu.snippet +++ /dev/null @@ -1 +0,0 @@ -render :file => "${1:filepath}", :use_full_path => ${2:false} diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/ri.snippet b/sources_non_forked/snipmate-snippets/ruby-rails/ri.snippet deleted file mode 100644 index 17a04048..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-rails/ri.snippet +++ /dev/null @@ -1 +0,0 @@ -render :inline => "<+<%= 'hello' %>+>" diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/ril.snippet b/sources_non_forked/snipmate-snippets/ruby-rails/ril.snippet deleted file mode 100644 index b1801aa4..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-rails/ril.snippet +++ /dev/null @@ -1 +0,0 @@ -render :inline => "${1:<%= 'hello' %>}", :locals => { ${2::name} => "${3:value}"${4} } diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/rit.snippet b/sources_non_forked/snipmate-snippets/ruby-rails/rit.snippet deleted file mode 100644 index b3cd8343..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-rails/rit.snippet +++ /dev/null @@ -1 +0,0 @@ -render :inline => "${1:<%= 'hello' %>}", :type => ${2::rxml} diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/rjson.snippet b/sources_non_forked/snipmate-snippets/ruby-rails/rjson.snippet deleted file mode 100644 index fece1fcc..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-rails/rjson.snippet +++ /dev/null @@ -1 +0,0 @@ -render :json => ${1:text to render} diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/rl.snippet b/sources_non_forked/snipmate-snippets/ruby-rails/rl.snippet deleted file mode 100644 index 53e8340a..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-rails/rl.snippet +++ /dev/null @@ -1 +0,0 @@ -render :layout => "${1:layoutname}" diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/rn.snippet b/sources_non_forked/snipmate-snippets/ruby-rails/rn.snippet deleted file mode 100644 index 6c6b0fec..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-rails/rn.snippet +++ /dev/null @@ -1 +0,0 @@ -render :nothing => ${1:true} diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/rns.snippet b/sources_non_forked/snipmate-snippets/ruby-rails/rns.snippet deleted file mode 100644 index d1a581f8..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-rails/rns.snippet +++ /dev/null @@ -1 +0,0 @@ -render :nothing => ${1:true}, :status => ${2:401} diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/rp.snippet b/sources_non_forked/snipmate-snippets/ruby-rails/rp.snippet deleted file mode 100644 index 0c5daa25..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-rails/rp.snippet +++ /dev/null @@ -1 +0,0 @@ -render :partial => "${1:item}" diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/rpc.snippet b/sources_non_forked/snipmate-snippets/ruby-rails/rpc.snippet deleted file mode 100644 index 570644b5..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-rails/rpc.snippet +++ /dev/null @@ -1 +0,0 @@ -render :partial => "<+item+>", :collection => <+@<+item+>s+> diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/rpl.snippet b/sources_non_forked/snipmate-snippets/ruby-rails/rpl.snippet deleted file mode 100644 index 6981fbc3..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-rails/rpl.snippet +++ /dev/null @@ -1 +0,0 @@ -render :partial => "<+item+>", :locals => { :<+item+> => <+@<+item+>+><++> } diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/rpo.snippet b/sources_non_forked/snipmate-snippets/ruby-rails/rpo.snippet deleted file mode 100644 index bab9da96..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-rails/rpo.snippet +++ /dev/null @@ -1 +0,0 @@ -render :partial => "<+item+>", :object => <+@<+item+>+> diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/rps.snippet b/sources_non_forked/snipmate-snippets/ruby-rails/rps.snippet deleted file mode 100644 index aef4c494..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-rails/rps.snippet +++ /dev/null @@ -1 +0,0 @@ -render :partial => "${1:item}", :status => ${2:500} diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/rt.snippet b/sources_non_forked/snipmate-snippets/ruby-rails/rt.snippet deleted file mode 100644 index c464879c..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-rails/rt.snippet +++ /dev/null @@ -1 +0,0 @@ -render :text => "${1:text to render}" diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/rtl.snippet b/sources_non_forked/snipmate-snippets/ruby-rails/rtl.snippet deleted file mode 100644 index fc78bf14..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-rails/rtl.snippet +++ /dev/null @@ -1 +0,0 @@ -render :text => "${1:text to render}", :layout => "${2:layoutname}" diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/rtlt.snippet b/sources_non_forked/snipmate-snippets/ruby-rails/rtlt.snippet deleted file mode 100644 index 69618be0..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-rails/rtlt.snippet +++ /dev/null @@ -1 +0,0 @@ -render :text => "${1:text to render}", :layout => ${2:true} diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/rts.snippet b/sources_non_forked/snipmate-snippets/ruby-rails/rts.snippet deleted file mode 100644 index 04fe409d..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-rails/rts.snippet +++ /dev/null @@ -1 +0,0 @@ -render :text => "${1:text to render}", :status => ${2:401} diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/ru.snippet b/sources_non_forked/snipmate-snippets/ruby-rails/ru.snippet deleted file mode 100644 index 3a2d1ed0..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-rails/ru.snippet +++ /dev/null @@ -1,3 +0,0 @@ -render :update do |${1:page}| - $1.${2} -end diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/rxml.snippet b/sources_non_forked/snipmate-snippets/ruby-rails/rxml.snippet deleted file mode 100644 index e4e721a0..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-rails/rxml.snippet +++ /dev/null @@ -1 +0,0 @@ -render :xml => ${1:text to render} diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/sha1.snippet b/sources_non_forked/snipmate-snippets/ruby-rails/sha1.snippet deleted file mode 100644 index 19847471..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-rails/sha1.snippet +++ /dev/null @@ -1 +0,0 @@ -Digest::SHA1.hexdigest(${1:string}) diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/sweeper.snippet b/sources_non_forked/snipmate-snippets/ruby-rails/sweeper.snippet deleted file mode 100644 index 659aeb0d..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-rails/sweeper.snippet +++ /dev/null @@ -1,15 +0,0 @@ -class ${1:ModelClassName}Sweeper < ActionController::Caching::Sweeper - observe $1 - - def after_save(${2:model_class_name}) - expire_cache($2) - end - - def after_destroy($2) - expire_cache($2) - end - - def expire_cache($2) - expire_page - end -end diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/tcb.snippet b/sources_non_forked/snipmate-snippets/ruby-rails/tcb.snippet deleted file mode 100644 index 021740df..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-rails/tcb.snippet +++ /dev/null @@ -1,2 +0,0 @@ -t.boolean :${1:title} -${2} diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/tcbi.snippet b/sources_non_forked/snipmate-snippets/ruby-rails/tcbi.snippet deleted file mode 100644 index 3e6d3c9c..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-rails/tcbi.snippet +++ /dev/null @@ -1,2 +0,0 @@ -t.binary :<+title+><+, :limit => <+2+>.megabytes+> -<++> diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/tcd.snippet b/sources_non_forked/snipmate-snippets/ruby-rails/tcd.snippet deleted file mode 100644 index 0932f2c1..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-rails/tcd.snippet +++ /dev/null @@ -1,2 +0,0 @@ -t.decimal :<+title+><+<+, :precision => <+10+>+><+, :scale => <+2+>+>+> -<++> diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/tcda.snippet b/sources_non_forked/snipmate-snippets/ruby-rails/tcda.snippet deleted file mode 100644 index b716e8b0..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-rails/tcda.snippet +++ /dev/null @@ -1,2 +0,0 @@ -t.date :${1:title} -${2} diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/tcdt.snippet b/sources_non_forked/snipmate-snippets/ruby-rails/tcdt.snippet deleted file mode 100644 index d060532e..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-rails/tcdt.snippet +++ /dev/null @@ -1,2 +0,0 @@ -t.datetime :${1:title} -${2} diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/tcf.snippet b/sources_non_forked/snipmate-snippets/ruby-rails/tcf.snippet deleted file mode 100644 index f09f7904..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-rails/tcf.snippet +++ /dev/null @@ -1,2 +0,0 @@ -t.float :${1:title} -${2} diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/tch.snippet b/sources_non_forked/snipmate-snippets/ruby-rails/tch.snippet deleted file mode 100644 index bcce7271..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-rails/tch.snippet +++ /dev/null @@ -1,2 +0,0 @@ -t.change :<+name+><+, :<+string+><+, :<+limit+> => <+80+>+>+> -<++> diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/tci.snippet b/sources_non_forked/snipmate-snippets/ruby-rails/tci.snippet deleted file mode 100644 index 7cb011ca..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-rails/tci.snippet +++ /dev/null @@ -1,2 +0,0 @@ -t.integer :${1:title} -${2} diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/tcl.snippet b/sources_non_forked/snipmate-snippets/ruby-rails/tcl.snippet deleted file mode 100644 index ffa359f5..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-rails/tcl.snippet +++ /dev/null @@ -1,2 +0,0 @@ -t.integer :lock_version, :null => false, :default => 0 -${1} diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/tcr.snippet b/sources_non_forked/snipmate-snippets/ruby-rails/tcr.snippet deleted file mode 100644 index 2b421dd7..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-rails/tcr.snippet +++ /dev/null @@ -1,2 +0,0 @@ -t.references :<+taggable+><+, :polymorphic => <+{ :default => '<+Photo+>' }+>+> -<++> diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/tcs.snippet b/sources_non_forked/snipmate-snippets/ruby-rails/tcs.snippet deleted file mode 100644 index a7b8473b..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-rails/tcs.snippet +++ /dev/null @@ -1,2 +0,0 @@ -t.string :${1:title} -${2} diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/tct.snippet b/sources_non_forked/snipmate-snippets/ruby-rails/tct.snippet deleted file mode 100644 index f28518f4..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-rails/tct.snippet +++ /dev/null @@ -1,2 +0,0 @@ -t.text :${1:title} -${2} diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/tcti.snippet b/sources_non_forked/snipmate-snippets/ruby-rails/tcti.snippet deleted file mode 100644 index 0006c819..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-rails/tcti.snippet +++ /dev/null @@ -1,2 +0,0 @@ -t.time :${1:title} -${2} diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/tcts.snippet b/sources_non_forked/snipmate-snippets/ruby-rails/tcts.snippet deleted file mode 100644 index e46e844c..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-rails/tcts.snippet +++ /dev/null @@ -1,2 +0,0 @@ -t.timestamp :${1:title} -${2} diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/tctss.snippet b/sources_non_forked/snipmate-snippets/ruby-rails/tctss.snippet deleted file mode 100644 index f009ee62..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-rails/tctss.snippet +++ /dev/null @@ -1,2 +0,0 @@ -t.timestamps -${1} diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/trc.snippet b/sources_non_forked/snipmate-snippets/ruby-rails/trc.snippet deleted file mode 100644 index 2d6250ab..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-rails/trc.snippet +++ /dev/null @@ -1 +0,0 @@ -t.remove :${1:column} diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/tre.snippet b/sources_non_forked/snipmate-snippets/ruby-rails/tre.snippet deleted file mode 100644 index 8f70788c..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-rails/tre.snippet +++ /dev/null @@ -1,2 +0,0 @@ -t.rename :<+old_column_name+>, :<+new_column_name+> -<++> diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/tref.snippet b/sources_non_forked/snipmate-snippets/ruby-rails/tref.snippet deleted file mode 100644 index 12867868..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-rails/tref.snippet +++ /dev/null @@ -1 +0,0 @@ -t.references :${1:model} diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/va.snippet b/sources_non_forked/snipmate-snippets/ruby-rails/va.snippet deleted file mode 100644 index 064bb7b2..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-rails/va.snippet +++ /dev/null @@ -1 +0,0 @@ -validates_associated :${1:attribute} diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/vao.snippet b/sources_non_forked/snipmate-snippets/ruby-rails/vao.snippet deleted file mode 100644 index 4c6c98b6..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-rails/vao.snippet +++ /dev/null @@ -1 +0,0 @@ -validates_acceptance_of :${1:terms} diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/vc.snippet b/sources_non_forked/snipmate-snippets/ruby-rails/vc.snippet deleted file mode 100644 index 0aa1a75d..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-rails/vc.snippet +++ /dev/null @@ -1 +0,0 @@ -validates_confirmation_of :${1:attribute} diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/ve.snippet b/sources_non_forked/snipmate-snippets/ruby-rails/ve.snippet deleted file mode 100644 index b6a4c4d5..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-rails/ve.snippet +++ /dev/null @@ -1 +0,0 @@ -validates_exclusion_of :${1:attribute}, :in => ${2:%w( mov avi )} diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/vf.snippet b/sources_non_forked/snipmate-snippets/ruby-rails/vf.snippet deleted file mode 100644 index adc142c7..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-rails/vf.snippet +++ /dev/null @@ -1 +0,0 @@ -validates_format_of :${1:attribute}, :with => /${2:regex}/ diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/vi.snippet b/sources_non_forked/snipmate-snippets/ruby-rails/vi.snippet deleted file mode 100644 index 8ba16d2e..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-rails/vi.snippet +++ /dev/null @@ -1 +0,0 @@ -validates_inclusion_of :${1:attribute}, :in => %w(${2: mov avi }) diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/vl.snippet b/sources_non_forked/snipmate-snippets/ruby-rails/vl.snippet deleted file mode 100644 index 71d802bd..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-rails/vl.snippet +++ /dev/null @@ -1 +0,0 @@ -validates_length_of :${1:attribute}, :within => ${2:3}..${3:20} diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/vn.snippet b/sources_non_forked/snipmate-snippets/ruby-rails/vn.snippet deleted file mode 100644 index 34bfaa72..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-rails/vn.snippet +++ /dev/null @@ -1 +0,0 @@ -validates_numericality_of :${1:attribute} diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/vpo.snippet b/sources_non_forked/snipmate-snippets/ruby-rails/vpo.snippet deleted file mode 100644 index c8fdff9c..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-rails/vpo.snippet +++ /dev/null @@ -1 +0,0 @@ -validates_presence_of :${1:attribute} diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/vu.snippet b/sources_non_forked/snipmate-snippets/ruby-rails/vu.snippet deleted file mode 100644 index 0c06e655..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-rails/vu.snippet +++ /dev/null @@ -1 +0,0 @@ -validates_uniqueness_of :${1:attribute} diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/wants.snippet b/sources_non_forked/snipmate-snippets/ruby-rails/wants.snippet deleted file mode 100644 index 909c8d59..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-rails/wants.snippet +++ /dev/null @@ -1 +0,0 @@ -wants.<+js|xml|html+> <+{ <++> }+> diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/xdelete.snippet b/sources_non_forked/snipmate-snippets/ruby-rails/xdelete.snippet deleted file mode 100644 index 41184e9e..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-rails/xdelete.snippet +++ /dev/null @@ -1 +0,0 @@ -xhr :delete, :${1:destroy}, :id => ${2:1}${3} diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/xget.snippet b/sources_non_forked/snipmate-snippets/ruby-rails/xget.snippet deleted file mode 100644 index 1ae7834e..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-rails/xget.snippet +++ /dev/null @@ -1 +0,0 @@ -xhr :get, :<+show+><+, :id => <+1+>+><++> diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/xpost.snippet b/sources_non_forked/snipmate-snippets/ruby-rails/xpost.snippet deleted file mode 100644 index 3681a95f..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-rails/xpost.snippet +++ /dev/null @@ -1 +0,0 @@ -xhr :post, :${1:create}, :${2:object} => { ${3} } diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/xput.snippet b/sources_non_forked/snipmate-snippets/ruby-rails/xput.snippet deleted file mode 100644 index f046f2ea..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-rails/xput.snippet +++ /dev/null @@ -1 +0,0 @@ -xhr :put, :${1:update}, :id => ${2:1}, :${3:object} => { ${4} }${5} diff --git a/sources_non_forked/snipmate-snippets/ruby-rspec/aft.snippet b/sources_non_forked/snipmate-snippets/ruby-rspec/aft.snippet deleted file mode 100644 index 528f1b30..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-rspec/aft.snippet +++ /dev/null @@ -1,3 +0,0 @@ -after(${1::each}) do - ${2} -end diff --git a/sources_non_forked/snipmate-snippets/ruby-rspec/annot.snippet b/sources_non_forked/snipmate-snippets/ruby-rspec/annot.snippet deleted file mode 100644 index 7199170c..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-rspec/annot.snippet +++ /dev/null @@ -1 +0,0 @@ -any_number_of_times diff --git a/sources_non_forked/snipmate-snippets/ruby-rspec/anr.snippet b/sources_non_forked/snipmate-snippets/ruby-rspec/anr.snippet deleted file mode 100644 index 573addd5..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-rspec/anr.snippet +++ /dev/null @@ -1 +0,0 @@ -and_return(${1:value}) diff --git a/sources_non_forked/snipmate-snippets/ruby-rspec/anra.snippet b/sources_non_forked/snipmate-snippets/ruby-rspec/anra.snippet deleted file mode 100644 index ab03deb4..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-rspec/anra.snippet +++ /dev/null @@ -1 +0,0 @@ -and_raise(${1:exception}) diff --git a/sources_non_forked/snipmate-snippets/ruby-rspec/anrb.snippet b/sources_non_forked/snipmate-snippets/ruby-rspec/anrb.snippet deleted file mode 100644 index e313a512..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-rspec/anrb.snippet +++ /dev/null @@ -1 +0,0 @@ -and_return { ${1} } diff --git a/sources_non_forked/snipmate-snippets/ruby-rspec/ant.snippet b/sources_non_forked/snipmate-snippets/ruby-rspec/ant.snippet deleted file mode 100644 index d230e92c..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-rspec/ant.snippet +++ /dev/null @@ -1 +0,0 @@ -and_throw(${1:sym}) diff --git a/sources_non_forked/snipmate-snippets/ruby-rspec/any.snippet b/sources_non_forked/snipmate-snippets/ruby-rspec/any.snippet deleted file mode 100644 index 34c08d69..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-rspec/any.snippet +++ /dev/null @@ -1 +0,0 @@ -and_yield(${1:values}) diff --git a/sources_non_forked/snipmate-snippets/ruby-rspec/atl.snippet b/sources_non_forked/snipmate-snippets/ruby-rspec/atl.snippet deleted file mode 100644 index b95128bb..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-rspec/atl.snippet +++ /dev/null @@ -1 +0,0 @@ -at_least(${1:n}).times diff --git a/sources_non_forked/snipmate-snippets/ruby-rspec/atm.snippet b/sources_non_forked/snipmate-snippets/ruby-rspec/atm.snippet deleted file mode 100644 index fa5c6060..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-rspec/atm.snippet +++ /dev/null @@ -1 +0,0 @@ -at_most(${1:n}).times diff --git a/sources_non_forked/snipmate-snippets/ruby-rspec/bef.snippet b/sources_non_forked/snipmate-snippets/ruby-rspec/bef.snippet deleted file mode 100644 index f96608c5..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-rspec/bef.snippet +++ /dev/null @@ -1,3 +0,0 @@ -before(${1::each}) do - ${2} -end diff --git a/sources_non_forked/snipmate-snippets/ruby-rspec/conn.snippet b/sources_non_forked/snipmate-snippets/ruby-rspec/conn.snippet deleted file mode 100644 index 4bd9d239..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-rspec/conn.snippet +++ /dev/null @@ -1 +0,0 @@ -controller_name :${1:controller} diff --git a/sources_non_forked/snipmate-snippets/ruby-rspec/des.snippet b/sources_non_forked/snipmate-snippets/ruby-rspec/des.snippet deleted file mode 100644 index 44c75845..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-rspec/des.snippet +++ /dev/null @@ -1,3 +0,0 @@ -describe "${1:subject}" do - ${2} -end diff --git a/sources_non_forked/snipmate-snippets/ruby-rspec/desc.snippet b/sources_non_forked/snipmate-snippets/ruby-rspec/desc.snippet deleted file mode 100644 index 6311aa1d..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-rspec/desc.snippet +++ /dev/null @@ -1,5 +0,0 @@ -require 'spec_helper' - -describe ${1:`Snippet_RubyClassNameFromFilename()`} do - ${2} -end diff --git a/sources_non_forked/snipmate-snippets/ruby-rspec/desrc.snippet b/sources_non_forked/snipmate-snippets/ruby-rspec/desrc.snippet deleted file mode 100644 index a9c8ac2b..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-rspec/desrc.snippet +++ /dev/null @@ -1,3 +0,0 @@ -describe ${1:controller}, "${2:GET|POST|PUT|DELETE} ${3:/some/path}${4}" do - ${5} -end diff --git a/sources_non_forked/snipmate-snippets/ruby-rspec/dest.snippet b/sources_non_forked/snipmate-snippets/ruby-rspec/dest.snippet deleted file mode 100644 index b3b3e01a..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-rspec/dest.snippet +++ /dev/null @@ -1,3 +0,0 @@ -describe ${1:Type} do - ${2} -end diff --git a/sources_non_forked/snipmate-snippets/ruby-rspec/dests.snippet b/sources_non_forked/snipmate-snippets/ruby-rspec/dests.snippet deleted file mode 100644 index 89e9372c..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-rspec/dests.snippet +++ /dev/null @@ -1,3 +0,0 @@ -describe ${1:Type}, "${2:description}" do - ${3} -end diff --git a/sources_non_forked/snipmate-snippets/ruby-rspec/ex.snippet b/sources_non_forked/snipmate-snippets/ruby-rspec/ex.snippet deleted file mode 100644 index 2e5a4a01..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-rspec/ex.snippet +++ /dev/null @@ -1 +0,0 @@ -exactly(${1:n}).times diff --git a/sources_non_forked/snipmate-snippets/ruby-rspec/isbl.snippet b/sources_non_forked/snipmate-snippets/ruby-rspec/isbl.snippet deleted file mode 100644 index 728223f0..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-rspec/isbl.snippet +++ /dev/null @@ -1 +0,0 @@ -it_should_behave_like '${1:do something}' diff --git a/sources_non_forked/snipmate-snippets/ruby-rspec/it.snippet b/sources_non_forked/snipmate-snippets/ruby-rspec/it.snippet deleted file mode 100644 index 8af38db4..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-rspec/it.snippet +++ /dev/null @@ -1,3 +0,0 @@ -it "${1}" do - ${2} -end diff --git a/sources_non_forked/snipmate-snippets/ruby-rspec/its.snippet b/sources_non_forked/snipmate-snippets/ruby-rspec/its.snippet deleted file mode 100644 index 963f4041..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-rspec/its.snippet +++ /dev/null @@ -1 +0,0 @@ -it "should ${1:do something}" do${2} diff --git a/sources_non_forked/snipmate-snippets/ruby-rspec/mat.snippet b/sources_non_forked/snipmate-snippets/ruby-rspec/mat.snippet deleted file mode 100644 index 2f047710..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-rspec/mat.snippet +++ /dev/null @@ -1,24 +0,0 @@ -class ${1:ReverseTo} - def initialize(${2:param}) - @$2 = $2 - end - - def matches?(actual) - @actual = actual - # Satisfy expectation here. Return false or raise an error if it's not met. - ${3:@actual.reverse.should == @$2} - true - end - - def failure_message - "expected #{@actual.inspect} to ${4} #{@$2.inspect}, but it didn't" - end - - def negative_failure_message - "expected #{@actual.inspect} not to ${5} #{@$2.inspect}, but it did" - end -end - -def ${6:reverse_to}(${7:expected}) - ${8}.new($7) -end diff --git a/sources_non_forked/snipmate-snippets/ruby-rspec/mm.snippet b/sources_non_forked/snipmate-snippets/ruby-rspec/mm.snippet deleted file mode 100644 index b10aa1d5..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-rspec/mm.snippet +++ /dev/null @@ -1 +0,0 @@ -mock_model(${1:model})${2} diff --git a/sources_non_forked/snipmate-snippets/ruby-rspec/moc.snippet b/sources_non_forked/snipmate-snippets/ruby-rspec/moc.snippet deleted file mode 100644 index 4ff954f1..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-rspec/moc.snippet +++ /dev/null @@ -1,2 +0,0 @@ -${1:var} = mock("${2:mock_name}"${3:, :null_object => true}) -${4} diff --git a/sources_non_forked/snipmate-snippets/ruby-rspec/mocw.snippet b/sources_non_forked/snipmate-snippets/ruby-rspec/mocw.snippet deleted file mode 100644 index 09f93e07..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-rspec/mocw.snippet +++ /dev/null @@ -1,3 +0,0 @@ -Spec::Runner.configure do |config| - config.mock_with :${1:mocha|flexmock|rr} -end diff --git a/sources_non_forked/snipmate-snippets/ruby-rspec/on.snippet b/sources_non_forked/snipmate-snippets/ruby-rspec/on.snippet deleted file mode 100644 index b2d1a776..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-rspec/on.snippet +++ /dev/null @@ -1 +0,0 @@ -once diff --git a/sources_non_forked/snipmate-snippets/ruby-rspec/resh.snippet b/sources_non_forked/snipmate-snippets/ruby-rspec/resh.snippet deleted file mode 100644 index 91cd5b06..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-rspec/resh.snippet +++ /dev/null @@ -1 +0,0 @@ -require File.dirname(__FILE__) + '/../spec_helper' diff --git a/sources_non_forked/snipmate-snippets/ruby-rspec/sef.snippet b/sources_non_forked/snipmate-snippets/ruby-rspec/sef.snippet deleted file mode 100644 index 89d34116..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-rspec/sef.snippet +++ /dev/null @@ -1,3 +0,0 @@ -shared_examples_for "${1:do something}" do - ${2} -end diff --git a/sources_non_forked/snipmate-snippets/ruby-rspec/sh.snippet b/sources_non_forked/snipmate-snippets/ruby-rspec/sh.snippet deleted file mode 100644 index 67530e9d..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-rspec/sh.snippet +++ /dev/null @@ -1,2 +0,0 @@ -${1:target}.should == ${2:value} -${3} diff --git a/sources_non_forked/snipmate-snippets/ruby-rspec/shb.snippet b/sources_non_forked/snipmate-snippets/ruby-rspec/shb.snippet deleted file mode 100644 index b909d9c0..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-rspec/shb.snippet +++ /dev/null @@ -1,2 +0,0 @@ -${1:target}.should be(${2:result}) -${3} diff --git a/sources_non_forked/snipmate-snippets/ruby-rspec/shbc.snippet b/sources_non_forked/snipmate-snippets/ruby-rspec/shbc.snippet deleted file mode 100644 index 9080a3c2..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-rspec/shbc.snippet +++ /dev/null @@ -1,2 +0,0 @@ -${1:target}.should be_close(${2:result}, ${3:tolerance}) -${4} diff --git a/sources_non_forked/snipmate-snippets/ruby-rspec/shbio.snippet b/sources_non_forked/snipmate-snippets/ruby-rspec/shbio.snippet deleted file mode 100644 index 98a73893..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-rspec/shbio.snippet +++ /dev/null @@ -1,2 +0,0 @@ -${1:target}.should be_instance_of(${2:class}) -${3} diff --git a/sources_non_forked/snipmate-snippets/ruby-rspec/shbko.snippet b/sources_non_forked/snipmate-snippets/ruby-rspec/shbko.snippet deleted file mode 100644 index 74bf8520..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-rspec/shbko.snippet +++ /dev/null @@ -1,2 +0,0 @@ -${1:target}.should be_a_kind_of(${2:class}) -${3} diff --git a/sources_non_forked/snipmate-snippets/ruby-rspec/shbr.snippet b/sources_non_forked/snipmate-snippets/ruby-rspec/shbr.snippet deleted file mode 100644 index 887ef800..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-rspec/shbr.snippet +++ /dev/null @@ -1,2 +0,0 @@ -response.should be_redirect -${1} diff --git a/sources_non_forked/snipmate-snippets/ruby-rspec/shbs.snippet b/sources_non_forked/snipmate-snippets/ruby-rspec/shbs.snippet deleted file mode 100644 index 602074b5..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-rspec/shbs.snippet +++ /dev/null @@ -1,2 +0,0 @@ -response.should be_success -${1} diff --git a/sources_non_forked/snipmate-snippets/ruby-rspec/shc.snippet b/sources_non_forked/snipmate-snippets/ruby-rspec/shc.snippet deleted file mode 100644 index 16206fa1..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-rspec/shc.snippet +++ /dev/null @@ -1,3 +0,0 @@ -lambda do - ${1} -end.should change(${2:target}, :${3:method}).from(${4:old_value}).to(${5:new_value}).by(${6:change}) diff --git a/sources_non_forked/snipmate-snippets/ruby-rspec/shdm.snippet b/sources_non_forked/snipmate-snippets/ruby-rspec/shdm.snippet deleted file mode 100644 index e82d82e7..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-rspec/shdm.snippet +++ /dev/null @@ -1,2 +0,0 @@ -${1:target}.should match(/${2:regexp}/) -${3} diff --git a/sources_non_forked/snipmate-snippets/ruby-rspec/she.snippet b/sources_non_forked/snipmate-snippets/ruby-rspec/she.snippet deleted file mode 100644 index f896a26e..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-rspec/she.snippet +++ /dev/null @@ -1,2 +0,0 @@ -${1:target}.should eql(${2:value}) -${3} diff --git a/sources_non_forked/snipmate-snippets/ruby-rspec/sheq.snippet b/sources_non_forked/snipmate-snippets/ruby-rspec/sheq.snippet deleted file mode 100644 index e3c389e6..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-rspec/sheq.snippet +++ /dev/null @@ -1,2 +0,0 @@ -${1:target}.should equal(${2:value}) -${3} diff --git a/sources_non_forked/snipmate-snippets/ruby-rspec/shh.snippet b/sources_non_forked/snipmate-snippets/ruby-rspec/shh.snippet deleted file mode 100644 index 93189cb8..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-rspec/shh.snippet +++ /dev/null @@ -1,2 +0,0 @@ -${1:target}.should have(${2:num}).${3:things} -${4} diff --git a/sources_non_forked/snipmate-snippets/ruby-rspec/shhal.snippet b/sources_non_forked/snipmate-snippets/ruby-rspec/shhal.snippet deleted file mode 100644 index dabe237a..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-rspec/shhal.snippet +++ /dev/null @@ -1,2 +0,0 @@ -${1:target}.should have_at_least(${2:num}).${3:things} -${4} diff --git a/sources_non_forked/snipmate-snippets/ruby-rspec/shham.snippet b/sources_non_forked/snipmate-snippets/ruby-rspec/shham.snippet deleted file mode 100644 index 7072add1..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-rspec/shham.snippet +++ /dev/null @@ -1,2 +0,0 @@ -${1:target}.should have_at_most(${2:num}).${3:things} -${4} diff --git a/sources_non_forked/snipmate-snippets/ruby-rspec/shhr.snippet b/sources_non_forked/snipmate-snippets/ruby-rspec/shhr.snippet deleted file mode 100644 index b8a8997f..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-rspec/shhr.snippet +++ /dev/null @@ -1,2 +0,0 @@ -${1:target}.should have(${2:n}).records -${3} diff --git a/sources_non_forked/snipmate-snippets/ruby-rspec/shn.snippet b/sources_non_forked/snipmate-snippets/ruby-rspec/shn.snippet deleted file mode 100644 index b19cbb67..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-rspec/shn.snippet +++ /dev/null @@ -1,2 +0,0 @@ -${1:target}.should_not == ${2:value} -${3} diff --git a/sources_non_forked/snipmate-snippets/ruby-rspec/shnb.snippet b/sources_non_forked/snipmate-snippets/ruby-rspec/shnb.snippet deleted file mode 100644 index a34d62e5..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-rspec/shnb.snippet +++ /dev/null @@ -1,2 +0,0 @@ -${1:target}.should_not be(${2:result}) -${3} diff --git a/sources_non_forked/snipmate-snippets/ruby-rspec/shnbc.snippet b/sources_non_forked/snipmate-snippets/ruby-rspec/shnbc.snippet deleted file mode 100644 index 55ac6d3a..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-rspec/shnbc.snippet +++ /dev/null @@ -1,2 +0,0 @@ -${1:target}.should_not be_close(${2:result}, ${3:tolerance}) -${4} diff --git a/sources_non_forked/snipmate-snippets/ruby-rspec/shnbio.snippet b/sources_non_forked/snipmate-snippets/ruby-rspec/shnbio.snippet deleted file mode 100644 index b6f15267..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-rspec/shnbio.snippet +++ /dev/null @@ -1,2 +0,0 @@ -${1:target}.should_not be_instance_of(${2:klass}) -${3} diff --git a/sources_non_forked/snipmate-snippets/ruby-rspec/shnbko.snippet b/sources_non_forked/snipmate-snippets/ruby-rspec/shnbko.snippet deleted file mode 100644 index 0b0cfc7f..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-rspec/shnbko.snippet +++ /dev/null @@ -1,2 +0,0 @@ -${1:target}.should_not be_a_kind_of(${2:klass}) -${3} diff --git a/sources_non_forked/snipmate-snippets/ruby-rspec/shnbr.snippet b/sources_non_forked/snipmate-snippets/ruby-rspec/shnbr.snippet deleted file mode 100644 index 25519b08..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-rspec/shnbr.snippet +++ /dev/null @@ -1,2 +0,0 @@ -response.should_not be_redirect -${1} diff --git a/sources_non_forked/snipmate-snippets/ruby-rspec/shnbs.snippet b/sources_non_forked/snipmate-snippets/ruby-rspec/shnbs.snippet deleted file mode 100644 index 7d35ab20..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-rspec/shnbs.snippet +++ /dev/null @@ -1,2 +0,0 @@ -response.should_not be_success -${1} diff --git a/sources_non_forked/snipmate-snippets/ruby-rspec/shnc.snippet b/sources_non_forked/snipmate-snippets/ruby-rspec/shnc.snippet deleted file mode 100644 index 7baead27..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-rspec/shnc.snippet +++ /dev/null @@ -1,3 +0,0 @@ -lambda do - ${1} -end.should_not change(${2:target}, :${3:method}) diff --git a/sources_non_forked/snipmate-snippets/ruby-rspec/shne.snippet b/sources_non_forked/snipmate-snippets/ruby-rspec/shne.snippet deleted file mode 100644 index 68a7451c..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-rspec/shne.snippet +++ /dev/null @@ -1,2 +0,0 @@ -${1:target}.should_not eql(${2:value}) -${3} diff --git a/sources_non_forked/snipmate-snippets/ruby-rspec/shneq.snippet b/sources_non_forked/snipmate-snippets/ruby-rspec/shneq.snippet deleted file mode 100644 index da4f59b9..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-rspec/shneq.snippet +++ /dev/null @@ -1,2 +0,0 @@ - ${1:target}.should_not equal(${2:value}) - ${3} diff --git a/sources_non_forked/snipmate-snippets/ruby-rspec/shnm.snippet b/sources_non_forked/snipmate-snippets/ruby-rspec/shnm.snippet deleted file mode 100644 index ee7b6043..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-rspec/shnm.snippet +++ /dev/null @@ -1,2 +0,0 @@ -${1:target}.should_not match(/${2:regexp}/) -${3} diff --git a/sources_non_forked/snipmate-snippets/ruby-rspec/shnp.snippet b/sources_non_forked/snipmate-snippets/ruby-rspec/shnp.snippet deleted file mode 100644 index 9f1298b7..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-rspec/shnp.snippet +++ /dev/null @@ -1 +0,0 @@ -${1:target}.should_not be_${2:predicate} diff --git a/sources_non_forked/snipmate-snippets/ruby-rspec/shnr.snippet b/sources_non_forked/snipmate-snippets/ruby-rspec/shnr.snippet deleted file mode 100644 index 98c0fc08..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-rspec/shnr.snippet +++ /dev/null @@ -1,2 +0,0 @@ -${1:mock}.should_not_receive(:${2:message})${3} -${4} diff --git a/sources_non_forked/snipmate-snippets/ruby-rspec/shnre.snippet b/sources_non_forked/snipmate-snippets/ruby-rspec/shnre.snippet deleted file mode 100644 index fbf9604e..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-rspec/shnre.snippet +++ /dev/null @@ -1,2 +0,0 @@ -${1:target}.should_not raise_error(${2:error}) -${3} diff --git a/sources_non_forked/snipmate-snippets/ruby-rspec/shnredt.snippet b/sources_non_forked/snipmate-snippets/ruby-rspec/shnredt.snippet deleted file mode 100644 index 2afb69cc..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-rspec/shnredt.snippet +++ /dev/null @@ -1,2 +0,0 @@ -response.should_not redirect_to(${1:url}) -${2} diff --git a/sources_non_forked/snipmate-snippets/ruby-rspec/shnrt.snippet b/sources_non_forked/snipmate-snippets/ruby-rspec/shnrt.snippet deleted file mode 100644 index c2c5f2cb..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-rspec/shnrt.snippet +++ /dev/null @@ -1,2 +0,0 @@ -${1:target}.should_not respond_to(:${2:sym}) -${3} diff --git a/sources_non_forked/snipmate-snippets/ruby-rspec/shns.snippet b/sources_non_forked/snipmate-snippets/ruby-rspec/shns.snippet deleted file mode 100644 index b73a71c8..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-rspec/shns.snippet +++ /dev/null @@ -1,2 +0,0 @@ -${1:target}.should_not satisfy { |${2:obj}| ${3} } -${4} diff --git a/sources_non_forked/snipmate-snippets/ruby-rspec/shnt.snippet b/sources_non_forked/snipmate-snippets/ruby-rspec/shnt.snippet deleted file mode 100644 index 0353376b..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-rspec/shnt.snippet +++ /dev/null @@ -1,2 +0,0 @@ -lambda { ${1} }.should_not throw_symbol(:${2:symbol}) -${3} diff --git a/sources_non_forked/snipmate-snippets/ruby-rspec/shp.snippet b/sources_non_forked/snipmate-snippets/ruby-rspec/shp.snippet deleted file mode 100644 index 9267b612..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-rspec/shp.snippet +++ /dev/null @@ -1 +0,0 @@ -${1:target}.should be_${2:predicate} diff --git a/sources_non_forked/snipmate-snippets/ruby-rspec/shr.snippet b/sources_non_forked/snipmate-snippets/ruby-rspec/shr.snippet deleted file mode 100644 index 4effa2c1..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-rspec/shr.snippet +++ /dev/null @@ -1,2 +0,0 @@ -${1:mock}.should_receive(:${2:message})${3} -${4} diff --git a/sources_non_forked/snipmate-snippets/ruby-rspec/shre.snippet b/sources_non_forked/snipmate-snippets/ruby-rspec/shre.snippet deleted file mode 100644 index 420bbe80..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-rspec/shre.snippet +++ /dev/null @@ -1,2 +0,0 @@ -${1:target}.should raise_error(${2:error}) -${3} diff --git a/sources_non_forked/snipmate-snippets/ruby-rspec/shredt.snippet b/sources_non_forked/snipmate-snippets/ruby-rspec/shredt.snippet deleted file mode 100644 index 979c1d6e..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-rspec/shredt.snippet +++ /dev/null @@ -1,2 +0,0 @@ -response.should redirect_to(${1:url}) -${2} diff --git a/sources_non_forked/snipmate-snippets/ruby-rspec/shrt.snippet b/sources_non_forked/snipmate-snippets/ruby-rspec/shrt.snippet deleted file mode 100644 index a796ebd2..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-rspec/shrt.snippet +++ /dev/null @@ -1,2 +0,0 @@ -${1:target}.should respond_to(:${2:sym}) -${3} diff --git a/sources_non_forked/snipmate-snippets/ruby-rspec/shs.snippet b/sources_non_forked/snipmate-snippets/ruby-rspec/shs.snippet deleted file mode 100644 index 08eb9419..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-rspec/shs.snippet +++ /dev/null @@ -1,2 +0,0 @@ -${1:target}.should satisfy { |${2:obj}| ${3} } -${4} diff --git a/sources_non_forked/snipmate-snippets/ruby-rspec/sht.snippet b/sources_non_forked/snipmate-snippets/ruby-rspec/sht.snippet deleted file mode 100644 index 86f55fa3..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-rspec/sht.snippet +++ /dev/null @@ -1,2 +0,0 @@ -${1:target}.should throw_symble(:${2:symbol}) -${3} diff --git a/sources_non_forked/snipmate-snippets/ruby-rspec/shtemp.snippet b/sources_non_forked/snipmate-snippets/ruby-rspec/shtemp.snippet deleted file mode 100644 index 9b08c10e..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-rspec/shtemp.snippet +++ /dev/null @@ -1,2 +0,0 @@ -response.should render_template(:${1:template}) -${2} diff --git a/sources_non_forked/snipmate-snippets/ruby-rspec/tw.snippet b/sources_non_forked/snipmate-snippets/ruby-rspec/tw.snippet deleted file mode 100644 index 6ebb6d4a..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-rspec/tw.snippet +++ /dev/null @@ -1 +0,0 @@ -twice diff --git a/sources_non_forked/snipmate-snippets/ruby-rspec/wia.snippet b/sources_non_forked/snipmate-snippets/ruby-rspec/wia.snippet deleted file mode 100644 index 21eda197..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-rspec/wia.snippet +++ /dev/null @@ -1,2 +0,0 @@ -with(${1:args}) -${2} diff --git a/sources_non_forked/snipmate-snippets/ruby-shoulda/context.snippet b/sources_non_forked/snipmate-snippets/ruby-shoulda/context.snippet deleted file mode 100644 index 0e5a7fd2..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-shoulda/context.snippet +++ /dev/null @@ -1,5 +0,0 @@ -context "${1:context}" do - - ${2} - -end diff --git a/sources_non_forked/snipmate-snippets/ruby-shoulda/samao.snippet b/sources_non_forked/snipmate-snippets/ruby-shoulda/samao.snippet deleted file mode 100644 index cfd4e59f..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-shoulda/samao.snippet +++ /dev/null @@ -1 +0,0 @@ -should_allow_mass_assignment_of :${1:field} diff --git a/sources_non_forked/snipmate-snippets/ruby-shoulda/savf.snippet b/sources_non_forked/snipmate-snippets/ruby-shoulda/savf.snippet deleted file mode 100644 index 39cfd6f1..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-shoulda/savf.snippet +++ /dev/null @@ -1 +0,0 @@ -should_allow_values_for :${1:field}, "${2:value}" diff --git a/sources_non_forked/snipmate-snippets/ruby-shoulda/sbt.snippet b/sources_non_forked/snipmate-snippets/ruby-shoulda/sbt.snippet deleted file mode 100644 index 90d25c84..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-shoulda/sbt.snippet +++ /dev/null @@ -1 +0,0 @@ -should_belong_to :${1:association} diff --git a/sources_non_forked/snipmate-snippets/ruby-shoulda/selal.snippet b/sources_non_forked/snipmate-snippets/ruby-shoulda/selal.snippet deleted file mode 100644 index 2fc48b4a..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-shoulda/selal.snippet +++ /dev/null @@ -1 +0,0 @@ -should_ensure_length_at_least :${1:field}, ${2:min_length} diff --git a/sources_non_forked/snipmate-snippets/ruby-shoulda/seli.snippet b/sources_non_forked/snipmate-snippets/ruby-shoulda/seli.snippet deleted file mode 100644 index 8bc2bf87..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-shoulda/seli.snippet +++ /dev/null @@ -1 +0,0 @@ -should_ensure_length_is :${1:field}, ${2:length} diff --git a/sources_non_forked/snipmate-snippets/ruby-shoulda/selir.snippet b/sources_non_forked/snipmate-snippets/ruby-shoulda/selir.snippet deleted file mode 100644 index 1f0bdc98..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-shoulda/selir.snippet +++ /dev/null @@ -1 +0,0 @@ -should_ensure_length_in_range :${1:field}, ${2:start}..${3:end} diff --git a/sources_non_forked/snipmate-snippets/ruby-shoulda/setup.snippet b/sources_non_forked/snipmate-snippets/ruby-shoulda/setup.snippet deleted file mode 100644 index 68b895c1..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-shoulda/setup.snippet +++ /dev/null @@ -1,3 +0,0 @@ -setup do - ${1} -end diff --git a/sources_non_forked/snipmate-snippets/ruby-shoulda/sevir.snippet b/sources_non_forked/snipmate-snippets/ruby-shoulda/sevir.snippet deleted file mode 100644 index 195f7484..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-shoulda/sevir.snippet +++ /dev/null @@ -1 +0,0 @@ -should_ensure_value_in_range :${1:field}, ${2:start}..${3:end} diff --git a/sources_non_forked/snipmate-snippets/ruby-shoulda/shabtm.snippet b/sources_non_forked/snipmate-snippets/ruby-shoulda/shabtm.snippet deleted file mode 100644 index 03c70e24..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-shoulda/shabtm.snippet +++ /dev/null @@ -1 +0,0 @@ -should_have_and_belong_to_many :${1:association} diff --git a/sources_non_forked/snipmate-snippets/ruby-shoulda/shcm.snippet b/sources_non_forked/snipmate-snippets/ruby-shoulda/shcm.snippet deleted file mode 100644 index 6948aea9..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-shoulda/shcm.snippet +++ /dev/null @@ -1 +0,0 @@ -should_have_class_methods :${1:method} diff --git a/sources_non_forked/snipmate-snippets/ruby-shoulda/shdc.snippet b/sources_non_forked/snipmate-snippets/ruby-shoulda/shdc.snippet deleted file mode 100644 index d841d650..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-shoulda/shdc.snippet +++ /dev/null @@ -1 +0,0 @@ -should_have_db_columns :${1:field} diff --git a/sources_non_forked/snipmate-snippets/ruby-shoulda/shi.snippet b/sources_non_forked/snipmate-snippets/ruby-shoulda/shi.snippet deleted file mode 100644 index d6d2b389..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-shoulda/shi.snippet +++ /dev/null @@ -1 +0,0 @@ -should_have_indices :${1:field} diff --git a/sources_non_forked/snipmate-snippets/ruby-shoulda/shim.snippet b/sources_non_forked/snipmate-snippets/ruby-shoulda/shim.snippet deleted file mode 100644 index 1f442528..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-shoulda/shim.snippet +++ /dev/null @@ -1 +0,0 @@ -should_have_instance_methods :${1:method} diff --git a/sources_non_forked/snipmate-snippets/ruby-shoulda/shm.snippet b/sources_non_forked/snipmate-snippets/ruby-shoulda/shm.snippet deleted file mode 100644 index 8c98c17e..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-shoulda/shm.snippet +++ /dev/null @@ -1 +0,0 @@ -should_have_many :${1:association} diff --git a/sources_non_forked/snipmate-snippets/ruby-shoulda/sho.snippet b/sources_non_forked/snipmate-snippets/ruby-shoulda/sho.snippet deleted file mode 100644 index a652b4f5..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-shoulda/sho.snippet +++ /dev/null @@ -1 +0,0 @@ -should_have_one :${1:association} diff --git a/sources_non_forked/snipmate-snippets/ruby-shoulda/shroa.snippet b/sources_non_forked/snipmate-snippets/ruby-shoulda/shroa.snippet deleted file mode 100644 index 022015df..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-shoulda/shroa.snippet +++ /dev/null @@ -1 +0,0 @@ -should_have_read_only_attributes :${1:field} diff --git a/sources_non_forked/snipmate-snippets/ruby-shoulda/snamao.snippet b/sources_non_forked/snipmate-snippets/ruby-shoulda/snamao.snippet deleted file mode 100644 index 236190b5..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-shoulda/snamao.snippet +++ /dev/null @@ -1 +0,0 @@ -should_not_allow_mass_assignment_of :${1:field} diff --git a/sources_non_forked/snipmate-snippets/ruby-shoulda/snavf.snippet b/sources_non_forked/snipmate-snippets/ruby-shoulda/snavf.snippet deleted file mode 100644 index 029c5bab..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-shoulda/snavf.snippet +++ /dev/null @@ -1 +0,0 @@ -should_not_allow_values_for :${1:field}, "${2:value}" diff --git a/sources_non_forked/snipmate-snippets/ruby-shoulda/svao.snippet b/sources_non_forked/snipmate-snippets/ruby-shoulda/svao.snippet deleted file mode 100644 index 8eccb887..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-shoulda/svao.snippet +++ /dev/null @@ -1 +0,0 @@ -should_validate_acceptance_of :${1:field} diff --git a/sources_non_forked/snipmate-snippets/ruby-shoulda/svno.snippet b/sources_non_forked/snipmate-snippets/ruby-shoulda/svno.snippet deleted file mode 100644 index a90c1cab..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-shoulda/svno.snippet +++ /dev/null @@ -1 +0,0 @@ -should_validate_numericality_of :${1:field} diff --git a/sources_non_forked/snipmate-snippets/ruby-shoulda/svpo.snippet b/sources_non_forked/snipmate-snippets/ruby-shoulda/svpo.snippet deleted file mode 100644 index 13598f86..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-shoulda/svpo.snippet +++ /dev/null @@ -1 +0,0 @@ -should_validate_presence_of :${1:field} diff --git a/sources_non_forked/snipmate-snippets/ruby-shoulda/svuo.snippet b/sources_non_forked/snipmate-snippets/ruby-shoulda/svuo.snippet deleted file mode 100644 index 6e26912d..00000000 --- a/sources_non_forked/snipmate-snippets/ruby-shoulda/svuo.snippet +++ /dev/null @@ -1 +0,0 @@ -should_validate_uniqueness_of :${1:field}, :scoped_to => ${2:arrayofnames} diff --git a/sources_non_forked/snipmate-snippets/ruby/Md.snippet b/sources_non_forked/snipmate-snippets/ruby/Md.snippet deleted file mode 100644 index 1c2c9f10..00000000 --- a/sources_non_forked/snipmate-snippets/ruby/Md.snippet +++ /dev/null @@ -1 +0,0 @@ -File.open(${1:dump_path}, "wb") { |${2:file}| Marshal.dump(${3:obj}, ${4:$2}) } diff --git a/sources_non_forked/snipmate-snippets/ruby/Ml.snippet b/sources_non_forked/snipmate-snippets/ruby/Ml.snippet deleted file mode 100644 index 33c3200c..00000000 --- a/sources_non_forked/snipmate-snippets/ruby/Ml.snippet +++ /dev/null @@ -1 +0,0 @@ -File.open(${1:dump_path}, "rb") { |${2:file}| Marshal.load(${3:$2}) } diff --git a/sources_non_forked/snipmate-snippets/ruby/Pn.snippet b/sources_non_forked/snipmate-snippets/ruby/Pn.snippet deleted file mode 100644 index e2136913..00000000 --- a/sources_non_forked/snipmate-snippets/ruby/Pn.snippet +++ /dev/null @@ -1 +0,0 @@ -PStore.new(${1}) diff --git a/sources_non_forked/snipmate-snippets/ruby/Yd.snippet b/sources_non_forked/snipmate-snippets/ruby/Yd.snippet deleted file mode 100644 index e667a081..00000000 --- a/sources_non_forked/snipmate-snippets/ruby/Yd.snippet +++ /dev/null @@ -1 +0,0 @@ -File.open(${1:path_to_yml}, "w") { |${2:file}| YAML.dump(${3:obj}, ${4:$2}) } diff --git a/sources_non_forked/snipmate-snippets/ruby/Yl.snippet b/sources_non_forked/snipmate-snippets/ruby/Yl.snippet deleted file mode 100644 index b37d1bb5..00000000 --- a/sources_non_forked/snipmate-snippets/ruby/Yl.snippet +++ /dev/null @@ -1 +0,0 @@ -File.open(${1:path_to_yml}) { |${2:file}| YAML.load(${3:$2}) } diff --git a/sources_non_forked/snipmate-snippets/ruby/am.snippet b/sources_non_forked/snipmate-snippets/ruby/am.snippet deleted file mode 100644 index 91209b9b..00000000 --- a/sources_non_forked/snipmate-snippets/ruby/am.snippet +++ /dev/null @@ -1 +0,0 @@ -alias_method :${1:new_name}, :${2:old_name} diff --git a/sources_non_forked/snipmate-snippets/ruby/as.snippet b/sources_non_forked/snipmate-snippets/ruby/as.snippet deleted file mode 100644 index a8c7f5cb..00000000 --- a/sources_non_forked/snipmate-snippets/ruby/as.snippet +++ /dev/null @@ -1 +0,0 @@ -assert ${1:test}, "${2:failure_message}" diff --git a/sources_non_forked/snipmate-snippets/ruby/asam.snippet b/sources_non_forked/snipmate-snippets/ruby/asam.snippet deleted file mode 100644 index 3c95b31c..00000000 --- a/sources_non_forked/snipmate-snippets/ruby/asam.snippet +++ /dev/null @@ -1 +0,0 @@ -assert_alias_method ${1:object}, ${2:alias_name}, ${3:original_name} diff --git a/sources_non_forked/snipmate-snippets/ruby/asb.snippet b/sources_non_forked/snipmate-snippets/ruby/asb.snippet deleted file mode 100644 index ab1eff71..00000000 --- a/sources_non_forked/snipmate-snippets/ruby/asb.snippet +++ /dev/null @@ -1 +0,0 @@ -assert_boolean ${1:actual} diff --git a/sources_non_forked/snipmate-snippets/ruby/asc.snippet b/sources_non_forked/snipmate-snippets/ruby/asc.snippet deleted file mode 100644 index c6badc3e..00000000 --- a/sources_non_forked/snipmate-snippets/ruby/asc.snippet +++ /dev/null @@ -1 +0,0 @@ -assert_compare ${1:expected}, ${2:operator}, ${3:actual} diff --git a/sources_non_forked/snipmate-snippets/ruby/ascd.snippet b/sources_non_forked/snipmate-snippets/ruby/ascd.snippet deleted file mode 100644 index bc77908f..00000000 --- a/sources_non_forked/snipmate-snippets/ruby/ascd.snippet +++ /dev/null @@ -1 +0,0 @@ -assert_const_defined ${1:object}, ${2:constant_name} diff --git a/sources_non_forked/snipmate-snippets/ruby/ase.snippet b/sources_non_forked/snipmate-snippets/ruby/ase.snippet deleted file mode 100644 index 5f650990..00000000 --- a/sources_non_forked/snipmate-snippets/ruby/ase.snippet +++ /dev/null @@ -1 +0,0 @@ -assert_equal ${1:expected}, ${2:actual} diff --git a/sources_non_forked/snipmate-snippets/ruby/asem.snippet b/sources_non_forked/snipmate-snippets/ruby/asem.snippet deleted file mode 100644 index 46428325..00000000 --- a/sources_non_forked/snipmate-snippets/ruby/asem.snippet +++ /dev/null @@ -1 +0,0 @@ -assert_empty ${1:object} diff --git a/sources_non_forked/snipmate-snippets/ruby/asf.snippet b/sources_non_forked/snipmate-snippets/ruby/asf.snippet deleted file mode 100644 index 27ff6da5..00000000 --- a/sources_non_forked/snipmate-snippets/ruby/asf.snippet +++ /dev/null @@ -1 +0,0 @@ -assert_false ${1:actual} diff --git a/sources_non_forked/snipmate-snippets/ruby/asfa.snippet b/sources_non_forked/snipmate-snippets/ruby/asfa.snippet deleted file mode 100644 index f45fa53f..00000000 --- a/sources_non_forked/snipmate-snippets/ruby/asfa.snippet +++ /dev/null @@ -1 +0,0 @@ -assert_fail_assertion { ${1:block} } diff --git a/sources_non_forked/snipmate-snippets/ruby/asi.snippet b/sources_non_forked/snipmate-snippets/ruby/asi.snippet deleted file mode 100644 index dedf94d2..00000000 --- a/sources_non_forked/snipmate-snippets/ruby/asi.snippet +++ /dev/null @@ -1 +0,0 @@ -assert_include ${1:collection}, ${2:object} diff --git a/sources_non_forked/snipmate-snippets/ruby/asid.snippet b/sources_non_forked/snipmate-snippets/ruby/asid.snippet deleted file mode 100644 index 683fb06c..00000000 --- a/sources_non_forked/snipmate-snippets/ruby/asid.snippet +++ /dev/null @@ -1 +0,0 @@ -assert_in_delta ${1:expected_float}, ${2:actual_float}, ${3:delta_float} diff --git a/sources_non_forked/snipmate-snippets/ruby/asie.snippet b/sources_non_forked/snipmate-snippets/ruby/asie.snippet deleted file mode 100644 index f13d0a36..00000000 --- a/sources_non_forked/snipmate-snippets/ruby/asie.snippet +++ /dev/null @@ -1 +0,0 @@ -assert_in_epsilon ${1:expected_float}, ${2:actual_float} diff --git a/sources_non_forked/snipmate-snippets/ruby/asio.snippet b/sources_non_forked/snipmate-snippets/ruby/asio.snippet deleted file mode 100644 index 56f0ab7e..00000000 --- a/sources_non_forked/snipmate-snippets/ruby/asio.snippet +++ /dev/null @@ -1 +0,0 @@ -assert_instance_of ${1:ExpectedClass}, ${2:actual_instance} diff --git a/sources_non_forked/snipmate-snippets/ruby/asko.snippet b/sources_non_forked/snipmate-snippets/ruby/asko.snippet deleted file mode 100644 index 555bf138..00000000 --- a/sources_non_forked/snipmate-snippets/ruby/asko.snippet +++ /dev/null @@ -1 +0,0 @@ -assert_kind_of ${1:ExpectedKind}, ${2:actual_instance} diff --git a/sources_non_forked/snipmate-snippets/ruby/asm.snippet b/sources_non_forked/snipmate-snippets/ruby/asm.snippet deleted file mode 100644 index 9860b4cf..00000000 --- a/sources_non_forked/snipmate-snippets/ruby/asm.snippet +++ /dev/null @@ -1 +0,0 @@ -assert_match /${1:expected_pattern}/, ${2:actual_string} diff --git a/sources_non_forked/snipmate-snippets/ruby/asn.snippet b/sources_non_forked/snipmate-snippets/ruby/asn.snippet deleted file mode 100644 index 36a2898e..00000000 --- a/sources_non_forked/snipmate-snippets/ruby/asn.snippet +++ /dev/null @@ -1 +0,0 @@ -assert_nil ${1:instance} diff --git a/sources_non_forked/snipmate-snippets/ruby/asncd.snippet b/sources_non_forked/snipmate-snippets/ruby/asncd.snippet deleted file mode 100644 index b4dcd735..00000000 --- a/sources_non_forked/snipmate-snippets/ruby/asncd.snippet +++ /dev/null @@ -1 +0,0 @@ -assert_not_const_defined ${1:object}, ${2:constant_name} diff --git a/sources_non_forked/snipmate-snippets/ruby/asne.snippet b/sources_non_forked/snipmate-snippets/ruby/asne.snippet deleted file mode 100644 index 91db286a..00000000 --- a/sources_non_forked/snipmate-snippets/ruby/asne.snippet +++ /dev/null @@ -1 +0,0 @@ -assert_not_equal ${1:unexpected}, ${2:actual} diff --git a/sources_non_forked/snipmate-snippets/ruby/asnem.snippet b/sources_non_forked/snipmate-snippets/ruby/asnem.snippet deleted file mode 100644 index 43d07728..00000000 --- a/sources_non_forked/snipmate-snippets/ruby/asnem.snippet +++ /dev/null @@ -1 +0,0 @@ -assert_not_empty ${1:object} diff --git a/sources_non_forked/snipmate-snippets/ruby/asni.snippet b/sources_non_forked/snipmate-snippets/ruby/asni.snippet deleted file mode 100644 index d450d9ea..00000000 --- a/sources_non_forked/snipmate-snippets/ruby/asni.snippet +++ /dev/null @@ -1 +0,0 @@ -assert_not_include ${1:collection}, ${2:object} diff --git a/sources_non_forked/snipmate-snippets/ruby/asnid.snippet b/sources_non_forked/snipmate-snippets/ruby/asnid.snippet deleted file mode 100644 index 23e039ad..00000000 --- a/sources_non_forked/snipmate-snippets/ruby/asnid.snippet +++ /dev/null @@ -1 +0,0 @@ -assert_not_in_delta ${1:expected_float}, ${2:actual_float} diff --git a/sources_non_forked/snipmate-snippets/ruby/asnie.snippet b/sources_non_forked/snipmate-snippets/ruby/asnie.snippet deleted file mode 100644 index 25eb7515..00000000 --- a/sources_non_forked/snipmate-snippets/ruby/asnie.snippet +++ /dev/null @@ -1 +0,0 @@ -assert_not_in_epsilon ${1:expected_float}, ${2:actual_float} diff --git a/sources_non_forked/snipmate-snippets/ruby/asnm.snippet b/sources_non_forked/snipmate-snippets/ruby/asnm.snippet deleted file mode 100644 index 95dbf247..00000000 --- a/sources_non_forked/snipmate-snippets/ruby/asnm.snippet +++ /dev/null @@ -1 +0,0 @@ -assert_no_match /${1:unexpected_pattern}/, ${2:actual_string} diff --git a/sources_non_forked/snipmate-snippets/ruby/asnn.snippet b/sources_non_forked/snipmate-snippets/ruby/asnn.snippet deleted file mode 100644 index 9227bc8a..00000000 --- a/sources_non_forked/snipmate-snippets/ruby/asnn.snippet +++ /dev/null @@ -1 +0,0 @@ -assert_not_nil ${1:instance} diff --git a/sources_non_forked/snipmate-snippets/ruby/asnp.snippet b/sources_non_forked/snipmate-snippets/ruby/asnp.snippet deleted file mode 100644 index a540f84d..00000000 --- a/sources_non_forked/snipmate-snippets/ruby/asnp.snippet +++ /dev/null @@ -1 +0,0 @@ -assert_not_predicate ${1:object}, ${2:predicate} diff --git a/sources_non_forked/snipmate-snippets/ruby/asnr.snippet b/sources_non_forked/snipmate-snippets/ruby/asnr.snippet deleted file mode 100644 index fc9a8204..00000000 --- a/sources_non_forked/snipmate-snippets/ruby/asnr.snippet +++ /dev/null @@ -1 +0,0 @@ -assert_nothing_raised { ${1:block} } diff --git a/sources_non_forked/snipmate-snippets/ruby/asnrt.snippet b/sources_non_forked/snipmate-snippets/ruby/asnrt.snippet deleted file mode 100644 index fb063d28..00000000 --- a/sources_non_forked/snipmate-snippets/ruby/asnrt.snippet +++ /dev/null @@ -1 +0,0 @@ -assert_not_respond_to ${1:object}, ${2:method} diff --git a/sources_non_forked/snipmate-snippets/ruby/asns.snippet b/sources_non_forked/snipmate-snippets/ruby/asns.snippet deleted file mode 100644 index 509e467a..00000000 --- a/sources_non_forked/snipmate-snippets/ruby/asns.snippet +++ /dev/null @@ -1 +0,0 @@ -assert_not_same ${1:unexpected}, ${2:actual} diff --git a/sources_non_forked/snipmate-snippets/ruby/asnse.snippet b/sources_non_forked/snipmate-snippets/ruby/asnse.snippet deleted file mode 100644 index befde129..00000000 --- a/sources_non_forked/snipmate-snippets/ruby/asnse.snippet +++ /dev/null @@ -1 +0,0 @@ -assert_not_send ${1:send_array} diff --git a/sources_non_forked/snipmate-snippets/ruby/asnt.snippet b/sources_non_forked/snipmate-snippets/ruby/asnt.snippet deleted file mode 100644 index cb633c22..00000000 --- a/sources_non_forked/snipmate-snippets/ruby/asnt.snippet +++ /dev/null @@ -1 +0,0 @@ -assert_nothing_thrown { ${1} } diff --git a/sources_non_forked/snipmate-snippets/ruby/aso.snippet b/sources_non_forked/snipmate-snippets/ruby/aso.snippet deleted file mode 100644 index 5b7faf64..00000000 --- a/sources_non_forked/snipmate-snippets/ruby/aso.snippet +++ /dev/null @@ -1 +0,0 @@ -assert_operator ${1:left}, :${2:operator}, ${3:right} diff --git a/sources_non_forked/snipmate-snippets/ruby/asp.snippet b/sources_non_forked/snipmate-snippets/ruby/asp.snippet deleted file mode 100644 index c23fd3f6..00000000 --- a/sources_non_forked/snipmate-snippets/ruby/asp.snippet +++ /dev/null @@ -1 +0,0 @@ -assert_predicate ${1:object}, ${2:predicate} diff --git a/sources_non_forked/snipmate-snippets/ruby/aspe.snippet b/sources_non_forked/snipmate-snippets/ruby/aspe.snippet deleted file mode 100644 index 3a3eed4f..00000000 --- a/sources_non_forked/snipmate-snippets/ruby/aspe.snippet +++ /dev/null @@ -1 +0,0 @@ -assert_path_exist ${1:path} diff --git a/sources_non_forked/snipmate-snippets/ruby/aspne.snippet b/sources_non_forked/snipmate-snippets/ruby/aspne.snippet deleted file mode 100644 index f7a8873a..00000000 --- a/sources_non_forked/snipmate-snippets/ruby/aspne.snippet +++ /dev/null @@ -1 +0,0 @@ -assert_path_not_exist ${1:path} diff --git a/sources_non_forked/snipmate-snippets/ruby/asr.snippet b/sources_non_forked/snipmate-snippets/ruby/asr.snippet deleted file mode 100644 index 834038d5..00000000 --- a/sources_non_forked/snipmate-snippets/ruby/asr.snippet +++ /dev/null @@ -1 +0,0 @@ -assert_raise(${1:Exception}) { ${2} } diff --git a/sources_non_forked/snipmate-snippets/ruby/asrko.snippet b/sources_non_forked/snipmate-snippets/ruby/asrko.snippet deleted file mode 100644 index f82820ed..00000000 --- a/sources_non_forked/snipmate-snippets/ruby/asrko.snippet +++ /dev/null @@ -1 +0,0 @@ -assert_raise_kind_of(${1:kinds...}) { ${2:block} } diff --git a/sources_non_forked/snipmate-snippets/ruby/asrm.snippet b/sources_non_forked/snipmate-snippets/ruby/asrm.snippet deleted file mode 100644 index f62f208b..00000000 --- a/sources_non_forked/snipmate-snippets/ruby/asrm.snippet +++ /dev/null @@ -1 +0,0 @@ -assert_raise_message ${1:expected_message} diff --git a/sources_non_forked/snipmate-snippets/ruby/asrt.snippet b/sources_non_forked/snipmate-snippets/ruby/asrt.snippet deleted file mode 100644 index ca8e84b7..00000000 --- a/sources_non_forked/snipmate-snippets/ruby/asrt.snippet +++ /dev/null @@ -1 +0,0 @@ -assert_respond_to ${1:object}, :${2:method} diff --git a/sources_non_forked/snipmate-snippets/ruby/asse.snippet b/sources_non_forked/snipmate-snippets/ruby/asse.snippet deleted file mode 100644 index 4fb9ef9a..00000000 --- a/sources_non_forked/snipmate-snippets/ruby/asse.snippet +++ /dev/null @@ -1 +0,0 @@ -assert_send ${1:send_array} diff --git a/sources_non_forked/snipmate-snippets/ruby/ast.snippet b/sources_non_forked/snipmate-snippets/ruby/ast.snippet deleted file mode 100644 index 8962cfb7..00000000 --- a/sources_non_forked/snipmate-snippets/ruby/ast.snippet +++ /dev/null @@ -1 +0,0 @@ -assert_throws(:${1:expected}) { ${2} } diff --git a/sources_non_forked/snipmate-snippets/ruby/astr.snippet b/sources_non_forked/snipmate-snippets/ruby/astr.snippet deleted file mode 100644 index b9d14f6e..00000000 --- a/sources_non_forked/snipmate-snippets/ruby/astr.snippet +++ /dev/null @@ -1 +0,0 @@ -assert_true ${1:actual} diff --git a/sources_non_forked/snipmate-snippets/ruby/bm.snippet b/sources_non_forked/snipmate-snippets/ruby/bm.snippet deleted file mode 100644 index 681c5621..00000000 --- a/sources_non_forked/snipmate-snippets/ruby/bm.snippet +++ /dev/null @@ -1,4 +0,0 @@ -TESTS = ${1:10_000} -Benchmark.bmbm do |results| - ${2} -end diff --git a/sources_non_forked/snipmate-snippets/ruby/case.snippet b/sources_non_forked/snipmate-snippets/ruby/case.snippet deleted file mode 100644 index 085a45db..00000000 --- a/sources_non_forked/snipmate-snippets/ruby/case.snippet +++ /dev/null @@ -1,5 +0,0 @@ -case ${1} -when ${2} -else - ${3} -end diff --git a/sources_non_forked/snipmate-snippets/ruby/class.snippet b/sources_non_forked/snipmate-snippets/ruby/class.snippet deleted file mode 100644 index cb396704..00000000 --- a/sources_non_forked/snipmate-snippets/ruby/class.snippet +++ /dev/null @@ -1,3 +0,0 @@ -class ${1:`Snippet_RubyClassNameFromFilename()`}${2} - ${3} -end diff --git a/sources_non_forked/snipmate-snippets/ruby/classe.snippet b/sources_non_forked/snipmate-snippets/ruby/classe.snippet deleted file mode 100644 index f683c688..00000000 --- a/sources_non_forked/snipmate-snippets/ruby/classe.snippet +++ /dev/null @@ -1 +0,0 @@ -class ${1:ErrorClassName} < ${2:StandardError}; end${3} diff --git a/sources_non_forked/snipmate-snippets/ruby/def.snippet b/sources_non_forked/snipmate-snippets/ruby/def.snippet deleted file mode 100644 index ad9bc8cf..00000000 --- a/sources_non_forked/snipmate-snippets/ruby/def.snippet +++ /dev/null @@ -1,3 +0,0 @@ -def ${1:name} - ${2} -end diff --git a/sources_non_forked/snipmate-snippets/ruby/defi.snippet b/sources_non_forked/snipmate-snippets/ruby/defi.snippet deleted file mode 100644 index 12c354c8..00000000 --- a/sources_non_forked/snipmate-snippets/ruby/defi.snippet +++ /dev/null @@ -1,3 +0,0 @@ -def initialize${1} - ${2} -end diff --git a/sources_non_forked/snipmate-snippets/ruby/defmm.snippet b/sources_non_forked/snipmate-snippets/ruby/defmm.snippet deleted file mode 100644 index e3b263a8..00000000 --- a/sources_non_forked/snipmate-snippets/ruby/defmm.snippet +++ /dev/null @@ -1,3 +0,0 @@ -def method_missing(meth, *args, &blk) - ${1} -end diff --git a/sources_non_forked/snipmate-snippets/ruby/defs.snippet b/sources_non_forked/snipmate-snippets/ruby/defs.snippet deleted file mode 100644 index 837733f2..00000000 --- a/sources_non_forked/snipmate-snippets/ruby/defs.snippet +++ /dev/null @@ -1,3 +0,0 @@ -def self.${1:class_method_name} - ${2} -end diff --git a/sources_non_forked/snipmate-snippets/ruby/deft.snippet b/sources_non_forked/snipmate-snippets/ruby/deft.snippet deleted file mode 100644 index 9c2adbff..00000000 --- a/sources_non_forked/snipmate-snippets/ruby/deft.snippet +++ /dev/null @@ -1,3 +0,0 @@ -def test_${1:case_name} - ${2} -end diff --git a/sources_non_forked/snipmate-snippets/ruby/detect.snippet b/sources_non_forked/snipmate-snippets/ruby/detect.snippet deleted file mode 100644 index 5fc24aaa..00000000 --- a/sources_non_forked/snipmate-snippets/ruby/detect.snippet +++ /dev/null @@ -1 +0,0 @@ -detect { |${1:element}| ${2:body} } diff --git a/sources_non_forked/snipmate-snippets/ruby/detecto.snippet b/sources_non_forked/snipmate-snippets/ruby/detecto.snippet deleted file mode 100644 index 904b2a67..00000000 --- a/sources_non_forked/snipmate-snippets/ruby/detecto.snippet +++ /dev/null @@ -1,3 +0,0 @@ -detect do |${1:element}| - ${2:body} -end diff --git a/sources_non_forked/snipmate-snippets/ruby/dglob.snippet b/sources_non_forked/snipmate-snippets/ruby/dglob.snippet deleted file mode 100644 index ca326ade..00000000 --- a/sources_non_forked/snipmate-snippets/ruby/dglob.snippet +++ /dev/null @@ -1 +0,0 @@ -Dir.glob(${1:"<+dir}"+>) { |${2:file}| ${3} } diff --git a/sources_non_forked/snipmate-snippets/ruby/do.snippet b/sources_non_forked/snipmate-snippets/ruby/do.snippet deleted file mode 100644 index 596c11a9..00000000 --- a/sources_non_forked/snipmate-snippets/ruby/do.snippet +++ /dev/null @@ -1,3 +0,0 @@ -do - ${1} -end diff --git a/sources_non_forked/snipmate-snippets/ruby/dop.snippet b/sources_non_forked/snipmate-snippets/ruby/dop.snippet deleted file mode 100644 index 9bf1898a..00000000 --- a/sources_non_forked/snipmate-snippets/ruby/dop.snippet +++ /dev/null @@ -1,3 +0,0 @@ -do |${1:param}| - ${2} -end diff --git a/sources_non_forked/snipmate-snippets/ruby/ea.snippet b/sources_non_forked/snipmate-snippets/ruby/ea.snippet deleted file mode 100644 index 5f7edec0..00000000 --- a/sources_non_forked/snipmate-snippets/ruby/ea.snippet +++ /dev/null @@ -1 +0,0 @@ -each { |${1:element}| ${2:body} } diff --git a/sources_non_forked/snipmate-snippets/ruby/each.snippet b/sources_non_forked/snipmate-snippets/ruby/each.snippet deleted file mode 100644 index 5f7edec0..00000000 --- a/sources_non_forked/snipmate-snippets/ruby/each.snippet +++ /dev/null @@ -1 +0,0 @@ -each { |${1:element}| ${2:body} } diff --git a/sources_non_forked/snipmate-snippets/ruby/each_with_index.snippet b/sources_non_forked/snipmate-snippets/ruby/each_with_index.snippet deleted file mode 100644 index f4d3ef11..00000000 --- a/sources_non_forked/snipmate-snippets/ruby/each_with_index.snippet +++ /dev/null @@ -1 +0,0 @@ -each_with_index { |${1:element},${2:i}| ${3:} } diff --git a/sources_non_forked/snipmate-snippets/ruby/each_with_indexo.snippet b/sources_non_forked/snipmate-snippets/ruby/each_with_indexo.snippet deleted file mode 100644 index e4fb7080..00000000 --- a/sources_non_forked/snipmate-snippets/ruby/each_with_indexo.snippet +++ /dev/null @@ -1,4 +0,0 @@ -each_with_index do |${1:element},${2:i}| - ${3:body} -end - diff --git a/sources_non_forked/snipmate-snippets/ruby/eacho.snippet b/sources_non_forked/snipmate-snippets/ruby/eacho.snippet deleted file mode 100644 index 7c133426..00000000 --- a/sources_non_forked/snipmate-snippets/ruby/eacho.snippet +++ /dev/null @@ -1,3 +0,0 @@ -each do |${1:element}| - ${2:body} -end diff --git a/sources_non_forked/snipmate-snippets/ruby/eado.snippet b/sources_non_forked/snipmate-snippets/ruby/eado.snippet deleted file mode 100644 index 7c133426..00000000 --- a/sources_non_forked/snipmate-snippets/ruby/eado.snippet +++ /dev/null @@ -1,3 +0,0 @@ -each do |${1:element}| - ${2:body} -end diff --git a/sources_non_forked/snipmate-snippets/ruby/eawi.snippet b/sources_non_forked/snipmate-snippets/ruby/eawi.snippet deleted file mode 100644 index f4d3ef11..00000000 --- a/sources_non_forked/snipmate-snippets/ruby/eawi.snippet +++ /dev/null @@ -1 +0,0 @@ -each_with_index { |${1:element},${2:i}| ${3:} } diff --git a/sources_non_forked/snipmate-snippets/ruby/eawido.snippet b/sources_non_forked/snipmate-snippets/ruby/eawido.snippet deleted file mode 100644 index e4fb7080..00000000 --- a/sources_non_forked/snipmate-snippets/ruby/eawido.snippet +++ /dev/null @@ -1,4 +0,0 @@ -each_with_index do |${1:element},${2:i}| - ${3:body} -end - diff --git a/sources_non_forked/snipmate-snippets/ruby/elsif.snippet b/sources_non_forked/snipmate-snippets/ruby/elsif.snippet deleted file mode 100644 index 84d8134e..00000000 --- a/sources_non_forked/snipmate-snippets/ruby/elsif.snippet +++ /dev/null @@ -1,2 +0,0 @@ -elsif ${1:condition} - ${2} diff --git a/sources_non_forked/snipmate-snippets/ruby/fileeach.snippet b/sources_non_forked/snipmate-snippets/ruby/fileeach.snippet deleted file mode 100644 index 5076ef1a..00000000 --- a/sources_non_forked/snipmate-snippets/ruby/fileeach.snippet +++ /dev/null @@ -1 +0,0 @@ -File.foreach(${1:"<+path}"+>) { |${2:line}| ${3} } diff --git a/sources_non_forked/snipmate-snippets/ruby/fopen.snippet b/sources_non_forked/snipmate-snippets/ruby/fopen.snippet deleted file mode 100644 index b630bfeb..00000000 --- a/sources_non_forked/snipmate-snippets/ruby/fopen.snippet +++ /dev/null @@ -1 +0,0 @@ -File.open(${1:path}, "${2:rwab}") { |${3:file}| ${4} } diff --git a/sources_non_forked/snipmate-snippets/ruby/fread.snippet b/sources_non_forked/snipmate-snippets/ruby/fread.snippet deleted file mode 100644 index d9e6074c..00000000 --- a/sources_non_forked/snipmate-snippets/ruby/fread.snippet +++ /dev/null @@ -1 +0,0 @@ -File.read(${1}) diff --git a/sources_non_forked/snipmate-snippets/ruby/http_get.snippet b/sources_non_forked/snipmate-snippets/ruby/http_get.snippet deleted file mode 100644 index cba6d589..00000000 --- a/sources_non_forked/snipmate-snippets/ruby/http_get.snippet +++ /dev/null @@ -1,2 +0,0 @@ -require 'net/http' -res = Net::HTTP.get URI.parse('${1:url}') diff --git a/sources_non_forked/snipmate-snippets/ruby/http_post.snippet b/sources_non_forked/snipmate-snippets/ruby/http_post.snippet deleted file mode 100644 index 3b2036ad..00000000 --- a/sources_non_forked/snipmate-snippets/ruby/http_post.snippet +++ /dev/null @@ -1,2 +0,0 @@ -require 'net/http' -res = Net::HTTP.post_form URI.parse('${1:url}')${2:, params} diff --git a/sources_non_forked/snipmate-snippets/ruby/if.snippet b/sources_non_forked/snipmate-snippets/ruby/if.snippet deleted file mode 100644 index b2d1e39e..00000000 --- a/sources_non_forked/snipmate-snippets/ruby/if.snippet +++ /dev/null @@ -1,3 +0,0 @@ -if ${1:condition} - ${2} -end diff --git a/sources_non_forked/snipmate-snippets/ruby/ife.snippet b/sources_non_forked/snipmate-snippets/ruby/ife.snippet deleted file mode 100644 index 2a7468df..00000000 --- a/sources_non_forked/snipmate-snippets/ruby/ife.snippet +++ /dev/null @@ -1,4 +0,0 @@ -if ${1:condition} - ${2} -else -end diff --git a/sources_non_forked/snipmate-snippets/ruby/inj.snippet b/sources_non_forked/snipmate-snippets/ruby/inj.snippet deleted file mode 100644 index 90dea0d8..00000000 --- a/sources_non_forked/snipmate-snippets/ruby/inj.snippet +++ /dev/null @@ -1 +0,0 @@ -inject(${1:init}) { |${2:total}, ${3:next}| ${4:body} } diff --git a/sources_non_forked/snipmate-snippets/ruby/injdo.snippet b/sources_non_forked/snipmate-snippets/ruby/injdo.snippet deleted file mode 100644 index d3235e90..00000000 --- a/sources_non_forked/snipmate-snippets/ruby/injdo.snippet +++ /dev/null @@ -1,3 +0,0 @@ -inject(${1:init}) do |${2:total}, ${3:next}| - ${4:body} -end diff --git a/sources_non_forked/snipmate-snippets/ruby/inject.snippet b/sources_non_forked/snipmate-snippets/ruby/inject.snippet deleted file mode 100644 index 78ad721d..00000000 --- a/sources_non_forked/snipmate-snippets/ruby/inject.snippet +++ /dev/null @@ -1 +0,0 @@ -inject { |${1:total},${2:next}| ${3:body} } diff --git a/sources_non_forked/snipmate-snippets/ruby/injecto.snippet b/sources_non_forked/snipmate-snippets/ruby/injecto.snippet deleted file mode 100644 index 1631033d..00000000 --- a/sources_non_forked/snipmate-snippets/ruby/injecto.snippet +++ /dev/null @@ -1,3 +0,0 @@ -inject do |${1:total},${2:next}| - ${3:body} -end diff --git a/sources_non_forked/snipmate-snippets/ruby/ip.snippet b/sources_non_forked/snipmate-snippets/ruby/ip.snippet deleted file mode 100644 index 91769768..00000000 --- a/sources_non_forked/snipmate-snippets/ruby/ip.snippet +++ /dev/null @@ -1 +0,0 @@ -ip_addr = request.env['REMOTE_ADDR'] diff --git a/sources_non_forked/snipmate-snippets/ruby/map.snippet b/sources_non_forked/snipmate-snippets/ruby/map.snippet deleted file mode 100644 index b3e7719f..00000000 --- a/sources_non_forked/snipmate-snippets/ruby/map.snippet +++ /dev/null @@ -1 +0,0 @@ -map { |${1:element}| ${2:body} } diff --git a/sources_non_forked/snipmate-snippets/ruby/mapdo.snippet b/sources_non_forked/snipmate-snippets/ruby/mapdo.snippet deleted file mode 100644 index 316e7c7c..00000000 --- a/sources_non_forked/snipmate-snippets/ruby/mapdo.snippet +++ /dev/null @@ -1,3 +0,0 @@ -map do |${1:element}| - ${2:body} -end diff --git a/sources_non_forked/snipmate-snippets/ruby/mapo.snippet b/sources_non_forked/snipmate-snippets/ruby/mapo.snippet deleted file mode 100644 index 316e7c7c..00000000 --- a/sources_non_forked/snipmate-snippets/ruby/mapo.snippet +++ /dev/null @@ -1,3 +0,0 @@ -map do |${1:element}| - ${2:body} -end diff --git a/sources_non_forked/snipmate-snippets/ruby/mod.snippet b/sources_non_forked/snipmate-snippets/ruby/mod.snippet deleted file mode 100644 index 457fd615..00000000 --- a/sources_non_forked/snipmate-snippets/ruby/mod.snippet +++ /dev/null @@ -1,3 +0,0 @@ -module ${1:`Snippet_RubyClassNameFromFilename()`} - ${2} -end diff --git a/sources_non_forked/snipmate-snippets/ruby/module.snippet b/sources_non_forked/snipmate-snippets/ruby/module.snippet deleted file mode 100644 index 78e025a1..00000000 --- a/sources_non_forked/snipmate-snippets/ruby/module.snippet +++ /dev/null @@ -1,14 +0,0 @@ -module ${1:`Snippet_RubyClassNameFromFilename()`} - module ClassMethods - ${2} - end - - module InstanceMethods - - end - - def self.included(receiver) - receiver.extend ClassMethods - receiver.send :include, InstanceMethods - end -end diff --git a/sources_non_forked/snipmate-snippets/ruby/nam.snippet b/sources_non_forked/snipmate-snippets/ruby/nam.snippet deleted file mode 100644 index 19b90a76..00000000 --- a/sources_non_forked/snipmate-snippets/ruby/nam.snippet +++ /dev/null @@ -1,3 +0,0 @@ -namespace :${1:namespace} do - ${2} -end diff --git a/sources_non_forked/snipmate-snippets/ruby/ope.snippet b/sources_non_forked/snipmate-snippets/ruby/ope.snippet deleted file mode 100644 index cfe92471..00000000 --- a/sources_non_forked/snipmate-snippets/ruby/ope.snippet +++ /dev/null @@ -1 +0,0 @@ -open(${1:path}, "${2:rwab}") { |${3:io}| ${4} } diff --git a/sources_non_forked/snipmate-snippets/ruby/pathhere.snippet b/sources_non_forked/snipmate-snippets/ruby/pathhere.snippet deleted file mode 100644 index f4ed9440..00000000 --- a/sources_non_forked/snipmate-snippets/ruby/pathhere.snippet +++ /dev/null @@ -1 +0,0 @@ -File.join(File.dirname(__FILE__), *%w[${1:rel_path_here}]) diff --git a/sources_non_forked/snipmate-snippets/ruby/r.snippet b/sources_non_forked/snipmate-snippets/ruby/r.snippet deleted file mode 100644 index f232fc94..00000000 --- a/sources_non_forked/snipmate-snippets/ruby/r.snippet +++ /dev/null @@ -1 +0,0 @@ -attr_reader :${1:attr_names} diff --git a/sources_non_forked/snipmate-snippets/ruby/reject.snippet b/sources_non_forked/snipmate-snippets/ruby/reject.snippet deleted file mode 100644 index 07d2787f..00000000 --- a/sources_non_forked/snipmate-snippets/ruby/reject.snippet +++ /dev/null @@ -1 +0,0 @@ -reject { |${1:element}| ${2:body} } diff --git a/sources_non_forked/snipmate-snippets/ruby/rejecto.snippet b/sources_non_forked/snipmate-snippets/ruby/rejecto.snippet deleted file mode 100644 index e906bd7e..00000000 --- a/sources_non_forked/snipmate-snippets/ruby/rejecto.snippet +++ /dev/null @@ -1,3 +0,0 @@ -reject do |${1:element}| - ${2:body} -end diff --git a/sources_non_forked/snipmate-snippets/ruby/rep.snippet b/sources_non_forked/snipmate-snippets/ruby/rep.snippet deleted file mode 100644 index 04b77b0d..00000000 --- a/sources_non_forked/snipmate-snippets/ruby/rep.snippet +++ /dev/null @@ -1 +0,0 @@ -results.report("${1:name}:") { TESTS.times { ${2} } } diff --git a/sources_non_forked/snipmate-snippets/ruby/rw.snippet b/sources_non_forked/snipmate-snippets/ruby/rw.snippet deleted file mode 100644 index 1862da33..00000000 --- a/sources_non_forked/snipmate-snippets/ruby/rw.snippet +++ /dev/null @@ -1 +0,0 @@ -attr_accessor :${1:attr_names} diff --git a/sources_non_forked/snipmate-snippets/ruby/select.snippet b/sources_non_forked/snipmate-snippets/ruby/select.snippet deleted file mode 100644 index 8ab228cc..00000000 --- a/sources_non_forked/snipmate-snippets/ruby/select.snippet +++ /dev/null @@ -1 +0,0 @@ -select { |${1:element}| ${2:body} } diff --git a/sources_non_forked/snipmate-snippets/ruby/selecto.snippet b/sources_non_forked/snipmate-snippets/ruby/selecto.snippet deleted file mode 100644 index a22a6505..00000000 --- a/sources_non_forked/snipmate-snippets/ruby/selecto.snippet +++ /dev/null @@ -1,3 +0,0 @@ -select do |${1:element}| - ${2:body} -end diff --git a/sources_non_forked/snipmate-snippets/ruby/sinc.snippet b/sources_non_forked/snipmate-snippets/ruby/sinc.snippet deleted file mode 100644 index 20e2c4c9..00000000 --- a/sources_non_forked/snipmate-snippets/ruby/sinc.snippet +++ /dev/null @@ -1 +0,0 @@ -class << self; self end diff --git a/sources_non_forked/snipmate-snippets/ruby/sort.snippet b/sources_non_forked/snipmate-snippets/ruby/sort.snippet deleted file mode 100644 index 08a67c1a..00000000 --- a/sources_non_forked/snipmate-snippets/ruby/sort.snippet +++ /dev/null @@ -1 +0,0 @@ -sort { |${1:x},${2:y}| ${3:body} } diff --git a/sources_non_forked/snipmate-snippets/ruby/sorto.snippet b/sources_non_forked/snipmate-snippets/ruby/sorto.snippet deleted file mode 100644 index 76c38e40..00000000 --- a/sources_non_forked/snipmate-snippets/ruby/sorto.snippet +++ /dev/null @@ -1,3 +0,0 @@ -sort do |${1:x},${2:y}| - ${3:body} -end diff --git a/sources_non_forked/snipmate-snippets/ruby/tas.snippet b/sources_non_forked/snipmate-snippets/ruby/tas.snippet deleted file mode 100644 index d949a6b5..00000000 --- a/sources_non_forked/snipmate-snippets/ruby/tas.snippet +++ /dev/null @@ -1,4 +0,0 @@ -desc "${1:Task description}" -task :${2:task_name}${3: => [:dependent, :tasks]} do - ${4} -end diff --git a/sources_non_forked/snipmate-snippets/ruby/task.snippet b/sources_non_forked/snipmate-snippets/ruby/task.snippet deleted file mode 100644 index d949a6b5..00000000 --- a/sources_non_forked/snipmate-snippets/ruby/task.snippet +++ /dev/null @@ -1,4 +0,0 @@ -desc "${1:Task description}" -task :${2:task_name}${3: => [:dependent, :tasks]} do - ${4} -end diff --git a/sources_non_forked/snipmate-snippets/ruby/tc.snippet b/sources_non_forked/snipmate-snippets/ruby/tc.snippet deleted file mode 100644 index 3e28f61a..00000000 --- a/sources_non_forked/snipmate-snippets/ruby/tc.snippet +++ /dev/null @@ -1,9 +0,0 @@ -require "test/unit" - -require "${1:library_file_name}" - -class Test${2:`Snippet_RubyClassNameFromFilename()`} < Test::Unit::TestCase - def test_${3:case_name} - ${4} - end -end diff --git a/sources_non_forked/snipmate-snippets/ruby/unless.snippet b/sources_non_forked/snipmate-snippets/ruby/unless.snippet deleted file mode 100644 index 3495d2ba..00000000 --- a/sources_non_forked/snipmate-snippets/ruby/unless.snippet +++ /dev/null @@ -1,3 +0,0 @@ -unless ${1:condition} - ${2} -end diff --git a/sources_non_forked/snipmate-snippets/ruby/unlesse.snippet b/sources_non_forked/snipmate-snippets/ruby/unlesse.snippet deleted file mode 100644 index d190b45e..00000000 --- a/sources_non_forked/snipmate-snippets/ruby/unlesse.snippet +++ /dev/null @@ -1,4 +0,0 @@ -unless ${1:condition} - ${2} -else -end diff --git a/sources_non_forked/snipmate-snippets/ruby/w.snippet b/sources_non_forked/snipmate-snippets/ruby/w.snippet deleted file mode 100644 index 0650e955..00000000 --- a/sources_non_forked/snipmate-snippets/ruby/w.snippet +++ /dev/null @@ -1 +0,0 @@ -attr_writer :${1:attr_names} diff --git a/sources_non_forked/snipmate-snippets/ruby/while.snippet b/sources_non_forked/snipmate-snippets/ruby/while.snippet deleted file mode 100644 index 6e878fa3..00000000 --- a/sources_non_forked/snipmate-snippets/ruby/while.snippet +++ /dev/null @@ -1,3 +0,0 @@ -while ${1:condition} - ${2} -end diff --git a/sources_non_forked/snipmate-snippets/ruby/xmlr.snippet b/sources_non_forked/snipmate-snippets/ruby/xmlr.snippet deleted file mode 100644 index eeb35802..00000000 --- a/sources_non_forked/snipmate-snippets/ruby/xmlr.snippet +++ /dev/null @@ -1 +0,0 @@ -REXML::Document.new(File.read(${1:path})) diff --git a/sources_non_forked/snipmate-snippets/ruby/xpa.snippet b/sources_non_forked/snipmate-snippets/ruby/xpa.snippet deleted file mode 100644 index 5bff9508..00000000 --- a/sources_non_forked/snipmate-snippets/ruby/xpa.snippet +++ /dev/null @@ -1,3 +0,0 @@ -elements.each(${1}) do |${2:node}| - ${3} -end diff --git a/sources_non_forked/snipmate-snippets/ruby/zip.snippet b/sources_non_forked/snipmate-snippets/ruby/zip.snippet deleted file mode 100644 index b2c831ab..00000000 --- a/sources_non_forked/snipmate-snippets/ruby/zip.snippet +++ /dev/null @@ -1 +0,0 @@ -zip(${1:enums}) { |${2:row}| ${3} } diff --git a/sources_non_forked/snipmate-snippets/sinatra/get.snippet b/sources_non_forked/snipmate-snippets/sinatra/get.snippet deleted file mode 100644 index 08f3fd5a..00000000 --- a/sources_non_forked/snipmate-snippets/sinatra/get.snippet +++ /dev/null @@ -1,3 +0,0 @@ -get '${1:/}' do - ${2} -end diff --git a/sources_non_forked/snipmate-snippets/sshconfig/host.snippet b/sources_non_forked/snipmate-snippets/sshconfig/host.snippet deleted file mode 100644 index 5992a2d0..00000000 --- a/sources_non_forked/snipmate-snippets/sshconfig/host.snippet +++ /dev/null @@ -1,3 +0,0 @@ -Host ${1:name} - Hostname ${2:example.com} - User ${3:username} diff --git a/sources_non_forked/snipmate-snippets/support_functions.vim b/sources_non_forked/snipmate-snippets/support_functions.vim deleted file mode 100644 index a09e81da..00000000 --- a/sources_non_forked/snipmate-snippets/support_functions.vim +++ /dev/null @@ -1,115 +0,0 @@ -"ruby {{{1 -function! Snippet_RubyClassNameFromFilename(...) - let name = expand("%:t:r") - if len(name) == 0 - if a:0 == 0 - let name = 'MyClass' - else - let name = a:1 - endif - endif - return Snippet_Camelcase(substitute(name, '_spec$', '', '')) -endfunction - -function! Snippet_MigrationNameFromFilename(...) - let name = substitute(expand("%:t:r"), '^.\{-}_', '', '') - if len(name) == 0 - if a:0 == 0 - let name = 'MyClass' - else - let name = a:1 - endif - endif - return Snippet_Camelcase(name) -endfunction - - -"python {{{1 -function! Snippet_PythonClassNameFromFilename(...) - let name = expand("%:t:r") - if len(name) == 0 - if a:0 == 0 - let name = 'MyClass' - else - let name = a:1 - endif - endif - return Snippet_Camelcase(name) -endfunction - -"php {{{1 -function! Snippet_PHPClassNameFromFilename(...) - let name = expand("%:t:r:r") - if len(name) == 0 - if a:0 == 0 - let name = 'MyClass' - else - let name = a:1 - endif - endif - return name -endfunction - -"java {{{1 -function! Snippet_JavaClassNameFromFilename(...) - let name = expand("%:t:r") - if len(name) == 0 - if a:0 == 0 - let name = 'MyClass' - else - let name = a:1 - endif - endif - return name -endfunction - -function! Snippet_JavaInstanceVarType(name) - let oldview = winsaveview() - if searchdecl(a:name) == 0 - normal! B - let old_reg = @" - normal! yaW - let type = @" - let @" = old_reg - call winrestview(oldview) - let type = substitute(type, '\s\+$', '', '') - - "searchdecl treats 'return foo;' as a declaration of foo - if type != 'return' - return type - endif - endif - return "<+type+>" -endfunction - - -"global {{{1 -function! s:start_comment() - return substitute(&commentstring, '^\([^ ]*\)\s*%s\(.*\)$', '\1', '') -endfunction - -function! s:end_comment() - return substitute(&commentstring, '^.*%s\(.*\)$', '\1', '') -endfunction - -function! Snippet_Modeline() - return s:start_comment() . " vim: set ${1:settings}:" . s:end_comment() -endfunction - -function! Snippet_Camelcase(s) - "upcase the first letter - let toReturn = substitute(a:s, '^\(.\)', '\=toupper(submatch(1))', '') - "turn all '_x' into 'X' - return substitute(toReturn, '_\(.\)', '\=toupper(submatch(1))', 'g') -endfunction - -function! Snippet_Underscore(s) - "down the first letter - let toReturn = substitute(a:s, '^\(.\)', '\=tolower(submatch(1))', '') - "turn all 'X' into '_x' - return substitute(toReturn, '\([A-Z]\)', '\=tolower("_".submatch(1))', 'g') -endfunction - - -" modeline {{{1 -" vim: set fdm=marker: diff --git a/sources_non_forked/snipmate-snippets/vim/au.snippet b/sources_non_forked/snipmate-snippets/vim/au.snippet deleted file mode 100644 index d59720a5..00000000 --- a/sources_non_forked/snipmate-snippets/vim/au.snippet +++ /dev/null @@ -1 +0,0 @@ -autocmd ${1:events} ${2:pattern} ${3:command} diff --git a/sources_non_forked/snipmate-snippets/vim/com.snippet b/sources_non_forked/snipmate-snippets/vim/com.snippet deleted file mode 100644 index b8eeb5b4..00000000 --- a/sources_non_forked/snipmate-snippets/vim/com.snippet +++ /dev/null @@ -1 +0,0 @@ -command! -nargs=${1:number_of_args} ${2:other_params} ${2:name} ${2:command} diff --git a/sources_non_forked/snipmate-snippets/vim/func.snippet b/sources_non_forked/snipmate-snippets/vim/func.snippet deleted file mode 100644 index 8591a835..00000000 --- a/sources_non_forked/snipmate-snippets/vim/func.snippet +++ /dev/null @@ -1,8 +0,0 @@ -"Function: $1 -"Desc: ${3:description} -" -"Arguments: -"${4} -function! ${1:name}(${2}) - ${5} -endfunction diff --git a/sources_non_forked/snipmate-snippets/vim/if.snippet b/sources_non_forked/snipmate-snippets/vim/if.snippet deleted file mode 100644 index 336e7a00..00000000 --- a/sources_non_forked/snipmate-snippets/vim/if.snippet +++ /dev/null @@ -1,3 +0,0 @@ -if ${1} - ${2} -endif diff --git a/sources_non_forked/snipmate-snippets/vim/ife.snippet b/sources_non_forked/snipmate-snippets/vim/ife.snippet deleted file mode 100644 index c5d16939..00000000 --- a/sources_non_forked/snipmate-snippets/vim/ife.snippet +++ /dev/null @@ -1,4 +0,0 @@ -if ${1} - ${2} -else -endif diff --git a/sources_non_forked/snipmate-snippets/vim/log.snippet b/sources_non_forked/snipmate-snippets/vim/log.snippet deleted file mode 100644 index 5a867549..00000000 --- a/sources_non_forked/snipmate-snippets/vim/log.snippet +++ /dev/null @@ -1 +0,0 @@ -echomsg ${1} diff --git a/sources_non_forked/snipmate-snippets/vim/try.snippet b/sources_non_forked/snipmate-snippets/vim/try.snippet deleted file mode 100644 index cd4c0e72..00000000 --- a/sources_non_forked/snipmate-snippets/vim/try.snippet +++ /dev/null @@ -1,4 +0,0 @@ -try - ${2} -catch /${1}/ -endtry diff --git a/sources_non_forked/snipmate-snippets/xslt/call.snippet b/sources_non_forked/snipmate-snippets/xslt/call.snippet deleted file mode 100644 index 2fe4f9d1..00000000 --- a/sources_non_forked/snipmate-snippets/xslt/call.snippet +++ /dev/null @@ -1,3 +0,0 @@ - - ${2} - diff --git a/sources_non_forked/snipmate-snippets/xslt/choose.snippet b/sources_non_forked/snipmate-snippets/xslt/choose.snippet deleted file mode 100644 index 1a877543..00000000 --- a/sources_non_forked/snipmate-snippets/xslt/choose.snippet +++ /dev/null @@ -1,7 +0,0 @@ - - - ${2} - - - - diff --git a/sources_non_forked/snipmate-snippets/xslt/mat.snippet b/sources_non_forked/snipmate-snippets/xslt/mat.snippet deleted file mode 100644 index a566e0ec..00000000 --- a/sources_non_forked/snipmate-snippets/xslt/mat.snippet +++ /dev/null @@ -1,3 +0,0 @@ - - ${2} - diff --git a/sources_non_forked/snipmate-snippets/xslt/out.snippet b/sources_non_forked/snipmate-snippets/xslt/out.snippet deleted file mode 100644 index 88e70c21..00000000 --- a/sources_non_forked/snipmate-snippets/xslt/out.snippet +++ /dev/null @@ -1 +0,0 @@ - diff --git a/sources_non_forked/snipmate-snippets/xslt/param.snippet b/sources_non_forked/snipmate-snippets/xslt/param.snippet deleted file mode 100644 index f4f9a504..00000000 --- a/sources_non_forked/snipmate-snippets/xslt/param.snippet +++ /dev/null @@ -1 +0,0 @@ - diff --git a/sources_non_forked/snipmate-snippets/xslt/sty.snippet b/sources_non_forked/snipmate-snippets/xslt/sty.snippet deleted file mode 100644 index f6751c74..00000000 --- a/sources_non_forked/snipmate-snippets/xslt/sty.snippet +++ /dev/null @@ -1,3 +0,0 @@ - - ${1} - diff --git a/sources_non_forked/snipmate-snippets/xslt/tem.snippet b/sources_non_forked/snipmate-snippets/xslt/tem.snippet deleted file mode 100644 index bcd86d6d..00000000 --- a/sources_non_forked/snipmate-snippets/xslt/tem.snippet +++ /dev/null @@ -1,3 +0,0 @@ - - ${2} - diff --git a/sources_non_forked/snipmate-snippets/xslt/value.snippet b/sources_non_forked/snipmate-snippets/xslt/value.snippet deleted file mode 100644 index 9128cc6d..00000000 --- a/sources_non_forked/snipmate-snippets/xslt/value.snippet +++ /dev/null @@ -1 +0,0 @@ - diff --git a/sources_non_forked/snipmate-snippets/xslt/var.snippet b/sources_non_forked/snipmate-snippets/xslt/var.snippet deleted file mode 100644 index d21b77c8..00000000 --- a/sources_non_forked/snipmate-snippets/xslt/var.snippet +++ /dev/null @@ -1,3 +0,0 @@ - - ${2} - diff --git a/sources_non_forked/snipmate-snippets/xslt/wparam.snippet b/sources_non_forked/snipmate-snippets/xslt/wparam.snippet deleted file mode 100644 index 2284b71c..00000000 --- a/sources_non_forked/snipmate-snippets/xslt/wparam.snippet +++ /dev/null @@ -1 +0,0 @@ - diff --git a/sources_non_forked/snipmate-snippets/xslt/xdec.snippet b/sources_non_forked/snipmate-snippets/xslt/xdec.snippet deleted file mode 100644 index f1e44209..00000000 --- a/sources_non_forked/snipmate-snippets/xslt/xdec.snippet +++ /dev/null @@ -1,2 +0,0 @@ - - ${2} diff --git a/sources_non_forked/snipmate-snippets/zend/assert.snippet b/sources_non_forked/snipmate-snippets/zend/assert.snippet deleted file mode 100644 index ca928f25..00000000 --- a/sources_non_forked/snipmate-snippets/zend/assert.snippet +++ /dev/null @@ -1 +0,0 @@ -$this->assertTrue(${1:somevar}, '${2:sometext}'); diff --git a/sources_non_forked/snipmate-snippets/zend/boolcol.snippet b/sources_non_forked/snipmate-snippets/zend/boolcol.snippet deleted file mode 100644 index 715fe19c..00000000 --- a/sources_non_forked/snipmate-snippets/zend/boolcol.snippet +++ /dev/null @@ -1 +0,0 @@ -$this->hasColumn('${1:active}', '${2:boolean}', ${3:1}, array('default' => '${4:1}','notnull' => true)); diff --git a/sources_non_forked/snipmate-snippets/zend/clac.snippet b/sources_non_forked/snipmate-snippets/zend/clac.snippet deleted file mode 100644 index 80972a11..00000000 --- a/sources_non_forked/snipmate-snippets/zend/clac.snippet +++ /dev/null @@ -1,20 +0,0 @@ -_flashMessenger->addMessage("${1}", '${2:error}'); diff --git a/sources_non_forked/snipmate-snippets/zend/getconf.snippet b/sources_non_forked/snipmate-snippets/zend/getconf.snippet deleted file mode 100644 index 10f2b202..00000000 --- a/sources_non_forked/snipmate-snippets/zend/getconf.snippet +++ /dev/null @@ -1 +0,0 @@ -$${1:conf} = Zend_Registry::get('${2:config}')->${3:general}; diff --git a/sources_non_forked/snipmate-snippets/zend/input.snippet b/sources_non_forked/snipmate-snippets/zend/input.snippet deleted file mode 100644 index 3c4ed27e..00000000 --- a/sources_non_forked/snipmate-snippets/zend/input.snippet +++ /dev/null @@ -1,4 +0,0 @@ -formInput(array( 'type' => '${1:hidden}', - 'name' => '${2}', - 'value' => ${3:}, - 'id' => '${4:}' )); ?> diff --git a/sources_non_forked/snipmate-snippets/zend/inputarr.snippet b/sources_non_forked/snipmate-snippets/zend/inputarr.snippet deleted file mode 100644 index 8e97bee5..00000000 --- a/sources_non_forked/snipmate-snippets/zend/inputarr.snippet +++ /dev/null @@ -1,6 +0,0 @@ -formInput(array( 'type' => '${1:dropdown}', - 'name' => '${2}', - 'label' => '${3:}', - 'errors' => ${4:}, - 'value' => ${5:}, - 'valueList' => ${6:} )); ?> diff --git a/sources_non_forked/snipmate-snippets/zend/intcol.snippet b/sources_non_forked/snipmate-snippets/zend/intcol.snippet deleted file mode 100644 index caacaa61..00000000 --- a/sources_non_forked/snipmate-snippets/zend/intcol.snippet +++ /dev/null @@ -1 +0,0 @@ -$this->hasColumn('${1:id}', '${2:integer}', ${3:11}, array(${4:'notnull' => true)}); diff --git a/sources_non_forked/snipmate-snippets/zend/lib.snippet b/sources_non_forked/snipmate-snippets/zend/lib.snippet deleted file mode 100644 index 683e22ef..00000000 --- a/sources_non_forked/snipmate-snippets/zend/lib.snippet +++ /dev/null @@ -1,5 +0,0 @@ -hasColumn('id', 'integer', 4, array('notnull' => true, - 'primary' => true, - 'autoincrement' => true)); - ${3} - } - -} diff --git a/sources_non_forked/snipmate-snippets/zend/navi.snippet b/sources_non_forked/snipmate-snippets/zend/navi.snippet deleted file mode 100644 index 2724ff9f..00000000 --- a/sources_non_forked/snipmate-snippets/zend/navi.snippet +++ /dev/null @@ -1 +0,0 @@ -$this->view->navigationActive = array('topnavi' => '${1:home}','subnavi' => '${2:index}'); diff --git a/sources_non_forked/snipmate-snippets/zend/route.snippet b/sources_non_forked/snipmate-snippets/zend/route.snippet deleted file mode 100644 index cdf834b2..00000000 --- a/sources_non_forked/snipmate-snippets/zend/route.snippet +++ /dev/null @@ -1 +0,0 @@ -$this->_redirector->gotoRoute(array('controller' => '${1}', 'action' => '${2:index}', 'id' => '${3:}'), '${4:admin_action}'); diff --git a/sources_non_forked/snipmate-snippets/zend/rp.snippet b/sources_non_forked/snipmate-snippets/zend/rp.snippet deleted file mode 100644 index b5dcd1ff..00000000 --- a/sources_non_forked/snipmate-snippets/zend/rp.snippet +++ /dev/null @@ -1,2 +0,0 @@ -partial('${1:somefile}.phtml', - array(${2}))?> diff --git a/sources_non_forked/snipmate-snippets/zend/strcol.snippet b/sources_non_forked/snipmate-snippets/zend/strcol.snippet deleted file mode 100644 index 98d3cf34..00000000 --- a/sources_non_forked/snipmate-snippets/zend/strcol.snippet +++ /dev/null @@ -1 +0,0 @@ -$this->hasColumn('${1:title}', '${2:string}', ${3:255}, array(${4:'notnull' => true})); diff --git a/sources_non_forked/typescript-vim/README.md b/sources_non_forked/typescript-vim/README.md new file mode 100644 index 00000000..c4873812 --- /dev/null +++ b/sources_non_forked/typescript-vim/README.md @@ -0,0 +1,136 @@ +Typescript Syntax for Vim +========================= + +Syntax file and other settings for [TypeScript](http://typescriptlang.org). The +syntax file is taken from this [blog +post](http://blogs.msdn.com/b/interoperability/archive/2012/10/01/sublime-text-vi-emacs-typescript-enabled.aspx). + +Checkout [Tsuquyomi](https://github.com/Quramy/tsuquyomi) for omni-completion +and other features for TypeScript editing. + +Install +------- + +From Vim 8 onward, the plugin can be installed as simply as (Unix/Mac): +``` +git clone https://github.com/leafgarland/typescript-vim.git ~/.vim/pack/typescript/start/typescript-vim +``` + +On Windows/Powershell, use the following: +``` +git clone https://github.com/leafgarland/typescript-vim.git $home/vimfiles/pack/typescript/start/typescript-vim +``` + +For older versions of Vim, the simplest way to install is via a Vim add-in manager such as +[Plug](https://github.com/junegunn/vim-plug), +[Vundle](https://github.com/gmarik/vundle) or +[Pathogen](https://github.com/tpope/vim-pathogen/). + +_See the [Installation Wiki](https://github.com/leafgarland/typescript-vim/wiki/Installation)_ + +### Pathogen + +``` +git clone https://github.com/leafgarland/typescript-vim.git ~/.vim/bundle/typescript-vim +``` + +If you want to install manually then you need to copy the files from this +repository into your vim path, see the vim docs for [:help +runtimepath](http://vimdoc.sourceforge.net/htmldoc/options.html#'runtimepath') +for more information. This might be as simple as copying the files and +directories to `~/.vim/` but it depends on your Vim install and operating +system. + +Usage +----- + +Once the files are installed the syntax highlighting and other settings will be +automatically enabled anytime you edit a `.ts` file. + +Indenting +--------- + +This plugin includes a custom indenter (based on [pangloss/vim-javascript's +indenter](https://github.com/pangloss/vim-javascript/blob/master/indent/javascript.vim)), +it works pretty well but there are cases where it fails. If these bother you or +want to use other indent settings you can disable it by setting a flag in your +`.vimrc`: + +```vim +let g:typescript_indent_disable = 1 +``` + +If you want the indenter to automatically indent chained method calls as you type. + +```typescript +something + .foo() + .bar(); +``` + +Then add something like `setlocal indentkeys+=0.` to your `.vimrc`, see `:help +'indentkeys'` in vim for more information. + +If you use the `=` operator to re-indent code it will always indent +chained method calls - this can be disabled by changing the regex the +indent script uses to identify indented lines. In this case removing '.' +from the regex means that it wont indent lines starting with '.'. Note, +this is not ideal as the regex may change making your setting out of date. + +```vim +let g:typescript_opfirst='\%([<>=,?^%|*/&]\|\([-:+]\)\1\@!\|!=\|in\%(stanceof\)\=\>\)' +``` + +Compiler settings +----------------- + +This plugin contains compiler settings to set `makeprg` and `errorformat`. +The compiler settings enable you to call the `tsc` compiler directly from Vim +and display any errors or warnings in Vim's QuickFix window. + +To run the compiler, enter `:make`, this will run `tsc` against the last saved +version of your currently edited file. + +The default for `makeprg` is `tsc $* %`. You can enter other compiler options into your `:make` +command line and they will be inserted in place of `$*`. + +There are options to change the compiler name and to insert default options. + +```vim +let g:typescript_compiler_binary = 'tsc' +let g:typescript_compiler_options = '' +``` + +These options will be passed to the binary as command arguments. For example, +if `g:typescript_compiler_binary = 'tsc'` and `g:typescript_compiler_options = '--lib es6'`, +`l:makeprg` will be: `tsc --lib es6 $* %`. + +You can completely override this plugin's compiler settings with something like +this in your `.vimrc`, where you can set makeprg to whatever you want. + +```vim + autocmd FileType typescript :set makeprg=tsc +``` + +Note, this plugin's compiler settings are not used by Syntastic which has its own +way of changing the options. See https://github.com/scrooloose/syntastic#faqargs. + +You can use something like this in your `.vimrc` to make the QuickFix +window automatically appear if `:make` has any errors. + +```vim +autocmd QuickFixCmdPost [^l]* nested cwindow +autocmd QuickFixCmdPost l* nested lwindow +``` + +Syntax highlighting +------------------- + +Syntax highlighting for TypeScript can be customized by following variables. + +- `g:typescript_ignore_typescriptdoc`: When this variable is defined, doccomments will not be + highlighted. +- `g:typescript_ignore_browserwords`: When this variable is set to `1`, browser API names such as + `window` or `document` will not be highlighted. (default to `0`) + +![Obligatory screenshot](https://raw.github.com/leafgarland/typescript-vim/master/vimshot01.png) diff --git a/sources_non_forked/typescript-vim/compiler/typescript.vim b/sources_non_forked/typescript-vim/compiler/typescript.vim new file mode 100644 index 00000000..77121eb5 --- /dev/null +++ b/sources_non_forked/typescript-vim/compiler/typescript.vim @@ -0,0 +1,30 @@ +if exists("current_compiler") + finish +endif +let current_compiler = "typescript" + +if !exists("g:typescript_compiler_binary") + let g:typescript_compiler_binary = "tsc" +endif + +if !exists("g:typescript_compiler_options") + let g:typescript_compiler_options = "" +endif + +if exists(":CompilerSet") != 2 + command! -nargs=* CompilerSet setlocal +endif + +let s:cpo_save = &cpo +set cpo-=C + +execute 'CompilerSet makeprg=' + \ . escape(g:typescript_compiler_binary, ' ') + \ . '\ ' + \ . escape(g:typescript_compiler_options, ' ') + \ . '\ $*\ %' + +CompilerSet errorformat=%+A\ %#%f\ %#(%l\\\,%c):\ %m,%C%m + +let &cpo = s:cpo_save +unlet s:cpo_save diff --git a/sources_non_forked/typescript-vim/ftdetect/typescript.vim b/sources_non_forked/typescript-vim/ftdetect/typescript.vim new file mode 100644 index 00000000..7c102061 --- /dev/null +++ b/sources_non_forked/typescript-vim/ftdetect/typescript.vim @@ -0,0 +1,4 @@ +" use `set filetype` to override default filetype=xml for *.ts files +autocmd BufNewFile,BufRead *.ts set filetype=typescript +" use `setfiletype` to not override any other plugins like ianks/vim-tsx +autocmd BufNewFile,BufRead *.tsx setfiletype typescript diff --git a/sources_non_forked/typescript-vim/ftplugin/typescript.vim b/sources_non_forked/typescript-vim/ftplugin/typescript.vim new file mode 100644 index 00000000..da4b1e85 --- /dev/null +++ b/sources_non_forked/typescript-vim/ftplugin/typescript.vim @@ -0,0 +1,21 @@ +if exists("b:did_ftplugin") + finish +endif +let b:did_ftplugin = 1 + +let s:cpo_save = &cpo +set cpo-=C + +compiler typescript +setlocal commentstring=//\ %s + +" Set 'formatoptions' to break comment lines but not other lines, +" " and insert the comment leader when hitting or using "o". +setlocal formatoptions-=t formatoptions+=croql + +setlocal suffixesadd+=.ts,.tsx + +let b:undo_ftplugin = "setl fo< ofu< com< cms<" + +let &cpo = s:cpo_save +unlet s:cpo_save diff --git a/sources_non_forked/typescript-vim/indent/typescript.vim b/sources_non_forked/typescript-vim/indent/typescript.vim new file mode 100644 index 00000000..81373985 --- /dev/null +++ b/sources_non_forked/typescript-vim/indent/typescript.vim @@ -0,0 +1,359 @@ +" Vim indent file +" Language: Typescript +" Acknowledgement: Almost direct copy from https://github.com/pangloss/vim-javascript + +" Only load this indent file when no other was loaded. +if exists('b:did_indent') || get(g:, 'typescript_indent_disable', 0) + finish +endif +let b:did_indent = 1 + +" Now, set up our indentation expression and keys that trigger it. +setlocal indentexpr=GetTypescriptIndent() +setlocal autoindent nolisp nosmartindent +setlocal indentkeys+=0],0) + +let b:undo_indent = 'setlocal indentexpr< smartindent< autoindent< indentkeys<' + +" Only define the function once. +if exists('*GetTypescriptIndent') + finish +endif + +let s:cpo_save = &cpo +set cpo&vim + +" Get shiftwidth value +if exists('*shiftwidth') + function s:sw() + return shiftwidth() + endfunction +else + function s:sw() + return &sw + endfunction +endif + +" searchpair() wrapper +if has('reltime') + function s:GetPair(start,end,flags,skip,time,...) + return searchpair('\m'.a:start,'','\m'.a:end,a:flags,a:skip,max([prevnonblank(v:lnum) - 2000,0] + a:000),a:time) + endfunction +else + function s:GetPair(start,end,flags,skip,...) + return searchpair('\m'.a:start,'','\m'.a:end,a:flags,a:skip,max([prevnonblank(v:lnum) - 1000,get(a:000,1)])) + endfunction +endif + +" Regex of syntax group names that are or delimit string or are comments. +let s:syng_strcom = 'string\|comment\|regex\|special\|doc\|template\%(braces\)\@!' +let s:syng_str = 'string\|template\|special' +let s:syng_com = 'comment\|doc' +" Expression used to check whether we should skip a match with searchpair(). +let s:skip_expr = "synIDattr(synID(line('.'),col('.'),0),'name') =~? '".s:syng_strcom."'" + +function s:skip_func() + if !s:free || search('\m`\|\${\|\*\/','nW',s:looksyn) + let s:free = !eval(s:skip_expr) + let s:looksyn = line('.') + return !s:free + endif + let s:looksyn = line('.') + return getline('.') =~ '\%<'.col('.').'c\/.\{-}\/\|\%>'.col('.').'c[''"]\|\\$' && + \ eval(s:skip_expr) +endfunction + +function s:alternatePair(stop) + let pos = getpos('.')[1:2] + while search('\m[][(){}]','bW',a:stop) + if !s:skip_func() + let idx = stridx('])}',s:looking_at()) + if idx + 1 + if s:GetPair(['\[','(','{'][idx], '])}'[idx],'bW','s:skip_func()',2000,a:stop) <= 0 + break + endif + else + return + endif + endif + endwhile + call call('cursor',pos) +endfunction + +function s:save_pos(f,...) + let l:pos = getpos('.')[1:2] + let ret = call(a:f,a:000) + call call('cursor',l:pos) + return ret +endfunction + +function s:syn_at(l,c) + return synIDattr(synID(a:l,a:c,0),'name') +endfunction + +function s:looking_at() + return getline('.')[col('.')-1] +endfunction + +function s:token() + return s:looking_at() =~ '\k' ? expand('') : s:looking_at() +endfunction + +function s:previous_token() + let l:n = line('.') + if (s:looking_at() !~ '\k' || search('\m\<','cbW')) && search('\m\S','bW') + if (getline('.')[col('.')-2:col('.')-1] == '*/' || line('.') != l:n && + \ getline('.') =~ '\%<'.col('.').'c\/\/') && s:syn_at(line('.'),col('.')) =~? s:syng_com + while search('\m\/\ze[/*]','cbW') + if !search('\m\S','bW') + break + elseif s:syn_at(line('.'),col('.')) !~? s:syng_com + return s:token() + endif + endwhile + else + return s:token() + endif + endif + return '' +endfunction + +function s:others(p) + return "((line2byte(line('.')) + col('.')) <= ".(line2byte(a:p[0]) + a:p[1]).") || ".s:skip_expr +endfunction + +function s:tern_skip(p) + return s:GetPair('{','}','nbW',s:others(a:p),200,a:p[0]) > 0 +endfunction + +function s:tern_col(p) + return s:GetPair('?',':\@ 0 +endfunction + +function s:label_col() + let pos = getpos('.')[1:2] + let [s:looksyn,s:free] = pos + call s:alternatePair(0) + if s:save_pos('s:IsBlock') + let poss = getpos('.')[1:2] + return call('cursor',pos) || !s:tern_col(poss) + elseif s:looking_at() == ':' + return !s:tern_col([0,0]) + endif +endfunction + +" configurable regexes that define continuation lines, not including (, {, or [. +let s:opfirst = '^' . get(g:,'typescript_opfirst', + \ '\%([<>=,?^%|*/&]\|\([-.:+]\)\1\@!\|!=\|in\%(stanceof\)\=\>\)') +let s:continuation = get(g:,'typescript_continuation', + \ '\%([-+<>=,.~!?/*^%|&:]\|\<\%(typeof\|delete\|void\|in\|instanceof\)\)') . '$' + +function s:continues(ln,con) + return !cursor(a:ln, match(' '.a:con,s:continuation)) && + \ eval( (['s:syn_at(line("."),col(".")) !~? "regex"'] + + \ repeat(['getline(".")[col(".")-2] != tr(s:looking_at(),">","=")'],3) + + \ repeat(['s:previous_token() != "."'],5) + [1])[ + \ index(split('/ > - + typeof in instanceof void delete'),s:token())]) +endfunction + +" get the line of code stripped of comments and move cursor to the last +" non-comment char. +function s:Trim(ln) + call cursor(a:ln+1,1) + call s:previous_token() + return strpart(getline('.'),0,col('.')) +endfunction + +" Find line above 'lnum' that isn't empty or in a comment +function s:PrevCodeLine(lnum) + let l:n = prevnonblank(a:lnum) + while l:n + if getline(l:n) =~ '^\s*\/[/*]' + if (stridx(getline(l:n),'`') > 0 || getline(l:n-1)[-1:] == '\') && + \ s:syn_at(l:n,1) =~? s:syng_str + return l:n + endif + let l:n = prevnonblank(l:n-1) + elseif getline(l:n) =~ '\([/*]\)\1\@![/*]' && s:syn_at(l:n,1) =~? s:syng_com + let l:n = s:save_pos('eval', + \ 'cursor('.l:n.',1) + search(''\m\/\*'',"bW")') + else + return l:n + endif + endwhile +endfunction + +" Check if line 'lnum' has a balanced amount of parentheses. +function s:Balanced(lnum) + let l:open = 0 + let l:line = getline(a:lnum) + let pos = match(l:line, '[][(){}]', 0) + while pos != -1 + if s:syn_at(a:lnum,pos + 1) !~? s:syng_strcom + let l:open += match(' ' . l:line[pos],'[[({]') + if l:open < 0 + return + endif + endif + let pos = match(l:line, '[][(){}]', pos + 1) + endwhile + return !l:open +endfunction + +function s:OneScope(lnum) + let pline = s:Trim(a:lnum) + let kw = 'else do' + if pline[-1:] == ')' && s:GetPair('(', ')', 'bW', s:skip_expr, 100) > 0 + call s:previous_token() + let kw = 'for if let while with' + if index(split('await each'),s:token()) + 1 + call s:previous_token() + let kw = 'for' + endif + endif + return pline[-2:] == '=>' || index(split(kw),s:token()) + 1 && + \ s:save_pos('s:previous_token') != '.' +endfunction + +" returns braceless levels started by 'i' and above lines * &sw. 'num' is the +" lineNr which encloses the entire context, 'cont' if whether line 'i' + 1 is +" a continued expression, which could have started in a braceless context +function s:iscontOne(i,num,cont) + let [l:i, l:num, bL] = [a:i, a:num + !a:num, 0] + let pind = a:num ? indent(l:num) + s:W : 0 + let ind = indent(l:i) + (a:cont ? 0 : s:W) + while l:i >= l:num && (ind > pind || l:i == l:num) + if indent(l:i) < ind && s:OneScope(l:i) + let bL += s:W + let l:i = line('.') + elseif !a:cont || bL || ind < indent(a:i) + break + endif + let ind = min([ind, indent(l:i)]) + let l:i = s:PrevCodeLine(l:i - 1) + endwhile + return bL +endfunction + +" https://github.com/sweet-js/sweet.js/wiki/design#give-lookbehind-to-the-reader +function s:IsBlock() + if s:looking_at() == '{' + let l:n = line('.') + let char = s:previous_token() + if match(s:stack,'xml\|jsx') + 1 && s:syn_at(line('.'),col('.')-1) =~? 'xml\|jsx' + return char != '{' + elseif char =~ '\k' + return index(split('return const let import export yield default delete var await void typeof throw case new in instanceof') + \ ,char) < (line('.') != l:n) || s:previous_token() == '.' + elseif char == '>' + return getline('.')[col('.')-2] == '=' || s:syn_at(line('.'),col('.')) =~? '^jsflow' + elseif char == ':' + return getline('.')[col('.')-2] != ':' && s:label_col() + elseif char == '/' + return s:syn_at(line('.'),col('.')) =~? 'regex' + endif + return char !~ '[=~!<*,?^%|&([]' && + \ (char !~ '[-+]' || l:n != line('.') && getline('.')[col('.')-2] == char) + endif +endfunction + +function GetTypescriptIndent() + let b:js_cache = get(b:,'js_cache',[0,0,0]) + " Get the current line. + call cursor(v:lnum,1) + let l:line = getline('.') + " use synstack as it validates syn state and works in an empty line + let s:stack = synstack(v:lnum,1) + let syns = synIDattr(get(s:stack,-1),'name') + + " start with strings,comments,etc. + if syns =~? s:syng_com + if l:line =~ '^\s*\*' + return cindent(v:lnum) + elseif l:line !~ '^\s*\/[/*]' + return -1 + endif + elseif syns =~? s:syng_str && l:line !~ '^[''"]' + if b:js_cache[0] == v:lnum - 1 && s:Balanced(v:lnum-1) + let b:js_cache[0] = v:lnum + endif + return -1 + endif + let l:lnum = s:PrevCodeLine(v:lnum - 1) + if !l:lnum + return + endif + + let l:line = substitute(l:line,'^\s*','','') + if l:line[:1] == '/*' + let l:line = substitute(l:line,'^\%(\/\*.\{-}\*\/\s*\)*','','') + endif + if l:line =~ '^\/[/*]' + let l:line = '' + endif + + " the containing paren, bracket, or curly. Many hacks for performance + let idx = index([']',')','}'],l:line[0]) + if b:js_cache[0] >= l:lnum && b:js_cache[0] < v:lnum && + \ (b:js_cache[0] > l:lnum || s:Balanced(l:lnum)) + call call('cursor',b:js_cache[1:]) + else + let [s:looksyn, s:free, top] = [v:lnum - 1, 1, (!indent(l:lnum) && + \ s:syn_at(l:lnum,1) !~? s:syng_str) * l:lnum] + if idx + 1 + call s:GetPair(['\[','(','{'][idx],'])}'[idx],'bW','s:skip_func()',2000,top) + elseif getline(v:lnum) !~ '^\S' && syns =~? 'block' + call s:GetPair('{','}','bW','s:skip_func()',2000,top) + else + call s:alternatePair(top) + endif + endif + + let b:js_cache = [v:lnum] + (line('.') == v:lnum ? [0,0] : getpos('.')[1:2]) + let num = b:js_cache[1] + + let [s:W, isOp, bL, switch_offset] = [s:sw(),0,0,0] + if !num || s:IsBlock() + let ilnum = line('.') + let pline = s:save_pos('s:Trim',l:lnum) + if num && s:looking_at() == ')' && s:GetPair('(', ')', 'bW', s:skip_expr, 100) > 0 + let num = ilnum == num ? line('.') : num + if idx < 0 && s:previous_token() ==# 'switch' && s:previous_token() != '.' + if &cino !~ ':' + let switch_offset = s:W + else + let cinc = matchlist(&cino,'.*:\zs\(-\)\=\(\d*\)\(\.\d\+\)\=\(s\)\=\C') + let switch_offset = max([cinc[0] is '' ? 0 : (cinc[1].1) * + \ ((strlen(cinc[2].cinc[3]) ? str2nr(cinc[2].str2nr(cinc[3][1])) : 10) * + \ (cinc[4] is '' ? 1 : s:W)) / 10, -indent(num)]) + endif + if pline[-1:] != '.' && l:line =~# '^\%(default\|case\)\>' + return indent(num) + switch_offset + endif + endif + endif + if idx < 0 && pline !~ '[{;]$' + if pline =~# ':\@" +hi link shebang Comment + +"" typescript comments"{{{ +syn keyword typescriptCommentTodo TODO FIXME XXX TBD contained +syn match typescriptLineComment "\/\/.*" contains=@Spell,typescriptCommentTodo,typescriptRef +syn match typescriptRefComment /\/\/\/<\(reference\|amd-\(dependency\|module\)\)\s\+.*\/>$/ contains=typescriptRefD,typescriptRefS +syn region typescriptRefD start=+"+ skip=+\\\\\|\\"+ end=+"\|$+ +syn region typescriptRefS start=+'+ skip=+\\\\\|\\'+ end=+'\|$+ + +syn match typescriptCommentSkip "^[ \t]*\*\($\|[ \t]\+\)" +syn region typescriptComment start="/\*" end="\*/" contains=@Spell,typescriptCommentTodo extend +"}}} +"" JSDoc support start"{{{ +if !exists("typescript_ignore_typescriptdoc") + syntax case ignore + +" syntax coloring for JSDoc comments (HTML) +"unlet b:current_syntax + + syntax region typescriptDocComment start="/\*\*\s*$" end="\*/" contains=typescriptDocTags,typescriptCommentTodo,typescriptCvsTag,@typescriptHtml,@Spell fold extend + syntax match typescriptDocTags contained "@\(param\|argument\|requires\|exception\|throws\|type\|class\|extends\|see\|link\|member\|module\|method\|title\|namespace\|optional\|default\|base\|file\|returns\=\)\>" nextgroup=typescriptDocParam,typescriptDocSeeTag skipwhite + syntax match typescriptDocTags contained "@\(beta\|deprecated\|description\|fileoverview\|author\|license\|version\|constructor\|private\|protected\|final\|ignore\|addon\|exec\)\>" + syntax match typescriptDocParam contained "\%(#\|\w\|\.\|:\|\/\)\+" + syntax region typescriptDocSeeTag contained matchgroup=typescriptDocSeeTag start="{" end="}" contains=typescriptDocTags + + syntax case match +endif "" JSDoc end +"}}} +syntax case match + +"" Syntax in the typescript code"{{{ +syn match typescriptSpecial "\\\d\d\d\|\\x\x\{2\}\|\\u\x\{4\}" contained containedin=typescriptStringD,typescriptStringS,typescriptStringB display +syn region typescriptStringD start=+"+ skip=+\\\\\|\\"+ end=+"\|$+ contains=typescriptSpecial,@htmlPreproc extend +syn region typescriptStringS start=+'+ skip=+\\\\\|\\'+ end=+'\|$+ contains=typescriptSpecial,@htmlPreproc extend +syn region typescriptStringB start=+`+ skip=+\\\\\|\\`+ end=+`+ contains=typescriptInterpolation,typescriptSpecial,@htmlPreproc extend + +syn region typescriptInterpolation matchgroup=typescriptInterpolationDelimiter + \ start=/${/ end=/}/ contained + \ contains=@typescriptExpression + +syn match typescriptNumber "-\=\<\d[0-9_]*L\=\>" display +syn match typescriptNumber "-\=\<0[xX][0-9a-fA-F][0-9a-fA-F_]*\>" display +syn match typescriptNumber "-\=\<0[bB][01][01_]*\>" display +syn match typescriptNumber "-\=\<0[oO]\o[0-7_]*\>" display +syn region typescriptRegexpString start=+/[^/*]+me=e-1 skip=+\\\\\|\\/+ end=+/[gi]\{0,2\}\s*$+ end=+/[gi]\{0,2\}\s*[;.,)\]}]+me=e-1 contains=@htmlPreproc oneline +" syntax match typescriptSpecial "\\\d\d\d\|\\x\x\{2\}\|\\u\x\{4\}\|\\." +" syntax region typescriptStringD start=+"+ skip=+\\\\\|\\$"+ end=+"+ contains=typescriptSpecial,@htmlPreproc +" syntax region typescriptStringS start=+'+ skip=+\\\\\|\\$'+ end=+'+ contains=typescriptSpecial,@htmlPreproc +" syntax region typescriptRegexpString start=+/\(\*\|/\)\@!+ skip=+\\\\\|\\/+ end=+/[gim]\{,3}+ contains=typescriptSpecial,@htmlPreproc oneline +" syntax match typescriptNumber /\<-\=\d\+L\=\>\|\<0[xX]\x\+\>/ +syntax match typescriptFloat /\<-\=\%(\d[0-9_]*\.\d[0-9_]*\|\d[0-9_]*\.\|\.\d[0-9]*\)\%([eE][+-]\=\d[0-9_]*\)\=\>/ +" syntax match typescriptLabel /\(?\s*\)\@/ +"}}} +"" typescript Prototype"{{{ +syntax keyword typescriptPrototype contained prototype +"}}} +" DOM, Browser and Ajax Support {{{ +"""""""""""""""""""""""" +if get(g:, 'typescript_ignore_browserwords', 0) + syntax keyword typescriptBrowserObjects window navigator screen history location + + syntax keyword typescriptDOMObjects document event HTMLElement Anchor Area Base Body Button Form Frame Frameset Image Link Meta Option Select Style Table TableCell TableRow Textarea + syntax keyword typescriptDOMMethods contained createTextNode createElement insertBefore replaceChild removeChild appendChild hasChildNodes cloneNode normalize isSupported hasAttributes getAttribute setAttribute removeAttribute getAttributeNode setAttributeNode removeAttributeNode getElementsByTagName hasAttribute getElementById adoptNode close compareDocumentPosition createAttribute createCDATASection createComment createDocumentFragment createElementNS createEvent createExpression createNSResolver createProcessingInstruction createRange createTreeWalker elementFromPoint evaluate getBoxObjectFor getElementsByClassName getSelection getUserData hasFocus importNode + syntax keyword typescriptDOMProperties contained nodeName nodeValue nodeType parentNode childNodes firstChild lastChild previousSibling nextSibling attributes ownerDocument namespaceURI prefix localName tagName + + syntax keyword typescriptAjaxObjects XMLHttpRequest + syntax keyword typescriptAjaxProperties contained readyState responseText responseXML statusText + syntax keyword typescriptAjaxMethods contained onreadystatechange abort getAllResponseHeaders getResponseHeader open send setRequestHeader + + syntax keyword typescriptPropietaryObjects ActiveXObject + syntax keyword typescriptPropietaryMethods contained attachEvent detachEvent cancelBubble returnValue + + syntax keyword typescriptHtmlElemProperties contained className clientHeight clientLeft clientTop clientWidth dir href id innerHTML lang length offsetHeight offsetLeft offsetParent offsetTop offsetWidth scrollHeight scrollLeft scrollTop scrollWidth style tabIndex target title + + syntax keyword typescriptEventListenerKeywords contained blur click focus mouseover mouseout load item + + syntax keyword typescriptEventListenerMethods contained scrollIntoView addEventListener dispatchEvent removeEventListener preventDefault stopPropagation +endif +" }}} +"" Programm Keywords"{{{ +syntax keyword typescriptSource import export from as +syntax keyword typescriptIdentifier arguments this void +syntax keyword typescriptStorageClass let var const +syntax keyword typescriptOperator delete new instanceof typeof +syntax keyword typescriptBoolean true false +syntax keyword typescriptNull null undefined +syntax keyword typescriptMessage alert confirm prompt status +syntax keyword typescriptGlobal self top parent +syntax keyword typescriptDeprecated escape unescape all applets alinkColor bgColor fgColor linkColor vlinkColor xmlEncoding +"}}} +"" Statement Keywords"{{{ +syntax keyword typescriptConditional if else switch +syntax keyword typescriptRepeat do while for in of +syntax keyword typescriptBranch break continue yield await +syntax keyword typescriptLabel case default async readonly +syntax keyword typescriptStatement return with + +syntax keyword typescriptGlobalObjects Array Boolean Date Function Infinity JSON Math Number NaN Object Packages RegExp String Symbol netscape + +syntax keyword typescriptExceptions try catch throw finally Error EvalError RangeError ReferenceError SyntaxError TypeError URIError + +syntax keyword typescriptReserved constructor declare as interface module abstract enum int short export interface static byte extends long super char final native synchronized class float package throws goto private transient debugger implements protected volatile double import public type namespace from get set keyof +"}}} +"" typescript/DOM/HTML/CSS specified things"{{{ + +" typescript Objects"{{{ + syn match typescriptFunction "(super\s*|constructor\s*)" contained nextgroup=typescriptVars + syn region typescriptVars start="(" end=")" contained contains=typescriptParameters transparent keepend + syn match typescriptParameters "([a-zA-Z0-9_?.$][\w?.$]*)\s*:\s*([a-zA-Z0-9_?.$][\w?.$]*)" contained skipwhite +"}}} +" DOM2 Objects"{{{ + syntax keyword typescriptType DOMImplementation DocumentFragment Node NodeList NamedNodeMap CharacterData Attr Element Text Comment CDATASection DocumentType Notation Entity EntityReference ProcessingInstruction void any string boolean number symbol never object unknown + syntax keyword typescriptExceptions DOMException +"}}} +" DOM2 CONSTANT"{{{ + syntax keyword typescriptDomErrNo INDEX_SIZE_ERR DOMSTRING_SIZE_ERR HIERARCHY_REQUEST_ERR WRONG_DOCUMENT_ERR INVALID_CHARACTER_ERR NO_DATA_ALLOWED_ERR NO_MODIFICATION_ALLOWED_ERR NOT_FOUND_ERR NOT_SUPPORTED_ERR INUSE_ATTRIBUTE_ERR INVALID_STATE_ERR SYNTAX_ERR INVALID_MODIFICATION_ERR NAMESPACE_ERR INVALID_ACCESS_ERR + syntax keyword typescriptDomNodeConsts ELEMENT_NODE ATTRIBUTE_NODE TEXT_NODE CDATA_SECTION_NODE ENTITY_REFERENCE_NODE ENTITY_NODE PROCESSING_INSTRUCTION_NODE COMMENT_NODE DOCUMENT_NODE DOCUMENT_TYPE_NODE DOCUMENT_FRAGMENT_NODE NOTATION_NODE +"}}} +" HTML events and internal variables"{{{ + syntax case ignore + syntax keyword typescriptHtmlEvents onblur onclick oncontextmenu ondblclick onfocus onkeydown onkeypress onkeyup onmousedown onmousemove onmouseout onmouseover onmouseup onresize onload onsubmit + syntax case match +"}}} + +" Follow stuff should be highligh within a special context +" While it can't be handled with context depended with Regex based highlight +" So, turn it off by default +if exists("typescript_enable_domhtmlcss") + +" DOM2 things"{{{ + syntax match typescriptDomElemAttrs contained /\%(nodeName\|nodeValue\|nodeType\|parentNode\|childNodes\|firstChild\|lastChild\|previousSibling\|nextSibling\|attributes\|ownerDocument\|namespaceURI\|prefix\|localName\|tagName\)\>/ + syntax match typescriptDomElemFuncs contained /\%(insertBefore\|replaceChild\|removeChild\|appendChild\|hasChildNodes\|cloneNode\|normalize\|isSupported\|hasAttributes\|getAttribute\|setAttribute\|removeAttribute\|getAttributeNode\|setAttributeNode\|removeAttributeNode\|getElementsByTagName\|getAttributeNS\|setAttributeNS\|removeAttributeNS\|getAttributeNodeNS\|setAttributeNodeNS\|getElementsByTagNameNS\|hasAttribute\|hasAttributeNS\)\>/ nextgroup=typescriptParen skipwhite +"}}} +" HTML things"{{{ + syntax match typescriptHtmlElemAttrs contained /\%(className\|clientHeight\|clientLeft\|clientTop\|clientWidth\|dir\|id\|innerHTML\|lang\|length\|offsetHeight\|offsetLeft\|offsetParent\|offsetTop\|offsetWidth\|scrollHeight\|scrollLeft\|scrollTop\|scrollWidth\|style\|tabIndex\|title\)\>/ + syntax match typescriptHtmlElemFuncs contained /\%(blur\|click\|focus\|scrollIntoView\|addEventListener\|dispatchEvent\|removeEventListener\|item\)\>/ nextgroup=typescriptParen skipwhite +"}}} +" CSS Styles in typescript"{{{ + syntax keyword typescriptCssStyles contained color font fontFamily fontSize fontSizeAdjust fontStretch fontStyle fontVariant fontWeight letterSpacing lineBreak lineHeight quotes rubyAlign rubyOverhang rubyPosition + syntax keyword typescriptCssStyles contained textAlign textAlignLast textAutospace textDecoration textIndent textJustify textJustifyTrim textKashidaSpace textOverflowW6 textShadow textTransform textUnderlinePosition + syntax keyword typescriptCssStyles contained unicodeBidi whiteSpace wordBreak wordSpacing wordWrap writingMode + syntax keyword typescriptCssStyles contained bottom height left position right top width zIndex + syntax keyword typescriptCssStyles contained border borderBottom borderLeft borderRight borderTop borderBottomColor borderLeftColor borderTopColor borderBottomStyle borderLeftStyle borderRightStyle borderTopStyle borderBottomWidth borderLeftWidth borderRightWidth borderTopWidth borderColor borderStyle borderWidth borderCollapse borderSpacing captionSide emptyCells tableLayout + syntax keyword typescriptCssStyles contained margin marginBottom marginLeft marginRight marginTop outline outlineColor outlineStyle outlineWidth padding paddingBottom paddingLeft paddingRight paddingTop + syntax keyword typescriptCssStyles contained listStyle listStyleImage listStylePosition listStyleType + syntax keyword typescriptCssStyles contained background backgroundAttachment backgroundColor backgroundImage backgroundPosition backgroundPositionX backgroundPositionY backgroundRepeat + syntax keyword typescriptCssStyles contained clear clip clipBottom clipLeft clipRight clipTop content counterIncrement counterReset cssFloat cursor direction display filter layoutGrid layoutGridChar layoutGridLine layoutGridMode layoutGridType + syntax keyword typescriptCssStyles contained marks maxHeight maxWidth minHeight minWidth opacity MozOpacity overflow overflowX overflowY verticalAlign visibility zoom cssText + syntax keyword typescriptCssStyles contained scrollbar3dLightColor scrollbarArrowColor scrollbarBaseColor scrollbarDarkShadowColor scrollbarFaceColor scrollbarHighlightColor scrollbarShadowColor scrollbarTrackColor +"}}} +endif "DOM/HTML/CSS + +" Highlight ways"{{{ +syntax match typescriptDotNotation "\." nextgroup=typescriptPrototype,typescriptDomElemAttrs,typescriptDomElemFuncs,typescriptDOMMethods,typescriptDOMProperties,typescriptHtmlElemAttrs,typescriptHtmlElemFuncs,typescriptHtmlElemProperties,typescriptAjaxProperties,typescriptAjaxMethods,typescriptPropietaryMethods,typescriptEventListenerMethods skipwhite skipnl +syntax match typescriptDotNotation "\.style\." nextgroup=typescriptCssStyles +"}}} + +"" end DOM/HTML/CSS specified things""}}} + + +"" Code blocks +syntax cluster typescriptAll contains=typescriptComment,typescriptLineComment,typescriptDocComment,typescriptStringD,typescriptStringS,typescriptStringB,typescriptRegexpString,typescriptNumber,typescriptFloat,typescriptDecorators,typescriptLabel,typescriptSource,typescriptType,typescriptOperator,typescriptBoolean,typescriptNull,typescriptFuncKeyword,typescriptConditional,typescriptGlobal,typescriptRepeat,typescriptBranch,typescriptStatement,typescriptGlobalObjects,typescriptMessage,typescriptIdentifier,typescriptStorageClass,typescriptExceptions,typescriptReserved,typescriptDeprecated,typescriptDomErrNo,typescriptDomNodeConsts,typescriptHtmlEvents,typescriptDotNotation,typescriptBrowserObjects,typescriptDOMObjects,typescriptAjaxObjects,typescriptPropietaryObjects,typescriptDOMMethods,typescriptHtmlElemProperties,typescriptDOMProperties,typescriptEventListenerKeywords,typescriptEventListenerMethods,typescriptAjaxProperties,typescriptAjaxMethods,typescriptFuncArg + +if main_syntax == "typescript" + syntax sync clear + syntax sync ccomment typescriptComment minlines=200 +" syntax sync match typescriptHighlight grouphere typescriptBlock /{/ +endif + +syntax keyword typescriptFuncKeyword function +"syntax region typescriptFuncDef start="function" end="\(.*\)" contains=typescriptFuncKeyword,typescriptFuncArg keepend +"syntax match typescriptFuncArg "\(([^()]*)\)" contains=typescriptParens,typescriptFuncComma contained +"syntax match typescriptFuncComma /,/ contained +" syntax region typescriptFuncBlock contained matchgroup=typescriptFuncBlock start="{" end="}" contains=@typescriptAll,typescriptParensErrA,typescriptParensErrB,typescriptParen,typescriptBracket,typescriptBlock fold + +syn match typescriptBraces "[{}\[\]]" +syn match typescriptParens "[()]" +syn match typescriptOpSymbols "=\{1,3}\|!==\|!=\|<\|>\|>=\|<=\|++\|+=\|--\|-=" +syn match typescriptEndColons "[;,]" +syn match typescriptLogicSymbols "\(&&\)\|\(||\)\|\(!\)" + +" typescriptFold Function {{{ + +" function! typescriptFold() + +" skip curly braces inside RegEx's and comments +syn region foldBraces start=/{/ skip=/\(\/\/.*\)\|\(\/.*\/\)/ end=/}/ transparent fold keepend extend + +" setl foldtext=FoldText() +" endfunction + +" au FileType typescript call typescriptFold() + +" }}} + +" Define the default highlighting. +" For version 5.7 and earlier: only when not done already +" For version 5.8 and later: only when an item doesn't have highlighting yet +if version >= 508 || !exists("did_typescript_syn_inits") + if version < 508 + let did_typescript_syn_inits = 1 + command -nargs=+ HiLink hi link + else + command -nargs=+ HiLink hi def link + endif + + "typescript highlighting + HiLink typescriptParameters Operator + HiLink typescriptSuperBlock Operator + + HiLink typescriptEndColons Exception + HiLink typescriptOpSymbols Operator + HiLink typescriptLogicSymbols Boolean + HiLink typescriptBraces Function + HiLink typescriptParens Operator + HiLink typescriptComment Comment + HiLink typescriptLineComment Comment + HiLink typescriptRefComment Include + HiLink typescriptRefS String + HiLink typescriptRefD String + HiLink typescriptDocComment Comment + HiLink typescriptCommentTodo Todo + HiLink typescriptCvsTag Function + HiLink typescriptDocTags Special + HiLink typescriptDocSeeTag Function + HiLink typescriptDocParam Function + HiLink typescriptStringS String + HiLink typescriptStringD String + HiLink typescriptStringB String + HiLink typescriptInterpolationDelimiter Delimiter + HiLink typescriptRegexpString String + HiLink typescriptGlobal Constant + HiLink typescriptCharacter Character + HiLink typescriptPrototype Type + HiLink typescriptConditional Conditional + HiLink typescriptBranch Conditional + HiLink typescriptIdentifier Identifier + HiLink typescriptStorageClass StorageClass + HiLink typescriptRepeat Repeat + HiLink typescriptStatement Statement + HiLink typescriptFuncKeyword Keyword + HiLink typescriptMessage Keyword + HiLink typescriptDeprecated Exception + HiLink typescriptError Error + HiLink typescriptParensError Error + HiLink typescriptParensErrA Error + HiLink typescriptParensErrB Error + HiLink typescriptParensErrC Error + HiLink typescriptReserved Keyword + HiLink typescriptOperator Operator + HiLink typescriptType Type + HiLink typescriptNull Type + HiLink typescriptNumber Number + HiLink typescriptFloat Number + HiLink typescriptDecorators Special + HiLink typescriptBoolean Boolean + HiLink typescriptLabel Label + HiLink typescriptSpecial Special + HiLink typescriptSource Special + HiLink typescriptGlobalObjects Special + HiLink typescriptExceptions Special + + HiLink typescriptDomErrNo Constant + HiLink typescriptDomNodeConsts Constant + HiLink typescriptDomElemAttrs Label + HiLink typescriptDomElemFuncs PreProc + + HiLink typescriptHtmlElemAttrs Label + HiLink typescriptHtmlElemFuncs PreProc + + HiLink typescriptCssStyles Label + + " Ajax Highlighting + HiLink typescriptBrowserObjects Constant + + HiLink typescriptDOMObjects Constant + HiLink typescriptDOMMethods Function + HiLink typescriptDOMProperties Special + + HiLink typescriptAjaxObjects Constant + HiLink typescriptAjaxMethods Function + HiLink typescriptAjaxProperties Special + + HiLink typescriptFuncDef Title + HiLink typescriptFuncArg Special + HiLink typescriptFuncComma Operator + + HiLink typescriptHtmlEvents Special + HiLink typescriptHtmlElemProperties Special + + HiLink typescriptEventListenerKeywords Keyword + + HiLink typescriptNumber Number + HiLink typescriptPropietaryObjects Constant + + delcommand HiLink +endif + +" Define the htmltypescript for HTML syntax html.vim +"syntax clear htmltypescript +"syntax clear typescriptExpression +syntax cluster htmltypescript contains=@typescriptAll,typescriptBracket,typescriptParen,typescriptBlock,typescriptParenError +syntax cluster typescriptExpression contains=@typescriptAll,typescriptBracket,typescriptParen,typescriptBlock,typescriptParenError,@htmlPreproc + +let b:current_syntax = "typescript" +if main_syntax == 'typescript' + unlet main_syntax +endif + +" vim: ts=4 diff --git a/sources_non_forked/typescript-vim/vimshot01.png b/sources_non_forked/typescript-vim/vimshot01.png new file mode 100644 index 00000000..7c2627f9 Binary files /dev/null and b/sources_non_forked/typescript-vim/vimshot01.png differ diff --git a/sources_non_forked/vim-abolish/.github/FUNDING.yml b/sources_non_forked/vim-abolish/.github/FUNDING.yml new file mode 100644 index 00000000..e2a49d11 --- /dev/null +++ b/sources_non_forked/vim-abolish/.github/FUNDING.yml @@ -0,0 +1,2 @@ +github: tpope +custom: ["https://www.paypal.me/vimpope"] diff --git a/sources_non_forked/vim-abolish/plugin/abolish.vim b/sources_non_forked/vim-abolish/plugin/abolish.vim index 4a97542e..3b71f944 100644 --- a/sources_non_forked/vim-abolish/plugin/abolish.vim +++ b/sources_non_forked/vim-abolish/plugin/abolish.vim @@ -215,7 +215,6 @@ function! s:SubComplete(A,L,P) endfunction function! s:Complete(A,L,P) - let g:L = a:L " Vim bug: :Abolish - calls this function with a:A equal to 0 if a:A =~# '^[^/?-]' && type(a:A) != type(0) return join(s:words(),"\n") @@ -314,7 +313,6 @@ function! s:normalize_options(flags) let opts = {} let flags = a:flags endif - let g:op1 = copy(opts) if flags =~# 'w' let opts.boundaries = 2 elseif flags =~# 'v' @@ -324,7 +322,6 @@ function! s:normalize_options(flags) endif let opts.case = (flags !~# 'I' ? get(opts,'case',1) : 0) let opts.flags = substitute(flags,'\C[avIiw]','','g') - let g:op2 = copy(opts) return opts endfunction @@ -622,7 +619,7 @@ endfunction nnoremap (abolish-coerce) coerce(nr2char(getchar())) nnoremap (abolish-coerce) coerce(nr2char(getchar())) -nnoremap (abolish-coerce-word) coerce(nr2char(getchar())).'iw' +nnoremap (abolish-coerce-word) coerce(nr2char(getchar())).'iw' " }}}1 diff --git a/sources_non_forked/vim-bundle-mako/ftplugin/mako.vim b/sources_non_forked/vim-bundle-mako/ftplugin/mako.vim index 41be4705..565defc7 100644 --- a/sources_non_forked/vim-bundle-mako/ftplugin/mako.vim +++ b/sources_non_forked/vim-bundle-mako/ftplugin/mako.vim @@ -1,11 +1,19 @@ " Vim filetype plugin file " Language: Mako " Maintainer: Randy Stauner -" Last Change: 2014-02-07 -" Version: 0.1 +" Last Change: 2019-09-06 +" Version: 0.2 if exists("b:did_ftplugin") | finish | endif let b:did_ftplugin = 1 setlocal comments=:## setlocal commentstring=##%s + +if exists("loaded_matchit") + let b:match_ignorecase = 1 + let b:match_words = "<:>," . + \ "<\@<=[ou]l\>[^>]*\%(>\|$\):<\@<=li\>:<\@<=/[ou]l>," . + \ "<\@<=dl\>[^>]*\%(>\|$\):<\@<=d[td]\>:<\@<=/dl>," . + \ "<\@<=\([^/][^ \t>]*\)[^>]*\%(>\|$\):<\@<=/\1>" +endif diff --git a/sources_non_forked/vim-commentary/.github/FUNDING.yml b/sources_non_forked/vim-commentary/.github/FUNDING.yml new file mode 100644 index 00000000..e2a49d11 --- /dev/null +++ b/sources_non_forked/vim-commentary/.github/FUNDING.yml @@ -0,0 +1,2 @@ +github: tpope +custom: ["https://www.paypal.me/vimpope"] diff --git a/sources_non_forked/vim-commentary/doc/commentary.txt b/sources_non_forked/vim-commentary/doc/commentary.txt index b0485694..01f73dad 100644 --- a/sources_non_forked/vim-commentary/doc/commentary.txt +++ b/sources_non_forked/vim-commentary/doc/commentary.txt @@ -6,6 +6,9 @@ License: Same terms as Vim itself (see |license|) Comment stuff out. Then uncomment it later. Relies on 'commentstring' to be correctly set, or uses b:commentary_format if it is set. +Assign b:commentary_startofline to insert comment characters at column 1 +regardless of indentation. + *gc* gc{motion} Comment or uncomment lines that {motion} moves over. diff --git a/sources_non_forked/vim-commentary/plugin/commentary.vim b/sources_non_forked/vim-commentary/plugin/commentary.vim index 862ca820..17c285b7 100644 --- a/sources_non_forked/vim-commentary/plugin/commentary.vim +++ b/sources_non_forked/vim-commentary/plugin/commentary.vim @@ -44,17 +44,23 @@ function! s:go(...) abort endif endfor + if get(b:, 'commentary_startofline') + let indent = '^' + else + let indent = '^\s*' + endif + for lnum in range(lnum1,lnum2) let line = getline(lnum) if strlen(r) > 2 && l.r !~# '\\' let line = substitute(line, - \'\M'.r[0:-2].'\zs\d\*\ze'.r[-1:-1].'\|'.l[0].'\zs\d\*\ze'.l[1:-1], + \'\M' . substitute(l, '\ze\S\s*$', '\\zs\\d\\*\\ze', '') . '\|' . substitute(r, '\S\zs', '\\zs\\d\\*\\ze', ''), \'\=substitute(submatch(0)+1-uncomment,"^0$\\|^-\\d*$","","")','g') endif if uncomment let line = substitute(line,'\S.*\s\@'), '\d\+_'),'')) + return function(substitute(a:name,'^s:',matchstr(expand(''), '.*\zs\d\+_'),'')) endfunction function! s:sub(str,pat,rep) abort @@ -46,7 +48,11 @@ endfunction function! s:shellesc(arg) abort if type(a:arg) == type([]) return join(map(copy(a:arg), 's:shellesc(v:val)')) +<<<<<<< HEAD elseif a:arg =~ '^[A-Za-z0-9_/.-]\+$' +======= + elseif a:arg =~ '^[A-Za-z0-9_/:.-]\+$' +>>>>>>> 27ad0d07862847896f691309a544a206783c94d6 return a:arg elseif s:winshell() return '"'.s:gsub(s:gsub(a:arg, '"', '""'), '\%', '"%"').'"' @@ -57,7 +63,9 @@ endfunction let s:fnameescape = " \t\n*?[{`$\\%#'\"|!<" function! s:fnameescape(file) abort - if exists('*fnameescape') + if type(a:file) == type([]) + return join(map(copy(a:file), 's:fnameescape(v:val)')) + elseif exists('*fnameescape') return fnameescape(a:file) else return escape(a:file, s:fnameescape) @@ -69,6 +77,7 @@ function! s:throw(string) abort endfunction function! s:DirCheck(...) abort +<<<<<<< HEAD if empty(a:0 ? s:Dir(a:1) : s:Dir()) return 'return ' . string('echoerr "fugitive: not a Git repository"') endif @@ -82,6 +91,24 @@ function! s:Mods(mods, ...) abort let mods = a:1 . ' ' . mods endif return substitute(mods, '\s\+', ' ', 'g') +======= + if !empty(a:0 ? s:Dir(a:1) : s:Dir()) + return '' + elseif empty(bufname('')) + return 'return ' . string('echoerr "fugitive: working directory does not belong to a Git repository"') + else + return 'return ' . string('echoerr "fugitive: file does not belong to a Git repository"') + endif +>>>>>>> 27ad0d07862847896f691309a544a206783c94d6 +endfunction + +function! s:Mods(mods, ...) abort + let mods = substitute(a:mods, '\C', '', '') + let mods = mods =~# '\S$' ? mods . ' ' : mods + if a:0 && mods !~# '\<\%(aboveleft\|belowright\|leftabove\|rightbelow\|topleft\|botright\|tab\)\>' + let mods = a:1 . ' ' . mods + endif + return substitute(mods, '\s\+', ' ', 'g') endfunction function! s:Slash(path) abort @@ -92,27 +119,19 @@ function! s:Slash(path) abort endif endfunction -function! s:PlatformSlash(path) abort - if exists('+shellslash') && !&shellslash - return tr(a:path, '/', '\') - else - return a:path - endif -endfunction - function! s:Resolve(path) abort let path = resolve(a:path) if has('win32') - let path = s:PlatformSlash(fnamemodify(fnamemodify(path, ':h'), ':p') . fnamemodify(path, ':t')) + let path = FugitiveVimPath(fnamemodify(fnamemodify(path, ':h'), ':p') . fnamemodify(path, ':t')) endif return path endfunction function! s:cpath(path, ...) abort if exists('+fileignorecase') && &fileignorecase - let path = s:PlatformSlash(tolower(a:path)) + let path = FugitiveVimPath(tolower(a:path)) else - let path = s:PlatformSlash(a:path) + let path = FugitiveVimPath(a:path) endif return a:0 ? path ==# s:cpath(a:1) : path endfunction @@ -139,6 +158,7 @@ function! s:executable(binary) abort return s:executables[a:binary] endfunction +<<<<<<< HEAD let s:nowait = v:version >= 704 ? '' : '' function! s:map(mode, lhs, rhs, ...) abort @@ -148,54 +168,192 @@ function! s:map(mode, lhs, rhs, ...) abort let keys = get(g:, a:mode.'remap', {}) if type(keys) == type([]) return +======= +if !exists('s:temp_scripts') + let s:temp_scripts = {} +endif +function! s:TempScript(...) abort + let body = join(a:000, "\n") + if !has_key(s:temp_scripts, body) + let temp = tempname() . '.sh' + call writefile(['#!/bin/sh'] + a:000, temp) + let s:temp_scripts[body] = temp endif - while !empty(head) - if has_key(keys, head) - let head = keys[head] - if empty(head) - return - endif - break + return FugitiveGitPath(s:temp_scripts[body]) +endfunction + +function! s:DoAutocmd(cmd) abort + if v:version >= 704 || (v:version == 703 && has('patch442')) + return 'doautocmd ' . a:cmd + elseif &modelines > 0 + return 'try|set modelines=0|doautocmd ' . a:cmd . '|finally|set modelines=' . &modelines . '|endtry' + else + return 'doautocmd ' . a:cmd +>>>>>>> 27ad0d07862847896f691309a544a206783c94d6 + endif +endfunction + +let s:nowait = v:version >= 704 ? '' : '' + +function! s:Map(mode, lhs, rhs, ...) abort + for mode in split(a:mode, '\zs') + let flags = (a:0 ? a:1 : '') . (a:rhs =~# '' ? '' : '