diff options
| author | Tom Ampuero <tom.ampuero.c@gmail.com> | 2025-08-08 16:31:57 +0100 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2025-10-26 00:33:41 +0200 |
| commit | 7c5ff99e8a0ef7c345596df8a0c2eec80afd16b4 (patch) | |
| tree | a10425e21679048f8c5130ba28bdd918ce1bd0c1 /runtime/autoload | |
| parent | 5db35449917de353fb8e35cbd4edca381233f381 (diff) | |
refactor(spell): migrate to Lua, drop netrw dependency
Problem:
Spell file downloads relied on Vimscript and netrw (:Nread). If netrw is
disabled, downloads fail.
Solution:
Port the logic to Lua as `nvim.spellfile` and wire it via a Lua plugin that
handles `SpellFileMissing`. Use `vim.net.request()` with a timeout for HTTP,
prompt via `vim.fn.input` and report via `vim.notify`.
Closes #7189
Diffstat (limited to 'runtime/autoload')
| -rw-r--r-- | runtime/autoload/spellfile.vim | 203 |
1 files changed, 0 insertions, 203 deletions
diff --git a/runtime/autoload/spellfile.vim b/runtime/autoload/spellfile.vim deleted file mode 100644 index e36e2f936b..0000000000 --- a/runtime/autoload/spellfile.vim +++ /dev/null @@ -1,203 +0,0 @@ -" Vim script to download a missing spell file - -if !exists('g:spellfile_URL') - " Always use https:// because it's secure. The certificate is for nluug.nl, - " thus we can't use the alias ftp.vim.org here. - let g:spellfile_URL = 'https://ftp.nluug.nl/pub/vim/runtime/spell' -endif -let s:spellfile_URL = '' " Start with nothing so that s:donedict is reset. - -" This function is used for the spellfile plugin. -function! spellfile#LoadFile(lang) - " Check for sandbox/modeline. #11359 - try - :! - catch /\<E12\>/ - throw 'Cannot download spellfile in sandbox/modeline. Try ":set spell" from the cmdline.' - endtry - - " If the netrw plugin isn't loaded we silently skip everything. - if !exists(":Nread") - if &verbose - echomsg 'spellfile#LoadFile(): Nread command is not available.' - endif - return - endif - let lang = tolower(a:lang) - - " If the URL changes we try all files again. - if s:spellfile_URL != g:spellfile_URL - let s:donedict = {} - let s:spellfile_URL = g:spellfile_URL - endif - - " I will say this only once! - if has_key(s:donedict, lang . &enc) - if &verbose - echomsg 'spellfile#LoadFile(): Tried this language/encoding before.' - endif - return - endif - let s:donedict[lang . &enc] = 1 - - " Find spell directories we can write in. - let [dirlist, dirchoices] = spellfile#GetDirChoices() - if len(dirlist) == 0 - let dir_to_create = spellfile#WritableSpellDir() - if &verbose || dir_to_create != '' - echomsg 'spellfile#LoadFile(): No (writable) spell directory found.' - endif - if dir_to_create != '' - call mkdir(dir_to_create, "p") - " Now it should show up in the list. - let [dirlist, dirchoices] = spellfile#GetDirChoices() - endif - if len(dirlist) == 0 - echomsg 'Failed to create: '.dir_to_create - return - else - echomsg 'Created '.dir_to_create - endif - endif - - let msg = 'No spell file for "' . a:lang . '" in ' . &enc - let msg .= "\nDownload it?" - if confirm(msg, "&Yes\n&No", 2) == 1 - let enc = &encoding - if enc == 'iso-8859-15' - let enc = 'latin1' - endif - let fname = a:lang . '.' . enc . '.spl' - - " Split the window, read the file into a new buffer. - " Remember the buffer number, we check it below. - new - let newbufnr = winbufnr(0) - setlocal bin fenc= - echo 'Downloading ' . fname . '...' - call spellfile#Nread(fname) - if getline(2) !~ 'VIMspell' - " Didn't work, perhaps there is an ASCII one. - " Careful: Nread() may have opened a new window for the error message, - " we need to go back to our own buffer and window. - if newbufnr != winbufnr(0) - let winnr = bufwinnr(newbufnr) - if winnr == -1 - " Our buffer has vanished!? Open a new window. - echomsg "download buffer disappeared, opening a new one" - new - setlocal bin fenc= - else - exe winnr . "wincmd w" - endif - endif - if newbufnr == winbufnr(0) - " We are back to the old buffer, remove any (half-finished) download. - keeppatterns g/^/d_ - else - let newbufnr = winbufnr(0) - endif - - let fname = lang . '.ascii.spl' - echo 'Could not find it, trying ' . fname . '...' - call spellfile#Nread(fname) - if getline(2) !~ 'VIMspell' - echo 'Download failed' - exe newbufnr . "bwipe!" - return - endif - endif - - " Delete the empty first line and mark the file unmodified. - 1d_ - set nomod - - if len(dirlist) == 1 - let dirchoice = 0 - else - let msg = "In which directory do you want to write the file:" - for i in range(len(dirlist)) - let msg .= "\n" . (i + 1) . '. ' . dirlist[i] - endfor - let dirchoice = confirm(msg, dirchoices) - 2 - endif - if dirchoice >= 0 - if exists('*fnameescape') - let dirname = fnameescape(dirlist[dirchoice]) - else - let dirname = escape(dirlist[dirchoice], ' ') - endif - setlocal fenc= - exe "write " . dirname . '/' . fname - - " Also download the .sug file. - keeppatterns g/^/d_ - let fname = substitute(fname, '\.spl$', '.sug', '') - echo 'Downloading ' . fname . '...' - call spellfile#Nread(fname) - if getline(2) =~ 'VIMsug' - 1d_ - exe "write " . dirname . '/' . fname - set nomod - else - echo 'Download failed' - " Go back to our own buffer/window, Nread() may have taken us to - " another window. - if newbufnr != winbufnr(0) - let winnr = bufwinnr(newbufnr) - if winnr != -1 - exe winnr . "wincmd w" - endif - endif - if newbufnr == winbufnr(0) - set nomod - endif - endif - endif - - " Wipe out the buffer we used. - exe newbufnr . "bwipe" - endif -endfunc - -" Read "fname" from the server. -function! spellfile#Nread(fname) - " We do our own error handling, don't want a window for it. - if exists("g:netrw_use_errorwindow") - let save_ew = g:netrw_use_errorwindow - endif - let g:netrw_use_errorwindow=0 - - if g:spellfile_URL =~ '^ftp://' - " for an ftp server use a default login and password to avoid a prompt - let machine = substitute(g:spellfile_URL, 'ftp://\([^/]*\).*', '\1', '') - let dir = substitute(g:spellfile_URL, 'ftp://[^/]*/\(.*\)', '\1', '') - exe 'Nread "' . machine . ' anonymous vim7user ' . dir . '/' . a:fname . '"' - else - exe 'Nread ' g:spellfile_URL . '/' . a:fname - endif - - if exists("save_ew") - let g:netrw_use_errorwindow = save_ew - else - unlet g:netrw_use_errorwindow - endif -endfunc - -" Get a list of writable spell directories and choices for confirm(). -function! spellfile#GetDirChoices() - let dirlist = [] - let dirchoices = '&Cancel' - for dir in split(globpath(&rtp, 'spell'), "\n") - if filewritable(dir) == 2 - call add(dirlist, dir) - let dirchoices .= "\n&" . len(dirlist) - endif - endfor - return [dirlist, dirchoices] -endfunc - -function! spellfile#WritableSpellDir() - " Always use the $XDG_DATA_HOME/…/site directory - return stdpath('data').'/site/spell' -endfunction |
