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.

Sign up for GitHub

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

Jump to bottom

rust-analyzer handles git merge conflicts than rls (VSCodium extension) (stable release) #13137

Closed
H-A-M-G-E-R opened this issue Aug 28, 2022 · 2 comments
Closed

rust-analyzer handles git merge conflicts than rls (VSCodium extension) (stable release) #13137

H-A-M-G-E-R opened this issue Aug 28, 2022 · 2 comments
Labels
A-parser parser issues

Comments

@H-A-M-G-E-R
Copy link

rust-analyzer treats conflicts as actual code
@H-A-M-G-E-R H-A-M-G-E-R changed the title rust-analyzer handles git merge conflicts than rls (VSCodium extension) rust-analyzer handles git merge conflicts than rls (VSCodium extension) (stable release) Aug 28, 2022
@bjorn3
Copy link
Member

bjorn3 commented Aug 29, 2022

Unlike rustc (which rls internally uses), rust-analyzer has a parser which is designed to keep producing somewhat useful results even in the face of incomplete or entirely incorrect syntax. This includes merge conflict markers.

@lnicola lnicola added the A-parser parser issues label Aug 29, 2022
@flodiebold
Copy link
Member

Duplicate of #7127

@flodiebold flodiebold marked this as a duplicate of #7127 Aug 29, 2022
@flodiebold flodiebold closed this as not planned Won't fix, can't repro, duplicate, stale Aug 29, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
A-parser parser issues
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
4 participants
@lnicola @flodiebold @bjorn3 @H-A-M-G-E-R