Mercurial > vim
view runtime/syntax/jsonc.vim @ 33844:58c9f11eae5b v9.0.2134
patch 9.0.2134: ml_get error when scrolling
Commit: https://github.com/vim/vim/commit/c4ffeddfe5bd1824650e9b911ed9245bf56c69e3
Author: Christian Brabandt <cb@256bit.org>
Date: Mon Nov 27 23:25:03 2023 +0100
patch 9.0.2134: ml_get error when scrolling
Problem: ml_get error when scrolling after delete
Solution: mark topline to be validated in main_loop
if it is larger than current buffers line
count
reset_lnums() is called after e.g. TextChanged autocommands and it may
accidentally cause curwin->w_topline to become invalid, e.g. if the
autocommand has deleted some lines.
So verify that curwin->w_topline points to a valid line and if not, mark
the window to have w_topline recalculated in main_loop() in
update_topline() after reset_lnums() returns.
fixes: #13568
fixes: #13578
Signed-off-by: Christian Brabandt <cb@256bit.org>
author | Christian Brabandt <cb@256bit.org> |
---|---|
date | Mon, 27 Nov 2023 23:30:04 +0100 |
parents | 84c7dc0fdcd2 |
children |
line wrap: on
line source
" Vim syntax file " Language: JSONC (JSON with Comments) " Original Author: Izhak Jakov <izhak724@gmail.com> " Acknowledgement: Based off of vim-jsonc maintained by Kevin Locke <kevin@kevinlocke.name> " https://github.com/kevinoid/vim-jsonc " License: MIT " Last Change: 2021-07-01 " Ensure syntax is loaded once, unless nested inside another (main) syntax " For description of main_syntax, see https://stackoverflow.com/q/16164549 if !exists('g:main_syntax') if exists('b:current_syntax') && b:current_syntax ==# 'jsonc' finish endif let g:main_syntax = 'jsonc' endif " Based on vim-json syntax runtime! syntax/json.vim " Remove syntax group for comments treated as errors if !exists("g:vim_json_warnings") || g:vim_json_warnings syn clear jsonCommentError endif syn match jsonStringMatch /"\([^"]\|\\\"\)\+"\ze\(\_s*\/\/.*\_s*\)*[}\]]/ contains=jsonString syn match jsonStringMatch /"\([^"]\|\\\"\)\+"\ze\_s*\/\*\_.*\*\/\_s*[}\]]/ contains=jsonString syn match jsonTrailingCommaError /\(,\)\+\ze\(\_s*\/\/.*\_s*\)*[}\]]/ syn match jsonTrailingCommaError /\(,\)\+\ze\_s*\/\*\_.*\*\/\_s*[}\]]/ " Define syntax matching comments and their contents syn keyword jsonCommentTodo FIXME NOTE TBD TODO XXX syn region jsonLineComment start=+\/\/+ end=+$+ contains=@Spell,jsonCommentTodo keepend syn region jsonComment start='/\*' end='\*/' contains=@Spell,jsonCommentTodo fold " Link comment syntax comment to highlighting hi! def link jsonLineComment Comment hi! def link jsonComment Comment " Set/Unset syntax to avoid duplicate inclusion and correctly handle nesting let b:current_syntax = 'jsonc' if g:main_syntax ==# 'jsonc' unlet g:main_syntax endif