mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-05 19:08:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #35546 from zeertzjq/vim-a07a2f4

Browse Source 
vim-patch:a07a2f4: runtime(astro): catch json_decode() error when parsing tsconfig.json
(cherry picked from commit 8a2587be23)
This commit is contained in:
zeertzjq
2025-08-30 08:14:15 +08:00
committed by github-actions[bot]
parent d70d469c04
commit a2603016ce
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
runtime/ftplugin/astro.vim
View File

@@ -3,6 +3,7 @@
" Maintainer: Romain Lafourcade <romainlafourcade@gmail.com> " Maintainer: Romain Lafourcade <romainlafourcade@gmail.com>
" Last Change: 2024 Apr 21 " Last Change: 2024 Apr 21
" 2024 May 24 by Riley Bruins <ribru17@gmail.com> ('commentstring') " 2024 May 24 by Riley Bruins <ribru17@gmail.com> ('commentstring')
" 2025 Aug 29 by Vim project, add try/catch around json_decode(), #18141
if exists("b:did_ftplugin") if exists("b:did_ftplugin")
finish finish
@@ -52,13 +53,19 @@ function! s:CollectPathsFromConfig() abort
endif endif
endif endif
let paths_from_config = config_json try
let paths_from_config = config_json
\ ->readfile() \ ->readfile()
\ ->filter({ _, val -> val =~ '^\s*[\[\]{}"0-9]' }) \ ->filter({ _, val -> val =~ '^\s*[\[\]{}"0-9]' })
\ ->join() \ ->join()
\ ->json_decode() \ ->json_decode()
\ ->get('compilerOptions', {}) \ ->get('compilerOptions', {})
\ ->get('paths', {}) \ ->get('paths', {})
catch /^Vim\%((\a\+)\)\=:E491:/ " invalid json
let paths_from_config = {}
catch /^Vim\%((\a\+)\)\=:E474:/ " invalid json in Nvim
let paths_from_config = {}
endtry
if !empty(paths_from_config) if !empty(paths_from_config)
let b:astro_paths = paths_from_config let b:astro_paths = paths_from_config