mirror of
https://github.com/amix/vimrc
synced 2025-07-10 11:44:59 +08:00
Updated plugins
This commit is contained in:
Amir Salihefendic
@ -1,7 +1,5 @@
|
||||
language: generic
|
||||
|
||||
sudo: false
|
||||
|
||||
install:
|
||||
- git clone --depth=1 https://github.com/thinca/vim-themis /tmp/themis
|
||||
- (if ! test -d $HOME/vim-$VIM_VERSION/bin; then
|
||||
@ -18,6 +16,8 @@ cache:
|
||||
- $HOME/vim-$VIM_VERSION
|
||||
|
||||
env:
|
||||
- VIM_VERSION=8.1.1775
|
||||
- VIM_VERSION=8.1.1700
|
||||
- VIM_VERSION=8.1.0000
|
||||
- VIM_VERSION=8.0.0000
|
||||
- VIM_VERSION=7.4
|
||||
|
||||
@ -52,11 +52,17 @@ landscape is my colorscheme, which is a high-contrast cterm-supported colorschem
|
||||
+ Orthogonality. The plugin does not rely on the implementation of other plugins. Such plugin crossing settings should be configured by users.
|
||||
|
||||
## Installation
|
||||
### [Vim packages](http://vimhelp.appspot.com/repeat.txt.html#packages) (since Vim 7.4.1528)
|
||||
|
||||
git clone https://github.com/itchyny/lightline.vim ~/.vim/pack/plugins/start/lightline
|
||||
|
||||
### [Pathogen](https://github.com/tpope/vim-pathogen)
|
||||
1. Install with the following command.
|
||||
|
||||
git clone https://github.com/itchyny/lightline.vim ~/.vim/bundle/lightline.vim
|
||||
|
||||
2. Generate help tags with `:Helptags`.
|
||||
|
||||
### [Vundle](https://github.com/VundleVim/Vundle.vim)
|
||||
1. Add the following configuration to your `.vimrc`.
|
||||
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
" Filename: autoload/lightline.vim
|
||||
" Author: itchyny
|
||||
" License: MIT License
|
||||
" Last Change: 2018/11/24 12:00:00.
|
||||
" Last Change: 2019/08/20 14:00:00.
|
||||
" =============================================================================
|
||||
|
||||
let s:save_cpo = &cpo
|
||||
@ -11,6 +11,7 @@ set cpo&vim
|
||||
let s:_ = 1 " 1: uninitialized, 2: disabled
|
||||
|
||||
function! lightline#update() abort
|
||||
if &buftype ==# 'popup' | return | endif
|
||||
if s:_
|
||||
if s:_ == 2 | return | endif
|
||||
call lightline#init()
|
||||
@ -20,7 +21,7 @@ function! lightline#update() abort
|
||||
return
|
||||
endif
|
||||
let w = winnr()
|
||||
let s = winnr('$') == 1 ? [lightline#statusline(0)] : [lightline#statusline(0), lightline#statusline(1)]
|
||||
let s = winnr('$') == 1 && w > 0 ? [lightline#statusline(0)] : [lightline#statusline(0), lightline#statusline(1)]
|
||||
for n in range(1, winnr('$'))
|
||||
call setwinvar(n, '&statusline', s[n!=w])
|
||||
call setwinvar(n, 'lightline', n!=w)
|
||||
@ -45,7 +46,10 @@ function! lightline#enable() abort
|
||||
call lightline#update()
|
||||
augroup lightline
|
||||
autocmd!
|
||||
autocmd WinEnter,BufWinEnter,FileType,SessionLoadPost * call lightline#update()
|
||||
autocmd WinEnter,BufEnter,SessionLoadPost * call lightline#update()
|
||||
if !has('patch-8.1.1715')
|
||||
autocmd FileType qf call lightline#update()
|
||||
endif
|
||||
autocmd SessionLoadPost * call lightline#highlight()
|
||||
autocmd ColorScheme * if !has('vim_starting') || expand('<amatch>') !=# 'macvim'
|
||||
\ | call lightline#update() | call lightline#highlight() | endif
|
||||
|
||||
@ -0,0 +1,39 @@
|
||||
" =============================================================================
|
||||
" Filename: autoload/lightline/colorscheme/ayu_mirage.vim
|
||||
" Author: impulse
|
||||
" License: MIT License
|
||||
" Last Change: 2019/08/11 11:52:20.
|
||||
" =============================================================================
|
||||
let s:base0 = [ '#d9d7ce', 244 ]
|
||||
let s:base1 = [ '#d9d7ce', 247 ]
|
||||
let s:base2 = [ '#607080', 248 ]
|
||||
let s:base3 = [ '#d9d7ce', 252 ]
|
||||
let s:base00 = [ '#272d38', 242 ]
|
||||
let s:base01 = [ '#272d38', 240 ]
|
||||
let s:base02 = [ '#212733', 238 ]
|
||||
let s:base023 = [ '#212733', 236 ]
|
||||
let s:base03 = [ '#ffc44c', 235 ]
|
||||
let s:yellow = [ '#ffc44c', 180 ]
|
||||
let s:orange = [ '#ffae57', 173 ]
|
||||
let s:red = [ '#f07178', 203 ]
|
||||
let s:magenta = [ '#d4bfff', 216 ]
|
||||
let s:blue = [ '#59c2ff', 117 ]
|
||||
let s:cyan = s:blue
|
||||
let s:green = [ '#bbe67e', 119 ]
|
||||
let s:p = {'normal': {}, 'inactive': {}, 'insert': {}, 'replace': {}, 'visual': {}, 'tabline': {}}
|
||||
let s:p.normal.left = [ [ s:base02, s:blue ], [ s:base3, s:base01 ] ]
|
||||
let s:p.normal.middle = [ [ s:base2, s:base02 ] ]
|
||||
let s:p.normal.right = [ [ s:base02, s:base0 ], [ s:base1, s:base01 ] ]
|
||||
let s:p.inactive.left = [ [ s:base1, s:base01 ], [ s:base3, s:base01 ] ]
|
||||
let s:p.inactive.middle = [ [ s:base1, s:base023 ] ]
|
||||
let s:p.inactive.right = [ [ s:base1, s:base01 ], [ s:base2, s:base02 ] ]
|
||||
let s:p.insert.left = [ [ s:base02, s:green ], [ s:base3, s:base01 ] ]
|
||||
let s:p.replace.left = [ [ s:base023, s:red ], [ s:base3, s:base01 ] ]
|
||||
let s:p.visual.left = [ [ s:base02, s:magenta ], [ s:base3, s:base01 ] ]
|
||||
let s:p.tabline.tabsel = [ [ s:base02, s:base03 ] ]
|
||||
let s:p.tabline.left = [ [ s:base3, s:base00 ] ]
|
||||
let s:p.tabline.middle = [ [ s:base2, s:base02 ] ]
|
||||
let s:p.tabline.right = [ [ s:base2, s:base00 ] ]
|
||||
let s:p.normal.error = [ [ s:base03, s:red ] ]
|
||||
let s:p.normal.warning = [ [ s:base023, s:yellow ] ]
|
||||
let g:lightline#colorscheme#ayu_mirage#palette = lightline#colorscheme#flatten(s:p)
|
||||
@ -0,0 +1,28 @@
|
||||
" =============================================================================
|
||||
" Filename: autoload/lightline/colorscheme/powerlineish.vim
|
||||
" Author: itchyny
|
||||
" License: MIT License
|
||||
" Last Change: 2019/06/12 18:47:00.
|
||||
" =============================================================================
|
||||
|
||||
let s:p = {'normal': {}, 'inactive': {}, 'insert': {}, 'replace': {}, 'visual': {}, 'tabline': {}}
|
||||
let s:p.normal.left = [ ['darkestgreen', 'brightgreen', 'bold'], ['white', 'gray0'] ]
|
||||
let s:p.normal.right = [ ['gray10', 'gray2'], ['white', 'gray1'], ['white', 'gray0'] ]
|
||||
let s:p.inactive.right = [ ['gray1', 'gray5'], ['gray4', 'gray1'], ['gray4', 'gray0'] ]
|
||||
let s:p.inactive.left = s:p.inactive.right[1:]
|
||||
let s:p.insert.left = [ ['darkestcyan', 'white', 'bold'], ['mediumcyan', 'darkestblue'] ]
|
||||
let s:p.insert.right = [ [ 'darkestblue', 'mediumcyan' ], [ 'mediumcyan', 'darkblue' ], [ 'mediumcyan', 'darkestblue' ] ]
|
||||
let s:p.replace.left = [ ['white', 'brightred', 'bold'], ['white', 'gray0'] ]
|
||||
let s:p.visual.left = [ ['black', 'brightestorange', 'bold'], ['white', 'gray0'] ]
|
||||
let s:p.normal.middle = [ [ 'white', 'gray0' ] ]
|
||||
let s:p.insert.middle = [ [ 'mediumcyan', 'darkestblue' ] ]
|
||||
let s:p.replace.middle = s:p.normal.middle
|
||||
let s:p.replace.right = s:p.normal.right
|
||||
let s:p.tabline.left = [ [ 'gray9', 'gray0' ] ]
|
||||
let s:p.tabline.tabsel = [ [ 'gray9', 'gray2' ] ]
|
||||
let s:p.tabline.middle = [ [ 'gray2', 'gray0' ] ]
|
||||
let s:p.tabline.right = [ [ 'gray9', 'gray1' ] ]
|
||||
let s:p.normal.error = [ [ 'gray9', 'brightestred' ] ]
|
||||
let s:p.normal.warning = [ [ 'gray1', 'yellow' ] ]
|
||||
|
||||
let g:lightline#colorscheme#powerlineish#palette = lightline#colorscheme#fill(s:p)
|
||||
@ -0,0 +1,50 @@
|
||||
" =============================================================================
|
||||
" Filename: autoload/lightline/colorscheme/selenized_dark.vim
|
||||
" Author: Charles Hall
|
||||
" License: MIT License
|
||||
" Last Change: 2019/07/22 11:05:34.
|
||||
" =============================================================================
|
||||
|
||||
" https://github.com/jan-warchol/selenized/blob/master/the-values.md#selenized-dark
|
||||
let s:black = [ "#184956", 0 ]
|
||||
let s:red = [ "#fa5750", 1 ]
|
||||
let s:green = [ "#75b938", 2 ]
|
||||
let s:yellow = [ "#dbb32d", 3 ]
|
||||
let s:blue = [ "#4695f7", 4 ]
|
||||
let s:magenta = [ "#f275be", 5 ]
|
||||
let s:cyan = [ "#41c7b9", 6 ]
|
||||
let s:white = [ "#72898f", 7 ]
|
||||
let s:brblack = [ "#2d5b69", 8 ]
|
||||
let s:brred = [ "#ff665c", 9 ]
|
||||
let s:brgreen = [ "#84c747", 10 ]
|
||||
let s:bryellow = [ "#ebc13d", 11 ]
|
||||
let s:brblue = [ "#58a3ff", 12 ]
|
||||
let s:brmagenta = [ "#ff84cd", 13 ]
|
||||
let s:brcyan = [ "#53d6c7", 14 ]
|
||||
let s:brwhite = [ "#cad8d9", 15 ]
|
||||
|
||||
let s:p = {'normal': {}, 'inactive': {}, 'insert': {}, 'replace': {}, 'visual': {}, 'tabline': {}}
|
||||
|
||||
let s:p.normal.right = [[ s:black, s:blue ],[ s:cyan, s:brblack ],[ s:white, s:black ]]
|
||||
let s:p.normal.left = [[ s:black, s:blue ],[ s:cyan, s:brblack ]]
|
||||
let s:p.normal.middle = [[ s:black, s:black ]]
|
||||
let s:p.normal.error = [[ s:black, s:red ]]
|
||||
let s:p.normal.warning = [[ s:black, s:yellow ]]
|
||||
|
||||
let s:p.insert.right = [[ s:black, s:green ],[ s:cyan, s:brblack ],[ s:white, s:black ]]
|
||||
let s:p.insert.left = [[ s:black, s:green ],[ s:cyan, s:brblack ]]
|
||||
|
||||
let s:p.visual.right = [[ s:black, s:magenta ],[ s:cyan, s:brblack ],[ s:white, s:black ]]
|
||||
let s:p.visual.left = [[ s:black, s:magenta ],[ s:cyan, s:brblack ]]
|
||||
|
||||
let s:p.inactive.left = [[ s:brblue, s:brblack ],[ s:cyan, s:brblack ]]
|
||||
let s:p.inactive.right = [[ s:brblue, s:brblack ],[ s:cyan, s:brblack ]]
|
||||
|
||||
let s:p.replace.right = [[ s:black, s:red ],[ s:cyan, s:brblack ],[ s:white, s:black ]]
|
||||
let s:p.replace.left = [[ s:black, s:red ],[ s:cyan, s:brblack ]]
|
||||
|
||||
let s:p.tabline.right = [[ s:black, s:red ]]
|
||||
let s:p.tabline.left = [[ s:cyan, s:brblack ]]
|
||||
let s:p.tabline.tabsel = [[ s:black, s:blue ]]
|
||||
|
||||
let g:lightline#colorscheme#selenized_dark#palette = lightline#colorscheme#flatten(s:p)
|
||||
@ -4,7 +4,7 @@ Version: 0.1
|
||||
Author: itchyny (https://github.com/itchyny)
|
||||
License: MIT License
|
||||
Repository: https://github.com/itchyny/lightline.vim
|
||||
Last Change: 2018/04/28 00:08:18.
|
||||
Last Change: 2019/08/14 10:46:55.
|
||||
|
||||
CONTENTS *lightline-contents*
|
||||
|
||||
@ -226,10 +226,12 @@ OPTIONS *lightline-option*
|
||||
<
|
||||
g:lightline.colorscheme *g:lightline.colorscheme*
|
||||
The colorscheme for lightline.vim.
|
||||
Currently, wombat, solarized, powerline, jellybeans, Tomorrow,
|
||||
Tomorrow_Night, Tomorrow_Night_Blue, Tomorrow_Night_Eighties,
|
||||
PaperColor, seoul256, landscape, one, darcula, molokai, materia,
|
||||
material, OldHope, nord, 16color and deus are available.
|
||||
Currently, wombat, solarized, powerline, powerlineish,
|
||||
jellybeans, molokai, seoul256, darcula, selenized_dark,
|
||||
Tomorrow, Tomorrow_Night, Tomorrow_Night_Blue,
|
||||
Tomorrow_Night_Bright, Tomorrow_Night_Eighties, PaperColor,
|
||||
landscape, one, materia, material, OldHope, nord, deus,
|
||||
srcery_drk, ayu_mirage and 16color are available.
|
||||
The default value is:
|
||||
>
|
||||
let g:lightline.colorscheme = 'default'
|
||||
@ -986,12 +988,15 @@ Problem 1: *lightline-problem-1*
|
||||
|
||||
1. Put all the files under $VIM.
|
||||
|
||||
If you are using |vim-pathogen|, install this plugin with the
|
||||
following command.
|
||||
If you are to install this plugin using |vim-pathogen|:
|
||||
|
||||
1. Install this plugin with the following command.
|
||||
>
|
||||
git clone https://github.com/itchyny/lightline.vim \
|
||||
~/.vim/bundle/lightline.vim
|
||||
<
|
||||
2. Generate help tags with |:Helptags|.
|
||||
|
||||
If you are to install this plugin using |Vundle|:
|
||||
|
||||
1. Add the following configuration to your
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
" Filename: plugin/lightline.vim
|
||||
" Author: itchyny
|
||||
" License: MIT License
|
||||
" Last Change: 2018/06/22 08:49:00.
|
||||
" Last Change: 2019/07/30 12:00:00.
|
||||
" =============================================================================
|
||||
|
||||
if exists('g:loaded_lightline') || v:version < 700
|
||||
@ -15,12 +15,20 @@ set cpo&vim
|
||||
|
||||
augroup lightline
|
||||
autocmd!
|
||||
autocmd WinEnter,BufWinEnter,FileType,SessionLoadPost * call lightline#update()
|
||||
autocmd WinEnter,BufEnter,SessionLoadPost * call lightline#update()
|
||||
if !has('patch-8.1.1715')
|
||||
autocmd FileType qf call lightline#update()
|
||||
endif
|
||||
autocmd SessionLoadPost * call lightline#highlight()
|
||||
autocmd ColorScheme * if !has('vim_starting') || expand('<amatch>') !=# 'macvim'
|
||||
\ | call lightline#update() | call lightline#highlight() | endif
|
||||
autocmd CursorMoved,BufUnload * call lightline#update_once()
|
||||
augroup END
|
||||
|
||||
" This quickfix option was introduced at Vim 85850f3a5ef9, which is the commit
|
||||
" just before 8.1.1715. Before this patch, autocmd FileType is required to
|
||||
" overwrite the statusline of the quickfix and location windows.
|
||||
let g:qf_disable_statusline = 1
|
||||
|
||||
let &cpo = s:save_cpo
|
||||
unlet s:save_cpo
|
||||
|
||||
@ -18,3 +18,5 @@ endfunction
|
||||
function! SID(name) abort
|
||||
return function(printf("\<SNR>%d_%s", s:sid('autoload/lightline.vim'), a:name))
|
||||
endfunction
|
||||
|
||||
filetype plugin on
|
||||
|
||||
19
sources_non_forked/lightline.vim/test/popup.vim
Normal file
19
sources_non_forked/lightline.vim/test/popup.vim
Normal file
@ -0,0 +1,19 @@
|
||||
if !exists('*popup_menu') || !exists('*win_execute')
|
||||
finish
|
||||
endif
|
||||
|
||||
let s:suite = themis#suite('popup')
|
||||
let s:assert = themis#helper('assert')
|
||||
|
||||
function! s:suite.before_each()
|
||||
let g:lightline = {}
|
||||
call lightline#init()
|
||||
tabnew
|
||||
tabonly
|
||||
endfunction
|
||||
|
||||
function! s:suite.win_execute_setfiletype()
|
||||
let id = popup_menu(['aaa', 'bbb'], {})
|
||||
call win_execute(id, 'setfiletype vim')
|
||||
call popup_close(id)
|
||||
endfunction
|
||||
25
sources_non_forked/lightline.vim/test/quickfix.vim
Normal file
25
sources_non_forked/lightline.vim/test/quickfix.vim
Normal file
@ -0,0 +1,25 @@
|
||||
let s:suite = themis#suite('quickfix')
|
||||
let s:assert = themis#helper('assert')
|
||||
|
||||
function! s:suite.before_each()
|
||||
let g:lightline = {}
|
||||
call lightline#init()
|
||||
tabnew
|
||||
tabonly
|
||||
endfunction
|
||||
|
||||
function! s:suite.quickfix_statusline()
|
||||
call setloclist(winnr(), [])
|
||||
lopen
|
||||
wincmd p
|
||||
call setloclist(winnr(), [])
|
||||
for n in range(1, winnr('$'))
|
||||
let statusline = getwinvar(n, '&statusline')
|
||||
call s:assert.match(statusline, 'lightline')
|
||||
if has('patch-8.1.1715')
|
||||
call s:assert.match(statusline, n == 1 ? '_active_' : '_inactive_')
|
||||
else
|
||||
call s:assert.match(statusline, n != 1 ? '_active_' : '_inactive_')
|
||||
endif
|
||||
endfor
|
||||
endfunction
|
||||
Reference in New Issue
Block a user