Skip to content

Improve SyntaxDiffer diffing rules - #609

Merged
mattwar merged 2 commits into
dotnet:masterfrom
mattwar:Bug463
Feb 18, 2015
Merged

Improve SyntaxDiffer diffing rules#609
mattwar merged 2 commits into
dotnet:masterfrom
mattwar:Bug463

Conversation

@mattwar

@mattwar mattwar commented Feb 17, 2015

Copy link
Copy Markdown
Contributor

Fixes #463

This change alters the diffing rules by no longer choosing to identify an insert action when look ahead discovers an identical matching node in the new tree if the same identical node is also found ahead in the old tree. Identical nodes generally occur due to lexer aggressive interning, but can occur due to tree edits too.

@dnfclas

dnfclas commented Feb 17, 2015

Copy link
Copy Markdown

Hi @mattwar, I'm your friendly neighborhood .NET Foundation Pull Request Bot (You can call me DNFBOT). Thanks for your contribution!

In order for us to evaluate and accept your PR, we ask that you sign a contribution license agreement. It's all electronic and will take just minutes. I promise there's no faxing. https://cla2.dotnetfoundation.org.

TTYL, DNFBOT;

@dnfclas

dnfclas commented Feb 18, 2015

Copy link
Copy Markdown

@mattwar, Thanks for signing the contribution license agreement so quickly! Actual humans will now validate the agreement and then evaluate the PR.

Thanks, DNFBOT;

@gafter

gafter commented Feb 18, 2015

Copy link
Copy Markdown
Member

:shipit: 👍

@gafter

gafter commented Feb 18, 2015

Copy link
Copy Markdown
Member

👍

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.

Problem with C# diff edit representation returned by SyntaxTree.GetChanges()

3 participants