Skip to content

Conversation

@CyrusNajmabadi
Copy link
Member

@CyrusNajmabadi CyrusNajmabadi commented Nov 17, 2025

Fixes #31774
Fixes #58298

@CyrusNajmabadi CyrusNajmabadi requested a review from a team as a code owner November 17, 2025 12:12
@CyrusNajmabadi
Copy link
Member Author

@roslyn-compiler ptal

@CyrusNajmabadi CyrusNajmabadi requested a review from a team as a code owner November 17, 2025 14:44
var result = await service.AnalyzeChangeAsync(
document, [new TextChange(new TextSpan(listIndex, 1), """
<<<<<<<
<<<<<<< goo
Copy link
Member Author

Choose a reason for hiding this comment

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

this test wanted to make merge-conflict-markers. but by leaving off the trailing text just ended up with lots of operator tokens, all of which had error locations get updated by the parsing change.

@CyrusNajmabadi
Copy link
Member Author

@jcouv @jjonescz ptal.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

CS1525 raised on unexpected location CS1525 "Invalid expression term '/'" at wrong line when there is other comments prior to it

1 participant