Skip to content

Delimiter/Separator Highlighting #56

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

Open
wants to merge 10 commits into
base: main
Choose a base branch
from
Open

Delimiter/Separator Highlighting #56

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
33eafc2
feat(syntax): add delimiter highlighting
Iron-E Dec 18, 2020
490cfc8
feat(syntax): highlight dot accessors in keys
Iron-E Dec 18, 2020
382cfee
fix(syntax): tomlKey not highlighted if contains \d
Iron-E Apr 2, 2021
9c22b5d
chore(syntax): remove reference to dead group
Iron-E Sep 21, 2021
02ec48e
perf(syntax): simplify `tomlKey` definition
Iron-E Sep 21, 2021
923f886
perf(syntax): simplify `tomlTable` definition
Iron-E Sep 21, 2021
774ab5d
chore(syntax): remove unused `:syn` group
Iron-E Sep 21, 2021
4e7208a
perf(syntax): remove unecessary `\V`
Iron-E Sep 21, 2021
1325043
perf(syntax): remove unecessary `contains`
Iron-E Sep 21, 2021
9455b84
fix: support numbers in `tomlTable`
Iron-E May 12, 2022
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
42 changes: 24 additions & 18 deletions syntax/toml.vim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,14 @@ if exists('b:current_syntax')
finish
endif

syn match tomlNoise "[,.]" display nextgroup=@tomlValue skipempty skipwhite

syn match tomlOperator "=" display nextgroup=@tomlValue skipempty skipwhite

syn match tomlEscape /\\[btnfr"/\\]/ display contained
syn match tomlEscape /\\u\x\{4}/ contained
syn match tomlEscape /\\U\x\{8}/ contained

syn match tomlLineEscape /\\$/ contained

" Basic strings
Expand Down Expand Up @@ -40,42 +45,43 @@ syn match tomlDate /\d\{4\}-\d\{2\}-\d\{2\}/ display
syn match tomlDate /\d\{2\}:\d\{2\}:\d\{2\}\%(\.\d\+\)\?/ display
syn match tomlDate /\d\{4\}-\d\{2\}-\d\{2\}[T ]\d\{2\}:\d\{2\}:\d\{2\}\%(\.\d\+\)\?\%(Z\|[+-]\d\{2\}:\d\{2\}\)\?/ display

syn match tomlDotInKey /\v[^.]+\zs\./ contained display
syn match tomlKey /\v(^|[{,])\s*\zs[[:alnum:]._-]+\ze\s*\=/ contains=tomlDotInKey display
syn match tomlKey /\v\w+[A-Za-z_.-]*(\s*\=)@=/ contains=tomlNoise display

syn region tomlKeyDq oneline start=/\v(^|[{,])\s*\zs"/ end=/"\ze\s*=/ contains=tomlEscape
syn region tomlKeySq oneline start=/\v(^|[{,])\s*\zs'/ end=/'\ze\s*=/

syn region tomlTable oneline start=/^\s*\[[^\[]/ end=/\]/ contains=tomlKey,tomlKeyDq,tomlKeySq,tomlDotInKey
syn region tomlKeySq oneline start=/\v(^|[{,])\s*\zs'/ end=/'\ze\s*=/

syn region tomlTableArray oneline start=/^\s*\[\[/ end=/\]\]/ contains=tomlKey,tomlKeyDq,tomlKeySq,tomlDotInKey
syn match tomlTable /\v\[\w+[0-9A-Za-z_.-]*\]/ contains=tomlNoise display

syn region tomlKeyValueArray start=/=\s*\[\zs/ end=/\]/ contains=@tomlValue
syn region tomlTableInline matchgroup=tomlTable start="{" end="}" transparent

syn region tomlArray start=/\[/ end=/\]/ contains=@tomlValue contained
syn cluster tomlValue contains=tomlArray,tomlTableInline,tomlString,tomlInteger,tomlFloat,tomlBoolean,tomlDate,tomlComment

syn cluster tomlValue contains=tomlArray,tomlString,tomlInteger,tomlFloat,tomlBoolean,tomlDate,tomlComment
syn match tomlArray /\v[\[\]]/ contains=tomlTable display

syn keyword tomlTodo TODO FIXME XXX BUG contained

syn match tomlComment /#.*/ contains=@Spell,tomlTodo

hi def link tomlArray tomlNoise
hi def link tomlBoolean Boolean
hi def link tomlComment Comment
hi def link tomlTodo Todo
hi def link tomlTableArray Title
hi def link tomlTable Title
hi def link tomlDotInKey Normal
hi def link tomlKeySq Identifier
hi def link tomlKeyDq Identifier
hi def link tomlKey Identifier
hi def link tomlDate Constant
hi def link tomlBoolean Boolean
hi def link tomlEscape SpecialChar
hi def link tomlFloat Float
hi def link tomlInteger Number
hi def link tomlString String
hi def link tomlKey Identifier
hi def link tomlKeyDq tomlKey
hi def link tomlKeySq tomlKey
hi def link tomlLineEscape SpecialChar
hi def link tomlEscape SpecialChar
hi def link tomlNoise Delimiter
hi def link tomlOperator Operator
hi def link tomlString String
hi def link tomlTable Title
hi def link tomlTodo Todo

syn sync minlines=500

let b:current_syntax = 'toml'

" vim: et sw=2 sts=2
4 changes: 4 additions & 0 deletions test/test.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,10 @@ issue11 = -210_000.0
# https://github.com/cespare/vim-toml/issues/13
issue13 = { version="1.0", features=["derive"] }

[target.x86_64-unknown-linux-gnu]
linker = "clang"
rustflags = ["-C", "link-arg=-fuse-ld=/usr/bin/mold"]

# https://github.com/cespare/vim-toml/pull/52
[foo.baz]
apple.type = "fruit"
Expand Down