From 08534be7aba0d70e2403df6183b8f516ce73b1b1 Mon Sep 17 00:00:00 2001 From: Aman Verma Date: Mon, 5 May 2025 00:37:39 -0500 Subject: [PATCH] runtime(toml): update syntax and ftplugin. Add "-" to iskeyword. This required a change to the syntax files too because they were using the word begin and end atoms. Co-authored-by: Teemu Ikonen Co-authored-by: A4-Tacks Signed-off-by: Aman Verma --- runtime/ftplugin/toml.vim | 5 +++-- runtime/syntax/toml.vim | 18 +++++++++--------- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/runtime/ftplugin/toml.vim b/runtime/ftplugin/toml.vim index 6bd79b1c0a..6565a76223 100644 --- a/runtime/ftplugin/toml.vim +++ b/runtime/ftplugin/toml.vim @@ -3,7 +3,7 @@ " Homepage: https://github.com/cespare/vim-toml " Maintainer: Aman Verma " Author: Lily Ballard -" Last Change: Sep 21, 2021 +" Last Change: May 5, 2025 if exists('b:did_ftplugin') finish @@ -12,10 +12,11 @@ let b:did_ftplugin = 1 let s:save_cpo = &cpo set cpo&vim -let b:undo_ftplugin = 'setlocal commentstring< comments<' +let b:undo_ftplugin = 'setlocal commentstring< comments< iskeyword<' setlocal commentstring=#\ %s setlocal comments=:# +setlocal iskeyword+=- let &cpo = s:save_cpo unlet s:save_cpo diff --git a/runtime/syntax/toml.vim b/runtime/syntax/toml.vim index bcb1b0b9c9..961e03340f 100644 --- a/runtime/syntax/toml.vim +++ b/runtime/syntax/toml.vim @@ -3,7 +3,7 @@ " Homepage: https://github.com/cespare/vim-toml " Maintainer: Aman Verma " Previous Maintainer: Caleb Spare -" Last Change: Oct 8, 2021 +" Last Change: May 5, 2025 if exists('b:current_syntax') finish @@ -23,15 +23,15 @@ syn region tomlString oneline start=/'/ end=/'/ " Multi-line literal strings syn region tomlString start=/'''/ end=/'''/ -syn match tomlInteger /[+-]\=\<[1-9]\(_\=\d\)*\>/ display -syn match tomlInteger /[+-]\=\<0\>/ display -syn match tomlInteger /[+-]\=\<0x[[:xdigit:]]\(_\=[[:xdigit:]]\)*\>/ display -syn match tomlInteger /[+-]\=\<0o[0-7]\(_\=[0-7]\)*\>/ display -syn match tomlInteger /[+-]\=\<0b[01]\(_\=[01]\)*\>/ display -syn match tomlInteger /[+-]\=\<\(inf\|nan\)\>/ display +syn match tomlInteger /[+-]\=[1-9]\(_\=\d\)*/ display +syn match tomlInteger /[+-]\=0/ display +syn match tomlInteger /[+-]\=0x[[:xdigit:]]\(_\=[[:xdigit:]]\)*/ display +syn match tomlInteger /[+-]\=0o[0-7]\(_\=[0-7]\)*/ display +syn match tomlInteger /[+-]\=0b[01]\(_\=[01]\)*/ display +syn match tomlInteger /[+-]\=\(inf\|nan\)/ display -syn match tomlFloat /[+-]\=\<\d\(_\=\d\)*\.\d\+\>/ display -syn match tomlFloat /[+-]\=\<\d\(_\=\d\)*\(\.\d\(_\=\d\)*\)\=[eE][+-]\=\d\(_\=\d\)*\>/ display +syn match tomlFloat /[+-]\=\d\(_\=\d\)*\.\d\+/ display +syn match tomlFloat /[+-]\=\d\(_\=\d\)*\(\.\d\(_\=\d\)*\)\=[eE][+-]\=\d\(_\=\d\)*/ display syn match tomlBoolean /\<\%(true\|false\)\>/ display