Skip to content

fix check whether valid language was passed to VLTY #2191

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

Closed
Konfekt wants to merge 2 commits into from
Closed

fix check whether valid language was passed to VLTY #2191

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ab35c2e
fix check whether valid language was passed to VLTY
Konfekt Oct 3, 2021
5aee5cb
Merge branch 'master' into vlty
Konfekt Oct 3, 2021
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
55 changes: 29 additions & 26 deletions compiler/vlty.vim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,39 +71,42 @@ if !exists('s:vlty.language')
\ 'prompt': 'Multiple spelllang languages detected, please select one:',
\ 'abort': v:false,
\})
let s:vlty.language = substitute(s:vlty.language, '_', '-', '')
endif

if !exists('s:list')
silent let s:list = split(
\ system(s:vlty_lt_command . ' --list NOFILE'),
\ '[[:space:]]')
endif
if !empty(s:list)
if match(s:list, '\c^' . s:vlty.language . '$') == -1
echohl WarningMsg
echomsg "Language '" . s:vlty.language . "'"
\ . " not listed in output of "
\ . s:vlty_lt_command . " --list!"
let s:vlty.language = matchstr(s:vlty.language, '\v^[^-]+')
echomsg "Trying '" . s:vlty.language . "' instead."
echohl None
if match(s:list, '\c^' . s:vlty.language . '$') == -1
echoerr "Language '" . s:vlty.language . "'"
\ . " not listed in output of "
\ . s:vlty_lt_command . " --list; trying anyway!"
endif
endif
endif

if !empty(s:vlty.language)
let s:vlty_language = ' --language ' . s:vlty.language
else
if empty(s:vlty.language)
echohl WarningMsg
echomsg 'Please set g:vimtex_grammar_vlty.language to enable more accurate'
echomsg 'checks by LanguageTool. Reverting to --autoDetect.'
echohl None
let s:vlty_language = ' --autoDetect'
else
let s:vlty.language = substitute(s:vlty.language, '_', '-', '')
let s:vlty_language = ' --language ' . s:vlty.language
if !exists('s:list')
silent let s:list = split(
\ system(s:vlty_lt_command . ' --list NOFILE'),
\ '[[:space:]]')
endif
if !empty(s:list)
if match(s:list, '\c^' . s:vlty.language . '$') == -1
echohl WarningMsg
echomsg "Language '" . s:vlty.language . "'"
\ . " not listed in output of the command "
\ . "'" . s:vlty_lt_command . " --list'! "
\ . "Please check its output!"
echohl None
if match(s:vlty.language, '-') != -1
let s:vlty.language = matchstr(s:vlty.language, '\v^[^-]+')
echohl WarningMsg
echomsg "Trying '" . s:vlty.language . "' instead."
echohl None
else
echohl WarningMsg
echomsg "Trying '" . s:vlty.language . "' anyway."
echohl None
endif
endif
endif
endif

let &l:makeprg =
Expand Down