diff --git a/.gitignore b/.gitignore index 2c24157..4069b0c 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,6 @@ vim/* .vim/tmp/ .vim/tags ctags* +*.un~ +.claude/ +ctags-patterns-for-javascript/ diff --git a/Rakefile b/Rakefile index e3b61b5..8d98f00 100644 --- a/Rakefile +++ b/Rakefile @@ -12,13 +12,13 @@ task :install do /usr/bin/ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)" brew install direnv brew install ripgrep bat fzf - brew install vim --with-lua #https://github.com/Shougo/neocomplete.vim#vim-for-mac-os-x + brew install vim neovim `curl -fLo ~/.vim/autoload/plug.vim --create-dirs \ https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim` system %Q{ cp -r $HOME/dotfiles/bin/* /usr/local/bin/} replace_all = ENV['REPLACE_ALL'] || false - files = Dir['*'] - %w[Rakefile README.md LICENSE"] + files = Dir['*'] - %w[Rakefile README.md LICENSE] files.each do |file| system %Q{mkdir -p "$HOME/.#{File.dirname(file)}"} if file =~ /\// if File.exist?(File.join(ENV['PWD'], "#{file.sub(/\.erb$/, '')}")) @@ -65,9 +65,6 @@ def link_file(file) File.open(File.join(ENV['HOME'], ".#{file.sub(/\.erb$/, '')}"), 'w') do |new_file| new_file.write ERB.new(File.read(file)).result(binding) end - elsif file =~ /zshrc$/ # copy zshrc instead of link - puts "copying ~/.#{file}" - system %Q{cp "$PWD/#{file}" "$HOME/.#{file}"} else puts "linking ~/.#{file}" system %Q{ln -fs "$PWD/#{file}" "$HOME/.#{file}"} diff --git a/ackrc b/ackrc deleted file mode 100644 index f99d5ee..0000000 --- a/ackrc +++ /dev/null @@ -1,15 +0,0 @@ ---type-add=css=.sass,.scss ---type-add=ruby=.rake,.builder ---type-add=html=.rhtml,.html.erb,.html.haml,.haml,.slim,.html.slim,.eco,.skim ---type-add=js=.rjs,.js.erb,.coffee,.js.coffee ---type-add=xml=.xml.builder ---ignore-dir=vendor ---ignore-dir=log ---ignore-dir=tmp ---ignore-dir=doc ---ignore-dir=coverage ---ignore-dir=public/assets ---ignore-dir=spec/cassettes ---ignore-dir=app/assets/javascripts/i18n/ ---ignore-dir=public/javascripts/ ---sort-files diff --git a/bashrc b/bashrc index c9b1509..afdd659 100644 --- a/bashrc +++ b/bashrc @@ -15,12 +15,10 @@ if [ -f ~/.git-prompt.sh ]; then export PS1='\h \w$(__git_ps1 "(%s)") \$ ' fi -# Fix tmux vim color export LESS='-NR' alias more='less' alias bower='noglob bower' -alias tmux="TERM=screen-256color-bce $HOME/dotfiles/bin/tmux" # find a file and less it function lgrep { @@ -42,7 +40,7 @@ fbr() { local branches branch branches=$(git for-each-ref --count=30 --sort=-committerdate refs/heads/ --format="%(refname:short)") && branch=$(echo "$branches" | - fzf-tmux -d $(( 2 + $(wc -l <<< "$branches") )) +m) && + fzf -d $(( 2 + $(wc -l <<< "$branches") )) +m) && git checkout $(echo "$branch" | sed "s/.* //" | sed "s#remotes/[^/]*/##") } fshow() { @@ -140,8 +138,12 @@ function cdpc { eval "$(docker-machine env $1)" } +# nvm: if running under zsh, ~/.zshrc has already set up a lazy loader. +# Only source nvm eagerly for real bash sessions. export NVM_DIR="$HOME/.nvm" -[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm -[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" # This loads nvm bash_completion +if [ -z "$ZSH_NAME" ]; then + [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" + [ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" +fi [ -z "$ZSH_NAME" ] && [ -f ~/.fzf.bash ] && source ~/.fzf.bash diff --git a/bin/it2setkeylabel b/bin/it2setkeylabel deleted file mode 100755 index 4cdb72f..0000000 --- a/bin/it2setkeylabel +++ /dev/null @@ -1,132 +0,0 @@ -#!/bin/bash - -# tmux requires unrecognized OSC sequences to be wrapped with DCS tmux; -# ST, and for all ESCs in to be replaced with ESC ESC. It -# only accepts ESC backslash for ST. -function print_osc() { - if [[ $TERM == screen* ]] ; then - printf "\033Ptmux;\033\033]" - else - printf "\033]" - fi -} - -# More of the tmux workaround described above. -function print_st() { - if [[ $TERM == screen* ]] ; then - printf "\a\033\\" - else - printf "\a" - fi -} - -function show_help() { - echo "Usage:" 1>& 2 - echo " $(basename $0) set Fn Label" 1>& 2 - echo " Where n is a value from 1 to 20" 1>& 2 - echo " $(basename $0) push [name]" 1>& 2 - echo " Saves the current labels with an optional name. Resets labels to their default value, unless name begins with a "." character." 1>& 2 - echo " $(basename $0) pop [name]" 1>& 2 - echo " If name is given, all key labels up to and including the one with the matching name are popped." 1>& 2 - echo "" 1>& 2 - echo "Example:" 1>& 2 - echo "#!/bin/bash" 1>& 2 - echo "# Wrapper script for mc that sets function key labels" 1>& 2 - echo "NAME=mc_\$RANDOM" 1>& 2 - echo "# Save existing labels" 1>& 2 - echo "$(basename $0) push \$NAME" 1>& 2 - echo "$(basename $0) set F1 Help" 1>& 2 - echo "$(basename $0) set F2 Menu" 1>& 2 - echo "$(basename $0) set F3 View" 1>& 2 - echo "$(basename $0) set F4 Edit" 1>& 2 - echo "$(basename $0) set F5 Copy" 1>& 2 - echo "$(basename $0) set F6 Move" 1>& 2 - echo "$(basename $0) set F7 Mkdir" 1>& 2 - echo "$(basename $0) set F8 Del" 1>& 2 - echo "$(basename $0) set F9 Menu" 1>& 2 - echo "$(basename $0) set F10 Quit" 1>& 2 - echo "$(basename $0) set F11 Menu" 1>& 2 - echo "$(basename $0) set F13 View" 1>& 2 - echo "$(basename $0) set F14 Edit" 1>& 2 - echo "$(basename $0) set F15 Copy" 1>& 2 - echo "$(basename $0) set F16 Move" 1>& 2 - echo "$(basename $0) set F17 Find" 1>& 2 - echo "mc" 1>& 2 - echo "# Restore labels to their previous state" 1>& 2 - echo "$(basename $0) pop \$NAME" 1>& 2 -} - -## Main -if [[ $# == 0 ]] -then - show_help - exit 1 -fi - -if [[ $1 == set ]] -then - if [[ $# != 3 ]] - then - show_help - exit 1 - fi - print_osc - printf "1337;SetKeyLabel=%s=%s" "$2" "$3" - print_st -elif [[ $1 == unset ]] -then - if [[ $# != 2 ]] - then - echo "missing arg" - show_help - exit 1 - fi - print_osc - printf "1337;SetKeyLabel=%s=%s" "$2" "$2" - print_st -elif [[ $1 == push ]] -then - if [[ $# == 1 ]] - then - print_osc - printf "1337;PushKeyLabels" - print_st - elif [[ $# == 2 ]] - then - if [[ $2 == "" ]] - then - echo "Name must not be empty" 1>& 2 - exit 1 - fi - print_osc - printf "1337;PushKeyLabels=%s" "$2" - print_st - else - show_help - exit 1 - fi -elif [[ $1 == pop ]] -then - if [[ $# == 1 ]] - then - print_osc - printf "1337;PopKeyLabels" - print_st - elif [[ $# == 2 ]] - then - if [[ $2 == "" ]] - then - echo "Name must not be empty" 1>& 2 - exit 1 - fi - print_osc - printf "1337;PopKeyLabels=%s" "$2" - print_st - else - show_help - exit 1 - fi -else - show_help - exit 1 -fi diff --git a/bin/tmux b/bin/tmux deleted file mode 100755 index 04e1b82..0000000 --- a/bin/tmux +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/bash -NAME=tmux_$RANDOM -APP=$HOME/dotfiles/bin/it2setkeylabel -# Save existing labels" -$APP push $NAME -$APP set F10 x -$APP set F5 \# -$APP set F8 + -$APP set F7 \< -$APP set F9 \> -tmux $@ -# Restore labels to their p -$APP pop $NAME diff --git a/gemrc b/gemrc deleted file mode 100644 index a63b0f4..0000000 --- a/gemrc +++ /dev/null @@ -1,9 +0,0 @@ ---- -:backtrace: false -:benchmark: false -:bulk_threshold: 1000 -:sources: -- http://gems.rubyforge.org -:update_sources: true -:verbose: true -gem: --no-ri --no-rdoc diff --git a/gitconfig b/gitconfig index cd5567c..cb56a3d 100644 --- a/gitconfig +++ b/gitconfig @@ -1,8 +1,7 @@ +[include] + path = ~/.gitconfig.local [github] user = gregory -[user] - name = gregory - email = greg2502@gmail.com [alias] lg = log -g --format=raw --date=relative l = log --format=raw --name-status --abbrev-commit --date=local @@ -47,12 +46,6 @@ default = simple [pull] rebase = true -[difftool "sourcetree"] - cmd = opendiff \"$LOCAL\" \"$REMOTE\" - path = -[mergetool "sourcetree"] - cmd = /Applications/SourceTree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\" - trustExitCode = true [url "https://"] insteadOf = git:// [filter "media"] diff --git a/guardfile b/guardfile deleted file mode 100644 index d3f2b3a..0000000 --- a/guardfile +++ /dev/null @@ -1,47 +0,0 @@ -# ~/.guardfile - -# More info at https://github.com/guard/guard#readme - -notification :off - -puts "Using default guard file." - -group :development do - - if File.exists?("./config.rb") - # Compile on start. - puts `compass compile --time --quiet` - # https://github.com/guard/guard-compass - guard :compass do - watch(%r{(.*)\.s[ac]ss$}) - end - end - - ## Uncomment if running a Drupal theme. Clears .info caches. Requires Drush. - # if Dir.glob("*.info").any? - # guard :shell do - # puts 'Monitoring theme info file.' - # watch(%r{.*\.info$}) { |m| - # puts 'Change detected: ' + m[0] - # `drush php-eval "system_rebuild_theme_data();"` - # puts 'Cleared info caches.' - # } - # end - # end - - ## Look for specified files in the current and child directories. - ## `find` requires Ruby 1.9 or greater. - # require 'find' - # if Find.find(Dir.pwd).detect{|dir|dir=~/.+\.(css|js|html?|php|inc|theme)$/} - # guard :livereload do - # watch(%r{.+\.(css|js|html?|php|inc|theme)$}) - # end - # end - - # Uncomment block above and remove this if using Ruby 1.9 or greater. - # https://github.com/guard/guard-livereload. - guard :livereload do - watch(%r{.+\.(css|js|html?|php|inc|theme)$}) - end - -end diff --git a/pryrc b/pryrc deleted file mode 100644 index dadd2b7..0000000 --- a/pryrc +++ /dev/null @@ -1,41 +0,0 @@ -## Pry Config - -Pry.config.pager = false -Pry.config.editor = "vim" -Pry.config.prompt = [proc{"? "}, proc{"| "}] - -if defined?(ActiveRecord::Base) - - # Get random object - class ActiveRecord::Base - def self.random - self.order("rand()").limit(1).first - end - end - -end - -# Useful collections - -def a - (1..20).to_a -end - -def h - {:hello => "world", :free => "of charge"} -end - -## Benchmarking -# Inspired by . - -def time(repetitions = 100, &block) - require 'benchmark' - Benchmark.bm{|b| b.report{repetitions.times(&block)}} -end - -## Odds and Ends - -def beep - putc ?\a - nil -end diff --git a/rspec b/rspec deleted file mode 100644 index bb259fe..0000000 --- a/rspec +++ /dev/null @@ -1,3 +0,0 @@ ---color ---format=nested ---backtrace diff --git a/tmux.conf b/tmux.conf deleted file mode 100644 index c857d18..0000000 --- a/tmux.conf +++ /dev/null @@ -1,146 +0,0 @@ -# cat << END_TMUX_CONF > /dev/null -set-environment -gu RBENV_VERSION -#set -g default-terminal "xterm-256color" -set-option -ga terminal-overrides ",xterm-256color:Tc" -set -g default-terminal "xterm-256color" -set -g history-limit 20000 -set-hook -g 'before-new-session' 'run "cut -c3- ~/.tmux.conf |sh -s _print"' -#set-hook -g 'after-kill-window' 'run "echo foo>bar.text"' - -#set-hook -g 'before-new-session' 'display-message "New window"' -#set-hook -g 'before-new-session' 'run "echo foo>bar.text"' -#set-hook -g 'after-new-window' 'run "notify-send new-window..."' -#set-hook -g 'after-split-window' 'display-message "I split this window!"' -#set-hook -g 'before-new-window' 'splitw ; run "notify-send YES"' -#set-hook -tfoo -n 'after-split-window' 'display-message "I split this window!"' -#set-hook -tfoo -n 'before-new-window' 'splitw ; run "notify-send YES"' -#new -sfoo - -#set tmux default to zsh -set-option -g default-shell $SHELL - -#Rename window: ctrl-f + , -# -# use VI -setw -g mode-keys vi -set-window-option -g xterm-keys on - -#set-option -g xterm-keys on -setw -g aggressive-resize on - -# Sane scrolling -set-option -g mouse on -set -g display-panes-time 3000 #2s display pane -set -g pane-base-index 1 -set -g base-index 1 - -# Use ctrl-f instead of ctrl-b -set -g prefix C-f -unbind C-b -bind C-f send-prefix -unbind [ -unbind / -bind c copy-mode -#unbind p -#bind p paste-buffer -# Bind ']' to use pbpaste -#bind p run "reattach-to-user-namespace pbpaste | tmux load-buffer - && tmux paste-buffer" -# list-keys -t vi-copy -bind-key -T copy-mode-vi 'v' send-keys -X begin-selection -set-option -g default-command "reattach-to-user-namespace -l ${SHELL}" -bind-key -T copy-mode-vi 'y' send-keys -X copy-pipe "reattach-to-user-namespace pbcopy" -unbind -T copy-mode-vi Enter -bind-key -T copy-mode-vi Enter send-keys -X copy-pipe "reattach-to-user-namespace pbcopy" -bind-key -T copy-mode-vi 'K' send-keys -X halfpage-up -bind-key -T copy-mode-vi 'J' send-keys -X halfpage-down -bind-key -T copy-mode-vi V send-keys -X rectangle-toggle - -# reload config -#unbind r -#bind r source-file ~/.tmux.conf - -unbind ^T -bind t split-window -p 25 - -# horizontal and vertical splits -unbind | -bind v split-window -h -unbind _ -bind s split-window - -# tile all windows -unbind = -bind = select-layout tiled - -# cycle through panes -unbind ^A -bind ^A select-pane -t :.+ - -unbind Right -bind Right resize-pane -R 25 -unbind Left -bind Left resize-pane -L 26 -unbind Up -bind Up resize-pane -t 1 -y 60 -unbind Down -bind Down resize-pane -t 1 -y 25 - -bind-key -n C-S-Left swap-window -t -1 -bind-key -n C-S-Right swap-window -t +1 - -unbind ^o -unbind r -bind r rotate-window -unbind o -bind o resize-pane -Z - -unbind h -bind-key -n C-h select-pane -L -unbind j -bind-key -n C-j select-pane -D -unbind k -bind-key -n C-k select-pane -U -unbind l -bind-key -n C-l select-pane -R - -bind-key -n C-Space display-panes \; select-pane -t :. -bind Space choose-window -#bind-key -n C-p choose-buffer - -#Clear the buffer -bind-key -n F10 confirm-before -p "kill-window #W? (y/n)" kill-window -bind-key -n F5 send-keys -R \; clear-history -unbind-key F5 -bind-key -n F8 new-window -bind-key -n F7 previous-window -bind-key -n F9 next-window - -############################################################################ -# Status Bar -############################################################################ -#set-option -g status-utf8 on -set-option -g status-justify left -set-option -g status-bg black # colour213 # pink -set-option -g status-fg cyan -set-option -g status-interval 1 -set-option -g status-left-length 60 - -set -g window-status-current-style bg=cyan,fg=black - -set-option -g status-left '' -set-option -g visual-activity on - -# battery status via https://raw.github.com/richoH/dotfiles/master/bin/battery -set -g status-right '#[fg=magenta]#(battery) #[fg=cyan]%B %e %R' -# clock -set-window-option -g clock-mode-colour cyan -set-window-option -g clock-mode-style 12 -# END_TMUX_CONF -# -# set -e -# -# _print() { -# //echo "foo bar" -# } -# -# "$@" diff --git a/vim/autoload/plug.vim b/vim/autoload/plug.vim deleted file mode 100644 index b6e4cbf..0000000 --- a/vim/autoload/plug.vim +++ /dev/null @@ -1,2802 +0,0 @@ -" vim-plug: Vim plugin manager -" ============================ -" -" Download plug.vim and put it in ~/.vim/autoload -" -" curl -fLo ~/.vim/autoload/plug.vim --create-dirs \ -" https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim -" -" Edit your .vimrc -" -" call plug#begin('~/.vim/plugged') -" -" " Make sure you use single quotes -" -" " Shorthand notation; fetches https://github.com/junegunn/vim-easy-align -" Plug 'junegunn/vim-easy-align' -" -" " Any valid git URL is allowed -" Plug 'https://github.com/junegunn/vim-github-dashboard.git' -" -" " Multiple Plug commands can be written in a single line using | separators -" Plug 'SirVer/ultisnips' | Plug 'honza/vim-snippets' -" -" " On-demand loading -" Plug 'scrooloose/nerdtree', { 'on': 'NERDTreeToggle' } -" Plug 'tpope/vim-fireplace', { 'for': 'clojure' } -" -" " Using a non-default branch -" Plug 'rdnetto/YCM-Generator', { 'branch': 'stable' } -" -" " Using a tagged release; wildcard allowed (requires git 1.9.2 or above) -" Plug 'fatih/vim-go', { 'tag': '*' } -" -" " Plugin options -" Plug 'nsf/gocode', { 'tag': 'v.20150303', 'rtp': 'vim' } -" -" " Plugin outside ~/.vim/plugged with post-update hook -" Plug 'junegunn/fzf', { 'dir': '~/.fzf', 'do': './install --all' } -" -" " Unmanaged plugin (manually installed and updated) -" Plug '~/my-prototype-plugin' -" -" " Initialize plugin system -" call plug#end() -" -" Then reload .vimrc and :PlugInstall to install plugins. -" -" Plug options: -" -"| Option | Description | -"| ----------------------- | ------------------------------------------------ | -"| `branch`/`tag`/`commit` | Branch/tag/commit of the repository to use | -"| `rtp` | Subdirectory that contains Vim plugin | -"| `dir` | Custom directory for the plugin | -"| `as` | Use different name for the plugin | -"| `do` | Post-update hook (string or funcref) | -"| `on` | On-demand loading: Commands or ``-mappings | -"| `for` | On-demand loading: File types | -"| `frozen` | Do not update unless explicitly specified | -" -" More information: https://github.com/junegunn/vim-plug -" -" -" Copyright (c) 2017 Junegunn Choi -" -" MIT License -" -" Permission is hereby granted, free of charge, to any person obtaining -" a copy of this software and associated documentation files (the -" "Software"), to deal in the Software without restriction, including -" without limitation the rights to use, copy, modify, merge, publish, -" distribute, sublicense, and/or sell copies of the Software, and to -" permit persons to whom the Software is furnished to do so, subject to -" the following conditions: -" -" The above copyright notice and this permission notice shall be -" included in all copies or substantial portions of the Software. -" -" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -" EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -" NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -" LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -" OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -" WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - -if exists('g:loaded_plug') - finish -endif -let g:loaded_plug = 1 - -let s:cpo_save = &cpo -set cpo&vim - -let s:plug_src = 'https://github.com/junegunn/vim-plug.git' -let s:plug_tab = get(s:, 'plug_tab', -1) -let s:plug_buf = get(s:, 'plug_buf', -1) -let s:mac_gui = has('gui_macvim') && has('gui_running') -let s:is_win = has('win32') -let s:nvim = has('nvim-0.2') || (has('nvim') && exists('*jobwait') && !s:is_win) -let s:vim8 = has('patch-8.0.0039') && exists('*job_start') -if s:is_win && &shellslash - set noshellslash - let s:me = resolve(expand(':p')) - set shellslash -else - let s:me = resolve(expand(':p')) -endif -let s:base_spec = { 'branch': '', 'frozen': 0 } -let s:TYPE = { -\ 'string': type(''), -\ 'list': type([]), -\ 'dict': type({}), -\ 'funcref': type(function('call')) -\ } -let s:loaded = get(s:, 'loaded', {}) -let s:triggers = get(s:, 'triggers', {}) - -function! s:is_powershell(shell) - return a:shell =~# 'powershell\(\.exe\)\?$' || a:shell =~# 'pwsh\(\.exe\)\?$' -endfunction - -function! s:isabsolute(dir) abort - return a:dir =~# '^/' || (has('win32') && a:dir =~? '^\%(\\\|[A-Z]:\)') -endfunction - -function! s:git_dir(dir) abort - let gitdir = s:trim(a:dir) . '/.git' - if isdirectory(gitdir) - return gitdir - endif - if !filereadable(gitdir) - return '' - endif - let gitdir = matchstr(get(readfile(gitdir), 0, ''), '^gitdir: \zs.*') - if len(gitdir) && !s:isabsolute(gitdir) - let gitdir = a:dir . '/' . gitdir - endif - return isdirectory(gitdir) ? gitdir : '' -endfunction - -function! s:git_origin_url(dir) abort - let gitdir = s:git_dir(a:dir) - let config = gitdir . '/config' - if empty(gitdir) || !filereadable(config) - return '' - endif - return matchstr(join(readfile(config)), '\[remote "origin"\].\{-}url\s*=\s*\zs\S*\ze') -endfunction - -function! s:git_revision(dir) abort - let gitdir = s:git_dir(a:dir) - let head = gitdir . '/HEAD' - if empty(gitdir) || !filereadable(head) - return '' - endif - - let line = get(readfile(head), 0, '') - let ref = matchstr(line, '^ref: \zs.*') - if empty(ref) - return line - endif - - if filereadable(gitdir . '/' . ref) - return get(readfile(gitdir . '/' . ref), 0, '') - endif - - if filereadable(gitdir . '/packed-refs') - for line in readfile(gitdir . '/packed-refs') - if line =~# ' ' . ref - return matchstr(line, '^[0-9a-f]*') - endif - endfor - endif - - return '' -endfunction - -function! s:git_local_branch(dir) abort - let gitdir = s:git_dir(a:dir) - let head = gitdir . '/HEAD' - if empty(gitdir) || !filereadable(head) - return '' - endif - let branch = matchstr(get(readfile(head), 0, ''), '^ref: refs/heads/\zs.*') - return len(branch) ? branch : 'HEAD' -endfunction - -function! s:git_origin_branch(spec) - if len(a:spec.branch) - return a:spec.branch - endif - - " The file may not be present if this is a local repository - let gitdir = s:git_dir(a:spec.dir) - let origin_head = gitdir.'/refs/remotes/origin/HEAD' - if len(gitdir) && filereadable(origin_head) - return matchstr(get(readfile(origin_head), 0, ''), - \ '^ref: refs/remotes/origin/\zs.*') - endif - - " The command may not return the name of a branch in detached HEAD state - let result = s:lines(s:system('git symbolic-ref --short HEAD', a:spec.dir)) - return v:shell_error ? '' : result[-1] -endfunction - -if s:is_win - function! s:plug_call(fn, ...) - let shellslash = &shellslash - try - set noshellslash - return call(a:fn, a:000) - finally - let &shellslash = shellslash - endtry - endfunction -else - function! s:plug_call(fn, ...) - return call(a:fn, a:000) - endfunction -endif - -function! s:plug_getcwd() - return s:plug_call('getcwd') -endfunction - -function! s:plug_fnamemodify(fname, mods) - return s:plug_call('fnamemodify', a:fname, a:mods) -endfunction - -function! s:plug_expand(fmt) - return s:plug_call('expand', a:fmt, 1) -endfunction - -function! s:plug_tempname() - return s:plug_call('tempname') -endfunction - -function! plug#begin(...) - if a:0 > 0 - let s:plug_home_org = a:1 - let home = s:path(s:plug_fnamemodify(s:plug_expand(a:1), ':p')) - elseif exists('g:plug_home') - let home = s:path(g:plug_home) - elseif !empty(&rtp) - let home = s:path(split(&rtp, ',')[0]) . '/plugged' - else - return s:err('Unable to determine plug home. Try calling plug#begin() with a path argument.') - endif - if s:plug_fnamemodify(home, ':t') ==# 'plugin' && s:plug_fnamemodify(home, ':h') ==# s:first_rtp - return s:err('Invalid plug home. '.home.' is a standard Vim runtime path and is not allowed.') - endif - - let g:plug_home = home - let g:plugs = {} - let g:plugs_order = [] - let s:triggers = {} - - call s:define_commands() - return 1 -endfunction - -function! s:define_commands() - command! -nargs=+ -bar Plug call plug#() - if !executable('git') - return s:err('`git` executable not found. Most commands will not be available. To suppress this message, prepend `silent!` to `call plug#begin(...)`.') - endif - if has('win32') - \ && &shellslash - \ && (&shell =~# 'cmd\(\.exe\)\?$' || s:is_powershell(&shell)) - return s:err('vim-plug does not support shell, ' . &shell . ', when shellslash is set.') - endif - if !has('nvim') - \ && (has('win32') || has('win32unix')) - \ && !has('multi_byte') - return s:err('Vim needs +multi_byte feature on Windows to run shell commands. Enable +iconv for best results.') - endif - command! -nargs=* -bar -bang -complete=customlist,s:names PlugInstall call s:install(0, []) - command! -nargs=* -bar -bang -complete=customlist,s:names PlugUpdate call s:update(0, []) - command! -nargs=0 -bar -bang PlugClean call s:clean(0) - command! -nargs=0 -bar PlugUpgrade if s:upgrade() | execute 'source' s:esc(s:me) | endif - command! -nargs=0 -bar PlugStatus call s:status() - command! -nargs=0 -bar PlugDiff call s:diff() - command! -nargs=? -bar -bang -complete=file PlugSnapshot call s:snapshot(0, ) -endfunction - -function! s:to_a(v) - return type(a:v) == s:TYPE.list ? a:v : [a:v] -endfunction - -function! s:to_s(v) - return type(a:v) == s:TYPE.string ? a:v : join(a:v, "\n") . "\n" -endfunction - -function! s:glob(from, pattern) - return s:lines(globpath(a:from, a:pattern)) -endfunction - -function! s:source(from, ...) - let found = 0 - for pattern in a:000 - for vim in s:glob(a:from, pattern) - execute 'source' s:esc(vim) - let found = 1 - endfor - endfor - return found -endfunction - -function! s:assoc(dict, key, val) - let a:dict[a:key] = add(get(a:dict, a:key, []), a:val) -endfunction - -function! s:ask(message, ...) - call inputsave() - echohl WarningMsg - let answer = input(a:message.(a:0 ? ' (y/N/a) ' : ' (y/N) ')) - echohl None - call inputrestore() - echo "\r" - return (a:0 && answer =~? '^a') ? 2 : (answer =~? '^y') ? 1 : 0 -endfunction - -function! s:ask_no_interrupt(...) - try - return call('s:ask', a:000) - catch - return 0 - endtry -endfunction - -function! s:lazy(plug, opt) - return has_key(a:plug, a:opt) && - \ (empty(s:to_a(a:plug[a:opt])) || - \ !isdirectory(a:plug.dir) || - \ len(s:glob(s:rtp(a:plug), 'plugin')) || - \ len(s:glob(s:rtp(a:plug), 'after/plugin'))) -endfunction - -function! plug#end() - if !exists('g:plugs') - return s:err('plug#end() called without calling plug#begin() first') - endif - - if exists('#PlugLOD') - augroup PlugLOD - autocmd! - augroup END - augroup! PlugLOD - endif - let lod = { 'ft': {}, 'map': {}, 'cmd': {} } - - if exists('g:did_load_filetypes') - filetype off - endif - for name in g:plugs_order - if !has_key(g:plugs, name) - continue - endif - let plug = g:plugs[name] - if get(s:loaded, name, 0) || !s:lazy(plug, 'on') && !s:lazy(plug, 'for') - let s:loaded[name] = 1 - continue - endif - - if has_key(plug, 'on') - let s:triggers[name] = { 'map': [], 'cmd': [] } - for cmd in s:to_a(plug.on) - if cmd =~? '^.\+' - if empty(mapcheck(cmd)) && empty(mapcheck(cmd, 'i')) - call s:assoc(lod.map, cmd, name) - endif - call add(s:triggers[name].map, cmd) - elseif cmd =~# '^[A-Z]' - let cmd = substitute(cmd, '!*$', '', '') - if exists(':'.cmd) != 2 - call s:assoc(lod.cmd, cmd, name) - endif - call add(s:triggers[name].cmd, cmd) - else - call s:err('Invalid `on` option: '.cmd. - \ '. Should start with an uppercase letter or ``.') - endif - endfor - endif - - if has_key(plug, 'for') - let types = s:to_a(plug.for) - if !empty(types) - augroup filetypedetect - call s:source(s:rtp(plug), 'ftdetect/**/*.vim', 'after/ftdetect/**/*.vim') - augroup END - endif - for type in types - call s:assoc(lod.ft, type, name) - endfor - endif - endfor - - for [cmd, names] in items(lod.cmd) - execute printf( - \ 'command! -nargs=* -range -bang -complete=file %s call s:lod_cmd(%s, "", , , , %s)', - \ cmd, string(cmd), string(names)) - endfor - - for [map, names] in items(lod.map) - for [mode, map_prefix, key_prefix] in - \ [['i', '', ''], ['n', '', ''], ['v', '', 'gv'], ['o', '', '']] - execute printf( - \ '%snoremap %s %s:call lod_map(%s, %s, %s, "%s")', - \ mode, map, map_prefix, string(map), string(names), mode != 'i', key_prefix) - endfor - endfor - - for [ft, names] in items(lod.ft) - augroup PlugLOD - execute printf('autocmd FileType %s call lod_ft(%s, %s)', - \ ft, string(ft), string(names)) - augroup END - endfor - - call s:reorg_rtp() - filetype plugin indent on - if has('vim_starting') - if has('syntax') && !exists('g:syntax_on') - syntax enable - end - else - call s:reload_plugins() - endif -endfunction - -function! s:loaded_names() - return filter(copy(g:plugs_order), 'get(s:loaded, v:val, 0)') -endfunction - -function! s:load_plugin(spec) - call s:source(s:rtp(a:spec), 'plugin/**/*.vim', 'after/plugin/**/*.vim') -endfunction - -function! s:reload_plugins() - for name in s:loaded_names() - call s:load_plugin(g:plugs[name]) - endfor -endfunction - -function! s:trim(str) - return substitute(a:str, '[\/]\+$', '', '') -endfunction - -function! s:version_requirement(val, min) - for idx in range(0, len(a:min) - 1) - let v = get(a:val, idx, 0) - if v < a:min[idx] | return 0 - elseif v > a:min[idx] | return 1 - endif - endfor - return 1 -endfunction - -function! s:git_version_requirement(...) - if !exists('s:git_version') - let s:git_version = map(split(split(s:system(['git', '--version']))[2], '\.'), 'str2nr(v:val)') - endif - return s:version_requirement(s:git_version, a:000) -endfunction - -function! s:progress_opt(base) - return a:base && !s:is_win && - \ s:git_version_requirement(1, 7, 1) ? '--progress' : '' -endfunction - -function! s:rtp(spec) - return s:path(a:spec.dir . get(a:spec, 'rtp', '')) -endfunction - -if s:is_win - function! s:path(path) - return s:trim(substitute(a:path, '/', '\', 'g')) - endfunction - - function! s:dirpath(path) - return s:path(a:path) . '\' - endfunction - - function! s:is_local_plug(repo) - return a:repo =~? '^[a-z]:\|^[%~]' - endfunction - - " Copied from fzf - function! s:wrap_cmds(cmds) - let cmds = [ - \ '@echo off', - \ 'setlocal enabledelayedexpansion'] - \ + (type(a:cmds) == type([]) ? a:cmds : [a:cmds]) - \ + ['endlocal'] - if has('iconv') - if !exists('s:codepage') - let s:codepage = libcallnr('kernel32.dll', 'GetACP', 0) - endif - return map(cmds, printf('iconv(v:val."\r", "%s", "cp%d")', &encoding, s:codepage)) - endif - return map(cmds, 'v:val."\r"') - endfunction - - function! s:batchfile(cmd) - let batchfile = s:plug_tempname().'.bat' - call writefile(s:wrap_cmds(a:cmd), batchfile) - let cmd = plug#shellescape(batchfile, {'shell': &shell, 'script': 0}) - if s:is_powershell(&shell) - let cmd = '& ' . cmd - endif - return [batchfile, cmd] - endfunction -else - function! s:path(path) - return s:trim(a:path) - endfunction - - function! s:dirpath(path) - return substitute(a:path, '[/\\]*$', '/', '') - endfunction - - function! s:is_local_plug(repo) - return a:repo[0] =~ '[/$~]' - endfunction -endif - -function! s:err(msg) - echohl ErrorMsg - echom '[vim-plug] '.a:msg - echohl None -endfunction - -function! s:warn(cmd, msg) - echohl WarningMsg - execute a:cmd 'a:msg' - echohl None -endfunction - -function! s:esc(path) - return escape(a:path, ' ') -endfunction - -function! s:escrtp(path) - return escape(a:path, ' ,') -endfunction - -function! s:remove_rtp() - for name in s:loaded_names() - let rtp = s:rtp(g:plugs[name]) - execute 'set rtp-='.s:escrtp(rtp) - let after = globpath(rtp, 'after') - if isdirectory(after) - execute 'set rtp-='.s:escrtp(after) - endif - endfor -endfunction - -function! s:reorg_rtp() - if !empty(s:first_rtp) - execute 'set rtp-='.s:first_rtp - execute 'set rtp-='.s:last_rtp - endif - - " &rtp is modified from outside - if exists('s:prtp') && s:prtp !=# &rtp - call s:remove_rtp() - unlet! s:middle - endif - - let s:middle = get(s:, 'middle', &rtp) - let rtps = map(s:loaded_names(), 's:rtp(g:plugs[v:val])') - let afters = filter(map(copy(rtps), 'globpath(v:val, "after")'), '!empty(v:val)') - let rtp = join(map(rtps, 'escape(v:val, ",")'), ',') - \ . ','.s:middle.',' - \ . join(map(afters, 'escape(v:val, ",")'), ',') - let &rtp = substitute(substitute(rtp, ',,*', ',', 'g'), '^,\|,$', '', 'g') - let s:prtp = &rtp - - if !empty(s:first_rtp) - execute 'set rtp^='.s:first_rtp - execute 'set rtp+='.s:last_rtp - endif -endfunction - -function! s:doautocmd(...) - if exists('#'.join(a:000, '#')) - execute 'doautocmd' ((v:version > 703 || has('patch442')) ? '' : '') join(a:000) - endif -endfunction - -function! s:dobufread(names) - for name in a:names - let path = s:rtp(g:plugs[name]) - for dir in ['ftdetect', 'ftplugin', 'after/ftdetect', 'after/ftplugin'] - if len(finddir(dir, path)) - if exists('#BufRead') - doautocmd BufRead - endif - return - endif - endfor - endfor -endfunction - -function! plug#load(...) - if a:0 == 0 - return s:err('Argument missing: plugin name(s) required') - endif - if !exists('g:plugs') - return s:err('plug#begin was not called') - endif - let names = a:0 == 1 && type(a:1) == s:TYPE.list ? a:1 : a:000 - let unknowns = filter(copy(names), '!has_key(g:plugs, v:val)') - if !empty(unknowns) - let s = len(unknowns) > 1 ? 's' : '' - return s:err(printf('Unknown plugin%s: %s', s, join(unknowns, ', '))) - end - let unloaded = filter(copy(names), '!get(s:loaded, v:val, 0)') - if !empty(unloaded) - for name in unloaded - call s:lod([name], ['ftdetect', 'after/ftdetect', 'plugin', 'after/plugin']) - endfor - call s:dobufread(unloaded) - return 1 - end - return 0 -endfunction - -function! s:remove_triggers(name) - if !has_key(s:triggers, a:name) - return - endif - for cmd in s:triggers[a:name].cmd - execute 'silent! delc' cmd - endfor - for map in s:triggers[a:name].map - execute 'silent! unmap' map - execute 'silent! iunmap' map - endfor - call remove(s:triggers, a:name) -endfunction - -function! s:lod(names, types, ...) - for name in a:names - call s:remove_triggers(name) - let s:loaded[name] = 1 - endfor - call s:reorg_rtp() - - for name in a:names - let rtp = s:rtp(g:plugs[name]) - for dir in a:types - call s:source(rtp, dir.'/**/*.vim') - endfor - if a:0 - if !s:source(rtp, a:1) && !empty(s:glob(rtp, a:2)) - execute 'runtime' a:1 - endif - call s:source(rtp, a:2) - endif - call s:doautocmd('User', name) - endfor -endfunction - -function! s:lod_ft(pat, names) - let syn = 'syntax/'.a:pat.'.vim' - call s:lod(a:names, ['plugin', 'after/plugin'], syn, 'after/'.syn) - execute 'autocmd! PlugLOD FileType' a:pat - call s:doautocmd('filetypeplugin', 'FileType') - call s:doautocmd('filetypeindent', 'FileType') -endfunction - -function! s:lod_cmd(cmd, bang, l1, l2, args, names) - call s:lod(a:names, ['ftdetect', 'after/ftdetect', 'plugin', 'after/plugin']) - call s:dobufread(a:names) - execute printf('%s%s%s %s', (a:l1 == a:l2 ? '' : (a:l1.','.a:l2)), a:cmd, a:bang, a:args) -endfunction - -function! s:lod_map(map, names, with_prefix, prefix) - call s:lod(a:names, ['ftdetect', 'after/ftdetect', 'plugin', 'after/plugin']) - call s:dobufread(a:names) - let extra = '' - while 1 - let c = getchar(0) - if c == 0 - break - endif - let extra .= nr2char(c) - endwhile - - if a:with_prefix - let prefix = v:count ? v:count : '' - let prefix .= '"'.v:register.a:prefix - if mode(1) == 'no' - if v:operator == 'c' - let prefix = "\" . prefix - endif - let prefix .= v:operator - endif - call feedkeys(prefix, 'n') - endif - call feedkeys(substitute(a:map, '^', "\", '') . extra) -endfunction - -function! plug#(repo, ...) - if a:0 > 1 - return s:err('Invalid number of arguments (1..2)') - endif - - try - let repo = s:trim(a:repo) - let opts = a:0 == 1 ? s:parse_options(a:1) : s:base_spec - let name = get(opts, 'as', s:plug_fnamemodify(repo, ':t:s?\.git$??')) - let spec = extend(s:infer_properties(name, repo), opts) - if !has_key(g:plugs, name) - call add(g:plugs_order, name) - endif - let g:plugs[name] = spec - let s:loaded[name] = get(s:loaded, name, 0) - catch - return s:err(repo . ' ' . v:exception) - endtry -endfunction - -function! s:parse_options(arg) - let opts = copy(s:base_spec) - let type = type(a:arg) - let opt_errfmt = 'Invalid argument for "%s" option of :Plug (expected: %s)' - if type == s:TYPE.string - if empty(a:arg) - throw printf(opt_errfmt, 'tag', 'string') - endif - let opts.tag = a:arg - elseif type == s:TYPE.dict - for opt in ['branch', 'tag', 'commit', 'rtp', 'dir', 'as'] - if has_key(a:arg, opt) - \ && (type(a:arg[opt]) != s:TYPE.string || empty(a:arg[opt])) - throw printf(opt_errfmt, opt, 'string') - endif - endfor - for opt in ['on', 'for'] - if has_key(a:arg, opt) - \ && type(a:arg[opt]) != s:TYPE.list - \ && (type(a:arg[opt]) != s:TYPE.string || empty(a:arg[opt])) - throw printf(opt_errfmt, opt, 'string or list') - endif - endfor - if has_key(a:arg, 'do') - \ && type(a:arg.do) != s:TYPE.funcref - \ && (type(a:arg.do) != s:TYPE.string || empty(a:arg.do)) - throw printf(opt_errfmt, 'do', 'string or funcref') - endif - call extend(opts, a:arg) - if has_key(opts, 'dir') - let opts.dir = s:dirpath(s:plug_expand(opts.dir)) - endif - else - throw 'Invalid argument type (expected: string or dictionary)' - endif - return opts -endfunction - -function! s:infer_properties(name, repo) - let repo = a:repo - if s:is_local_plug(repo) - return { 'dir': s:dirpath(s:plug_expand(repo)) } - else - if repo =~ ':' - let uri = repo - else - if repo !~ '/' - throw printf('Invalid argument: %s (implicit `vim-scripts'' expansion is deprecated)', repo) - endif - let fmt = get(g:, 'plug_url_format', 'https://git::@github.com/%s.git') - let uri = printf(fmt, repo) - endif - return { 'dir': s:dirpath(g:plug_home.'/'.a:name), 'uri': uri } - endif -endfunction - -function! s:install(force, names) - call s:update_impl(0, a:force, a:names) -endfunction - -function! s:update(force, names) - call s:update_impl(1, a:force, a:names) -endfunction - -function! plug#helptags() - if !exists('g:plugs') - return s:err('plug#begin was not called') - endif - for spec in values(g:plugs) - let docd = join([s:rtp(spec), 'doc'], '/') - if isdirectory(docd) - silent! execute 'helptags' s:esc(docd) - endif - endfor - return 1 -endfunction - -function! s:syntax() - syntax clear - syntax region plug1 start=/\%1l/ end=/\%2l/ contains=plugNumber - syntax region plug2 start=/\%2l/ end=/\%3l/ contains=plugBracket,plugX - syn match plugNumber /[0-9]\+[0-9.]*/ contained - syn match plugBracket /[[\]]/ contained - syn match plugX /x/ contained - syn match plugDash /^-\{1}\ / - syn match plugPlus /^+/ - syn match plugStar /^*/ - syn match plugMessage /\(^- \)\@<=.*/ - syn match plugName /\(^- \)\@<=[^ ]*:/ - syn match plugSha /\%(: \)\@<=[0-9a-f]\{4,}$/ - syn match plugTag /(tag: [^)]\+)/ - syn match plugInstall /\(^+ \)\@<=[^:]*/ - syn match plugUpdate /\(^* \)\@<=[^:]*/ - syn match plugCommit /^ \X*[0-9a-f]\{7,9} .*/ contains=plugRelDate,plugEdge,plugTag - syn match plugEdge /^ \X\+$/ - syn match plugEdge /^ \X*/ contained nextgroup=plugSha - syn match plugSha /[0-9a-f]\{7,9}/ contained - syn match plugRelDate /([^)]*)$/ contained - syn match plugNotLoaded /(not loaded)$/ - syn match plugError /^x.*/ - syn region plugDeleted start=/^\~ .*/ end=/^\ze\S/ - syn match plugH2 /^.*:\n-\+$/ - syn match plugH2 /^-\{2,}/ - syn keyword Function PlugInstall PlugStatus PlugUpdate PlugClean - hi def link plug1 Title - hi def link plug2 Repeat - hi def link plugH2 Type - hi def link plugX Exception - hi def link plugBracket Structure - hi def link plugNumber Number - - hi def link plugDash Special - hi def link plugPlus Constant - hi def link plugStar Boolean - - hi def link plugMessage Function - hi def link plugName Label - hi def link plugInstall Function - hi def link plugUpdate Type - - hi def link plugError Error - hi def link plugDeleted Ignore - hi def link plugRelDate Comment - hi def link plugEdge PreProc - hi def link plugSha Identifier - hi def link plugTag Constant - - hi def link plugNotLoaded Comment -endfunction - -function! s:lpad(str, len) - return a:str . repeat(' ', a:len - len(a:str)) -endfunction - -function! s:lines(msg) - return split(a:msg, "[\r\n]") -endfunction - -function! s:lastline(msg) - return get(s:lines(a:msg), -1, '') -endfunction - -function! s:new_window() - execute get(g:, 'plug_window', 'vertical topleft new') -endfunction - -function! s:plug_window_exists() - let buflist = tabpagebuflist(s:plug_tab) - return !empty(buflist) && index(buflist, s:plug_buf) >= 0 -endfunction - -function! s:switch_in() - if !s:plug_window_exists() - return 0 - endif - - if winbufnr(0) != s:plug_buf - let s:pos = [tabpagenr(), winnr(), winsaveview()] - execute 'normal!' s:plug_tab.'gt' - let winnr = bufwinnr(s:plug_buf) - execute winnr.'wincmd w' - call add(s:pos, winsaveview()) - else - let s:pos = [winsaveview()] - endif - - setlocal modifiable - return 1 -endfunction - -function! s:switch_out(...) - call winrestview(s:pos[-1]) - setlocal nomodifiable - if a:0 > 0 - execute a:1 - endif - - if len(s:pos) > 1 - execute 'normal!' s:pos[0].'gt' - execute s:pos[1] 'wincmd w' - call winrestview(s:pos[2]) - endif -endfunction - -function! s:finish_bindings() - nnoremap R :call retry() - nnoremap D :PlugDiff - nnoremap S :PlugStatus - nnoremap U :call status_update() - xnoremap U :call status_update() - nnoremap ]] :silent! call section('') - nnoremap [[ :silent! call section('b') -endfunction - -function! s:prepare(...) - if empty(s:plug_getcwd()) - throw 'Invalid current working directory. Cannot proceed.' - endif - - for evar in ['$GIT_DIR', '$GIT_WORK_TREE'] - if exists(evar) - throw evar.' detected. Cannot proceed.' - endif - endfor - - call s:job_abort() - if s:switch_in() - if b:plug_preview == 1 - pc - endif - enew - else - call s:new_window() - endif - - nnoremap q :call close_pane() - if a:0 == 0 - call s:finish_bindings() - endif - let b:plug_preview = -1 - let s:plug_tab = tabpagenr() - let s:plug_buf = winbufnr(0) - call s:assign_name() - - for k in ['', 'L', 'o', 'X', 'd', 'dd'] - execute 'silent! unmap ' k - endfor - setlocal buftype=nofile bufhidden=wipe nobuflisted nolist noswapfile nowrap cursorline modifiable nospell - if exists('+colorcolumn') - setlocal colorcolumn= - endif - setf vim-plug - if exists('g:syntax_on') - call s:syntax() - endif -endfunction - -function! s:close_pane() - if b:plug_preview == 1 - pc - let b:plug_preview = -1 - else - bd - endif -endfunction - -function! s:assign_name() - " Assign buffer name - let prefix = '[Plugins]' - let name = prefix - let idx = 2 - while bufexists(name) - let name = printf('%s (%s)', prefix, idx) - let idx = idx + 1 - endwhile - silent! execute 'f' fnameescape(name) -endfunction - -function! s:chsh(swap) - let prev = [&shell, &shellcmdflag, &shellredir] - if !s:is_win - set shell=sh - endif - if a:swap - if s:is_powershell(&shell) - let &shellredir = '2>&1 | Out-File -Encoding UTF8 %s' - elseif &shell =~# 'sh' || &shell =~# 'cmd\(\.exe\)\?$' - set shellredir=>%s\ 2>&1 - endif - endif - return prev -endfunction - -function! s:bang(cmd, ...) - let batchfile = '' - try - let [sh, shellcmdflag, shrd] = s:chsh(a:0) - " FIXME: Escaping is incomplete. We could use shellescape with eval, - " but it won't work on Windows. - let cmd = a:0 ? s:with_cd(a:cmd, a:1) : a:cmd - if s:is_win - let [batchfile, cmd] = s:batchfile(cmd) - endif - let g:_plug_bang = (s:is_win && has('gui_running') ? 'silent ' : '').'!'.escape(cmd, '#!%') - execute "normal! :execute g:_plug_bang\\" - finally - unlet g:_plug_bang - let [&shell, &shellcmdflag, &shellredir] = [sh, shellcmdflag, shrd] - if s:is_win && filereadable(batchfile) - call delete(batchfile) - endif - endtry - return v:shell_error ? 'Exit status: ' . v:shell_error : '' -endfunction - -function! s:regress_bar() - let bar = substitute(getline(2)[1:-2], '.*\zs=', 'x', '') - call s:progress_bar(2, bar, len(bar)) -endfunction - -function! s:is_updated(dir) - return !empty(s:system_chomp(['git', 'log', '--pretty=format:%h', 'HEAD...HEAD@{1}'], a:dir)) -endfunction - -function! s:do(pull, force, todo) - for [name, spec] in items(a:todo) - if !isdirectory(spec.dir) - continue - endif - let installed = has_key(s:update.new, name) - let updated = installed ? 0 : - \ (a:pull && index(s:update.errors, name) < 0 && s:is_updated(spec.dir)) - if a:force || installed || updated - execute 'cd' s:esc(spec.dir) - call append(3, '- Post-update hook for '. name .' ... ') - let error = '' - let type = type(spec.do) - if type == s:TYPE.string - if spec.do[0] == ':' - if !get(s:loaded, name, 0) - let s:loaded[name] = 1 - call s:reorg_rtp() - endif - call s:load_plugin(spec) - try - execute spec.do[1:] - catch - let error = v:exception - endtry - if !s:plug_window_exists() - cd - - throw 'Warning: vim-plug was terminated by the post-update hook of '.name - endif - else - let error = s:bang(spec.do) - endif - elseif type == s:TYPE.funcref - try - call s:load_plugin(spec) - let status = installed ? 'installed' : (updated ? 'updated' : 'unchanged') - call spec.do({ 'name': name, 'status': status, 'force': a:force }) - catch - let error = v:exception - endtry - else - let error = 'Invalid hook type' - endif - call s:switch_in() - call setline(4, empty(error) ? (getline(4) . 'OK') - \ : ('x' . getline(4)[1:] . error)) - if !empty(error) - call add(s:update.errors, name) - call s:regress_bar() - endif - cd - - endif - endfor -endfunction - -function! s:hash_match(a, b) - return stridx(a:a, a:b) == 0 || stridx(a:b, a:a) == 0 -endfunction - -function! s:checkout(spec) - let sha = a:spec.commit - let output = s:git_revision(a:spec.dir) - if !empty(output) && !s:hash_match(sha, s:lines(output)[0]) - let credential_helper = s:git_version_requirement(2) ? '-c credential.helper= ' : '' - let output = s:system( - \ 'git '.credential_helper.'fetch --depth 999999 && git checkout '.plug#shellescape(sha).' --', a:spec.dir) - endif - return output -endfunction - -function! s:finish(pull) - let new_frozen = len(filter(keys(s:update.new), 'g:plugs[v:val].frozen')) - if new_frozen - let s = new_frozen > 1 ? 's' : '' - call append(3, printf('- Installed %d frozen plugin%s', new_frozen, s)) - endif - call append(3, '- Finishing ... ') | 4 - redraw - call plug#helptags() - call plug#end() - call setline(4, getline(4) . 'Done!') - redraw - let msgs = [] - if !empty(s:update.errors) - call add(msgs, "Press 'R' to retry.") - endif - if a:pull && len(s:update.new) < len(filter(getline(5, '$'), - \ "v:val =~ '^- ' && v:val !~# 'Already up.to.date'")) - call add(msgs, "Press 'D' to see the updated changes.") - endif - echo join(msgs, ' ') - call s:finish_bindings() -endfunction - -function! s:retry() - if empty(s:update.errors) - return - endif - echo - call s:update_impl(s:update.pull, s:update.force, - \ extend(copy(s:update.errors), [s:update.threads])) -endfunction - -function! s:is_managed(name) - return has_key(g:plugs[a:name], 'uri') -endfunction - -function! s:names(...) - return sort(filter(keys(g:plugs), 'stridx(v:val, a:1) == 0 && s:is_managed(v:val)')) -endfunction - -function! s:check_ruby() - silent! ruby require 'thread'; VIM::command("let g:plug_ruby = '#{RUBY_VERSION}'") - if !exists('g:plug_ruby') - redraw! - return s:warn('echom', 'Warning: Ruby interface is broken') - endif - let ruby_version = split(g:plug_ruby, '\.') - unlet g:plug_ruby - return s:version_requirement(ruby_version, [1, 8, 7]) -endfunction - -function! s:update_impl(pull, force, args) abort - let sync = index(a:args, '--sync') >= 0 || has('vim_starting') - let args = filter(copy(a:args), 'v:val != "--sync"') - let threads = (len(args) > 0 && args[-1] =~ '^[1-9][0-9]*$') ? - \ remove(args, -1) : get(g:, 'plug_threads', 16) - - let managed = filter(copy(g:plugs), 's:is_managed(v:key)') - let todo = empty(args) ? filter(managed, '!v:val.frozen || !isdirectory(v:val.dir)') : - \ filter(managed, 'index(args, v:key) >= 0') - - if empty(todo) - return s:warn('echo', 'No plugin to '. (a:pull ? 'update' : 'install')) - endif - - if !s:is_win && s:git_version_requirement(2, 3) - let s:git_terminal_prompt = exists('$GIT_TERMINAL_PROMPT') ? $GIT_TERMINAL_PROMPT : '' - let $GIT_TERMINAL_PROMPT = 0 - for plug in values(todo) - let plug.uri = substitute(plug.uri, - \ '^https://git::@github\.com', 'https://github.com', '') - endfor - endif - - if !isdirectory(g:plug_home) - try - call mkdir(g:plug_home, 'p') - catch - return s:err(printf('Invalid plug directory: %s. '. - \ 'Try to call plug#begin with a valid directory', g:plug_home)) - endtry - endif - - if has('nvim') && !exists('*jobwait') && threads > 1 - call s:warn('echom', '[vim-plug] Update Neovim for parallel installer') - endif - - let use_job = s:nvim || s:vim8 - let python = (has('python') || has('python3')) && !use_job - let ruby = has('ruby') && !use_job && (v:version >= 703 || v:version == 702 && has('patch374')) && !(s:is_win && has('gui_running')) && threads > 1 && s:check_ruby() - - let s:update = { - \ 'start': reltime(), - \ 'all': todo, - \ 'todo': copy(todo), - \ 'errors': [], - \ 'pull': a:pull, - \ 'force': a:force, - \ 'new': {}, - \ 'threads': (python || ruby || use_job) ? min([len(todo), threads]) : 1, - \ 'bar': '', - \ 'fin': 0 - \ } - - call s:prepare(1) - call append(0, ['', '']) - normal! 2G - silent! redraw - - " Set remote name, overriding a possible user git config's clone.defaultRemoteName - let s:clone_opt = ['--origin', 'origin'] - if get(g:, 'plug_shallow', 1) - call extend(s:clone_opt, ['--depth', '1']) - if s:git_version_requirement(1, 7, 10) - call add(s:clone_opt, '--no-single-branch') - endif - endif - - if has('win32unix') || has('wsl') - call extend(s:clone_opt, ['-c', 'core.eol=lf', '-c', 'core.autocrlf=input']) - endif - - let s:submodule_opt = s:git_version_requirement(2, 8) ? ' --jobs='.threads : '' - - " Python version requirement (>= 2.7) - if python && !has('python3') && !ruby && !use_job && s:update.threads > 1 - redir => pyv - silent python import platform; print platform.python_version() - redir END - let python = s:version_requirement( - \ map(split(split(pyv)[0], '\.'), 'str2nr(v:val)'), [2, 6]) - endif - - if (python || ruby) && s:update.threads > 1 - try - let imd = &imd - if s:mac_gui - set noimd - endif - if ruby - call s:update_ruby() - else - call s:update_python() - endif - catch - let lines = getline(4, '$') - let printed = {} - silent! 4,$d _ - for line in lines - let name = s:extract_name(line, '.', '') - if empty(name) || !has_key(printed, name) - call append('$', line) - if !empty(name) - let printed[name] = 1 - if line[0] == 'x' && index(s:update.errors, name) < 0 - call add(s:update.errors, name) - end - endif - endif - endfor - finally - let &imd = imd - call s:update_finish() - endtry - else - call s:update_vim() - while use_job && sync - sleep 100m - if s:update.fin - break - endif - endwhile - endif -endfunction - -function! s:log4(name, msg) - call setline(4, printf('- %s (%s)', a:msg, a:name)) - redraw -endfunction - -function! s:update_finish() - if exists('s:git_terminal_prompt') - let $GIT_TERMINAL_PROMPT = s:git_terminal_prompt - endif - if s:switch_in() - call append(3, '- Updating ...') | 4 - for [name, spec] in items(filter(copy(s:update.all), 'index(s:update.errors, v:key) < 0 && (s:update.force || s:update.pull || has_key(s:update.new, v:key))')) - let [pos, _] = s:logpos(name) - if !pos - continue - endif - if has_key(spec, 'commit') - call s:log4(name, 'Checking out '.spec.commit) - let out = s:checkout(spec) - elseif has_key(spec, 'tag') - let tag = spec.tag - if tag =~ '\*' - let tags = s:lines(s:system('git tag --list '.plug#shellescape(tag).' --sort -version:refname 2>&1', spec.dir)) - if !v:shell_error && !empty(tags) - let tag = tags[0] - call s:log4(name, printf('Latest tag for %s -> %s', spec.tag, tag)) - call append(3, '') - endif - endif - call s:log4(name, 'Checking out '.tag) - let out = s:system('git checkout -q '.plug#shellescape(tag).' -- 2>&1', spec.dir) - else - let branch = s:git_origin_branch(spec) - call s:log4(name, 'Merging origin/'.s:esc(branch)) - let out = s:system('git checkout -q '.plug#shellescape(branch).' -- 2>&1' - \. (has_key(s:update.new, name) ? '' : ('&& git merge --ff-only '.plug#shellescape('origin/'.branch).' 2>&1')), spec.dir) - endif - if !v:shell_error && filereadable(spec.dir.'/.gitmodules') && - \ (s:update.force || has_key(s:update.new, name) || s:is_updated(spec.dir)) - call s:log4(name, 'Updating submodules. This may take a while.') - let out .= s:bang('git submodule update --init --recursive'.s:submodule_opt.' 2>&1', spec.dir) - endif - let msg = s:format_message(v:shell_error ? 'x': '-', name, out) - if v:shell_error - call add(s:update.errors, name) - call s:regress_bar() - silent execute pos 'd _' - call append(4, msg) | 4 - elseif !empty(out) - call setline(pos, msg[0]) - endif - redraw - endfor - silent 4 d _ - try - call s:do(s:update.pull, s:update.force, filter(copy(s:update.all), 'index(s:update.errors, v:key) < 0 && has_key(v:val, "do")')) - catch - call s:warn('echom', v:exception) - call s:warn('echo', '') - return - endtry - call s:finish(s:update.pull) - call setline(1, 'Updated. Elapsed time: ' . split(reltimestr(reltime(s:update.start)))[0] . ' sec.') - call s:switch_out('normal! gg') - endif -endfunction - -function! s:job_abort() - if (!s:nvim && !s:vim8) || !exists('s:jobs') - return - endif - - for [name, j] in items(s:jobs) - if s:nvim - silent! call jobstop(j.jobid) - elseif s:vim8 - silent! call job_stop(j.jobid) - endif - if j.new - call s:rm_rf(g:plugs[name].dir) - endif - endfor - let s:jobs = {} -endfunction - -function! s:last_non_empty_line(lines) - let len = len(a:lines) - for idx in range(len) - let line = a:lines[len-idx-1] - if !empty(line) - return line - endif - endfor - return '' -endfunction - -function! s:job_out_cb(self, data) abort - let self = a:self - let data = remove(self.lines, -1) . a:data - let lines = map(split(data, "\n", 1), 'split(v:val, "\r", 1)[-1]') - call extend(self.lines, lines) - " To reduce the number of buffer updates - let self.tick = get(self, 'tick', -1) + 1 - if !self.running || self.tick % len(s:jobs) == 0 - let bullet = self.running ? (self.new ? '+' : '*') : (self.error ? 'x' : '-') - let result = self.error ? join(self.lines, "\n") : s:last_non_empty_line(self.lines) - call s:log(bullet, self.name, result) - endif -endfunction - -function! s:job_exit_cb(self, data) abort - let a:self.running = 0 - let a:self.error = a:data != 0 - call s:reap(a:self.name) - call s:tick() -endfunction - -function! s:job_cb(fn, job, ch, data) - if !s:plug_window_exists() " plug window closed - return s:job_abort() - endif - call call(a:fn, [a:job, a:data]) -endfunction - -function! s:nvim_cb(job_id, data, event) dict abort - return (a:event == 'stdout' || a:event == 'stderr') ? - \ s:job_cb('s:job_out_cb', self, 0, join(a:data, "\n")) : - \ s:job_cb('s:job_exit_cb', self, 0, a:data) -endfunction - -function! s:spawn(name, cmd, opts) - let job = { 'name': a:name, 'running': 1, 'error': 0, 'lines': [''], - \ 'new': get(a:opts, 'new', 0) } - let s:jobs[a:name] = job - - if s:nvim - if has_key(a:opts, 'dir') - let job.cwd = a:opts.dir - endif - let argv = a:cmd - call extend(job, { - \ 'on_stdout': function('s:nvim_cb'), - \ 'on_stderr': function('s:nvim_cb'), - \ 'on_exit': function('s:nvim_cb'), - \ }) - let jid = s:plug_call('jobstart', argv, job) - if jid > 0 - let job.jobid = jid - else - let job.running = 0 - let job.error = 1 - let job.lines = [jid < 0 ? argv[0].' is not executable' : - \ 'Invalid arguments (or job table is full)'] - endif - elseif s:vim8 - let cmd = join(map(copy(a:cmd), 'plug#shellescape(v:val, {"script": 0})')) - if has_key(a:opts, 'dir') - let cmd = s:with_cd(cmd, a:opts.dir, 0) - endif - let argv = s:is_win ? ['cmd', '/s', '/c', '"'.cmd.'"'] : ['sh', '-c', cmd] - let jid = job_start(s:is_win ? join(argv, ' ') : argv, { - \ 'out_cb': function('s:job_cb', ['s:job_out_cb', job]), - \ 'err_cb': function('s:job_cb', ['s:job_out_cb', job]), - \ 'exit_cb': function('s:job_cb', ['s:job_exit_cb', job]), - \ 'err_mode': 'raw', - \ 'out_mode': 'raw' - \}) - if job_status(jid) == 'run' - let job.jobid = jid - else - let job.running = 0 - let job.error = 1 - let job.lines = ['Failed to start job'] - endif - else - let job.lines = s:lines(call('s:system', has_key(a:opts, 'dir') ? [a:cmd, a:opts.dir] : [a:cmd])) - let job.error = v:shell_error != 0 - let job.running = 0 - endif -endfunction - -function! s:reap(name) - let job = s:jobs[a:name] - if job.error - call add(s:update.errors, a:name) - elseif get(job, 'new', 0) - let s:update.new[a:name] = 1 - endif - let s:update.bar .= job.error ? 'x' : '=' - - let bullet = job.error ? 'x' : '-' - let result = job.error ? join(job.lines, "\n") : s:last_non_empty_line(job.lines) - call s:log(bullet, a:name, empty(result) ? 'OK' : result) - call s:bar() - - call remove(s:jobs, a:name) -endfunction - -function! s:bar() - if s:switch_in() - let total = len(s:update.all) - call setline(1, (s:update.pull ? 'Updating' : 'Installing'). - \ ' plugins ('.len(s:update.bar).'/'.total.')') - call s:progress_bar(2, s:update.bar, total) - call s:switch_out() - endif -endfunction - -function! s:logpos(name) - let max = line('$') - for i in range(4, max > 4 ? max : 4) - if getline(i) =~# '^[-+x*] '.a:name.':' - for j in range(i + 1, max > 5 ? max : 5) - if getline(j) !~ '^ ' - return [i, j - 1] - endif - endfor - return [i, i] - endif - endfor - return [0, 0] -endfunction - -function! s:log(bullet, name, lines) - if s:switch_in() - let [b, e] = s:logpos(a:name) - if b > 0 - silent execute printf('%d,%d d _', b, e) - if b > winheight('.') - let b = 4 - endif - else - let b = 4 - endif - " FIXME For some reason, nomodifiable is set after :d in vim8 - setlocal modifiable - call append(b - 1, s:format_message(a:bullet, a:name, a:lines)) - call s:switch_out() - endif -endfunction - -function! s:update_vim() - let s:jobs = {} - - call s:bar() - call s:tick() -endfunction - -function! s:tick() - let pull = s:update.pull - let prog = s:progress_opt(s:nvim || s:vim8) -while 1 " Without TCO, Vim stack is bound to explode - if empty(s:update.todo) - if empty(s:jobs) && !s:update.fin - call s:update_finish() - let s:update.fin = 1 - endif - return - endif - - let name = keys(s:update.todo)[0] - let spec = remove(s:update.todo, name) - let new = empty(globpath(spec.dir, '.git', 1)) - - call s:log(new ? '+' : '*', name, pull ? 'Updating ...' : 'Installing ...') - redraw - - let has_tag = has_key(spec, 'tag') - if !new - let [error, _] = s:git_validate(spec, 0) - if empty(error) - if pull - let cmd = s:git_version_requirement(2) ? ['git', '-c', 'credential.helper=', 'fetch'] : ['git', 'fetch'] - if has_tag && !empty(globpath(spec.dir, '.git/shallow')) - call extend(cmd, ['--depth', '99999999']) - endif - if !empty(prog) - call add(cmd, prog) - endif - call s:spawn(name, cmd, { 'dir': spec.dir }) - else - let s:jobs[name] = { 'running': 0, 'lines': ['Already installed'], 'error': 0 } - endif - else - let s:jobs[name] = { 'running': 0, 'lines': s:lines(error), 'error': 1 } - endif - else - let cmd = ['git', 'clone'] - if !has_tag - call extend(cmd, s:clone_opt) - endif - if !empty(prog) - call add(cmd, prog) - endif - call s:spawn(name, extend(cmd, [spec.uri, s:trim(spec.dir)]), { 'new': 1 }) - endif - - if !s:jobs[name].running - call s:reap(name) - endif - if len(s:jobs) >= s:update.threads - break - endif -endwhile -endfunction - -function! s:update_python() -let py_exe = has('python') ? 'python' : 'python3' -execute py_exe "<< EOF" -import datetime -import functools -import os -try: - import queue -except ImportError: - import Queue as queue -import random -import re -import shutil -import signal -import subprocess -import tempfile -import threading as thr -import time -import traceback -import vim - -G_NVIM = vim.eval("has('nvim')") == '1' -G_PULL = vim.eval('s:update.pull') == '1' -G_RETRIES = int(vim.eval('get(g:, "plug_retries", 2)')) + 1 -G_TIMEOUT = int(vim.eval('get(g:, "plug_timeout", 60)')) -G_CLONE_OPT = ' '.join(vim.eval('s:clone_opt')) -G_PROGRESS = vim.eval('s:progress_opt(1)') -G_LOG_PROB = 1.0 / int(vim.eval('s:update.threads')) -G_STOP = thr.Event() -G_IS_WIN = vim.eval('s:is_win') == '1' - -class PlugError(Exception): - def __init__(self, msg): - self.msg = msg -class CmdTimedOut(PlugError): - pass -class CmdFailed(PlugError): - pass -class InvalidURI(PlugError): - pass -class Action(object): - INSTALL, UPDATE, ERROR, DONE = ['+', '*', 'x', '-'] - -class Buffer(object): - def __init__(self, lock, num_plugs, is_pull): - self.bar = '' - self.event = 'Updating' if is_pull else 'Installing' - self.lock = lock - self.maxy = int(vim.eval('winheight(".")')) - self.num_plugs = num_plugs - - def __where(self, name): - """ Find first line with name in current buffer. Return line num. """ - found, lnum = False, 0 - matcher = re.compile('^[-+x*] {0}:'.format(name)) - for line in vim.current.buffer: - if matcher.search(line) is not None: - found = True - break - lnum += 1 - - if not found: - lnum = -1 - return lnum - - def header(self): - curbuf = vim.current.buffer - curbuf[0] = self.event + ' plugins ({0}/{1})'.format(len(self.bar), self.num_plugs) - - num_spaces = self.num_plugs - len(self.bar) - curbuf[1] = '[{0}{1}]'.format(self.bar, num_spaces * ' ') - - with self.lock: - vim.command('normal! 2G') - vim.command('redraw') - - def write(self, action, name, lines): - first, rest = lines[0], lines[1:] - msg = ['{0} {1}{2}{3}'.format(action, name, ': ' if first else '', first)] - msg.extend([' ' + line for line in rest]) - - try: - if action == Action.ERROR: - self.bar += 'x' - vim.command("call add(s:update.errors, '{0}')".format(name)) - elif action == Action.DONE: - self.bar += '=' - - curbuf = vim.current.buffer - lnum = self.__where(name) - if lnum != -1: # Found matching line num - del curbuf[lnum] - if lnum > self.maxy and action in set([Action.INSTALL, Action.UPDATE]): - lnum = 3 - else: - lnum = 3 - curbuf.append(msg, lnum) - - self.header() - except vim.error: - pass - -class Command(object): - CD = 'cd /d' if G_IS_WIN else 'cd' - - def __init__(self, cmd, cmd_dir=None, timeout=60, cb=None, clean=None): - self.cmd = cmd - if cmd_dir: - self.cmd = '{0} {1} && {2}'.format(Command.CD, cmd_dir, self.cmd) - self.timeout = timeout - self.callback = cb if cb else (lambda msg: None) - self.clean = clean if clean else (lambda: None) - self.proc = None - - @property - def alive(self): - """ Returns true only if command still running. """ - return self.proc and self.proc.poll() is None - - def execute(self, ntries=3): - """ Execute the command with ntries if CmdTimedOut. - Returns the output of the command if no Exception. - """ - attempt, finished, limit = 0, False, self.timeout - - while not finished: - try: - attempt += 1 - result = self.try_command() - finished = True - return result - except CmdTimedOut: - if attempt != ntries: - self.notify_retry() - self.timeout += limit - else: - raise - - def notify_retry(self): - """ Retry required for command, notify user. """ - for count in range(3, 0, -1): - if G_STOP.is_set(): - raise KeyboardInterrupt - msg = 'Timeout. Will retry in {0} second{1} ...'.format( - count, 's' if count != 1 else '') - self.callback([msg]) - time.sleep(1) - self.callback(['Retrying ...']) - - def try_command(self): - """ Execute a cmd & poll for callback. Returns list of output. - Raises CmdFailed -> return code for Popen isn't 0 - Raises CmdTimedOut -> command exceeded timeout without new output - """ - first_line = True - - try: - tfile = tempfile.NamedTemporaryFile(mode='w+b') - preexec_fn = not G_IS_WIN and os.setsid or None - self.proc = subprocess.Popen(self.cmd, stdout=tfile, - stderr=subprocess.STDOUT, - stdin=subprocess.PIPE, shell=True, - preexec_fn=preexec_fn) - thrd = thr.Thread(target=(lambda proc: proc.wait()), args=(self.proc,)) - thrd.start() - - thread_not_started = True - while thread_not_started: - try: - thrd.join(0.1) - thread_not_started = False - except RuntimeError: - pass - - while self.alive: - if G_STOP.is_set(): - raise KeyboardInterrupt - - if first_line or random.random() < G_LOG_PROB: - first_line = False - line = '' if G_IS_WIN else nonblock_read(tfile.name) - if line: - self.callback([line]) - - time_diff = time.time() - os.path.getmtime(tfile.name) - if time_diff > self.timeout: - raise CmdTimedOut(['Timeout!']) - - thrd.join(0.5) - - tfile.seek(0) - result = [line.decode('utf-8', 'replace').rstrip() for line in tfile] - - if self.proc.returncode != 0: - raise CmdFailed([''] + result) - - return result - except: - self.terminate() - raise - - def terminate(self): - """ Terminate process and cleanup. """ - if self.alive: - if G_IS_WIN: - os.kill(self.proc.pid, signal.SIGINT) - else: - os.killpg(self.proc.pid, signal.SIGTERM) - self.clean() - -class Plugin(object): - def __init__(self, name, args, buf_q, lock): - self.name = name - self.args = args - self.buf_q = buf_q - self.lock = lock - self.tag = args.get('tag', 0) - - def manage(self): - try: - if os.path.exists(self.args['dir']): - self.update() - else: - self.install() - with self.lock: - thread_vim_command("let s:update.new['{0}'] = 1".format(self.name)) - except PlugError as exc: - self.write(Action.ERROR, self.name, exc.msg) - except KeyboardInterrupt: - G_STOP.set() - self.write(Action.ERROR, self.name, ['Interrupted!']) - except: - # Any exception except those above print stack trace - msg = 'Trace:\n{0}'.format(traceback.format_exc().rstrip()) - self.write(Action.ERROR, self.name, msg.split('\n')) - raise - - def install(self): - target = self.args['dir'] - if target[-1] == '\\': - target = target[0:-1] - - def clean(target): - def _clean(): - try: - shutil.rmtree(target) - except OSError: - pass - return _clean - - self.write(Action.INSTALL, self.name, ['Installing ...']) - callback = functools.partial(self.write, Action.INSTALL, self.name) - cmd = 'git clone {0} {1} {2} {3} 2>&1'.format( - '' if self.tag else G_CLONE_OPT, G_PROGRESS, self.args['uri'], - esc(target)) - com = Command(cmd, None, G_TIMEOUT, callback, clean(target)) - result = com.execute(G_RETRIES) - self.write(Action.DONE, self.name, result[-1:]) - - def repo_uri(self): - cmd = 'git rev-parse --abbrev-ref HEAD 2>&1 && git config -f .git/config remote.origin.url' - command = Command(cmd, self.args['dir'], G_TIMEOUT,) - result = command.execute(G_RETRIES) - return result[-1] - - def update(self): - actual_uri = self.repo_uri() - expect_uri = self.args['uri'] - regex = re.compile(r'^(?:\w+://)?(?:[^@/]*@)?([^:/]*(?::[0-9]*)?)[:/](.*?)(?:\.git)?/?$') - ma = regex.match(actual_uri) - mb = regex.match(expect_uri) - if ma is None or mb is None or ma.groups() != mb.groups(): - msg = ['', - 'Invalid URI: {0}'.format(actual_uri), - 'Expected {0}'.format(expect_uri), - 'PlugClean required.'] - raise InvalidURI(msg) - - if G_PULL: - self.write(Action.UPDATE, self.name, ['Updating ...']) - callback = functools.partial(self.write, Action.UPDATE, self.name) - fetch_opt = '--depth 99999999' if self.tag and os.path.isfile(os.path.join(self.args['dir'], '.git/shallow')) else '' - cmd = 'git fetch {0} {1} 2>&1'.format(fetch_opt, G_PROGRESS) - com = Command(cmd, self.args['dir'], G_TIMEOUT, callback) - result = com.execute(G_RETRIES) - self.write(Action.DONE, self.name, result[-1:]) - else: - self.write(Action.DONE, self.name, ['Already installed']) - - def write(self, action, name, msg): - self.buf_q.put((action, name, msg)) - -class PlugThread(thr.Thread): - def __init__(self, tname, args): - super(PlugThread, self).__init__() - self.tname = tname - self.args = args - - def run(self): - thr.current_thread().name = self.tname - buf_q, work_q, lock = self.args - - try: - while not G_STOP.is_set(): - name, args = work_q.get_nowait() - plug = Plugin(name, args, buf_q, lock) - plug.manage() - work_q.task_done() - except queue.Empty: - pass - -class RefreshThread(thr.Thread): - def __init__(self, lock): - super(RefreshThread, self).__init__() - self.lock = lock - self.running = True - - def run(self): - while self.running: - with self.lock: - thread_vim_command('noautocmd normal! a') - time.sleep(0.33) - - def stop(self): - self.running = False - -if G_NVIM: - def thread_vim_command(cmd): - vim.session.threadsafe_call(lambda: vim.command(cmd)) -else: - def thread_vim_command(cmd): - vim.command(cmd) - -def esc(name): - return '"' + name.replace('"', '\"') + '"' - -def nonblock_read(fname): - """ Read a file with nonblock flag. Return the last line. """ - fread = os.open(fname, os.O_RDONLY | os.O_NONBLOCK) - buf = os.read(fread, 100000).decode('utf-8', 'replace') - os.close(fread) - - line = buf.rstrip('\r\n') - left = max(line.rfind('\r'), line.rfind('\n')) - if left != -1: - left += 1 - line = line[left:] - - return line - -def main(): - thr.current_thread().name = 'main' - nthreads = int(vim.eval('s:update.threads')) - plugs = vim.eval('s:update.todo') - mac_gui = vim.eval('s:mac_gui') == '1' - - lock = thr.Lock() - buf = Buffer(lock, len(plugs), G_PULL) - buf_q, work_q = queue.Queue(), queue.Queue() - for work in plugs.items(): - work_q.put(work) - - start_cnt = thr.active_count() - for num in range(nthreads): - tname = 'PlugT-{0:02}'.format(num) - thread = PlugThread(tname, (buf_q, work_q, lock)) - thread.start() - if mac_gui: - rthread = RefreshThread(lock) - rthread.start() - - while not buf_q.empty() or thr.active_count() != start_cnt: - try: - action, name, msg = buf_q.get(True, 0.25) - buf.write(action, name, ['OK'] if not msg else msg) - buf_q.task_done() - except queue.Empty: - pass - except KeyboardInterrupt: - G_STOP.set() - - if mac_gui: - rthread.stop() - rthread.join() - -main() -EOF -endfunction - -function! s:update_ruby() - ruby << EOF - module PlugStream - SEP = ["\r", "\n", nil] - def get_line - buffer = '' - loop do - char = readchar rescue return - if SEP.include? char.chr - buffer << $/ - break - else - buffer << char - end - end - buffer - end - end unless defined?(PlugStream) - - def esc arg - %["#{arg.gsub('"', '\"')}"] - end - - def killall pid - pids = [pid] - if /mswin|mingw|bccwin/ =~ RUBY_PLATFORM - pids.each { |pid| Process.kill 'INT', pid.to_i rescue nil } - else - unless `which pgrep 2> /dev/null`.empty? - children = pids - until children.empty? - children = children.map { |pid| - `pgrep -P #{pid}`.lines.map { |l| l.chomp } - }.flatten - pids += children - end - end - pids.each { |pid| Process.kill 'TERM', pid.to_i rescue nil } - end - end - - def compare_git_uri a, b - regex = %r{^(?:\w+://)?(?:[^@/]*@)?([^:/]*(?::[0-9]*)?)[:/](.*?)(?:\.git)?/?$} - regex.match(a).to_a.drop(1) == regex.match(b).to_a.drop(1) - end - - require 'thread' - require 'fileutils' - require 'timeout' - running = true - iswin = VIM::evaluate('s:is_win').to_i == 1 - pull = VIM::evaluate('s:update.pull').to_i == 1 - base = VIM::evaluate('g:plug_home') - all = VIM::evaluate('s:update.todo') - limit = VIM::evaluate('get(g:, "plug_timeout", 60)') - tries = VIM::evaluate('get(g:, "plug_retries", 2)') + 1 - nthr = VIM::evaluate('s:update.threads').to_i - maxy = VIM::evaluate('winheight(".")').to_i - vim7 = VIM::evaluate('v:version').to_i <= 703 && RUBY_PLATFORM =~ /darwin/ - cd = iswin ? 'cd /d' : 'cd' - tot = VIM::evaluate('len(s:update.todo)') || 0 - bar = '' - skip = 'Already installed' - mtx = Mutex.new - take1 = proc { mtx.synchronize { running && all.shift } } - logh = proc { - cnt = bar.length - $curbuf[1] = "#{pull ? 'Updating' : 'Installing'} plugins (#{cnt}/#{tot})" - $curbuf[2] = '[' + bar.ljust(tot) + ']' - VIM::command('normal! 2G') - VIM::command('redraw') - } - where = proc { |name| (1..($curbuf.length)).find { |l| $curbuf[l] =~ /^[-+x*] #{name}:/ } } - log = proc { |name, result, type| - mtx.synchronize do - ing = ![true, false].include?(type) - bar += type ? '=' : 'x' unless ing - b = case type - when :install then '+' when :update then '*' - when true, nil then '-' else - VIM::command("call add(s:update.errors, '#{name}')") - 'x' - end - result = - if type || type.nil? - ["#{b} #{name}: #{result.lines.to_a.last || 'OK'}"] - elsif result =~ /^Interrupted|^Timeout/ - ["#{b} #{name}: #{result}"] - else - ["#{b} #{name}"] + result.lines.map { |l| " " << l } - end - if lnum = where.call(name) - $curbuf.delete lnum - lnum = 4 if ing && lnum > maxy - end - result.each_with_index do |line, offset| - $curbuf.append((lnum || 4) - 1 + offset, line.gsub(/\e\[./, '').chomp) - end - logh.call - end - } - bt = proc { |cmd, name, type, cleanup| - tried = timeout = 0 - begin - tried += 1 - timeout += limit - fd = nil - data = '' - if iswin - Timeout::timeout(timeout) do - tmp = VIM::evaluate('tempname()') - system("(#{cmd}) > #{tmp}") - data = File.read(tmp).chomp - File.unlink tmp rescue nil - end - else - fd = IO.popen(cmd).extend(PlugStream) - first_line = true - log_prob = 1.0 / nthr - while line = Timeout::timeout(timeout) { fd.get_line } - data << line - log.call name, line.chomp, type if name && (first_line || rand < log_prob) - first_line = false - end - fd.close - end - [$? == 0, data.chomp] - rescue Timeout::Error, Interrupt => e - if fd && !fd.closed? - killall fd.pid - fd.close - end - cleanup.call if cleanup - if e.is_a?(Timeout::Error) && tried < tries - 3.downto(1) do |countdown| - s = countdown > 1 ? 's' : '' - log.call name, "Timeout. Will retry in #{countdown} second#{s} ...", type - sleep 1 - end - log.call name, 'Retrying ...', type - retry - end - [false, e.is_a?(Interrupt) ? "Interrupted!" : "Timeout!"] - end - } - main = Thread.current - threads = [] - watcher = Thread.new { - if vim7 - while VIM::evaluate('getchar(1)') - sleep 0.1 - end - else - require 'io/console' # >= Ruby 1.9 - nil until IO.console.getch == 3.chr - end - mtx.synchronize do - running = false - threads.each { |t| t.raise Interrupt } unless vim7 - end - threads.each { |t| t.join rescue nil } - main.kill - } - refresh = Thread.new { - while true - mtx.synchronize do - break unless running - VIM::command('noautocmd normal! a') - end - sleep 0.2 - end - } if VIM::evaluate('s:mac_gui') == 1 - - clone_opt = VIM::evaluate('s:clone_opt').join(' ') - progress = VIM::evaluate('s:progress_opt(1)') - nthr.times do - mtx.synchronize do - threads << Thread.new { - while pair = take1.call - name = pair.first - dir, uri, tag = pair.last.values_at *%w[dir uri tag] - exists = File.directory? dir - ok, result = - if exists - chdir = "#{cd} #{iswin ? dir : esc(dir)}" - ret, data = bt.call "#{chdir} && git rev-parse --abbrev-ref HEAD 2>&1 && git config -f .git/config remote.origin.url", nil, nil, nil - current_uri = data.lines.to_a.last - if !ret - if data =~ /^Interrupted|^Timeout/ - [false, data] - else - [false, [data.chomp, "PlugClean required."].join($/)] - end - elsif !compare_git_uri(current_uri, uri) - [false, ["Invalid URI: #{current_uri}", - "Expected: #{uri}", - "PlugClean required."].join($/)] - else - if pull - log.call name, 'Updating ...', :update - fetch_opt = (tag && File.exist?(File.join(dir, '.git/shallow'))) ? '--depth 99999999' : '' - bt.call "#{chdir} && git fetch #{fetch_opt} #{progress} 2>&1", name, :update, nil - else - [true, skip] - end - end - else - d = esc dir.sub(%r{[\\/]+$}, '') - log.call name, 'Installing ...', :install - bt.call "git clone #{clone_opt unless tag} #{progress} #{uri} #{d} 2>&1", name, :install, proc { - FileUtils.rm_rf dir - } - end - mtx.synchronize { VIM::command("let s:update.new['#{name}'] = 1") } if !exists && ok - log.call name, result, ok - end - } if running - end - end - threads.each { |t| t.join rescue nil } - logh.call - refresh.kill if refresh - watcher.kill -EOF -endfunction - -function! s:shellesc_cmd(arg, script) - let escaped = substitute('"'.a:arg.'"', '[&|<>()@^!"]', '^&', 'g') - return substitute(escaped, '%', (a:script ? '%' : '^') . '&', 'g') -endfunction - -function! s:shellesc_ps1(arg) - return "'".substitute(escape(a:arg, '\"'), "'", "''", 'g')."'" -endfunction - -function! s:shellesc_sh(arg) - return "'".substitute(a:arg, "'", "'\\\\''", 'g')."'" -endfunction - -" Escape the shell argument based on the shell. -" Vim and Neovim's shellescape() are insufficient. -" 1. shellslash determines whether to use single/double quotes. -" Double-quote escaping is fragile for cmd.exe. -" 2. It does not work for powershell. -" 3. It does not work for *sh shells if the command is executed -" via cmd.exe (ie. cmd.exe /c sh -c command command_args) -" 4. It does not support batchfile syntax. -" -" Accepts an optional dictionary with the following keys: -" - shell: same as Vim/Neovim 'shell' option. -" If unset, fallback to 'cmd.exe' on Windows or 'sh'. -" - script: If truthy and shell is cmd.exe, escape for batchfile syntax. -function! plug#shellescape(arg, ...) - if a:arg =~# '^[A-Za-z0-9_/:.-]\+$' - return a:arg - endif - let opts = a:0 > 0 && type(a:1) == s:TYPE.dict ? a:1 : {} - let shell = get(opts, 'shell', s:is_win ? 'cmd.exe' : 'sh') - let script = get(opts, 'script', 1) - if shell =~# 'cmd\(\.exe\)\?$' - return s:shellesc_cmd(a:arg, script) - elseif s:is_powershell(shell) - return s:shellesc_ps1(a:arg) - endif - return s:shellesc_sh(a:arg) -endfunction - -function! s:glob_dir(path) - return map(filter(s:glob(a:path, '**'), 'isdirectory(v:val)'), 's:dirpath(v:val)') -endfunction - -function! s:progress_bar(line, bar, total) - call setline(a:line, '[' . s:lpad(a:bar, a:total) . ']') -endfunction - -function! s:compare_git_uri(a, b) - " See `git help clone' - " https:// [user@] github.com[:port] / junegunn/vim-plug [.git] - " [git@] github.com[:port] : junegunn/vim-plug [.git] - " file:// / junegunn/vim-plug [/] - " / junegunn/vim-plug [/] - let pat = '^\%(\w\+://\)\='.'\%([^@/]*@\)\='.'\([^:/]*\%(:[0-9]*\)\=\)'.'[:/]'.'\(.\{-}\)'.'\%(\.git\)\=/\?$' - let ma = matchlist(a:a, pat) - let mb = matchlist(a:b, pat) - return ma[1:2] ==# mb[1:2] -endfunction - -function! s:format_message(bullet, name, message) - if a:bullet != 'x' - return [printf('%s %s: %s', a:bullet, a:name, s:lastline(a:message))] - else - let lines = map(s:lines(a:message), '" ".v:val') - return extend([printf('x %s:', a:name)], lines) - endif -endfunction - -function! s:with_cd(cmd, dir, ...) - let script = a:0 > 0 ? a:1 : 1 - return printf('cd%s %s && %s', s:is_win ? ' /d' : '', plug#shellescape(a:dir, {'script': script}), a:cmd) -endfunction - -function! s:system(cmd, ...) - let batchfile = '' - try - let [sh, shellcmdflag, shrd] = s:chsh(1) - if type(a:cmd) == s:TYPE.list - " Neovim's system() supports list argument to bypass the shell - " but it cannot set the working directory for the command. - " Assume that the command does not rely on the shell. - if has('nvim') && a:0 == 0 - return system(a:cmd) - endif - let cmd = join(map(copy(a:cmd), 'plug#shellescape(v:val, {"shell": &shell, "script": 0})')) - if s:is_powershell(&shell) - let cmd = '& ' . cmd - endif - else - let cmd = a:cmd - endif - if a:0 > 0 - let cmd = s:with_cd(cmd, a:1, type(a:cmd) != s:TYPE.list) - endif - if s:is_win && type(a:cmd) != s:TYPE.list - let [batchfile, cmd] = s:batchfile(cmd) - endif - return system(cmd) - finally - let [&shell, &shellcmdflag, &shellredir] = [sh, shellcmdflag, shrd] - if s:is_win && filereadable(batchfile) - call delete(batchfile) - endif - endtry -endfunction - -function! s:system_chomp(...) - let ret = call('s:system', a:000) - return v:shell_error ? '' : substitute(ret, '\n$', '', '') -endfunction - -function! s:git_validate(spec, check_branch) - let err = '' - if isdirectory(a:spec.dir) - let result = [s:git_local_branch(a:spec.dir), s:git_origin_url(a:spec.dir)] - let remote = result[-1] - if empty(remote) - let err = join([remote, 'PlugClean required.'], "\n") - elseif !s:compare_git_uri(remote, a:spec.uri) - let err = join(['Invalid URI: '.remote, - \ 'Expected: '.a:spec.uri, - \ 'PlugClean required.'], "\n") - elseif a:check_branch && has_key(a:spec, 'commit') - let sha = s:git_revision(a:spec.dir) - if empty(sha) - let err = join(add(result, 'PlugClean required.'), "\n") - elseif !s:hash_match(sha, a:spec.commit) - let err = join([printf('Invalid HEAD (expected: %s, actual: %s)', - \ a:spec.commit[:6], sha[:6]), - \ 'PlugUpdate required.'], "\n") - endif - elseif a:check_branch - let current_branch = result[0] - " Check tag - let origin_branch = s:git_origin_branch(a:spec) - if has_key(a:spec, 'tag') - let tag = s:system_chomp('git describe --exact-match --tags HEAD 2>&1', a:spec.dir) - if a:spec.tag !=# tag && a:spec.tag !~ '\*' - let err = printf('Invalid tag: %s (expected: %s). Try PlugUpdate.', - \ (empty(tag) ? 'N/A' : tag), a:spec.tag) - endif - " Check branch - elseif origin_branch !=# current_branch - let err = printf('Invalid branch: %s (expected: %s). Try PlugUpdate.', - \ current_branch, origin_branch) - endif - if empty(err) - let [ahead, behind] = split(s:lastline(s:system([ - \ 'git', 'rev-list', '--count', '--left-right', - \ printf('HEAD...origin/%s', origin_branch) - \ ], a:spec.dir)), '\t') - if !v:shell_error && ahead - if behind - " Only mention PlugClean if diverged, otherwise it's likely to be - " pushable (and probably not that messed up). - let err = printf( - \ "Diverged from origin/%s (%d commit(s) ahead and %d commit(s) behind!\n" - \ .'Backup local changes and run PlugClean and PlugUpdate to reinstall it.', origin_branch, ahead, behind) - else - let err = printf("Ahead of origin/%s by %d commit(s).\n" - \ .'Cannot update until local changes are pushed.', - \ origin_branch, ahead) - endif - endif - endif - endif - else - let err = 'Not found' - endif - return [err, err =~# 'PlugClean'] -endfunction - -function! s:rm_rf(dir) - if isdirectory(a:dir) - return s:system(s:is_win - \ ? 'rmdir /S /Q '.plug#shellescape(a:dir) - \ : ['rm', '-rf', a:dir]) - endif -endfunction - -function! s:clean(force) - call s:prepare() - call append(0, 'Searching for invalid plugins in '.g:plug_home) - call append(1, '') - - " List of valid directories - let dirs = [] - let errs = {} - let [cnt, total] = [0, len(g:plugs)] - for [name, spec] in items(g:plugs) - if !s:is_managed(name) - call add(dirs, spec.dir) - else - let [err, clean] = s:git_validate(spec, 1) - if clean - let errs[spec.dir] = s:lines(err)[0] - else - call add(dirs, spec.dir) - endif - endif - let cnt += 1 - call s:progress_bar(2, repeat('=', cnt), total) - normal! 2G - redraw - endfor - - let allowed = {} - for dir in dirs - let allowed[s:dirpath(s:plug_fnamemodify(dir, ':h:h'))] = 1 - let allowed[dir] = 1 - for child in s:glob_dir(dir) - let allowed[child] = 1 - endfor - endfor - - let todo = [] - let found = sort(s:glob_dir(g:plug_home)) - while !empty(found) - let f = remove(found, 0) - if !has_key(allowed, f) && isdirectory(f) - call add(todo, f) - call append(line('$'), '- ' . f) - if has_key(errs, f) - call append(line('$'), ' ' . errs[f]) - endif - let found = filter(found, 'stridx(v:val, f) != 0') - end - endwhile - - 4 - redraw - if empty(todo) - call append(line('$'), 'Already clean.') - else - let s:clean_count = 0 - call append(3, ['Directories to delete:', '']) - redraw! - if a:force || s:ask_no_interrupt('Delete all directories?') - call s:delete([6, line('$')], 1) - else - call setline(4, 'Cancelled.') - nnoremap d :set opfunc=delete_opg@ - nmap dd d_ - xnoremap d :call delete_op(visualmode(), 1) - echo 'Delete the lines (d{motion}) to delete the corresponding directories' - endif - endif - 4 - setlocal nomodifiable -endfunction - -function! s:delete_op(type, ...) - call s:delete(a:0 ? [line("'<"), line("'>")] : [line("'["), line("']")], 0) -endfunction - -function! s:delete(range, force) - let [l1, l2] = a:range - let force = a:force - let err_count = 0 - while l1 <= l2 - let line = getline(l1) - if line =~ '^- ' && isdirectory(line[2:]) - execute l1 - redraw! - let answer = force ? 1 : s:ask('Delete '.line[2:].'?', 1) - let force = force || answer > 1 - if answer - let err = s:rm_rf(line[2:]) - setlocal modifiable - if empty(err) - call setline(l1, '~'.line[1:]) - let s:clean_count += 1 - else - delete _ - call append(l1 - 1, s:format_message('x', line[1:], err)) - let l2 += len(s:lines(err)) - let err_count += 1 - endif - let msg = printf('Removed %d directories.', s:clean_count) - if err_count > 0 - let msg .= printf(' Failed to remove %d directories.', err_count) - endif - call setline(4, msg) - setlocal nomodifiable - endif - endif - let l1 += 1 - endwhile -endfunction - -function! s:upgrade() - echo 'Downloading the latest version of vim-plug' - redraw - let tmp = s:plug_tempname() - let new = tmp . '/plug.vim' - - try - let out = s:system(['git', 'clone', '--depth', '1', s:plug_src, tmp]) - if v:shell_error - return s:err('Error upgrading vim-plug: '. out) - endif - - if readfile(s:me) ==# readfile(new) - echo 'vim-plug is already up-to-date' - return 0 - else - call rename(s:me, s:me . '.old') - call rename(new, s:me) - unlet g:loaded_plug - echo 'vim-plug has been upgraded' - return 1 - endif - finally - silent! call s:rm_rf(tmp) - endtry -endfunction - -function! s:upgrade_specs() - for spec in values(g:plugs) - let spec.frozen = get(spec, 'frozen', 0) - endfor -endfunction - -function! s:status() - call s:prepare() - call append(0, 'Checking plugins') - call append(1, '') - - let ecnt = 0 - let unloaded = 0 - let [cnt, total] = [0, len(g:plugs)] - for [name, spec] in items(g:plugs) - let is_dir = isdirectory(spec.dir) - if has_key(spec, 'uri') - if is_dir - let [err, _] = s:git_validate(spec, 1) - let [valid, msg] = [empty(err), empty(err) ? 'OK' : err] - else - let [valid, msg] = [0, 'Not found. Try PlugInstall.'] - endif - else - if is_dir - let [valid, msg] = [1, 'OK'] - else - let [valid, msg] = [0, 'Not found.'] - endif - endif - let cnt += 1 - let ecnt += !valid - " `s:loaded` entry can be missing if PlugUpgraded - if is_dir && get(s:loaded, name, -1) == 0 - let unloaded = 1 - let msg .= ' (not loaded)' - endif - call s:progress_bar(2, repeat('=', cnt), total) - call append(3, s:format_message(valid ? '-' : 'x', name, msg)) - normal! 2G - redraw - endfor - call setline(1, 'Finished. '.ecnt.' error(s).') - normal! gg - setlocal nomodifiable - if unloaded - echo "Press 'L' on each line to load plugin, or 'U' to update" - nnoremap L :call status_load(line('.')) - xnoremap L :call status_load(line('.')) - end -endfunction - -function! s:extract_name(str, prefix, suffix) - return matchstr(a:str, '^'.a:prefix.' \zs[^:]\+\ze:.*'.a:suffix.'$') -endfunction - -function! s:status_load(lnum) - let line = getline(a:lnum) - let name = s:extract_name(line, '-', '(not loaded)') - if !empty(name) - call plug#load(name) - setlocal modifiable - call setline(a:lnum, substitute(line, ' (not loaded)$', '', '')) - setlocal nomodifiable - endif -endfunction - -function! s:status_update() range - let lines = getline(a:firstline, a:lastline) - let names = filter(map(lines, 's:extract_name(v:val, "[x-]", "")'), '!empty(v:val)') - if !empty(names) - echo - execute 'PlugUpdate' join(names) - endif -endfunction - -function! s:is_preview_window_open() - silent! wincmd P - if &previewwindow - wincmd p - return 1 - endif -endfunction - -function! s:find_name(lnum) - for lnum in reverse(range(1, a:lnum)) - let line = getline(lnum) - if empty(line) - return '' - endif - let name = s:extract_name(line, '-', '') - if !empty(name) - return name - endif - endfor - return '' -endfunction - -function! s:preview_commit() - if b:plug_preview < 0 - let b:plug_preview = !s:is_preview_window_open() - endif - - let sha = matchstr(getline('.'), '^ \X*\zs[0-9a-f]\{7,9}') - if empty(sha) - return - endif - - let name = s:find_name(line('.')) - if empty(name) || !has_key(g:plugs, name) || !isdirectory(g:plugs[name].dir) - return - endif - - if exists('g:plug_pwindow') && !s:is_preview_window_open() - execute g:plug_pwindow - execute 'e' sha - else - execute 'pedit' sha - wincmd P - endif - setlocal previewwindow filetype=git buftype=nofile nobuflisted modifiable - let batchfile = '' - try - let [sh, shellcmdflag, shrd] = s:chsh(1) - let cmd = 'cd '.plug#shellescape(g:plugs[name].dir).' && git show --no-color --pretty=medium '.sha - if s:is_win - let [batchfile, cmd] = s:batchfile(cmd) - endif - execute 'silent %!' cmd - finally - let [&shell, &shellcmdflag, &shellredir] = [sh, shellcmdflag, shrd] - if s:is_win && filereadable(batchfile) - call delete(batchfile) - endif - endtry - setlocal nomodifiable - nnoremap q :q - wincmd p -endfunction - -function! s:section(flags) - call search('\(^[x-] \)\@<=[^:]\+:', a:flags) -endfunction - -function! s:format_git_log(line) - let indent = ' ' - let tokens = split(a:line, nr2char(1)) - if len(tokens) != 5 - return indent.substitute(a:line, '\s*$', '', '') - endif - let [graph, sha, refs, subject, date] = tokens - let tag = matchstr(refs, 'tag: [^,)]\+') - let tag = empty(tag) ? ' ' : ' ('.tag.') ' - return printf('%s%s%s%s%s (%s)', indent, graph, sha, tag, subject, date) -endfunction - -function! s:append_ul(lnum, text) - call append(a:lnum, ['', a:text, repeat('-', len(a:text))]) -endfunction - -function! s:diff() - call s:prepare() - call append(0, ['Collecting changes ...', '']) - let cnts = [0, 0] - let bar = '' - let total = filter(copy(g:plugs), 's:is_managed(v:key) && isdirectory(v:val.dir)') - call s:progress_bar(2, bar, len(total)) - for origin in [1, 0] - let plugs = reverse(sort(items(filter(copy(total), (origin ? '' : '!').'(has_key(v:val, "commit") || has_key(v:val, "tag"))')))) - if empty(plugs) - continue - endif - call s:append_ul(2, origin ? 'Pending updates:' : 'Last update:') - for [k, v] in plugs - let branch = s:git_origin_branch(v) - if len(branch) - let range = origin ? '..origin/'.branch : 'HEAD@{1}..' - let cmd = ['git', 'log', '--graph', '--color=never'] - if s:git_version_requirement(2, 10, 0) - call add(cmd, '--no-show-signature') - endif - call extend(cmd, ['--pretty=format:%x01%h%x01%d%x01%s%x01%cr', range]) - if has_key(v, 'rtp') - call extend(cmd, ['--', v.rtp]) - endif - let diff = s:system_chomp(cmd, v.dir) - if !empty(diff) - let ref = has_key(v, 'tag') ? (' (tag: '.v.tag.')') : has_key(v, 'commit') ? (' '.v.commit) : '' - call append(5, extend(['', '- '.k.':'.ref], map(s:lines(diff), 's:format_git_log(v:val)'))) - let cnts[origin] += 1 - endif - endif - let bar .= '=' - call s:progress_bar(2, bar, len(total)) - normal! 2G - redraw - endfor - if !cnts[origin] - call append(5, ['', 'N/A']) - endif - endfor - call setline(1, printf('%d plugin(s) updated.', cnts[0]) - \ . (cnts[1] ? printf(' %d plugin(s) have pending updates.', cnts[1]) : '')) - - if cnts[0] || cnts[1] - nnoremap (plug-preview) :silent! call preview_commit() - if empty(maparg("\", 'n')) - nmap (plug-preview) - endif - if empty(maparg('o', 'n')) - nmap o (plug-preview) - endif - endif - if cnts[0] - nnoremap X :call revert() - echo "Press 'X' on each block to revert the update" - endif - normal! gg - setlocal nomodifiable -endfunction - -function! s:revert() - if search('^Pending updates', 'bnW') - return - endif - - let name = s:find_name(line('.')) - if empty(name) || !has_key(g:plugs, name) || - \ input(printf('Revert the update of %s? (y/N) ', name)) !~? '^y' - return - endif - - call s:system('git reset --hard HEAD@{1} && git checkout '.plug#shellescape(g:plugs[name].branch).' --', g:plugs[name].dir) - setlocal modifiable - normal! "_dap - setlocal nomodifiable - echo 'Reverted' -endfunction - -function! s:snapshot(force, ...) abort - call s:prepare() - setf vim - call append(0, ['" Generated by vim-plug', - \ '" '.strftime("%c"), - \ '" :source this file in vim to restore the snapshot', - \ '" or execute: vim -S snapshot.vim', - \ '', '', 'PlugUpdate!']) - 1 - let anchor = line('$') - 3 - let names = sort(keys(filter(copy(g:plugs), - \'has_key(v:val, "uri") && !has_key(v:val, "commit") && isdirectory(v:val.dir)'))) - for name in reverse(names) - let sha = s:git_revision(g:plugs[name].dir) - if !empty(sha) - call append(anchor, printf("silent! let g:plugs['%s'].commit = '%s'", name, sha)) - redraw - endif - endfor - - if a:0 > 0 - let fn = s:plug_expand(a:1) - if filereadable(fn) && !(a:force || s:ask(a:1.' already exists. Overwrite?')) - return - endif - call writefile(getline(1, '$'), fn) - echo 'Saved as '.a:1 - silent execute 'e' s:esc(fn) - setf vim - endif -endfunction - -function! s:split_rtp() - return split(&rtp, '\\\@ https://devhints.io/vimscript -" -set nocompatible "We run vim not VI -let g:polyglot_disabled = ['javascript'] -if has('nvim') - let s:remote_plugins_updated = 0 - function! PlugRemotePlugins(info) abort - if !s:remote_plugins_updated - let s:remote_plugins_updated = 1 - UpdateRemotePlugins - endif - endfunction -else - function! PlugRemotePlugins(info) abort - endfunction -endif - -function! PlugCoc(info) abort - if a:info.status ==? 'installed' || a:info.force - !./install.sh nightly - if exists('s:coc_extensions') - call call('coc#add_extension', s:coc_extensions) - endif - elseif a:info.status ==? 'updated' - !./install.sh nightly - call coc#util#update() - endif - call PlugRemotePlugins(a:info) -endfunction - -call plug#begin('~/.vim/plugged') - -" Plugins -"------------------------------------------- - -" Coding Tools -Plug 'mbbill/undotree' " Display your undo history in a graph -Plug 'tpope/vim-fugitive' " Git tools "Plug 'jgdavey/tslime.vim' -"Plug 'mhinz/vim-signify' " show modified lines in gutter -Plug 'scrooloose/nerdcommenter' -Plug 'stefandtw/quickfix-reflector.vim' "Replace text from the copen pane -Plug 'editorconfig/editorconfig-vim' -Plug 'moll/vim-node' -Plug 'tpope/vim-rhubarb' -Plug 'terryma/vim-multiple-cursors' - -"Code Completion -"Plug 'ervandew/supertab' - -let s:coc_extensions = [ - \ 'coc-css', - \ 'coc-html', - \ 'coc-json', - \ 'coc-yaml', - \ 'coc-eslint', - "\ 'coc-tslint', - "\ 'coc-tslint-plugin', - \ 'coc-prettier', - "\ 'coc-tsserver', - "\ 'coc-ultisnips' - "\ 'coc-neosnippet' - \ ] -Plug 'neoclide/coc.nvim', {'branch':'release', 'do': function('PlugCoc')} -"Plug 'SirVer/ultisnips', {'do': function('PlugRemotePlugins')} -Plug 'honza/vim-snippets' -Plug 'hashivim/vim-terraform' -Plug 'vim-syntastic/syntastic' -Plug 'juliosueiras/vim-terraform-completion' -Plug 'cmather/vim-meteor-snippets' - -Plug 'tpope/vim-endwise' "Add closing arg (end etc) -Plug 'Chiel92/vim-autoformat' " code formatting -Plug 'tpope/vim-repeat' -" Memo: -" S( will surround with ( ) the visual block -" ys+motion +( will surround motion with ( -" cs([ will change surround ( by [ -" ds( will remove surround ( -" dst will remove tags around the current position -" yss{ will wrap sentence in { -Plug 'tpope/vim-surround' - -" Navigation -Plug 'scrooloose/nerdtree', { 'on': ['NERDTreeToggle', 'NERDTreeFind']} -Plug 'easymotion/vim-easymotion' -Plug 'kana/vim-submode' -Plug 'haya14busa/incsearch.vim' -Plug 'haya14busa/incsearch-fuzzy.vim' -Plug 'haya14busa/incsearch-easymotion.vim' -"Plug 'gorkunov/smartpairs.vim' -Plug 'jiangmiao/auto-pairs' -Plug 'szw/vim-ctrlspace' -Plug 'MattesGroeger/vim-bookmarks' -Plug 'kshenoy/vim-signature' "add and navigate to marks -"Plug 't9md/vim-choosewin' " NOTE: disavling this to force me to use easymotion -Plug 'haya14busa/vim-asterisk' -Plug 'junegunn/fzf', { 'dir': '~/.fzf', 'do': './install --all' } -Plug 'junegunn/fzf.vim' - -Plug 'tomtom/tlib_vim' - -" Syntax -Plug 'sheerun/vim-polyglot' -Plug 'othree/yajs.vim' -"Plug 'jparise/vim-graphql', {'for': 'graphql'} -"Plug 'nathanaelkane/vim-indent-guides' "display indent guide -Plug 'marcweber/vim-addon-mw-utils' -"Plug 'Slava/vim-spacebars', {'for': 'html'} - -"Formaters & linters -"Plug 'w0rp/ale', { - "\ 'for': ['javascript', 'css', 'json','graphql'], 'do': 'npm install -g eslint' } -Plug 'junegunn/vim-easy-align' " easy align things - -"The Theme -Plug 'morhetz/gruvbox' -Plug 'rakr/vim-one' -Plug 'joshdick/onedark.vim' -"Plug 'altercation/vim-colors-solarized' -"Plug 'vim-airline/vim-airline' "Bottom bar info -"Plug 'vim-airline/vim-airline-themes' -Plug 'itchyny/lightline.vim' -call plug#end() - -let g:AutoPairsFlyMode = 1 -let g:AutoPairsMapCR=0 -let g:AutoPairsShortcutBackInsert = '' -let g:ale_fixers = { - \ '*': ['remove_trailing_lines', 'trim_whitespace'], - \ 'javascript': ['eslint'], - \} -let g:ale_fix_on_save = 1 -"let g:ale_linters_explicit = 1 -let g:ale_lint_on_text_changed = 'never' -let g:ale_keep_list_window_open = 1 -"let g:ale_open_list = 1 -let g:ale_set_loclist = 1 - -let mapleader="," " change the mapleader from \ to , - -" -" Pimping vim -" -"set foldmethod=syntax "slow -"augroup fold_manual - "au FileType javascript setlocal re=1 foldmethod=syntax foldlevel=2 -"augroup END -set nofoldenable -"set notimeout ttimeout timeoutlen=100 -" cheatsheet: zO zm/M(minimize) zr/R(fold) zi(toggle zoom) -map zo zO -nmap bm BookmarkToggle -nmap bi BookmarkAnnotate -nmap bn BookmarkNext -nmap bp BookmarkPrev -nmap ba BookmarkShowAll -nmap bC BookmarkClearAll -nmap bx BookmarkClear -"since i am opening vim in the main process, ctrl-z wont work -nmap - -nnoremap zz zi -nnoremap z+ zr -nnoremap z- zm -nnoremap z1 zR -nnoremap z0 zM - -cnoremap $t :t'' -cnoremap $T :T'' -cnoremap $m :m'' -cnoremap $M :M'' -cnoremap $d :d`` -set autoindent " always set autoindenting on -set autowrite -set backspace=indent,eol,start " allow backspacing over everything in insert mode -set colorcolumn=100 -set copyindent " copy the previous indentation on autoindenting -set cursorline -set nocursorline "disable this for the moment: https://superuser.com/a/625994 -set encoding=utf-8 -set expandtab -set fileencoding=utf-8 -set hidden -set hlsearch " highlight matches -set incsearch " show search matches as you type -set laststatus=2 " Show the status line all the time -set lazyredraw " tells Vim not to bother redrawing during these scenarios, leading to faster macros -set linebreak " tells Vim to only wrap at a character in the breakat option -set listchars=tab:>.,trail:.,extends:#,nbsp:. -"set mouse=nv nvica => normal visual insert commmandLine All -set mouse= " disabled -set nobackup -set noerrorbells " don't beep -"set noea "Dont resize buffers when other closes -set ead=ver " Only auto resize vertical buffers -set nolist " list disables linebreak -set nonumber " hide line numbers -":set number relativenumber -":set nonumber norelativenumber " turn hybrid line numbers off -set noswapfile " Don't create swap file -set nowritebackup - -"set cmdheight=2 " Better display for messages -set shortmess+=c " don't give |ins-completion-menu| messages. -set signcolumn=yes " always show signcolumns - -set scrolloff=3 -set shell=/bin/zsh -set shiftround " use multiple of shiftwidth when indenting with '<' and '>' -set shiftwidth=2 " number of spaces to use for autoindenting -set showmatch " (set show matching parenthesis) -set noshowmatch "disable this for the moment: https://superuser.com/a/625994 -set noshowmode " Dont Display the mode nymore since powerline -set showtabline=2 " Show tabs bar -set smartcase " ignore case if search pattern is all lowercase, case-sensitive otherwise -set ignorecase -set smartindent -set smarttab " insert tabs on the start of a line according to shiftwidth, not tabstop -set softtabstop=2 -set splitbelow "split below the buffer -set splitright "split on the right of the buffer -set tabstop=2 " a tab is 2 spaces -set textwidth=100 -set title " change the erminal's title -set ts=2 sw=2 et -set ttyfast " fast scrolling -set ttymouse=xterm2 -set undolevels=1000 " use many muchos levels of undo -set visualbell " don't beep -set t_vb= "disable visual belt -set viminfo='100,f1 -set wildignore=*.swp,*.bak,*.pyc,*.class -set wildmenu " Enhanced command line completion -set wildmode=longest:full:full " Complete files like a shell -"set wrap " wrap line when too long -set formatoptions=l - -" check file change every 4 seconds ('CursorHold') and reload the buffer upon detecting change -set autoread " refresh unchanged file - -" rails.vim -set cpoptions+=$ " puts a $ marker for the end of words/lines in cw/c$ commands - -let html_no_rendering=1 "disable this for the moment: https://superuser.com/a/625994 -"nnoremap gT -let vimDir = '$HOME/.vim' - -let &runtimepath.=','.vimDir -set path+=** -let g:EasyMotion_smartcase = 1 -"utilsnip -""let g:UltiSnipsExpandTrigger="" -"let g:UltiSnipsExpandTrigger="" -"let g:endwise_no_mappings = 1 -"let g:ulti_expand_or_jump_res = 0 -"function! ExpandSnippetOrReturn() - "let snippet = UltiSnips#ExpandSnippetOrJump() - "if g:ulti_expand_or_jump_res > 0 - "return snippet - "else - "return "\" - "endif -"endfunction -"inoremap pumvisible() ? "\=ExpandSnippetOrReturn()\" : "\\=EndwiseDiscretionary()\" -"let g:UltiSnipsJumpForwardTrigger="" -"let g:UltiSnipsJumpBackwardTrigger="" -"let g:UltiSnipsEditSplit="vertical" -"smartpairs -let g:smartpairs_uber_mode = 1 -" vim-rspec - -" Vim fzf -function! s:build_quickfix_list(lines) - call setqflist(map(copy(a:lines), '{ "filename": v:val }')) - copen - cc -endfunction -let g:fzf_action = { - \ 'ctrl-o': 'tab split', - \ 'ctrl-s': 'split', - \ 'ctrl-v': 'vsplit', - \ 'ctrl-q': function('s:build_quickfix_list') } -" signify - -let g:signify_vcs_list = [ 'git' ] -let g:signify_sign_change = '~' - -noremap % v% -map vib viB -map cib ciB -map yib yiB - -"cmap w!! w !sudo tee % >/dev/null - -"map :exec &mouse!=""? "set mouse=" : "set mouse=nv" -"tmap : exec &mouse!=""? "set mouse=" : "set mouse=nv" -tmap : tabnext -tmap : tabprevious -tmap : tabnew -nmap : tabnext -nmap : tabprevious -nmap : tabnew -nmap : CtrlSpace List - -"nmap ( [ -"nmap ) ] -"omap ( [ -"omap ) ] -"xmap ( [ -"xmap ) ] - -" vim-bookmarks -let g:bookmark_save_per_working_dir = 1 -let g:bookmark_auto_save = 1 -" ctrl-space -" -let g:CtrlSpaceDefaultMappingKey ='' -"let g:CtrlSpaceLoadLastWorkspaceOnStart = 1 -let g:CtrlSpaceSaveWorkspaceOnSwitch = 1 -"let g:CtrlSpaceSaveWorkspaceOnExit = 1 -nnoremap dir :CtrlSpace E -nmap Q :CtrlSpace Q -nmap :CtrlSpace a -"nnoremap ls :set nomore:ls:set more:b -nnoremap f :echo join(sort(map(filter(range(0, bufnr('$')), 'bufwinnr(v:val)>=0'), 'fnamemodify(bufname(v:val), ":t")'), 'n'), "\n") -nnoremap v:count ? ":\ ". v:count ." wincmd w\" : "\" -nmap T :CtrlSpace l -nmap W :CtrlSpace w -nmap :GFiles -cmo --exclude-standard -nmap ge :Ggrep -"nnoremap :CtrlSpace h -"nnoremap :CtrlSpace O -"nnoremap :bnext -"nnoremap :bprev - -" NERDTree -let g:NERDTreeMinimalUI = 1 -"let g:NERDTreeChDirMode=2 "2 would update the cwd anytime i change the root -let g:NERDTreeWinSize = 40 -let g:NERDTreeDirArrows = 0 -let g:NERDTreeQuitOnOpen = 1 -let g:NERDTreeAutoDeleteBuffer = 1 -let NERDTreeIgnore = ['^node_modules$[[dir]]', '^coverage$[[dir]]'] - -"Note: This option must be set in .vimrc(_vimrc). NOT IN .gvimrc(_gvimrc)! -" Disable AutoComplPop. -let g:acp_enableAtStartup = 0 - -let g:terraform_completion_keys = 1 -let g:terraform_registry_module_completion = 0 -" - -" easymotion -let g:EasyMotion_do_mapping = 0 -let g:EasyMotion_startofline = 0 -let g:EasyMotion_smartcase = 1 - -let g:tcd_blacklist = '\v(cheat40|denite|gundo|help|nerdtree|netrw|peekaboo|quickmenu|startify|tagbar|undotree|unite|vimfiler|vimshell|fzf)' -fu! ToggleCurline () - if &cursorline && &cursorcolumn - "set nocursorline - set nocursorcolumn - else - "set cursorline - set cursorcolumn - endif -endfunction - -nmap cl :call ToggleCurline() -augroup BgHighlight - autocmd! - autocmd WinEnter * set cul - autocmd WinEnter * set colorcolumn=100 - autocmd WinLeave * set nocul - autocmd WinLeave * set colorcolumn=0 -augroup END - -"set statusline=1 -"set statusline=%<%f\ %h%m%r%{fugitive#statusline()}%=%-14.(%l,%c%V%)\ %P -"set statusline+=%#warningmsg# -"set statusline+=%{SyntasticStatuslineFlag()} -"set statusline+=%* -function! LightlineFilename() - let root = fnamemodify(get(b:, 'git_dir'), ':h') - let path = expand('%:p') - if path[:len(root)-1] ==# root - let file = path[len(root)+1:] - return &filetype !~# g:tcd_blacklist && winwidth(0) <= len(file) ? '' : file - endif - return &filetype !~# g:tcd_blacklist && winwidth(0) > 70 ? expand('%') : &filetype -endfunction -function! LightlineMode() - return expand('%:t') ==# '__Tagbar__' ? 'Tagbar': - \ expand('%:t') ==# 'ControlP' ? 'CtrlP' : - \ &filetype ==# 'vimfiler' ? 'VimFiler' : - \ &filetype ==# 'javascript.jsx' ? '[JS]' : - \ &filetype ==# 'javascript' ? '[JS]' : - \ &filetype ==# '' ? lightline#mode() : '[' . &filetype . ']' -endfunction -function! LightlineFileEncoding() - return winwidth(0) > 100 ? &fileencoding: '' -endfunction - -function! LightlineFiletype() - return winwidth(0) > 100 ? (&filetype !=# '' ? '' : '<>') : '' -endfunction -function! CocCurrentFunction() - return get(b:, 'coc_current_function', '') -endfunction - -let g:lightline = { - \ 'active': { - \ 'left': [ [ 'mode', 'paste'], - \ [ 'filename', 'modified'] - \ ], - \ 'right': [ ['position', 'modified'], - \ [ 'percent' , 'filetype', 'fileencoding'], - \ ['syntastic', 'cocstatus'] - \ ] - \ }, - \ 'inactive': { - \ 'left': [ - \ [ 'filename', 'modified'] - \ ], - \ 'right': [ ['position'], - \ ] - \ }, - \ 'component_function': { - "\ 'gitbranch': 'fugitive#head', - \ 'filename': 'LightlineFilename', - \ 'fileencoding': 'LightlineFileEncoding', - \ 'filetype': 'LightlineFiletype', 'mode': 'LightlineMode', 'cocstatus':'coc#status', - \ 'currentfunction': 'CocCurrentFunction' - \ }, - \ 'component': { - \ 'charvaluehex': '0x%B', - \ 'position': '%{winnr()}:%n %2l:%-1v' - \ }, - \ 'component_expand': {'syntastic': 'SyntasticStatuslineFlag'}, - \ 'component_type': {'syntastic': 'error'}, - \ 'subseparator': { 'left': ">", 'right': ">" }, - \ 'separator': { 'left': "", 'right': "" }, - \ } - -let g:lightline.tab = { - \ 'active': [ 'tabnum', 'filename', 'modified' ], - \ 'inactive': [ 'tabnum', 'filename', 'modified' ] } - -let g:lightline#colorscheme#Greg#palette= lightline#colorscheme#fill(g:lightline#colorscheme#one#palette) -"let g:lightline#colorscheme#Greg#palette= lightline#colorscheme#fill(g:lightline#colorscheme#onedark#palette) -let g:lightline#colorscheme#Greg#palette.inactive.right[0] = ['#fafafa', '#98c379', 255, 35, 'bold'] -"let g:lightline#colorscheme#Greg#palette.inactive.left[0] = ['#fafafa', '#98c379', 255, 35, 'bold'] -let g:lightline#colorscheme#Greg#palette.inactive.left[0] = g:lightline#colorscheme#Greg#palette.normal.left[1] - -"vim-javascript -let javascript_enable_domhtmlcss=1 - -let &t_ZH="\e[3m" " for italic comments end -let &t_ZR="\e[23m" " for italic comments start - -" hlsearch -let hlstate=0 - -" -"vim-indent-guides tab -" -let g:indent_guides_enable_on_vim_startup = 1 -let g:indent_guides_auto_colors = 0 -let g:indent_guides_start_level = 1 -let g:indent_guides_guide_size = 1 -let g:indent_guides_color_change_percent = 100 - -let g:undotree_SetFocusWhenToggle = 1 - -" choosewin -" -let g:choosewin_overlay_enable = 1 -" Custom Functions - -let ignore = [".git", "node_modules/","packages", "vendor", ".svg", ".eot", "log/", ".jpg", '\/\.', '^\..*'] " ignore hidden files -let excludes= " \| GREP_OPTIONS=\'\' egrep -v -e \'" . join(map(ignore, 'v:val'), "\|") . "\'" - -function! FollowSymlink() - let current_file = expand('%:p') - " check if file type is a symlink - if getftype(current_file) == 'link' - " if it is a symlink resolve to the actual file path - " and open the actual file - let actual_file = resolve(current_file) - silent! execute 'file ' . actual_file - end -endfunction - -function! SetProjectRoot() - " default to the current file's directory - lcd %:p:h - let git_dir = system("git rev-parse --show-toplevel") - " See if the command output starts with 'fatal' (if it does, not in a git repo) - let is_not_git_dir = matchstr(git_dir, '^fatal:.*') - " if git project, change local directory to git project root - if empty(is_not_git_dir) - lcd `=git_dir` - endif -endfunction - -augroup custom_augroup - au! - autocmd FileType ruby,eruby let g:rubycomplete_buffer_loading = 1 - autocmd FileType ruby,eruby let g:rubycomplete_classes_in_global = 1 - autocmd FileType ruby,eruby let g:rubycomplete_rails = 1 - autocmd FileType ruby setlocal tabstop=2 - autocmd FileType ruby setlocal shiftwidth=2 - autocmd FileType ruby setlocal softtabstop=2 - autocmd FileType ruby setlocal commentstring=#\ %s - autocmd FileType ruby noremap view :Eview - autocmd FileType ruby noremap cont :Econtroller - autocmd FileType ruby noremap test :A - autocmd FileType slim set formatoptions-=t - autocmd FileType slim set nolist - - autocmd FileType html,xml,json set colorcolumn=0 - autocmd FileType json syntax match Comment +\/\/.\+$+ - - autocmd FileType html,javascript set shiftwidth=2 tabstop=2 showtabline=2 - autocmd FileType html,javascript set nowrap list - autocmd FileType html,javascript let g:indent_guides_start_level=2 - autocmd FileType html,javascript let g:indent_guides_guide_size=2 - - autocmd FileType css setlocal omnifunc=csscomplete#CompleteCSS - autocmd FileType html,markdown setlocal omnifunc=htmlcomplete#CompleteTags - autocmd FileType javascript setlocal omnifunc=javascriptcomplete#CompleteJS - autocmd FileType python setlocal omnifunc=pythoncomplete#Complete - autocmd FileType xml setlocal omnifunc=xmlcomplete#CompleteTags - autocmd FileType less set omnifunc=csscomplete#CompleteCSS - - au CursorHold,FocusLost * checktime " checkfile when cursor moved - autocmd BufEnter * if expand("%:p:h") !~ g:excludes | silent! lcd %:p:h | endif - autocmd BufRead * - \ call FollowSymlink() | - \ call SetProjectRoot() - "set autowriteall "save file when buffer switched - au! BufRead,BufNewFile .envrc,.env set filetype=config - au! BufRead,BufNewFile *.haml set filetype=haml - au! BufRead,BufNewFile *.slim set filetype=slim - au! BufNewFile,BufReadPost *.styl set filetype=stylus - au! BufNewFile,BufReadPost *.stylus set filetype=stylus - au! BufNewFile,BufReadPost *.builder set filetype=ruby - au! BufNewFile,BufReadPost *.voxml set filetype=ruby - au! BufNewFile,BufReadPost *.ex,*.exs set filetype=elixir - autocmd BufNewFile,BufRead *.less set filetype=less - au! BufRead,BufNewFile * set updatetime=2000 " set file diff checkevery 2 sec - - autocmd BufReadPost fugitive://* set bufhidden=delete - autocmd User fugitive - \ if get(b:, 'fugitive_type', '') =~# '^\%(tree\|blob\)$' | - \ nnoremap .. :edit %:h | - \ endif - autocmd User Rails let b:surround_{char2nr('-')} = "<% \r %>" " displays <% %> correctly - - autocmd FileWritePre * :silent! keepjumps call TrimWhiteSpace() - autocmd FileAppendPre * :silent! keepjump call TrimWhiteSpace() - autocmd FilterWritePre * :silent! keepjump call TrimWhiteSpace() - autocmd BufWritePre * :silent! keepjump call TrimWhiteSpace() - let term=$TERM - if term == 'screen-256color' - autocmd VimEnter * :silent !echo -ne "\033Ptmux;\033\033]1337;SetKeyLabel=F6=Format\a\033\\" - autocmd VimLeave * :silent !echo -ne "\033Ptmux;\033\033]1337;SetKeyLabel=F6=F6\a\033\\" - else - autocmd VimEnter * :silent !echo -ne "\033]1337;SetKeyLabel=F6=Format\a" - autocmd VimLeave * :silent !echo -ne "\033]1337;SetKeyLabel=F6=F6\a" - endif -augroup END -"autocmd CursorMoved silent * -"" short circuit for non-netrw files - "\ if &filetype == 'netrw' | - "\ call FollowSymlink() | - "\ call SetProjectRoot() | - "\ endif -"" Run a given vim command on the results of fuzzy selecting from a given shell -"" command. See usage below. -"" Note: I'm using Iterm2 and remapped ^[ to "Send Hex Codes: 0x03" which is == ^C - -if has("persistent_undo") - let myUndoDir = expand(vimDir . '/undodir') - call system('mkdir ' . vimDir) - call system('mkdir ' . myUndoDir) - let &undodir = myUndoDir - set undofile -endif - -function! SelectaCommand(choice_command, selecta_args, vim_command) - lcd %:p:h - let git_dir = system("git rev-parse --show-toplevel") - " See if the command output starts with 'fatal' (if it does, not in a git repo) - let is_not_git_dir = matchstr(git_dir, '^fatal:.*') - " if git project, change local directory to git project root - if empty(is_not_git_dir) - lcd `=git_dir` - endif - try - let selection = system(a:choice_command . " | selecta " . a:selecta_args) - catch /Vim:Interrupt/ - " Swallow the ^C so that the redraw below happens; otherwise there will be - " leftovers from selecta on the screen - lcd %:p:h - redraw! - return '' - endtry - redraw! - exec a:vim_command . " " . "" .selection . "" -endfunction - -function! SelectaFile(path) - call SelectaCommand("find " . a:path . "/* -type f", "", ":e") -endfunction - -"Fuzzy select -function! SelectaIdentifier() - " Yank the word under the cursor into the z register - normal "zyiw - " Fuzzy match files in the current directory, starting with the word under - " the cursor - call SelectaCommand("find * -type f", "-s " . @z, ":e") -endfunction - -command! -nargs=0 -bar Qargs execute 'args ' . s:QuickfixFilenames() - -" Contributed by "ib." -" http://stackoverflow.com/questions/5686206/search-replace-using-quickfix-list-in-vim#comment8286582_5686810 -command! -nargs=1 -complete=command -bang Qdo call s:Qdo(, ) - -function! s:Qdo(bang, command) - if exists('w:quickfix_title') - let in_quickfix_window = 1 - cclose - else - let in_quickfix_window = 0 - endif - - arglocal - exe 'args '.s:QuickfixFilenames() - exe 'argdo'.a:bang.' '.a:command - argglobal - - if in_quickfix_window - copen - endif -endfunction - -function! s:QuickfixFilenames() - " Building a hash ensures we get each buffer only once - let buffer_numbers = {} - - " if the current window has a local quickfix list (a location list) - " then use it, otherwise use the global quickfix list - let quickfix_items = getloclist(0) - if len(quickfix_items) == 0 - let quickfix_items = getqflist() - endif - - for quickfix_item in quickfix_items - let buffer_numbers[quickfix_item['bufnr']] = bufname(quickfix_item['bufnr']) - endfor - - return join(map(values(buffer_numbers), 'fnameescape(v:val)')) -endfunction -" -" Removes trailing spaces -" -function! TrimWhiteSpace() - let _s=@/ - let l = line(".") - let c = col(".") - :%s/\s\+$//e - :silent! g/^\n\{2,}/d - let @/=_s - call cursor(l, c) -endfunction - -" rename current file and new file path -function! RenameFile() - let old_name = expand('%') - let new_name = input('New file name: ', expand('%')) - if new_name != '' && new_name != old_name - exec ':Gmove ' . new_name - "exec ':saveas ' . new_name - "exec ':silent !rm ' . old_name - "redraw! - endif -endfunction - -syntax enable - -syntax keyword javascriptImport require - -function! SetTransp() - hi normal ctermbg=none - hi Terminal ctermbg=none - set t_vb= -endfunction - -function! LightBackground() - set notermguicolors - set t_Co=256 - set term=xterm-256color - let g:solarized_visibility = "high" - let g:solarized_contrast = "high" - let g:solarized_termtrans = 0 - - let g:one_allow_italics = 1 " I love italic for comments - set t_8b=^[[48;2;%lu;%lu;%lum - set t_8f=^[[38;2;%lu;%lu;%lum - "hi clear - "syntax reset - colorscheme one - set background=light - let g:lightline.colorscheme = 'Greg' - hi Comment cterm=italic - hi! link javascriptOperator Identifier - hi Terminal ctermfg=23 ctermbg=255 - hi! link IndentGuidesEven CursorLine - hi! link IndentGuidesOdd noise - let g:indent_guides_guide_size=2 - "hi jsStorageClass ctermfg=170 guifg=#C678DD - "call SetTransp() -endfunction - -function! DarkBackground() - set notermguicolors - set t_Co=256 - set term=xterm-256color - "let g:solarized_visibility = "high" - "let g:solarized_contrast = "high" - "let g:solarized_termtrans = 0 - let g:onedark_termcolors=256 - set background=dark - "colorscheme onedark - colorscheme gruvbox - hi Comment cterm=italic - let g:indent_guides_guide_size=2 - "https://github.com/pangloss/vim-javascript/blob/master/syntax/javascript.vim - hi! link IndentGuidesEven CursorLine - hi! link IndentGuidesOdd noise - - hi Terminal ctermfg=145 ctermbg=235 - - let g:lightline.colorscheme = 'Greg' - call SetTransp() -endfunction - -function! TransparentBackground() - set notermguicolors - set t_Co=256 - set term=xterm-256color - let g:solarized_visibility = "high" - let g:solarized_contrast = "high" - let g:solarized_termtrans = 0 - let g:onedark_termcolors=256 - "hi clear - "syntax reset - set background=dark - colorscheme onedark - hi Comment cterm=italic - hi! link javascriptAsyncFuncKeyword Keyword - hi! link javascriptNodeGlobal Structure - hi! link javascriptGlobal Structure - hi! link javascriptOperator Identifier - "colorscheme gruvbox - let g:indent_guides_guide_size=2 - "https://github.com/pangloss/vim-javascript/blob/master/syntax/javascript.vim - "hi! link jsGlobalNodeObjects GruvboxAqua - "hi! link jsStorageClass Gruvboxyellow - "hi! link jsOperator Gruvboxyellow - "hi! link jsFuncCall Gruvboxorange - "hi! link jsGlobalObjects Gruvboxyellow - hi! link IndentGuidesEven CursorLine - hi! link IndentGuidesOdd noise - - hi Terminal ctermfg=145 ctermbg=235 - - let g:lightline.colorscheme = 'Greg' - call SetTransp() -endfunction - -function! SetTheme() - let iterm_profile = $ITERM_PROFILE - " Color scheme based on time - if iterm_profile == "Dark" - call DarkBackground() - else - call LightBackground() - endif - hi! link javascriptOperator Identifier - "match ExtraWhitespace /\s\+$/ - "hi ExtraWhitespace ctermbg=red guibg=red - set visualbell " don't beep - set t_vb= "disable visual belt -endfunction - -"" Zoom / Restore window. -function! ZoomToggle() abort - if exists('t:zoomed') && t:zoomed - execute t:zoom_winrestcmd - let t:zoomed = 0 - else - let t:zoom_winrestcmd = winrestcmd() - resize - vertical resize - let t:zoomed = 1 - endif -endfunction - -hi link EasyMotionTarget ErrorMsg -hi EasyMotionTarget2First ctermbg=280 -hi link EasyMotionShade Comment - -" Link function to commands -command! GdiffInTab tabedit %|vsplit|Gdiff - -cabbrev grep Ggrep -abbrev requrie require -cabbrev git Git - -" File type setup - -filetype plugin indent on " Turn on file type detection. - -"augroup AuNERDTreeCmd - "autocmd! - "autocmd AuNERDTreeCmd VimEnter * call s:CdIfDirectory(expand("")) - "autocmd AuNERDTreeCmd FocusGained * call s:UpdateNERDTree() -"augroup END - -let b:autopairs_enabled=0 -autocmd FileType html,javascript,css,less let b:autopairs_enabled=1 -"autocmd FileType html,javascript,css,less inoremap :call search('["\[''({]','bW')a -"autocmd FileType html,javascript,css,less inoremap :call search('["\]'')}]','W')a -let g:prettier#autoformat = 1 -let g:prettier#config#trailing_comma = 'none' -let g:prettier#config#bracket_spacing = 'true' -let g:prettier#config#print_width = 100 -"autocmd FileWritePre,BufWrite *.json,*.css,*.scss,*.less,*.graphql PrettierAsync -"autocmd FileWritePre,BufWrite *.js,*.jsx,*.json,*.css,*.scss,*.less,*.graphql PrettierAsync - -"autocmd BufLeave,FocusLost * :silent! wall -"autocmd BufEnter * :call EasyMotion#S(2,1,0) - -" NOTE: more events here: http://vimdoc.sourceforge.net/htmldoc/autocmd.html -"autocmd VimEnter * :silent! term ++curwin -command! -nargs=0 Prettier :CocCommand prettier.forceFormatDocument -noremap :Prettier - -" Abbreviations/aliases -" -"abbrev bp binding.pry - -" Mappings - -"nnoremap Q -nnoremap :call ZoomToggle() -tnoremap : call ZoomToggle() -nnoremap d :GdiffInTab -nnoremap D :tabclose -nmap gb :Git blame -nmap gs :Git status -nmap gd :Git diff -nmap gl :Git log -15 -- -nmap gr :Git reset HEAD % -nmap gck :Git checkout -- % -nmap gc :Git commit -nmap gp :Git push -f -nmap rm :Git rm % -nnoremap a hea - -" Disabling temporarily to see if used -map m :NERDTreeToggle -map n :NERDTreeFind - -" easy align -augroup VCenterCursor - au! - au BufEnter,WinEnter,WinNew,VimResized *,*.* - \ let &scrolloff=winheight(win_getid())/2 -augroup END -""vmap (EasyAlign) VCenterCursor -vmap (EasyAlign) - -" choose win -" -"nnoremap :ChooseWinSwapStay -"nnoremap :ChooseWinSwap -"nnoremap ? :call EasyMotion#OverwinF(2) -nnoremap s :call EasyMotion#OverwinF(2) - -" clipboard unamed will yank vim to clipboard -"set clipboard=unnamed -" -" :r read the content of the command into the buffer -map p : r! pbpaste -"tnoremap p : r! pbpaste -tnoremap p : set paste"*p: set nopastea - -"inoremap p :r! pbpaste -"nmap p :set paste"*p:set nopastea -"imap p "*pa -"imap p :set paste"*]p:set nopastei -" -"imap p :set pastei"*]p:set nopaste" -"nmap p :set paste"*p:set nopastea -"imap p :set paste"*p:set nopastea - -" -" -" This allow to past directly from alfred -" -function! WrapForTmux(s) - if !exists('$TMUX') - return a:s - endif - - let tmux_start = "\Ptmux;" - let tmux_end = "\\\" - - return tmux_start . substitute(a:s, "\", "\\", 'g') . tmux_end -endfunction - -"let &t_SI .= WrapForTmux("\[?2004h") -"let &t_EI .= WrapForTmux("\[?2004l") - -function! XTermPasteBegin() - set pastetoggle=[201~ - set paste - return "" -endfunction - -"tnoremap [200~ XTermPasteBegin() - -"nnoremap j gj -"nnoremap k gk -nnoremap S :set hlsearch! - -"ropen the previous file -nmap - :e# - -"nmap (easymotion-overwin-line) - -" easy motion -"map / (easymotion-sn) -"omap / (easymotion-tn) -map l (easymotion-lineforward) -map j (easymotion-j) -map k (easymotion-k) -map h (easymotion-linebackward) -map :echo "hi<" . synIDattr(synID(line("."),col("."),1),"name") . '> trans<'. synIDattr(synID(line("."),col("."),0),"name") . "> lo<" . synIDattr(synIDtrans(synID(line("."),col("."),1)),"name") . ">" -"map f (easymotion-bd-w) -"nmap f (easymotion-overwin-w) - -function! s:incsearch_config(...) abort - " Add \ incsearch#config#fuzzyspell#converter() for spell converter - return incsearch#util#deepextend(deepcopy({ - \ 'modules': [incsearch#config#easymotion#module()], - \ 'keymap': { - \ "\": '(easymotion)' - \ }, - \ 'is_expr': 0 - \ }), get(a:, 1, {})) -endfunction -noremap ? incsearch#go(incsearch_config({'command': '?'})) -noremap g/ incsearch#go(incsearch_config({'is_stay': 1})) -noremap / incsearch#go(incsearch_config({'is_stay': 0})) -noremap f incsearch#go(incsearch_config({'converters': [incsearch#config#fuzzy#converter()]})) - -augroup incsearch-keymap - autocmd! - autocmd VimEnter * call s:incsearch_keymap() -augroup END -function! s:incsearch_keymap() - IncSearchNoreMap (incsearch-next) - IncSearchNoreMap (incsearch-prev) - IncSearchNoreMap (incsearch-scroll-f) - IncSearchNoreMap (incsearch-scroll-b) -endfunction - -let g:asterisk#keeppos = 1 -let g:incsearch#auto_nohlsearch = 1 -map n (incsearch-nohl-n) -map N (incsearch-nohl-N) -map * (incsearch-nohl-*) -map # (incsearch-nohl-#) -map g* (incsearch-nohl-g*) -map g# (incsearch-nohl-g#) -nnoremap i :nohi -"turn off hl search when insert - -nnoremap mzJ`z - -" signify -nmap gj (signify-next-hunk) -nmap gk (signify-prev-hunk) - -" Invert background -noremap :call DarkBackground() -noremap :call LightBackground() -noremap :call TransparentBackground() - -" Toggle the undo tree -nnoremap :UndotreeToggle -nnoremap U - -" ma to mark position to a, mma to recover -"nmap ` gg -"nmap m ` -"nnoremap M m - -nnoremap cd :call SelectaCommand("find * -type d" .g:excludes, "", "lcd") -nnoremap gs :GFiles? -nnoremap ? :BLines - -"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" -" NOTE: Remap :CtrlSpace a to this function -function! PrintFooBar(k) - ":Windows - echo "Foo Bar!" - "call SelectaCommand("git ls-files -cmo --exclude-standard" .g:excludes ."\|sort\| uniq", "", ":e") -endfunction -let g:CtrlSpaceKeys = { "Buffer": { "b": "PrintFooBar" } } -"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" - -" Use for trigger snippet expand. -imap (coc-snippets-expand) - -" Use for select text for visual placeholder of snippet. -vmap (coc-snippets-select) - -" Use for jump to next placeholder, it's default of coc.nvim -let g:coc_snippet_next = '' - -" Use for jump to previous placeholder, it's default of coc.nvim -let g:coc_snippet_prev = '' -" Use for both expand and jump (make expand higher priority.) -imap (coc-snippets-expand-jump) -" Use tab for trigger completion with characters ahead and navigate. -" Use command ':verbose imap ' to make sure tab is not mapped by other plugin. - -function! s:check_back_space() abort - let col = col('.') - 1 - return !col || getline('.')[col - 1] =~# '\s' -endfunction -inoremap - \ pumvisible() ? coc#_select_confirm() : - "\ pumvisible() ? "\" : - \ coc#expandableOrJumpable() ? "\=coc#rpc#request('doKeymap', ['snippets-expand-jump',''])\" : - \ check_back_space() ? "\" : - \ coc#refresh() -inoremap pumvisible() ? "\" : "\" - -" Use to confirm completion, `u` means break undo chain at current position. -" Coc only does snippet and additional edit on confirm. -"inoremap pumvisible() ? "\" : "\u\" - -"let g:coc_snippet_next = '' -"let g:coc_node_path='/usr/local/bin/node' -let g:coc_node_path='/Users/greg/.nvm/versions/node/v16.12.0/bin/node' -" Use `:Format` to format current buffer -command! -nargs=0 Format :call CocAction('format') - -" Use `:Fold` to fold current buffer -command! -nargs=? Fold :call CocAction('fold', ) -" Highlight symbol under cursor on CursorHold -autocmd CursorHold * silent call CocActionAsync('highlight') - -" Remap for rename current word -nmap rn (coc-rename) - -" Remap for format selected region -xmap f (coc-format-selected) -"nmap f (coc-format-selected) -augroup mygroup - autocmd! - " Setup formatexpr specified filetype(s). - autocmd FileType typescript,json setl formatexpr=CocAction('formatSelected') - " Update signature help on jump placeholder - autocmd User CocJumpPlaceholder call CocActionAsync('showSignatureHelp') -augroup end - -"if executable("ag") -"let g:CtrlSpaceGlobCommand = 'ag -l --nocolor -g ""' -"endif -"inoremap fzf#vim#complete(fzf#wrap({ - "\ 'prefix': '^.*$', - "\ 'source': 'rg -n ^ --color always', - "\ 'options': '--ansi --delimiter : --nth 3..', - "\ 'reducer': { lines -> join(split(lines[0], ':\zs')[2:], '') }})) - -nnoremap mru :call fzf#run({ - \ 'source': v:oldfiles, - \ 'sink': 'e', - \ 'options': '-m -x +s --exact', - \ 'down': '20%'}) -"command! -bang -nargs=* GGrep - "\ call fzf#vim#grep( - "\ 'git grep --line-number '.shellescape(), 1, - "\ fzf#vim#with_preview(), - "\ 0) - -command! -bang -nargs=* Ggrep - \ call fzf#vim#grep('rg --column --no-heading --ignore -S --follow -C3 --line-number --color=always '.shellescape(),1, - \ fzf#vim#with_preview(), - \ 0) - -command! -bang -nargs=* Rg - \ call fzf#vim#grep('rg --column --no-heading --ignore -S --follow -C3 --line-number --color=always '.shellescape(), - \ 1, - \ fzf#vim#with_preview({ 'dir':system('git rev-parse --show-toplevel 2> /dev/null')[:-2] }, 'right:50%:hidden', 'f3'), - \ 0) -command! -bang -nargs=* GrepLocal - \ call fzf#vim#grep('rg --column --no-heading --ignore -S --follow -C3 --line-number --color=always '.shellescape(), - \ 1, - \ fzf#vim#with_preview('right:50%:hidden', 'f3'), - \ 0) -command! -bang -nargs=* MarksWithPreview - \ call fzf#vim#marks( fzf#vim#with_preview({ 'dir':system('git rev-parse --show-toplevel 2> /dev/null')[:-2] }, 'right:50%:hidden', 'f3'), - \ 0) -"command! -bang -nargs=* Rg - "\ call fzf#vim#grep('rg --column --no-heading --ignore -S --follow --line-number --color=always '.shellescape(), - "\ 1, - "\ 0 ? fzf#vim#with_preview('up:60%') - "\ : fzf#vim#with_preview('right:50%:hidden', 'f3'), - "\ 0) - -command! -bang -nargs=? -complete=dir Files - \ call fzf#vim#files(, - \ fzf#vim#with_preview({ 'dir':system('git rev-parse --show-toplevel 2> /dev/null')[:-2] }, 'right:50%:hidden', 'f3'), - \ 0) - -"" Command for git grep -"" - fzf#vim#grep(command, with_column, [options], [fullscreen]) -"command! -bang -nargs=* GGrep - "\ call fzf#vim#grep( - "\ 'rg --column --line-number --no-heading --color=always --smart-case '.shellescape(), 1, - "\ 0 ? fzf#vim#with_preview('up:60%') - "\ : fzf#vim#with_preview('right:50%:hidden', '?'), - "\ 0) - -nnoremap :Rg -nmap mv :call RenameFile() -imap (fzf-complete-file-ag) -imap (fzf-complete-line) -imap (fzf-complete-word) -imap (fzf-complete-path) -nmap (fzf-maps-n) -xmap (fzf-maps-x) -omap (fzf-maps-o) -"nnoremap cd :cd %:p:h:pwd - -" quick edit/reload vim file -nmap ev :e $MYVIMRC - -" Use fd to save -inoremap fd :update -nnoremap fd :w -vnoremap fd :wgv -"cnoremap w :w:redraw! - -"ino " "" -"ino ' '' -"ino ( () -"ino [ [] -"ino { {} -"ino { {}O -"ino {; {};O - -nnoremap v :vert term ++close ++kill="kill" -nnoremap s :term ++close ++kill="kill" -nnoremap t :term ++close ++kill="kill" ++rows=25 -nnoremap = :term ++close ++kill="kill" ++rows=25 -nnoremap :wincmd k -nnoremap :wincmd h -nnoremap :wincmd l -nnoremap :wincmd j -nnoremap :resize +5 -nnoremap :resize -5 -nnoremap :vertical resize -5 -nnoremap :vertical resize +5 - -if has("terminal") - tnoremap f : set nomore:ls:set more:b - tnoremap : : - tnoremap fd N - tnoremap gt : tabnext - tnoremap :q : q! - tnoremap : wincmd k - tnoremap : wincmd h - tnoremap : wincmd l - tnoremap : wincmd j - tnoremap : resize +5 - tnoremap : resize -5 - tnoremap : vertical resize +5 - tnoremap : vertical resize -5 - "tnoremap : : - tmap S : aboveleft new - tmap V : aboveleft vert new - tmap s : new - tmap v : vert new - - "tnoremap : call LightBackground() - "tnoremap : call DarkBackground() - tnoremap v : vert term ++close ++kill="int" - tnoremap s : term ++close ++kill="int" - tnoremap t : term ++close ++kill="int" ++rows=25 - tnoremap = = -endif - -"Move to marks -"nnoremap ]` -"nnoremap [` -" -"nmap mm m, -nnoremap M :MarksWithPreview -nnoremap j jzz -nnoremap k kzz -nnoremap l e -nnoremap h b -"nnoremap J j -"nnoremap K k -"nnoremap H h -"nnoremap L l -nnoremap J 10jzz -nnoremap K 10kzz -nnoremap H 5b -nnoremap L 5e - -nnoremap :cn -nnoremap :cp -nnoremap :copen -nnoremap :cclose -nnoremap :lne -nnoremap :lpr -nnoremap :lop -nnoremap :lcl - -map S :aboveleft split -map V :aboveleft vsplit -map s :split -map v :vsplit - -call SetTheme() - diff --git a/zshrc b/zshrc index d2e93e7..aaec790 100644 --- a/zshrc +++ b/zshrc @@ -2,86 +2,65 @@ export ZSH=$HOME/.oh-my-zsh # Set name of the theme to load. -# Look in ~/.oh-my-zsh/themes/ -# Optionally, if you set this to "random", it'll load a random theme each -# time that oh-my-zsh is loaded. ZSH_THEME="robbyrussell" -# Uncomment the following line to use case-sensitive completion. -# CASE_SENSITIVE="true" - -# Uncomment the following line to disable bi-weekly auto-update checks. -# DISABLE_AUTO_UPDATE="true" - -# Uncomment the following line to change how often to auto-update (in days). -# export UPDATE_ZSH_DAYS=13 - -# Uncomment the following line to disable colors in ls. -# DISABLE_LS_COLORS="true" -# Uncomment the following line to disable auto-setting terminal title. - - DISABLE_AUTO_TITLE="true" -# Uncomment the following line to enable command auto-correction. -# ENABLE_CORRECTION="true" -# Uncomment the following line to display red dots whilst waiting for completion. -# COMPLETION_WAITING_DOTS="true" -# Uncomment the following line if you want to disable marking untracked files -# under VCS as dirty. This makes repository status check for large repositories # much, much faster. -# DISABLE_UNTRACKED_FILES_DIRTY="true" - -# Uncomment the following line if you want to change the command execution time -# stamp shown in the history command output. -# The optional three formats: "mm/dd/yyyy"|"dd.mm.yyyy"|"yyyy-mm-dd" -# HIST_STAMPS="mm/dd/yyyy" - -# Would you like to use another custom folder than $ZSH/custom? -# ZSH_CUSTOM=/path/to/new-custom-folder - -# Which plugins would you like to load? (plugins can be found in ~/.oh-my-zsh/plugins/*) -# Custom plugins may be added to ~/.oh-my-zsh/custom/plugins/ -# Example format: plugins=(rails git textmate ruby lighthouse) -# Add wisely, as too many plugins slow down shell startup. - -# automatically enter directories without cd -#setopt auto_cd +DISABLE_AUTO_TITLE="true" # Allow [ or ] whereever you want unsetopt nomatch -# automatically pushd -#setopt auto_pushd export dirstacksize=5 -plugins=(git bundler brew gem heroku rails) +plugins=(git brew) source $ZSH/oh-my-zsh.sh # User configuration -# export MANPATH="/usr/local/man:$MANPATH" - -# You may need to manually set your language environment -# export LANG=en_US.UTF-8 +eval "$(/opt/homebrew/bin/direnv hook zsh)" + +# --- Lazy-load nvm (saves ~1.5s on shell startup) --- +# nvm.sh itself is slow to source, and oh-my-zsh's load-nvmrc runs it eagerly. +# Instead we register shim functions that source nvm on first use. +export NVM_DIR="$HOME/.nvm" +if [[ -s "$NVM_DIR/nvm.sh" ]]; then + _nvm_load() { + unset -f nvm node npm npx yarn pnpm 2>/dev/null + \. "$NVM_DIR/nvm.sh" + [[ -s "$NVM_DIR/bash_completion" ]] && \. "$NVM_DIR/bash_completion" + } + nvm() { _nvm_load; nvm "$@"; } + node() { _nvm_load; node "$@"; } + npm() { _nvm_load; npm "$@"; } + npx() { _nvm_load; npx "$@"; } + yarn() { _nvm_load; yarn "$@"; } + pnpm() { _nvm_load; pnpm "$@"; } + # Add default node bin to PATH so `which node` works without triggering load + if [[ -f "$NVM_DIR/alias/default" ]]; then + _nvm_default_ver="$(<"$NVM_DIR/alias/default")" + # nvm stores versions under v/ (e.g. v20.12.1), but the alias file + # may contain the bare version (20.12.1). Normalise with a leading `v`. + [[ "$_nvm_default_ver" != v* ]] && _nvm_default_ver="v$_nvm_default_ver" + [[ -d "$NVM_DIR/versions/node/$_nvm_default_ver/bin" ]] && \ + export PATH="$NVM_DIR/versions/node/$_nvm_default_ver/bin:$PATH" + unset _nvm_default_ver + fi +fi + +[[ -s ~/.bashrc ]] && source ~/.bashrc +[[ -s ~/.zsh.local ]] && source ~/.zsh.local -# Preferred editor for local and remote sessions -# if [[ -n $SSH_CONNECTION ]]; then -# export EDITOR='vim' -# else -# export EDITOR='mvim' -# fi +### Added by the Heroku Toolbelt +export PATH="/usr/local/heroku/bin:$PATH" -# Compilation flags -# export ARCHFLAGS="-arch x86_64" +[ -f ~/.fzf.zsh ] && source ~/.fzf.zsh -# ssh -# export SSH_KEY_PATH="~/.ssh/dsa_id" +export PATH="$HOME/.yarn/bin:$HOME/.config/yarn/global/node_modules/.bin:$PATH" +export PATH="/opt/homebrew/opt/mongodb-community@4.2/bin:$PATH" +export PATH="/opt/homebrew/opt/curl/bin:$PATH" -# Set personal aliases, overriding those provided by oh-my-zsh libs, -# plugins, and themes. Aliases can be placed here, though oh-my-zsh -# users are encouraged to define aliases within the ZSH_CUSTOM folder. -# For a full list of active aliases, run `alias`. -# -# Example aliases -# alias zshconfig="mate ~/.zshrc" -# alias ohmyzsh="mate ~/.oh-my-zsh" -[[ -s ~/.zsh.local ]] && source ~/.zsh.local +# Added by Antigravity +export PATH="/Users/greg/.antigravity/antigravity/bin:$PATH" +export PATH="$HOME/.local/bin:$PATH" +# Docker CLI completions (compinit is already run by oh-my-zsh) +fpath=(/Users/greg/.docker/completions $fpath)