Syntax highlighting improvements and tests #1014
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ivanz
changed the title
DustinCampbell
approved these changes
Dec 5, 2016
| @@ -123,6 +160,43 @@ | |||
| } | |||
| ] | |||
| }, | |||
| "genericConstraints": { | |||
| "begin": "(where)\\s*(\\w+)\\s*:", | |||
There was a problem hiding this comment.
It probably doesn't matter in practice, but shouldn't the \\s* after (where) above technically be \\s+? Otherwise, wouldn't it match whereImCool:?
| } | ||
| }, | ||
| { | ||
| "match": "([\\w<>]+)\\s*(?=,|where|{)", |
There was a problem hiding this comment.
Does matching [\\w<>]+ mean that it won't work for generic types with multiple parameters?
There was a problem hiding this comment.
You are right. I need to think how to handle this better. Whitespace handling is a pain in the a**. :) Will update the pull request.
ivanz
force-pushed
the
ivan-class-syntax-improvements
branch
from
e0eb3a0 to
5ca75df
Compare
…d generic constraints.
…d test for generic fields.
|
I've done some updates and it's now again ready for review. |
|
I saw you approved this pull (thanks!), but heads up that I don't have merge permissions, so you will have to merge it when ready 👍 |
|
Yup. I was waiting to merge when I got into the office. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes: #757, #960
Class Declaration and Inheritance
Screenshots are from before I made the above changes around generics, but you get the gist.
Before
After
Class Generic Constraints
Before
After
Fields
Before
After