Commit Graph

81 Commits

Author SHA1 Message Date
Saleem Abdulrasool
4dab467654 vim: highlight reethrows as a modifier 2016-05-30 21:50:42 -07:00
Saleem Abdulrasool
0d600fdbf1 vim: highlight attributed function declarations
Check for a type declaration following an attribute.  This corrects the
highlighting of function types such as:

  @noescape (Wrapped) throws -> T
2016-05-30 21:50:42 -07:00
Saleem Abdulrasool
a756131efe vim: more clever highlighting of generics
Perform more clever highlighting of generic clauses.  The archetype identifier
is now identified as an identifier, the archtetype type as a type, and the
constraints (where) as special syntax.
2016-05-30 21:50:42 -07:00
Saleem Abdulrasool
5fd99aec6a vim: not all function keywords get generalised
We currently only do init<T>.  Only permit generalization of init, not deinit,
subscript.
2016-05-30 21:50:42 -07:00
Saleem Abdulrasool
ba4a17c1d2 vim: differentiate between a type and a typename
A typename is a name for a type being defined.  A type may contain optionality
as well.  This ensures that we do not accidentally highlight an invalid name
such as `InvalidName?` as a type name.

Fix the fact that I had previously created a special group for the array.  An
array is a type, so it should be part of the same group.
2016-05-30 21:50:42 -07:00
Saleem Abdulrasool
314699e83c vim: highlight autoreleasepool 2016-05-28 21:35:55 -07:00
Saleem Abdulrasool
6435ba6748 vim: highlight the throws modifier
Highlight the `throws` keyword which indicates a function may throw an
exception.
2016-05-28 21:26:06 -07:00
Saleem Abdulrasool
156bfe8e11 vim: add throw keyword 2016-05-28 21:25:10 -07:00
Saleem Abdulrasool
6b8eae03c3 vim: consider optionality as part of the type
Include the optionality of a type as part of the type name.
2016-05-28 21:24:19 -07:00
Saleem Abdulrasool
980b408882 vim: remove destructor keyword for deinit
This fixes the highlighting for the "destructor" in swift.
2016-05-28 21:10:28 -07:00
Saleem Abdulrasool
bfd78da590 vim: highlight dynamic modifier
Treat `dynamic` as a modifier for functions.
2016-05-28 21:03:04 -07:00
Saleem Abdulrasool
8c5161d6c6 vim: highlight array types in cast target
Highlight array types when used for type names as types.
2016-05-28 21:03:04 -07:00
Saleem Abdulrasool
e0a5eddcf3 vim: tweak casting operator highlighting
Tweak the matching for swift 2 casting operators (as, as?, as!).
2016-05-28 21:03:04 -07:00
Saleem Abdulrasool
2986b11a15 vim: add dynamicType
Include the `dynamicType` keyword in the identifier keywords.
2016-05-28 21:03:04 -07:00
Saleem Abdulrasool
188b70da95 vim: remove support for obsolete attribute syntax
Bracketed attributes have not been supported since pre-1.0.  Let us consider
them obsoleted.
2016-05-28 19:58:04 -07:00
Saleem Abdulrasool
3ce5337a9a vim: clean up skipwhite usage
The skipwhite option is only relevant when there is a nextgroup directive as
well.  Normalise the usage across the file and remove the extraneous skipwhite
directives.  NFC.
2016-05-28 11:59:42 -07:00
Saleem Abdulrasool
60cf8f75cd vim: add try and catch keywords
These were missing from the keyword list.  Add them.
2016-05-26 20:49:15 -07:00
Saleem Abdulrasool
bc6cac32e2 vim: sort the keyword list 2016-05-26 20:46:56 -07:00
Saleem Abdulrasool
96e64bf10a vim: change the keyword list into a list
Just represent the list of keywords as a visible list.  This makes it easier to
see the individual keywords as well as makes it easy to add new keywords in the
future.
2016-05-26 20:45:51 -07:00
Saleem Abdulrasool
caa40e268b vim: remoe unnecessary keyword option
skipwhite does not do anything for keyword matches.  Remove the unnecessary
option.  NFC.
2016-05-26 20:43:45 -07:00
Dmitri Gribenko
071c80714a vim: add coloring for 'guard' 2016-05-16 14:46:14 -07:00
Saleem Abdulrasool
df44056ae9 vim: comment out #if false
Similar to `#if 0` in C/C++, `#if false` is used to block comment out code.
Treat it as such.
2016-05-16 11:52:38 -07:00
Saleem Abdulrasool
83e702a73e vim: update syntax file
Support `#else` and `#elseif` as valid tokens as well.  Also support whitespace
before the #.
2016-05-14 21:32:16 -07:00
Max Moiseev
b29bdd4361 [vim] support for more keywords
Support for a newly introduced `associatedtype` as well as `final`,
`override` etc. `get`/`set`, nil`, `as` and `??` will get highlighted
too.
2016-01-22 15:40:29 -08:00
Max Moiseev
881b2b48d5 [vim] highlighting FIXME and TODO in comments 2015-12-04 17:31:36 -08:00
Max Moiseev
bc46ab5bc5 Minor tweaks to vim syntax highlighting
Highlighting #if/#endif, @attributes, mutating and some more keywords
2015-12-01 15:44:43 -08:00
Chris Willmore
c7c7388cf2 Change do-while to repeat-while.
Change all uses of "do { ... } while <cond>" to use "repeat" instead.
Rename DoWhileStmt to RepeatWhileStmt. Add diagnostic suggesting change
of 'do' to 'repeat' if a condition is found afterwards.

<rdar://problem/20336424> rename do/while loops to repeat/while & introduce "repeat <count> {}" loops

Swift SVN r27650
2015-04-23 22:48:31 +00:00
Dmitri Hrybenko
dc39ed2537 utils/vim: add syntax highlighing for 'public', 'private', 'internal'
Swift SVN r19683
2014-07-08 10:46:52 +00:00
Mikhail Zolotukhin
5b459f614d Add support for new range operator '...' and '..<' in vim syntax files.
Swift SVN r19511
2014-07-03 14:16:12 +00:00
Ted Kremenek
fad874708e Adjust test cases.
Swift SVN r17964
2014-05-12 22:01:52 +00:00
Joe Groff
804b423cf2 Basic vim highlighting for Swift.
Swift SVN r3939
2013-02-03 19:06:05 +00:00