Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix highlighting issues caused by escaped reserved keywords (e.g. @class) #682

Merged

Conversation

ivanz
Copy link
Contributor

@ivanz ivanz commented Aug 18, 2016

Fixes #614 and overall two issues:

  1. Some escaped keywords were still getting highlighted as keywords (e.g. @class or @namespace)
  2. Highlighting was breaking across the file when @Class @namespace @interface @struct , etc was used.

@DustinCampbell DustinCampbell added this to the 1.4 milestone Aug 18, 2016
@DustinCampbell
Copy link
Member

This works for many of the reserved keywords. Is there a changed needed for predefined types (e.g. @int)?

@ivanz
Copy link
Contributor Author

ivanz commented Aug 18, 2016

Good point. Let me add those and rebase.

@ivanz ivanz force-pushed the fix-highlighting-reserved-keywords branch from b6a8a7f to f91fc2e Compare August 18, 2016 17:03
@ivanz
Copy link
Contributor Author

ivanz commented Aug 18, 2016

@DustinCampbell Added them and rebased.

@DustinCampbell
Copy link
Member

Do we not need the [@] before using anymore?

@DustinCampbell
Copy link
Member

Otherwise, LGTM. I'll go ahead and merge.

@DustinCampbell DustinCampbell merged commit 3eea0ff into dotnet:master Aug 18, 2016
@ivanz ivanz deleted the fix-highlighting-reserved-keywords branch August 26, 2016 08:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants