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

Update Java lexer #873

Merged
merged 3 commits into from
Oct 26, 2023
Merged

Update Java lexer #873

merged 3 commits into from
Oct 26, 2023

Conversation

otbutz
Copy link
Contributor

@otbutz otbutz commented Oct 16, 2023

Fixes #872

Generated from pygments v2.16.1.

python3 _tools/pygments2chroma_xml.py pygments.lexers.jvm.JavaLexer > lexers/embedded/java.xml

grafik

@@ -5,116 +5,188 @@
<filename>*.java</filename>
<mime_type>text/x-java</mime_type>
<dot_all>true</dot_all>
<ensure_nl>true</ensure_nl>
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This got dropped while regenerating the file.

@otbutz
Copy link
Contributor Author

otbutz commented Oct 17, 2023

@alecthomas the test errors for cql and markdown look unrelated to my changes but follow the same trend as the changes in the newly generated Java lexer definition.

  • Operator -> Punctuation
  • Text -> TextWhitespace

@otbutz
Copy link
Contributor Author

otbutz commented Oct 26, 2023

@alecthomas should I regenerate the expected files for these formats?

@alecthomas
Copy link
Owner

Yes. They're failing because they embed Java.

@otbutz
Copy link
Contributor Author

otbutz commented Oct 26, 2023

Done :)

@alecthomas alecthomas merged commit 810464a into alecthomas:master Oct 26, 2023
2 checks passed
@alecthomas
Copy link
Owner

Thanks!

@otbutz otbutz deleted the java_text_blocks branch October 26, 2023 10:01
@otbutz
Copy link
Contributor Author

otbutz commented Oct 26, 2023

Any timeline for the next release? Would love to get the change into the upcoming gitea relase 😉

@alecthomas
Copy link
Owner

Sure thing, tagged 2.10.0

KN4CK3R pushed a commit to go-gitea/gitea that referenced this pull request Oct 26, 2023
Bump the chroma version to v2.10.0:
https://github.com/alecthomas/chroma/releases/tag/v2.10.0

This release includes a better Java lexer
alecthomas/chroma#873
GiteaBot pushed a commit to GiteaBot/gitea that referenced this pull request Oct 27, 2023
silverwind pushed a commit to go-gitea/gitea that referenced this pull request Oct 27, 2023
Backport #27803 by @bt90

Bump the chroma version to v2.10.0:
https://github.com/alecthomas/chroma/releases/tag/v2.10.0

This release includes a better Java lexer
alecthomas/chroma#873

Co-authored-by: bt90 <[email protected]>
@otbutz
Copy link
Contributor Author

otbutz commented Nov 3, 2023

@alecthomas could you bump the playground version to v2.10.0?

fuxiaohei pushed a commit to fuxiaohei/gitea that referenced this pull request Jan 17, 2024
silverwind pushed a commit to silverwind/gitea that referenced this pull request Feb 20, 2024
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.

Java text blocks
2 participants