Skip to content
This repository has been archived by the owner on Apr 22, 2020. It is now read-only.

Include JAVA_KEYWORDS in ALL_KEYWORDS #408

Merged
merged 1 commit into from
Dec 4, 2015
Merged

Include JAVA_KEYWORDS in ALL_KEYWORDS #408

merged 1 commit into from
Dec 4, 2015

Conversation

sfreilich
Copy link
Contributor

JAVA_KEYWORDS was inadvertently removed from ALL_KEYWORDS in d0fd4e3,
breaking several tests.

This also corrects a test to note a known bug. In the "java" test in
prettify_test.html, we incorrectly highlight "remove" as a keyword,
since that's a C# keyword and the language is not specified.

One preexisting test failure remains after this change: The "dart" test
in prettify_test.html fails due to 0dc62dc.

JAVA_KEYWORDS was inadvertently removed from ALL_KEYWORDS in d0fd4e3,
breaking several tests.

This also corrects a test to note a known bug. In the "java" test in
prettify_test.html, we incorrectly highlight "remove" as a keyword,
since that's a C# keyword and the language is not specified.

One preexisting test failure remains after this change: The "dart" test
in prettify_test.html fails due to 0dc62dc.
sfreilich referenced this pull request Dec 3, 2015
Updated `CSHARP_KEYWORDS` section with the new keywords introduced in C# 6.
Based on the official list of [C# keywords](https://msdn.microsoft.com/en-us/library/x53a06bb.aspx).
mikesamuel added a commit that referenced this pull request Dec 4, 2015
Include JAVA_KEYWORDS in ALL_KEYWORDS
@mikesamuel mikesamuel merged commit 58f5245 into googlearchive:master Dec 4, 2015
@mikesamuel
Copy link
Contributor

Thanks. I missed this and "fixed" the tests other ways so this might have some fallout, but I'll fix that.

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants