Skip to content

coallesce mayset queries #192

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

coallesce mayset queries #192

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
71538f6
lift up execute() check into s:Execute()
mralusw Mar 20, 2024
d6cb88a
accumulate :set's, perform at end
mralusw Mar 20, 2024
66c1a95
support unqueried options
mralusw Mar 24, 2024
13bd446
accumulate non-MaySet() options too
mralusw Mar 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
158 changes: 100 additions & 58 deletions plugin/sensible.vim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,78 +15,96 @@ if &compatible
set nocompatible
endif

" Check if an option was set from a file in $HOME. This lets us avoid
" overriding options in the user's vimrc, but still override options in the
" system vimrc.
function! s:MaySet(option) abort
if exists('*execute')
let out = execute('verbose setglobal all ' . a:option . '?')
else
if exists('*execute')
let s:Execute = function('execute')
else
function! s:Execute(cmd) abort
redir => out
silent verbose execute 'setglobal all' a:option . '?'
silent verbose execute a:cmd
redir END
return out
endfunction
endif

let s:defaultval_yes = ['set ', '']
let s:defaultval_no = ['set no', '']
let s:defaultval_checked = ['" ', ''] " translates to comment -> no :set
let s:default_opts = []
let s:default_vals = {}
let s:option_query_str = ' '
let s:option_not_queried = { }
function! s:AddOptionQuery(option)
let s:option_not_queried[a:option] = 0
let s:option_query_str .= a:option . '? '
endfunction
function! s:DefaultSet(option, setcmd, query_it = 1) abort
if ! a:query_it || exists('&' . a:option)
if a:query_it
call s:AddOptionQuery(a:option)
endif
call add(s:default_opts, a:option)
let s:default_vals[a:option] = a:setcmd[0] . a:option . a:setcmd[1]
endif
return out !~# " \\(\\~[\\/][^\n]*\\|Lua\\)$"
endfunction
function! s:DefaultMod(option, mod, value, query_it = 1) abort
call s:DefaultSet(a:option, ['set ', a:mod . a:value], a:query_it)
endfunction
function! s:Default(option, value, query_it = 1) abort
call s:DefaultSet(a:option, ['set ', '=' . a:value], a:query_it)
endfunction

if s:MaySet('backspace')
set backspace=indent,eol,start
endif
call s:Default('backspace', 'indent,eol,start')
" Disable completing keywords in included files (e.g., #include in C). When
" configured properly, this can result in the slow, recursive scanning of
" hundreds of files of dubious relevance.
set complete-=i
if s:MaySet('smarttab')
set smarttab
endif
call s:DefaultMod('complete', '-=', 'i', 0)
call s:DefaultSet('smarttab', s:defaultval_yes)

set nrformats-=octal
call s:DefaultMod('nrformats', '-=', 'octal', 0)

" Make the escape key more responsive by decreasing the wait time for an
" escape sequence (e.g., arrow keys).
if !has('nvim') && &ttimeoutlen == -1
set ttimeout
set ttimeoutlen=100
call s:DefaultSet('ttimeout', s:defaultval_yes, 0)
call s:Default('ttimeoutlen', '100', 0)
endif

if has('reltime') && s:MaySet('incsearch')
set incsearch
if has('reltime')
call s:DefaultSet('incsearch', s:defaultval_yes)
endif
" Use CTRL-L to clear the highlighting of 'hlsearch' (off by default) and call
" :diffupdate.
if maparg('<C-L>', 'n') ==# ''
nnoremap <silent> <C-L> :nohlsearch<C-R>=has('diff')?'<Bar>diffupdate':''<CR><CR><C-L>
endif

if s:MaySet('laststatus')
set laststatus=2
endif
if s:MaySet('ruler')
set ruler
endif
if s:MaySet('wildmenu')
set wildmenu
endif
call s:Default('laststatus', '2')
call s:DefaultSet('ruler', s:defaultval_yes)
call s:DefaultSet('wildmenu', s:defaultval_yes)

if s:MaySet('scrolloff')
set scrolloff=1
endif
if s:MaySet('sidescroll') && s:MaySet('sidescrolloff')
set sidescroll=1
set sidescrolloff=2
endif
set display+=lastline
call s:Default('scrolloff', '1')

call s:AddOptionQuery('sidescroll')
call s:AddOptionQuery('sidescrolloff')
" call at the end
function! s:SetSidescroll() abort
if s:MaySet('sidescroll') && s:MaySet('sidescrolloff')
set sidescroll=1
set sidescrolloff=2
endif
endfunction

let s:display_mods='lastline'
if has('patch-7.4.2109')
set display+=truncate
let s:display_mods .= ',truncate'
endif
call s:DefaultMod('display', '+=', s:display_mods, 0)

if s:MaySet('listchars')
set listchars=tab:>\ ,trail:-,extends:>,precedes:<,nbsp:+
endif
call s:Default('listchars', 'tab:>\ ,trail:-,extends:>,precedes:<,nbsp:+')

" Delete comment character when joining commented lines.
if v:version > 703 || v:version == 703 && has("patch541")
set formatoptions+=j
call s:DefaultMod('formatoptions', '+=', 'j', 0)
endif

" Replace the check for a tags file in the parent directory of the current
Expand All @@ -95,41 +113,61 @@ if has('path_extra') && (',' . &g:tags . ',') =~# ',\./tags,'
setglobal tags-=./tags tags-=./tags; tags^=./tags;
endif

if s:MaySet('autoread')
set autoread
endif
call s:DefaultSet('autoread', s:defaultval_yes)

if s:MaySet('history')
set history=1000
endif
if s:MaySet('tabpagemax')
set tabpagemax=50
endif
call s:Default('history', '1000')
call s:Default('tabpagemax', '50')

" Persist g:UPPERCASE variables, used by some plugins, in .viminfo.
if !empty(&viminfo)
set viminfo^=!
endif
" Saving options in session and view files causes more problems than it
" solves, so disable it.
set sessionoptions-=options
set viewoptions-=options
call s:DefaultMod('sessionoptions', '-=', 'options', 0)
call s:DefaultMod('viewoptions', '-=', 'options', 0)

" Allow color schemes to do bright colors without forcing bold.
if &t_Co == 8 && $TERM !~# '^Eterm'
set t_Co=16
call s:Default('t_Co', '16', 0)
endif

" If the running Vim lacks support for the Fish shell, use Bash instead.
if &shell =~# 'fish$' && (v:version < 704 || v:version == 704 && !has('patch276'))
set shell=/usr/bin/env\ bash
call s:Default('shell', '/usr/bin/env\ bash', 0)
endif

" Disable a legacy behavior that can break plugin maps.
if has('langmap') && exists('+langremap') && &langremap && s:MaySet('langremap')
set nolangremap
if has('langmap') && exists('+langremap') && &langremap
call s:DefaultSet('langremap', s:defaultval_no)
endif

function! s:CheckDefaults() abort
let s:global_settings = s:Execute('verbose setglobal all lines? ' . s:option_query_str)
" 'lines=' delimits the start of the answer
let s:global_settings = substitute(s:global_settings, '.*lines=[^\n]*', '', '') . "\n"
" ^ begins and ends in newline
endfunction

" Check if an option was set from a file in $HOME. This lets us avoid
" overriding options in the user's vimrc, but still override options in the
" system vimrc.
let s:homerx = " \\(\\~[\\/][^\n]*\\|Lua\\)\n"
function! s:MaySet(option) abort
"return s:Execute('verbose setglobal all ' . a:option . '?') . "\n" !~# s:homerx " previous version
return get(s:option_not_queried, a:option, 1) || s:global_settings !~# ('\n\(\s\+\|no\)\?' . a:option . '\(=[^\n]*\n\|\n\)' . '[^\n]*' . s:homerx)
endfunction

function! s:ComputeSettings() abort
call filter(s:default_opts, 's:MaySet(v:val)')
return join(map(s:default_opts, 's:default_vals[v:val]'), "\n")
endfunction

call s:CheckDefaults()
let s:computed_settings = s:ComputeSettings()
call s:Execute(s:computed_settings)
call s:SetSidescroll()

if !(exists('g:did_load_filetypes') && exists('g:did_load_ftplugin') && exists('g:did_indent_on'))
filetype plugin indent on
endif
Expand Down Expand Up @@ -164,3 +202,7 @@ endif
if exists(':Man') != 2 && !exists('g:loaded_man') && &filetype !=? 'man' && !has('nvim')
runtime ftplugin/man.vim
endif

function! s:GetComputedSettings() abort " DEBUG: call with <SNR> from :scriptnames
return s:computed_settings
endfun