vim: re-organise import keyword, component highlighting

Author: compnerd

utils/vim/syntax/swift.vim

@@ -7,11 +7,6 @@ if exists("b:current_syntax")
     finish
 endif
 
-syn keyword swiftImport import skipwhite nextgroup=swiftImportModule
-
-syn match swiftImportModule /\<[A-Za-z_][A-Za-z_0-9]*\>/ contained nextgroup=swiftImportComponent
-syn match swiftImportComponent /\.\<[A-Za-z_][A-Za-z_0-9]*\>/ contained nextgroup=swiftImportComponent
-
 syn keyword swiftKeyword
       \ associatedtype
       \ break
@@ -49,6 +44,9 @@ syn keyword swiftKeyword
       \ where
       \ while
 
+syn keyword swiftImport skipwhite nextgroup=swiftImportModule
+      \ import
+
 syn keyword swiftDefinitionModifier
       \ dynamic
       \ internal
@@ -92,6 +90,11 @@ syn keyword swiftVarDefinition skipwhite nextgroup=swiftVarName
       \ let
       \ var
 
+syn match swiftImportModule contained nextgroup=swiftImportComponent
+      \ /\<[A-Za-z_][A-Za-z_0-9]*\>/
+syn match swiftImportComponent contained nextgroup=swiftImportComponent
+      \ /\.\<[A-Za-z_][A-Za-z_0-9]*\>/
+
 syn match swiftTypeName contained nextgroup=swiftTypeParameters
       \ /\<[A-Za-z_][A-Za-z_0-9\.]*\>/
 syn match swiftVarName contained skipwhite nextgroup=swiftTypeDeclaration