Skip to content

Vim syntax improvements #2764

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

Merged
merged 10 commits into from
May 29, 2016
Merged

Vim syntax improvements #2764

Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
188b70d
vim: remove support for obsolete attribute syntax
compnerd May 29, 2016
2986b11
vim: add `dynamicType`
compnerd May 29, 2016
e0a5edd
vim: tweak casting operator highlighting
compnerd May 29, 2016
8c5161d
vim: highlight array types in cast target
compnerd May 29, 2016
bfd78da
vim: highlight `dynamic` modifier
compnerd May 29, 2016
980b408
vim: remove `destructor` keyword for `deinit`
compnerd May 29, 2016
6b8eae0
vim: consider optionality as part of the type
compnerd May 29, 2016
156bfe8
vim: add `throw` keyword
compnerd May 29, 2016
6435ba6
vim: highlight the `throws` modifier
compnerd May 29, 2016
314699e
vim: highlight `autoreleasepool`
compnerd May 29, 2016
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
49 changes: 36 additions & 13 deletions utils/vim/syntax/swift.vim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,36 +42,56 @@ syn keyword swiftKeyword
\ return
\ static
\ switch
\ throw
\ try
\ typealias
\ var
\ where
\ while

syn keyword swiftDefinitionModifier
\ dynamic
\ internal
\ private
\ public
\ static
\ throws

syn keyword swiftIdentifierKeyword
\ Self
\ dynamicType
\ metatype
\ self
\ super

syn keyword swiftFuncKeyword nextgroup=swiftTypeParameters
\ deinit
\ init
\ subscript

syn keyword swiftScope
\ autoreleasepool

syn keyword swiftTypeDefinition class extension protocol struct typealias enum skipwhite nextgroup=swiftTypeName
syn region swiftTypeAttributes start="\[" end="\]" contained skipwhite nextgroup=swiftTypeName
syn match swiftTypeName /\<[A-Za-z_][A-Za-z_0-9\.]*\>/ contained nextgroup=swiftTypeParameters

syn match swiftTypeName /\<[A-Za-z_][A-Za-z_0-9\.]*\>[!?]\?/ contained nextgroup=swiftTypeParameters
syn region swiftArrayType start=/\[/ end=/\]/ contained skipwhite nextgroup=swiftTypeName

syn region swiftTypeParameters start="<" end=">" contained

syn keyword swiftMutating mutating skipwhite nextgroup=swiftFuncDefinition
syn keyword swiftFuncDefinition func skipwhite nextgroup=swiftFuncAttributes,swiftFuncName,swiftOperator
syn region swiftFuncAttributes start="\[" end="\]" contained skipwhite nextgroup=swiftFuncName,swiftOperator
syn keyword swiftFuncDefinition func skipwhite nextgroup=swiftFuncName,swiftOperator
syn match swiftFuncName /\<[A-Za-z_][A-Za-z_0-9]*\>/ contained skipwhite nextgroup=swiftTypeParameters
syn keyword swiftFuncKeyword subscript init destructor nextgroup=swiftTypeParameters

syn keyword swiftVarDefinition var skipwhite nextgroup=swiftVarName
syn keyword swiftVarDefinition let skipwhite nextgroup=swiftVarName
syn match swiftVarName /\<[A-Za-z_][A-Za-z_0-9]*\>/ contained

syn keyword swiftDefinitionModifier static public internal private

syn match swiftImplicitVarName /\$\<[A-Za-z_0-9]\+\>/

syn match swiftTypeDeclaration /:/ skipwhite nextgroup=swiftTypeAttributes,swiftTypeName
syn match swiftTypeDeclaration /->/ skipwhite nextgroup=swiftTypeAttributes,swiftTypeName
syn match swiftTypeDeclaration /:/ skipwhite nextgroup=swiftTypeName
syn match swiftTypeDeclaration /->/ skipwhite nextgroup=swiftTypeName

syn keyword swiftIdentifierKeyword metatype super self Self

syn keyword swiftNew new skipwhite nextgroup=swiftTypeName

Expand Down Expand Up @@ -101,7 +121,9 @@ syn match swiftAttribute /@\<\w\+\>/

syn keyword swiftTodo TODO FIXME contained
syn keyword swiftNil nil
syn match swiftNilOps "\<as?\?\>"

syn match swiftCastOp "\<as\>[!?]\?" skipwhite nextgroup=swiftTypeName,swiftArrayType

syn match swiftNilOps "??"

hi def link swiftImport Include
Expand All @@ -110,12 +132,11 @@ hi def link swiftImportComponent Identifier
hi def link swiftKeyword Statement
hi def link swiftTypeDefinition Define
hi def link swiftTypeName Type
hi def link swiftArrayType Type
hi def link swiftTypeParameters Special
hi def link swiftTypeAttributes PreProc
hi def link swiftFuncDefinition Define
hi def link swiftDefinitionModifier Define
hi def link swiftFuncName Function
hi def link swiftFuncAttributes PreProc
hi def link swiftFuncKeyword Function
hi def link swiftVarDefinition Define
hi def link swiftVarName Identifier
Expand All @@ -141,6 +162,8 @@ hi def link swiftPreprocFalse Comment
hi def link swiftAttribute Type
hi def link swiftTodo Todo
hi def link swiftNil Constant
hi def link swiftCastOp Operator
hi def link swiftNilOps Operator
hi def link swiftScope PreProc

let b:current_syntax = "swift"