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

chore: merge with upstream master #2

Merged
merged 118 commits into from
May 6, 2024
Merged

Conversation

anto-deepsource
Copy link
Collaborator

@anto-deepsource anto-deepsource commented Apr 17, 2024

Merge with upstream changes to support Java 21.

Ignore the failing tests.
We never added tests for the changes in grammar that we did.
These tests fail in master as well.

bmahe and others added 30 commits January 26, 2023 17:28
Parse text blocks which may contain " (double quotes)
feat: support distinguishing escape sequences inside strings, fix multiline strings
…entifier

This change partially reverts a change from tree-sitter#125 which caused the regression.
The test case introduced by tree-sitter#125 still exists and works.

Fixes tree-sitter#138
…le-declaration

fix, Local variable declaration with generic types and scoped type id…
create a cmake config to enable building this as lib for Visual Studio buildchain
…on-expression

Introduce condition alias for capturing the conditions
Create CMakeLists.txt for Windows builds
Fixes issues where a binary bitwise expression could be interpreted as a cast expression
fix: rework decimal logic to properly parse octal numbers
fix: make cast expression values with ampersands stricter
@anto-deepsource anto-deepsource changed the title Merge upstream master chore: merge with upstream master Apr 17, 2024
@srijan-deepsource srijan-deepsource merged commit 055463a into master May 6, 2024
1 of 4 checks passed
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.