fix: resolve invalid conflict resolution #11077 for v6.5

[DanielRuf]

Description

Wrong local variable _this was used.

• Closes [Magellan] seems to be broken with 6.5.0-rc.1 #11355

Motivation and Context

Fix the wrong local variable, should be this or e.target.

Screenshots (if appropriate):

Types of changes

• Documentation
• Bug fix (non-breaking change which fixes an issue)
• New feature (non-breaking change which adds functionality)
• Breaking change (fix or feature that would cause existing
  functionality to change)

Checklist (all required):

• I have read and follow the CONTRIBUTING document.
• There are no other pull request similar to this one.
• The pull request title is descriptive.
• The template is fully and correctly filled.
• The pull request targets the right branch (develop or support/*).
• My commits are correctly titled and contain all relevant information.
• My code follows the code style of this project.
• I have updated the documentation accordingly to my changes (if relevant).
• I have added tests to cover my changes (if relevant).
• All new and existing tests passed.

[ncoden]

This comes from a merge conflict that was incorrectly resolved. This issue was already resolved in #11076.

Take a look at the difference between:

• The original pull request (#11077)
• Its import in the derived 6.5 version (12822b4)

The current PR is nice but you may rename it (and the commit too) to indicate that this is more a conflict resolution that a bug fix.

Something like:

fix: resolve invalid conflict resolution #11077 for v6.5

What do you think ?

[DanielRuf]

Because this is wrong in 6.5.0 RC1.

[DanielRuf]

In general it is a bugfix. Your proposed commit message is not a clear and precise one as it does not describe the change imho.

[ncoden]

The commit title I proposed describe the purpose of the commit. We are not fixing a bug we just discovered in v6.5, we're re-applying a fix that was removed in a conflict resolution.

The code change and the reasons for it are kept in the same place: the pull request we want to "re-import" #11077.

[DanielRuf]

Something like:

fix: resolve invalid conflict resolution #11077 for v6.5

What do you think ?

Done.

[ncoden]

Nice. Thank you 👍

[DaSchTour]

This would be more readable if lambdas and e.target would be used. This would allow to eliminate the _this;