Skip to content
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

Jump to bottom

Better syntax highlighting #14

Merged
merged 1 commit into from
Oct 10, 2019
Merged

Better syntax highlighting #14

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
33 changes: 21 additions & 12 deletions syntax/fsharp.vim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ syn keyword fsharpScript contained install_printer remove_printer requirethread
syn keyword fsharpScript contained trace untrace untrace_all print_depth
syn keyword fsharpScript contained print_length define undef if elif else endif
syn keyword fsharpScript contained line error warning light nowarn
syn keyword fsharpScript contained I load r time


" comments
Expand All @@ -40,8 +41,9 @@ syn region fsharpDoubleBacktick start="``" end="``" keepend oneline


" symbol names
syn match fsharpSymbol "\%(let\|use\|mutable\|rec\|and\|private\)\@<=!\=\s\+\zs\w\+\ze\s*[^=:]*[=:]"
syn match fsharpSymbol "\%(member\)\@<=\s\+\w\+\.\zs\w\+"
syn match fsharpSymbol "\%(let\|use\|mutable\|rec\|and\|inline\|public\|private\|internal\|static\|member\|override\)\@<=!\=\s\+\(\w\+\.\)\=\zs\w\+\ze"
"syn match fsharpSymbol "\%(let\|use\|mutable\|rec\|and\|private\)\@<=!\=\s\+\zs\w\+\ze\s*[^=:]*[=:]"
"syn match fsharpSymbol "\%(member\)\@<=\s\+\w\+\.\zs\w\+"


" types
Expand Down Expand Up @@ -82,11 +84,16 @@ syn keyword fsharpKeyword process pure return seq tailcall trait

" additional operator keywords (Microsoft.FSharp.Core.Operators)
syn keyword fsharpKeyword box hash sizeof typeof typedefof unbox ref fst snd
syn keyword fsharpKeyword stdin stdout stderr
syn keyword fsharpKeyword stdin stdout stderr id compare incr decr defaultArg
syn keyword fsharpKeyword exit ignore lock using

" extra operator keywords (Microsoft.FSharp.Core.ExtraTopLevelOperators)
syn keyword fsharpKeyword array2D dict set

" math operators (Microsoft.FSharp.Core.Operators)
syn keyword fsharpKeyword abs acos asin atan atan2 ceil cos cosh exp floor log
syn keyword fsharpKeyword log10 pown round sign sin sinh sqrt tan tanh
syn keyword fsharpKeyword log10 pown round sign sin sinh sqrt tan tanh truncate
syn keyword fsharpKeyword infinity infinityf nan nanf

syn keyword fsharpOCaml asr land lor lsl lsr lxor mod sig

Expand All @@ -98,8 +105,8 @@ endif
syn keyword fsharpOpen open

" exceptions
syn keyword fsharpException try failwith failwithf finally invalid_arg raise
syn keyword fsharpException rethrow
syn keyword fsharpException try failwith failwithf finally invalidArg invalidOp Failure raise
syn keyword fsharpException rethrow nullArg reraise

" modifiers
syn keyword fsharpModifier abstract const extern internal override private
Expand All @@ -109,17 +116,20 @@ syn keyword fsharpModifier volatile
" constants
syn keyword fsharpConstant null
syn keyword fsharpBoolean false true
syn keyword fsharpSourceBuiltin __LINE__ __SOURCE_DIRECTORY__ __SOURCE_FILE__

" types
syn keyword fsharpType array bool byte char decimal double enum exn float
syn keyword fsharpType float32 int int16 int32 int64 lazy_t list nativeint
syn keyword fsharpType float32 int int16 int32 int64 list nativeint
syn keyword fsharpType obj option sbyte single string uint uint32 uint64
syn keyword fsharpType uint16 unativeint unit
syn keyword fsharpType uint16 unativeint unit int8 uint8 bigint

syn keyword fsharpType inref outref byref nativeptr

" core classes
syn match fsharpCore "\u\a*\." transparent contains=fsharpCoreClass

syn keyword fsharpCoreClass Array Async Directory File List Option Path Map Set contained
syn keyword fsharpCoreClass Array Async Directory File List Option Path Map Set Lazy contained
syn keyword fsharpCoreClass String Seq Tuple contained

syn keyword fsharpCoreMethod printf printfn sprintf eprintf eprintfn fprintf
Expand Down Expand Up @@ -180,7 +190,7 @@ syn match fsharpFloat "\<-\=\d\(_\|\d\)*\.\(_\|\d\)*\([eE][-+]\=\d\(_
syn match fsharpFloat "\<\d\+\.\d*"

" modules
syn match fsharpModule "\%#=1\%(\<open\s\+\)\@<=[a-zA-Z.]\+"
syn match fsharpModule "\%#=1\%(\<open\s\+\)\@<=[a-zA-Z0-9.]\+"

" attributes
syn region fsharpAttrib matchgroup=fsharpAttribute start="\[<" end=">]"
Expand Down Expand Up @@ -210,7 +220,6 @@ if version >= 508 || !exists("did_fs_syntax_inits")
HiLink fsharpDoubleBacktick String

HiLink fsharpOpen Include
HiLink fsharpModPath Include
HiLink fsharpScript Include
HiLink fsharpPreCondit Include

Expand All @@ -230,6 +239,7 @@ if version >= 508 || !exists("did_fs_syntax_inits")

HiLink fsharpBoolean Boolean
HiLink fsharpConstant Constant
HiLink fsharpSourceBuiltin Constant
HiLink fsharpCharacter Character
HiLink fsharpNumber Number
HiLink fsharpFloat Float
Expand All @@ -244,7 +254,6 @@ if version >= 508 || !exists("did_fs_syntax_inits")
HiLink fsharpLabel Identifier
HiLink fsharpOption Identifier
HiLink fsharpTypeName Identifier
HiLink fsharpModule Identifier

HiLink fsharpType Type

Expand Down