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.

Sign up for GitHub

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

FindReplaceLogic.updateTarget should call endSession on current target #1846

Merged
merged 1 commit into from
Apr 24, 2024
Merged

FindReplaceLogic.updateTarget should call endSession on current target #1846

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions ....ui.workbench.texteditor/src/org/eclipse/ui/internal/findandreplace/FindReplaceLogic.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -588,12 +588,11 @@ public void updateTarget(IFindReplaceTarget newTarget, boolean canEditTarget) {
this.isTargetEditable = canEditTarget;

if (this.target != newTarget) {
if (newTarget != null && newTarget instanceof IFindReplaceTargetExtension)
((IFindReplaceTargetExtension) newTarget).endSession();
if (this.target instanceof IFindReplaceTargetExtension)
Copy link
Contributor Author

Choose a reason for hiding this comment

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

We should end the session for the current target not for the new target.

Copy link
Contributor

Choose a reason for hiding this comment

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

Thank you for finding this, @merks! This is a regression from #1132. Your proposal properly restored the previous behavior.

((IFindReplaceTargetExtension) this.target).endSession();

this.target = newTarget;
if (newTarget != null)
isTargetSupportingRegEx = newTarget instanceof IFindReplaceTargetExtension3;
isTargetSupportingRegEx = newTarget instanceof IFindReplaceTargetExtension3;
Copy link
Contributor Author

Choose a reason for hiding this comment

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

The null guard seems pointless.


if (newTarget instanceof IFindReplaceTargetExtension) {
((IFindReplaceTargetExtension) newTarget).beginSession();
Expand Down
Loading