Skip to content
This repository has been archived by the owner on Nov 5, 2021. It is now read-only.

fix rust raw string highlighting #2552 #146

Merged
merged 5 commits into from
Jul 15, 2021
Merged

Conversation

nathanrreed
Copy link
Contributor

This PR fixes an issue where rust raw strings were not highlighted

r"\"
r##"now#"#"highlighted"##

microsoft/monaco-editor#2552

@nathanrreed nathanrreed changed the title fix rust raw string #2552 fix rust raw string highlighting #2552 Jul 14, 2021
@hediet
Copy link
Member

hediet commented Jul 14, 2021

Thank you! Can you add some tests?

@hediet hediet merged commit 26a8cec into microsoft:main Jul 15, 2021
@hediet hediet added this to the June 2021 milestone Jul 15, 2021
@arlosi
Copy link
Member

arlosi commented Oct 28, 2021

@hediet it looks like only one of the commits from this PR was merged. Raw string highlighting is still broken in main.

@hediet
Copy link
Member

hediet commented Oct 28, 2021

it looks like only one of the commits from this PR was merged.

That would be very concerning. Can you investigate what happened?

@arlosi
Copy link
Member

arlosi commented Oct 28, 2021

@hediet I was wrong about only one of the commits being merged, it's more complicated.

The git history around #146 and #147 is pretty confusing. It looks like the history between the two is intertwined and #147 un-did most of the changes in #146.

For example:
#147 contains this commit: 416cea6, which effectively un-does the changes introduced by commit 075be30 from this PR.

I'll make a follow up PR to fix it.

@arlosi
Copy link
Member

arlosi commented Oct 29, 2021

@hediet I submitted PR #167 to fix it.

The implementation in the previous PR didn't handle raw strings that spanned multiple lines, so my implementation is different.

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

Successfully merging this pull request may close these issues.

3 participants