diff options
Diffstat (limited to 'runtime/syntax/form.vim')
| -rw-r--r-- | runtime/syntax/form.vim | 91 |
1 files changed, 39 insertions, 52 deletions
diff --git a/runtime/syntax/form.vim b/runtime/syntax/form.vim index 19a47ed6b9..9718480da3 100644 --- a/runtime/syntax/form.vim +++ b/runtime/syntax/form.vim @@ -11,11 +11,8 @@ " This syntax file is still in development. Please send suggestions " to the maintainer. -" For version 5.x: Clear all syntax items -" For version 6.x: Quit when a syntax file was already loaded -if version < 600 - syntax clear -elseif exists("b:current_syntax") +" quit when a syntax file was already loaded +if exists("b:current_syntax") finish endif @@ -88,7 +85,7 @@ syn match formComment "\;\ *\*.*$" contains=formTodo syn region formString start=+"+ end=+"+ contains=formSpecial syn region formString start=+'+ end=+'+ syn region formNestedString start=+`+ end=+'+ contains=formNestedString -syn match formPreProc "^\=\#[a-zA-z][a-zA-Z0-9]*\>" +syn match formPreProc "^\=\#[a-zA-Z][a-zA-Z0-9]*\>" syn match formNumber "\<\d\+\>" syn match formNumber "\<\d\+\.\d*\>" syn match formNumber "\.\d\+\>" @@ -97,61 +94,51 @@ syn match formNumber "-\.\d" contains=Number syn match formNumber "i_\+\>" syn match formNumber "fac_\+\>" " pattern matching wildcards -syn match formNumber "?[A-z0-9]*" +syn match formNumber "?[a-zA-Z0-9]*" " dollar-variables (new in 3.x) -syn match formNumber "\\$[A-z0-9]*" +syn match formNumber "\\$[a-zA-Z0-9]*" " scalar products -syn match formNumber "^\=[a-zA-z][a-zA-Z0-9]*\.[a-zA-z][a-zA-Z0-9]*\>" +syn match formNumber "^\=[a-zA-Z][a-zA-Z0-9]*\.[a-zA-Z][a-zA-Z0-9]*\>" -syn match formDirective "^\=\.[a-zA-z][a-zA-Z0-9]*\>" +syn match formDirective "^\=\.[a-zA-Z][a-zA-Z0-9]*\>" " hi User Labels syn sync ccomment formComment minlines=10 " Define the default highlighting. -" For version 5.7 and earlier: only when not done already -" For version 5.8 and later: only when an item doesn't have highlighting yet -if version >= 508 || !exists("did_form_syn_inits") - if version < 508 - let did_form_syn_inits = 1 - command -nargs=+ HiLink hi link <args> - else - command -nargs=+ HiLink hi def link <args> - endif - - HiLink formConditional Conditional - HiLink formNumber Number - HiLink formStatement Statement - HiLink formComment Comment - HiLink formPreProc PreProc - HiLink formDirective PreProc - HiLink formType Type - HiLink formString String - HiLink formNestedString String - HiLink formReserved Error - HiLink formTodo Todo - HiLink formSpecial SpecialChar - - if !exists("form_enhanced_color") - HiLink formHeaderStatement Statement - else - " enhanced color mode - HiLink formHeaderStatement HeaderStatement - " dark and a light background for local types - if &background == "dark" - hi HeaderStatement term=underline ctermfg=LightGreen guifg=LightGreen gui=bold - else - hi HeaderStatement term=underline ctermfg=DarkGreen guifg=SeaGreen gui=bold - endif - " change slightly the default for dark gvim - if has("gui_running") && &background == "dark" - hi Conditional guifg=LightBlue gui=bold - hi Statement guifg=LightYellow - endif - endif - - delcommand HiLink +" Only when an item doesn't have highlighting yet + +hi def link formConditional Conditional +hi def link formNumber Number +hi def link formStatement Statement +hi def link formComment Comment +hi def link formPreProc PreProc +hi def link formDirective PreProc +hi def link formType Type +hi def link formString String +hi def link formNestedString String +hi def link formReserved Error +hi def link formTodo Todo +hi def link formSpecial SpecialChar + +if !exists("form_enhanced_color") +hi def link formHeaderStatement Statement +else +" enhanced color mode +hi def link formHeaderStatement HeaderStatement +" dark and a light background for local types +if &background == "dark" +hi HeaderStatement term=underline ctermfg=LightGreen guifg=LightGreen gui=bold +else +hi HeaderStatement term=underline ctermfg=DarkGreen guifg=SeaGreen gui=bold endif +" change slightly the default for dark gvim +if has("gui_running") && &background == "dark" +hi Conditional guifg=LightBlue gui=bold +hi Statement guifg=LightYellow +endif +endif + let b:current_syntax = "form" |