Skip to content

Commit 00d852d

Browse files
committed
vim: move remaining keywords
1 parent 63e6759 commit 00d852d

File tree

1 file changed

+11
-5
lines changed

1 file changed

+11
-5
lines changed

utils/vim/syntax/swift.vim

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,17 @@ syn keyword swiftVarDefinition skipwhite nextgroup=swiftVarName
9090
\ let
9191
\ var
9292

93+
syn keyword swiftLabel
94+
\ get
95+
\ set
96+
97+
syn keyword swiftBoolean
98+
\ false
99+
\ true
100+
101+
syn keyword swiftNil
102+
\ nil
103+
93104
syn match swiftImportModule contained nextgroup=swiftImportComponent
94105
\ /\<[A-Za-z_][A-Za-z_0-9]*\>/
95106
syn match swiftImportComponent contained nextgroup=swiftImportComponent
@@ -128,8 +139,6 @@ syn match swiftTypeDeclaration skipwhite nextgroup=swiftType
128139
syn match swiftTypeDeclaration skipwhite nextgroup=swiftType
129140
\ /->/
130141

131-
syn keyword swiftBoolean true false
132-
133142
syn region swiftString start=/"/ skip=/\\\\\|\\"/ end=/"/ contains=swiftInterpolation
134143
syn region swiftInterpolation start=/\\(/ end=/)/ contained
135144
syn region swiftComment start="/\*" end="\*/" contains=swiftComment,swiftLineComment,swiftTodo
@@ -145,15 +154,12 @@ syn match swiftOperator "\.\.[<.]" skipwhite nextgroup=swiftTypeParameters
145154

146155
syn match swiftChar /'\([^'\\]\|\\\(["'tnr0\\]\|x[0-9a-fA-F]\{2}\|u[0-9a-fA-F]\{4}\|U[0-9a-fA-F]\{8}\)\)'/
147156

148-
syn keyword swiftLabel get set
149-
150157
syn match swiftPreproc /^\s*#\(\<if\>\|\<else\>\|\<elseif\>\|\<endif\>\)/
151158
syn region swiftPreprocFalse start="^\s*#\<if\>\s\+\<false\>" end="^\s*#\(\<else\>\|\<elseif\>\|\<endif\>\)"
152159

153160
syn match swiftAttribute /@\<\w\+\>/ skipwhite nextgroup=swiftType
154161

155162
syn keyword swiftTodo TODO FIXME contained
156-
syn keyword swiftNil nil
157163

158164
syn match swiftCastOp "\<as\>[!?]\?" skipwhite nextgroup=swiftType
159165

0 commit comments

Comments
 (0)