Update java grammar, including the addition of textblocks and fixes for the 'throws' and 'new' keywords

redhat-developer / eclipseide-jdtls

A language server client for Eclipse using JDT-LS

MIT License

11 stars 5 forks source link

Update java grammar, including the addition of textblocks and fixes for the 'throws' and 'new' keywords #121

Closed hopehadfield closed 11 months ago

hopehadfield commented 11 months ago

Updating based on language-support/java/java.tmLanguage.json. The grammar is now owned there as per discussion at https://github.com/microsoft/vscode/pull/187725#issuecomment-1643685076.

The following changes are included:

Added support for text blocks / triple quotes (redhat-developer/vscode-java#3200 + redhat-developer/vscode-java#3412)
Corrected comments after 'throws' keyword (redhat-developer/vscode-java#3209)
Fixed highlighting for 'new' keyword for inner classes (redhat-developer/vscode-java#3224)

mickaelistria commented 11 months ago

I don't think we should provide the grammar in eclipseide-jdtls any more. The TM4E project has https://github.com/eclipse/tm4e/tree/main/org.eclipse.tm4e.language_pack/java which does provide the grammar (which directly pulls from vscode repo). So instead of maintaining 2 copies, we'd rather remove textmate grammar from here and make com.redhat.eclipseide.jdtls bundle define a requirement on org.eclipse.tm4e.language_pack.

mickaelistria commented 11 months ago

I've submitted https://github.com/redhat-developer/eclipseide-jdtls/pull/122 which does defer the issue to TM4E.

rgrunber commented 11 months ago

... https://github.com/eclipse/tm4e/tree/main/org.eclipse.tm4e.language_pack/java which does provide the grammar (which directly pulls from vscode repo).

... and VS Code now fetches from vscode-java :wink: (The original repo has been archived)

@hopehadfield , I would create a direct PR for updating the grammar in https://github.com/eclipse/tm4e and referencing how vscode-java became the main source.

mickaelistria commented 11 months ago

I would create a direct PR for updating the grammar in https://github.com/eclipse/tm4e and referencing how vscode-java became the main source.

I think TM4E does already fetch from VSCode. I think it's better to keep things simpler and stick to vscode, even if it causes a 1-month delay in the update.

rgrunber commented 11 months ago

Fair enough. They may just need a heads-up though. Last update was in 2022, https://github.com/eclipse/tm4e/commits/main/org.eclipse.tm4e.language_pack/java/java.tmLanguage.json .