From 1d533624c2389707f878c7c36673919c9bca5509 Mon Sep 17 00:00:00 2001 From: Saleem Abdulrasool Date: Fri, 12 Jun 2020 10:45:04 -0700 Subject: [PATCH 1/4] vim: treat `associatedtype` as `typealias` for highlighting --- utils/vim/syntax/swift.vim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/vim/syntax/swift.vim b/utils/vim/syntax/swift.vim index 2928550b4adb8..14dec4bfa5a37 100644 --- a/utils/vim/syntax/swift.vim +++ b/utils/vim/syntax/swift.vim @@ -16,7 +16,6 @@ if exists("b:current_syntax") endif syn keyword swiftKeyword - \ associatedtype \ break \ catch \ continue @@ -92,6 +91,7 @@ syn keyword swiftTypeDefinition skipwhite skipempty nextgroup=swiftTypeName \ struct syn keyword swiftTypeAliasDefinition skipwhite skipempty nextgroup=swiftTypeAliasName + \ associatedtype \ typealias syn match swiftMultiwordTypeDefinition skipwhite skipempty nextgroup=swiftTypeName From 22006e376cb3812a47466379e15aca55c1694d2d Mon Sep 17 00:00:00 2001 From: Saleem Abdulrasool Date: Fri, 12 Jun 2020 10:45:39 -0700 Subject: [PATCH 2/4] vim: add some missing keywords for highlighting --- utils/vim/syntax/swift.vim | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/utils/vim/syntax/swift.vim b/utils/vim/syntax/swift.vim index 14dec4bfa5a37..7dd4b49aeee1d 100644 --- a/utils/vim/syntax/swift.vim +++ b/utils/vim/syntax/swift.vim @@ -17,8 +17,10 @@ endif syn keyword swiftKeyword \ break + \ case \ catch \ continue + \ default \ defer \ do \ else @@ -87,6 +89,8 @@ syn keyword swiftTypeDefinition skipwhite skipempty nextgroup=swiftTypeName \ class \ enum \ extension + \ operator + \ precedencegroup \ protocol \ struct From 2b5059c204f3e4e0f8500789121c24bc913407e1 Mon Sep 17 00:00:00 2001 From: Saleem Abdulrasool Date: Fri, 12 Jun 2020 10:46:19 -0700 Subject: [PATCH 3/4] vim: handle `Any` and `AnyObject` as core types --- utils/vim/syntax/swift.vim | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/utils/vim/syntax/swift.vim b/utils/vim/syntax/swift.vim index 7dd4b49aeee1d..ee8980fb3a319 100644 --- a/utils/vim/syntax/swift.vim +++ b/utils/vim/syntax/swift.vim @@ -39,6 +39,10 @@ syn keyword swiftKeyword syn match swiftMultiwordKeyword \ "indirect case" +syn keyword swiftCoreTypes + \ Any + \ AnyObject + syn keyword swiftImport skipwhite skipempty nextgroup=swiftImportModule \ import @@ -212,9 +216,9 @@ syn match swiftAttribute syn keyword swiftTodo MARK TODO FIXME contained -syn match swiftCastOp skipwhite skipempty nextgroup=swiftType +syn match swiftCastOp skipwhite skipempty nextgroup=swiftType,swiftCoreTypes \ "\" -syn match swiftCastOp skipwhite skipempty nextgroup=swiftType +syn match swiftCastOp skipwhite skipempty nextgroup=swiftType,swiftCoreTypes \ "\[!?]\?" syn match swiftNilOps @@ -227,6 +231,7 @@ hi def link swiftImport Include hi def link swiftImportModule Title hi def link swiftImportComponent Identifier hi def link swiftKeyword Statement +hi def link swiftCoreTypes Type hi def link swiftMultiwordKeyword Statement hi def link swiftTypeDefinition Define hi def link swiftMultiwordTypeDefinition Define From 20dbe3fb220570da839a8dd27de6f5ae8cfe98db Mon Sep 17 00:00:00 2001 From: Saleem Abdulrasool Date: Fri, 12 Jun 2020 10:47:09 -0700 Subject: [PATCH 4/4] vim: handle `column` and `dsohandle` identifiers --- utils/vim/syntax/swift.vim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/vim/syntax/swift.vim b/utils/vim/syntax/swift.vim index ee8980fb3a319..b3db3dc949e2d 100644 --- a/utils/vim/syntax/swift.vim +++ b/utils/vim/syntax/swift.vim @@ -205,7 +205,7 @@ syn match swiftDecimal contained \ /[0-9]\+/ syn match swiftPreproc - \ /#\(\\|\\|\\)/ + \ /#\(\\|\\|\\|\\|\\)/ syn match swiftPreproc \ /^\s*#\(\\|\\|\\|\\|\\|\\)/ syn region swiftPreprocFalse