Symbols: improve Swift regexes 2 (#2945)

Author: chrismwendt

cmd/symbols/.ctags.d/additional-languages.ctags

@@ -43,15 +43,15 @@
 
 --langdef=swift
 --langmap=swift:.swift
---regex-swift=/^[[:space:]]*public[[:space:]]*((static|final)[[:space:]])*class[[:space:]]+([[:alnum:]_]+)/\3/c,class/
---regex-swift=/^[[:space:]]*public[[:space:]]*((static|final)[[:space:]])*let[[:space:]]+([[:alnum:]_]+)/\3/C,constant/
---regex-swift=/^[[:space:]]*public[[:space:]]*((static|final)[[:space:]])*var[[:space:]]+([[:alnum:]_]+)/\3/v,variable/
---regex-swift=/^[[:space:]]*public[[:space:]]*((static|final)[[:space:]])*enum[[:space:]]+([[:alnum:]_]+)/\3/e,enum/
---regex-swift=/^[[:space:]]*public[[:space:]]*((static|final)[[:space:]])*func[[:space:]]+([[:alnum:]_]+)/\3/f,function/
---regex-swift=/^[[:space:]]*public[[:space:]]*((static|final)[[:space:]])*protocol[[:space:]]+([[:alnum:]_]+)/\3/i,interface/
---regex-swift=/^[[:space:]]*public[[:space:]]*((static|final)[[:space:]])*struct[[:space:]]+([[:alnum:]_]+)/\3/s,struct/
---regex-swift=/^[[:space:]]*public[[:space:]]*((static|final)[[:space:]])*extension[[:space:]]+([[:alnum:]_]+)/\3/d,define/
---regex-swift=/^[[:space:]]*public[[:space:]]*((static|final)[[:space:]])*typealias[[:space:]]+([[:alnum:]_]+)/\3/a,alias/
+--regex-swift=/^[[:space:]]*((associatedtype|class|deinit|enum|extension|fileprivate|func|import|init|inout|internal|let|open|operator|private|protocol|public|static|struct|subscript|typealias|var)[[:space:]])*class[[:space:]]+([[:alnum:]_]+)/\3/c,class/
+--regex-swift=/^[[:space:]]*public[[:space:]]*((associatedtype|class|deinit|enum|extension|fileprivate|func|import|init|inout|internal|let|open|operator|private|protocol|public|static|struct|subscript|typealias|final)[[:space:]])*let[[:space:]]+([[:alnum:]_]+)/\3/C,constant/
+--regex-swift=/^[[:space:]]*public[[:space:]]*((associatedtype|class|deinit|enum|extension|fileprivate|func|import|init|inout|internal|let|open|operator|private|protocol|public|static|struct|subscript|typealias|final|lazy|mutating|nonmutating|optional|override|required|unowned|weak)[[:space:]])*var[[:space:]]+([[:alnum:]_]+)/\3/v,variable/
+--regex-swift=/^[[:space:]]*((associatedtype|class|deinit|enum|extension|fileprivate|func|import|init|inout|internal|let|open|operator|private|protocol|public|static|struct|subscript|typealias|var)[[:space:]])*enum[[:space:]]+([[:alnum:]_]+)/\3/e,enum/
+--regex-swift=/^[[:space:]]*((associatedtype|class|deinit|enum|extension|fileprivate|func|import|init|inout|internal|let|open|operator|private|protocol|public|static|struct|subscript|typealias|var|convenience|dynamic|final|mutating|nonmutating|optional|override|required)[[:space:]])*func[[:space:]]+([[:alnum:]_]+)/\3/f,function/
+--regex-swift=/^[[:space:]]*((associatedtype|class|deinit|enum|extension|fileprivate|func|import|init|inout|internal|let|open|operator|private|protocol|public|static|struct|subscript|typealias|var)[[:space:]])*protocol[[:space:]]+([[:alnum:]_]+)/\3/i,interface/
+--regex-swift=/^[[:space:]]*((associatedtype|class|deinit|enum|extension|fileprivate|func|import|init|inout|internal|let|open|operator|private|protocol|public|static|struct|subscript|typealias|var)[[:space:]])*struct[[:space:]]+([[:alnum:]_]+)/\3/s,struct/
+--regex-swift=/^[[:space:]]*((associatedtype|class|deinit|enum|extension|fileprivate|func|import|init|inout|internal|let|open|operator|private|protocol|public|static|struct|subscript|typealias|var)[[:space:]])*extension[[:space:]]+([[:alnum:]_]+)/\3/d,define/
+--regex-swift=/^[[:space:]]*((associatedtype|class|deinit|enum|extension|fileprivate|func|import|init|inout|internal|let|open|operator|private|protocol|public|static|struct|subscript|typealias|var)[[:space:]])*typealias[[:space:]]+([[:alnum:]_]+)/\3/a,alias/
 
 --langdef=kotlin
 --langmap=kotlin:+.kt