aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-10-15 07:14:09 -04:00
Code Activity

runtime(cangjie): Fixes and improvements for syntax script

Browse Source 
Housekeeping:
- Add GitHub repository link
- Update Last Change date

Style:
- Add Vim modeline for consistent formatting
- Unify indentation style (spaces to tabs)
- Wrap long cluster definitions for readability

New Features:
- Add highlighting for escape sequences
- Add error highlighting for invalid rune literals
- Add syntax-based folding support

Fixes:
- Fix rune matching to allow only a single character/escape
- Fix highlighting for double-quoted rune literals
- Fix highlighting for floats with exponents and type suffixes

Co-authored-by: dkearns <dougkearns@gmail.com>
Signed-off-by: Wu Junkai <wujunkai20041123@outlook.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
Wu Junkai
2025-10-12 14:10:34 +00:00
committed by Christian Brabandt
parent 6800da6ff1
commit 37c8ce7fac
1 changed files with 75 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

110
runtime/syntax/cangjie.vim
View File

@@ -1,7 +1,8 @@
" Vim syntax file " Vim syntax file
" Language: Cangjie " Language: Cangjie
" Maintainer: Wu Junkai <wu.junkai@qq.com> " Maintainer: Wu Junkai <wu.junkai@qq.com>
" Last Change: 2025 Aug 17 " URL: https://github.com/WuJunkai2004/cangjie.vim
" Last Change: 2025 Oct 12
" "
" The Cangjie programming language is a new-generation programming " The Cangjie programming language is a new-generation programming
" language oriented to full-scenario intelligence. It features " language oriented to full-scenario intelligence. It features
@@ -33,7 +34,7 @@ syn case match
" 1. comments " 1. comments
syn keyword cangjieTodo TODO FIXME XXX NOTE BUG contained syn keyword cangjieTodo TODO FIXME XXX NOTE BUG contained
syn match cangjieComment /\v\/\/.*/ contains=cangjieTodo syn match cangjieComment /\v\/\/.*/ contains=cangjieTodo
syn region cangjieComment start=/\/\*/ end=/\*\// contains=cangjieTodo,@Spell syn region cangjieComment start=/\/\*/ end=/\*\// contains=cangjieTodo,@Spell
" 2. keywords " 2. keywords
@@ -44,10 +45,15 @@ syn keyword cangjieStatement as break case catch continue do else finally for in
syn keyword cangjieStatement if in is match quote return spawn super synchronized syn keyword cangjieStatement if in is match quote return spawn super synchronized
syn keyword cangjieStatement throw try unsafe where while syn keyword cangjieStatement throw try unsafe where while
syn keyword cangjieIdentlike false init main this true syn keyword cangjieIdentlike false init main this true
syn keyword cangjieVariable const let var syn keyword cangjieVariable const let var
syn keyword cangjieOption Option Some None syn keyword cangjieOption Option Some None
syn keyword cangjieDeclaration func struct class enum import package nextgroup=cangjieTypeName skipwhite syn keyword cangjieDeclaration func struct class enum import package nextgroup=cangjieTypeName skipwhite
syn cluster cangjieKeywordCluster contains=cangjieDeclaration,cangjieStatement,cangjieIdentlike,cangjieVariable,cangjieOption syn cluster cangjieKeywordCluster contains=
\ cangjieDeclaration,
\ cangjieStatement,
\ cangjieIdentlike,
\ cangjieVariable,
\ cangjieOption
" 3. macro (e.g., @override) " 3. macro (e.g., @override)
syn match cangjieMacro /@\h\w*/ syn match cangjieMacro /@\h\w*/
@@ -59,37 +65,61 @@ syn match cangjieTypeName /\h\w*/ contained
syn region cangjieSpIdentifier start=/`/ end=/`/ oneline syn region cangjieSpIdentifier start=/`/ end=/`/ oneline
" 6. types " 6. types
syn keyword cangjieSpType Any Nothing Range Unit Iterable syn keyword cangjieSpType Any Nothing Range Unit Iterable
syn keyword cangjieArrayType Array ArrayList VArray syn keyword cangjieArrayType Array ArrayList VArray
syn keyword cangjieHashType HashMap HashSet syn keyword cangjieHashType HashMap HashSet
syn keyword cangjieCommonType Bool Byte Rune String syn keyword cangjieCommonType Bool Byte Rune String
syn keyword cangjieFloatType Float16 Float32 Float64 syn keyword cangjieFloatType Float16 Float32 Float64
syn keyword cangjieIntType Int8 Int16 Int32 Int64 IntNative syn keyword cangjieIntType Int8 Int16 Int32 Int64 IntNative
syn keyword cangjieUIntType UInt8 UInt16 UInt32 UInt64 UIntNative syn keyword cangjieUIntType UInt8 UInt16 UInt32 UInt64 UIntNative
syn cluster cangjieTypeCluster contains=cangjieSpType,cangjieArrayType,cangjieHashType,cangjieCommonType,cangjieFloatType,cangjieIntType,cangjieUIntType syn cluster cangjieTypeCluster contains=
\ cangjieSpType,
\ cangjieArrayType,
\ cangjieHashType,
\ cangjieCommonType,
\ cangjieFloatType,
\ cangjieIntType,
\ cangjieUIntType
" 7. character and strings " 7. character and strings
syn cluster cangjieInterpolatedPart contains=@cangjieKeywordCluster,cangjieSpIdentifier,@cangjieTypeCluster,@cangjieNumberCluster,cangjieOperator syn cluster cangjieInterpolatedPart contains=
syn region cangjieInterpolation contained keepend start=/\${/ end=/}/ contains=@cangjieInterpolatedPart matchgroup=cangjieInterpolationDelimiter \ @cangjieKeywordCluster,
syn region cangjieRune start=/r'/ skip=/\\\\\|\\'/ end=/'/ oneline \ cangjieSpIdentifier,
syn region cangjieRune start=/b'/ skip=/\\\\\|\\'/ end=/'/ oneline \ @cangjieTypeCluster,
syn region cangjieString start=/"/ skip=/\\\\\|\\"/ end=/"/ oneline contains=cangjieInterpolation \ @cangjieNumberCluster,
syn region cangjieString start=/'/ skip=/\\\\\|\\'/ end=/'/ oneline contains=cangjieInterpolation \ cangjieOperator
syn region cangjieString start=/"""/ skip=/\\\\\|\\"/ end=/"""/ contains=cangjieInterpolation keepend syn region cangjieInterpolation contained keepend start=/\${/ end=/}/ contains=@cangjieInterpolatedPart
syn region cangjieString start=/'''/ skip=/\\\\\|\\'/ end=/'''/ contains=cangjieInterpolation keepend syn match cangjieEscape /\v\\u\{[0-9a-fA-F]{1,8}\}|\\./ contained
syn match cangjieRuneError /\v[rb]'([^'\\]|\\.)*'/
syn match cangjieRuneError /\v[rb]"([^"\\]|\\.)*"/
syn match cangjieRune /\vr'(\\u\{[0-9a-fA-F]{1,8}\}|\\.|[^'\\])'/ contains=cangjieEscape
syn match cangjieRune /\vr"(\\u\{[0-9a-fA-F]{1,8}\}|\\.|[^"\\])"/ contains=cangjieEscape
syn match cangjieRune /\vb'(\\u\{[0-9a-fA-F]{1,8}\}|\\.|[^'\\])'/ contains=cangjieEscape
syn region cangjieString start=/"/ skip=/\\\\\|\\"/ end=/"/ oneline contains=cangjieInterpolation,cangjieEscape
syn region cangjieString start=/'/ skip=/\\\\\|\\'/ end=/'/ oneline contains=cangjieInterpolation,cangjieEscape
syn region cangjieString start=/"""/ skip=/\\\\\|\\"/ end=/"""/ contains=cangjieInterpolation,cangjieEscape keepend
syn region cangjieString start=/'''/ skip=/\\\\\|\\'/ end=/'''/ contains=cangjieInterpolation,cangjieEscape keepend
syn region cangjieRawString start='\z(#*\)#"' end='"#\z1' syn region cangjieRawString start='\z(#*\)#"' end='"#\z1'
syn region cangjieRawString start='\z(#*\)#\'' end='\'#\z1' syn region cangjieRawString start='\z(#*\)#\'' end='\'#\z1'
" 8. number " 8. number
syn match cangjieHexFloatNumber /\v\c<0x([0-9a-f_]+\.?|[0-9a-f_]*\.[0-9a-f_]+)[p][-+]?\d[0-9_]*>/
syn match cangjieFloatNumber /\v\c<\d[0-9_]*\.\d[0-9_]*([ep][-+]?\d[0-9_]*)?(f(16|32|64))?>/ syn match cangjieFloatNumber /\v\c<\d[0-9_]*\.\d[0-9_]*([ep][-+]?\d[0-9_]*)?(f(16|32|64))?>/
syn match cangjieFloatNumber /\v\c<\d[0-9_]*\.([ep][-+]?\d[0-9_]*)?(f(16|32|64))?>/ syn match cangjieFloatNumber /\v\c<\d[0-9_]*\.([ep][-+]?\d[0-9_]*)?(f(16|32|64))?>/
syn match cangjieFloatNumber /\v\c\.\d[0-9_]*([ep][-+]?\d[0-9_]*)?(f(16|32|64))?>/ syn match cangjieFloatNumber /\v\c\.\d[0-9_]*([ep][-+]?\d[0-9_]*)?(f(16|32|64))?>/
syn match cangjieScienceNumber /\v\c<\d[0-9_]*[e][-+]?\d[0-9_]*>/ syn match cangjieScienceNumber /\v\c<\d[0-9_]*[e][-+]?\d[0-9_]*(f(16|32|64))?>/
syn match cangjieHexNumber /\v\c<0x[0-9a-f_]+([iu](8|16|32|64))?>/ syn match cangjieHexNumber /\v\c<0x[0-9a-f_]+([iu](8|16|32|64))?>/
syn match cangjieOctalNumber /\v\c<0o[0-7_]+([iu](8|16|32|64))?>/ syn match cangjieOctalNumber /\v\c<0o[0-7_]+([iu](8|16|32|64))?>/
syn match cangjieBinaryNumber /\v\c<0b[01_]+([iu](8|16|32|64))?>/ syn match cangjieBinaryNumber /\v\c<0b[01_]+([iu](8|16|32|64))?>/
syn match cangjieDecimalNumber /\v\c<\d[0-9_]*([iu](8|16|32|64))?>/ syn match cangjieDecimalNumber /\v\c<\d[0-9_]*([iu](8|16|32|64))?>/
syn cluster cangjieNumberCluster contains=cangjieFloatNumber,cangjieScienceNumber,cangjieHexNumber,cangjieOctalNumber,cangjieBinaryNumber,cangjieDecimalNumber syn cluster cangjieNumberCluster contains=
\ cangjieHexFloatNumber,
\ cangjieFloatNumber,
\ cangjieScienceNumber,
\ cangjieHexNumber,
\ cangjieOctalNumber,
\ cangjieBinaryNumber,
\ cangjieDecimalNumber
" 9. operators " 9. operators
syn match cangjieOperator /[-+%<>!&|^*=]=\?/ syn match cangjieOperator /[-+%<>!&|^*=]=\?/
@@ -101,10 +131,15 @@ syn match cangjieOperator /[:]/
syn match cangjieOperator /\.\./ syn match cangjieOperator /\.\./
syn match cangjieVarArgs /\.\.\./ syn match cangjieVarArgs /\.\.\./
" 10. folding
syn region cangjieFoldBraces transparent fold start='{' end='}' contains=ALLBUT,cangjieComment
syn region cangjieFoldParens transparent fold start='(' end=')' contains=ALLBUT,cangjieComment
syn region cangjieFoldBrackets transparent fold start='\[' end='\]' contains=ALLBUT,cangjieComment
" finally, link the syntax groups to the highlight groups " finally, link the syntax groups to the highlight groups
if s:enabled('comment') if s:enabled('comment')
hi def link cangjieTodo Todo hi def link cangjieTodo Todo
hi def link cangjieComment Comment hi def link cangjieComment Comment
endif endif
if s:enabled('identifier') if s:enabled('identifier')
hi def link cangjieSpIdentifier Identifier hi def link cangjieSpIdentifier Identifier
@@ -113,13 +148,14 @@ if s:enabled('keyword')
hi def link cangjieDeclaration Keyword hi def link cangjieDeclaration Keyword
hi def link cangjieStatement Statement hi def link cangjieStatement Statement
hi def link cangjieIdentlike Keyword hi def link cangjieIdentlike Keyword
hi def link cangjieVariable Keyword hi def link cangjieVariable Keyword
hi def link cangjieOption Keyword hi def link cangjieOption Keyword
endif endif
if s:enabled('macro') if s:enabled('macro')
hi def link cangjieMacro PreProc hi def link cangjieMacro PreProc
endif endif
if s:enabled('number') if s:enabled('number')
hi def link cangjieHexFloatNumber Number
hi def link cangjieFloatNumber Float hi def link cangjieFloatNumber Float
hi def link cangjieScienceNumber Float hi def link cangjieScienceNumber Float
hi def link cangjieHexNumber Number hi def link cangjieHexNumber Number
@@ -128,26 +164,30 @@ if s:enabled('number')
hi def link cangjieDecimalNumber Number hi def link cangjieDecimalNumber Number
endif endif
if s:enabled('operator') if s:enabled('operator')
hi def link cangjieOperator Operator hi def link cangjieOperator Operator
hi def link cangjieVarArgs Operator hi def link cangjieVarArgs Operator
endif endif
if s:enabled('string') if s:enabled('string')
hi def link cangjieRune Character hi def link cangjieRune Character
hi def link cangjieString String hi def link cangjieRuneError Error
hi def link cangjieString String
hi def link cangjieRawString String hi def link cangjieRawString String
hi def link cangjieEscape SpecialChar
endif endif
if s:enabled('type') if s:enabled('type')
hi def link cangjieTypeName Type hi def link cangjieTypeName Type
hi def link cangjieSpType Type hi def link cangjieSpType Type
hi def link cangjieArrayType Type hi def link cangjieArrayType Type
hi def link cangjieHashType Type hi def link cangjieHashType Type
hi def link cangjieCommonType Type hi def link cangjieCommonType Type
hi def link cangjieFloatType Type hi def link cangjieFloatType Type
hi def link cangjieIntType Type hi def link cangjieIntType Type
hi def link cangjieUIntType Type hi def link cangjieUIntType Type
endif endif
let b:current_syntax = "cangjie" let b:current_syntax = "cangjie"
let &cpo = s:save_cpo let &cpo = s:save_cpo
unlet s:save_cpo unlet s:save_cpo
" vim: ts=8 sw=8 noet