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

Fixed mistakes in Ignored Substitutions #549

Merged
merged 5 commits into from
Jan 11, 2021

Conversation

EugeneLaptev
Copy link
Contributor

I've fixed the two issues that you've identified, which are seen on the picture:
https://user-images.githubusercontent.com/98126/104092948-9dd84580-52ca-11eb-80f8-fa03742f2a1c.png

(Also please check that for that particular case on the picture the highlighting of the line difference on the character level works correctly. To me it looks like the difference is lit on the world level: "IDENTLEVEL" - even if you ask to highlight on the character level.)

I've also created two commits with similar descriptions, which I'd fuse into one commit (with the last message), but my git skills are not sufficient for such operation.

…ed strings had commonalities. Fixed a mistake in breaking down the IS tokens.
… commonalities. Fixed IS handling change blocks consisting of several changes. Fixed a mistake in breaking down the IS tokens.
@EugeneLaptev EugeneLaptev changed the title Fixed a mistake in Ignored Substitutions Fixed mistakes in Ignored Substitutions Jan 11, 2021
@sdottaka sdottaka merged commit 8a66c2b into WinMerge:master Jan 11, 2021
@sdottaka
Copy link
Member

Thank you!

I may make the following changes later.

  • Add the "Match cases" checkbox

  • Match terms to the terms in the replace dialog.
    e.g.
    On one panel-> Find what
    On the other panel-> Replace with

  • Move the "Completely unhighlight the ignore change" checkbox to the options dialog.
    (This function should also work with line filters etc.)

  • Allow regular expressions \1 and \2 to be specified on the "On the other panel" side.
    e.g.
    On one panel: func(([^,]+), ([^)]+))
    On the other panel: func(\2, \1)

    So I might remove the "Ignore changes in both directions" checkbox.

@EugeneLaptev
Copy link
Contributor Author

EugeneLaptev commented Jan 12, 2021 via email

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.

None yet

2 participants