Skip to content

Avoid FindReplaceOverlay setTextEditorActionsActivated resulting in NPE #2724

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

Merged
merks merged 1 commit into from
Jan 21, 2025
Merged

Avoid FindReplaceOverlay setTextEditorActionsActivated resulting in NPE #2724

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
33 changes: 27 additions & 6 deletions ...org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/AbstractTextEditor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,7 @@
import org.eclipse.jface.text.source.VerticalRuler;

import org.eclipse.ui.IActionBars;
import org.eclipse.ui.IEditorActionBarContributor;
import org.eclipse.ui.IEditorDescriptor;
import org.eclipse.ui.IEditorInput;
import org.eclipse.ui.IEditorPart;
Expand Down Expand Up @@ -5212,10 +5213,15 @@ public void setAction(String actionID, IAction action) {
/**
* Sets this editor's actions into activated (default) or deactived state.
* <p>
* XXX: This is called by the Java editor for its breadcrumb feature. We
* don't want to make this risky method API because the Java editor
* breadcrumb might become a Platform UI feature during 3.5 and hence we can
* then delete this workaround.
* XXX: This is called by the Java editor for its breadcrumb feature. We don't
* want to make this risky method API because the Java editor breadcrumb might
* become a Platform UI feature during 3.5 and hence we can then delete this
* workaround.
* </p>
* <p>
* This is also called reflectively by
* org.eclipse.ui.internal.findandreplace.overlay.FindReplaceOverlay.targetActionActivationHandling.new
* FocusListener() {...}.setTextEditorActionsActivated(boolean).
* </p>
*
* @param state <code>true</code> if activated
Expand All @@ -5230,9 +5236,9 @@ private void setActionActivation(boolean state) {
if (action != null)
fActivationCodeTrigger.registerActionForKeyActivation(action);
}
getEditorSite().getActionBarContributor().setActiveEditor(this);
setActiveEditor(this);
} else {
getEditorSite().getActionBarContributor().setActiveEditor(null);
setActiveEditor(null);
Iterator<IAction> iter= fActions.values().iterator();
while (iter.hasNext()) {
IAction action= iter.next();
Expand All @@ -5243,6 +5249,21 @@ private void setActionActivation(boolean state) {
}
}

private void setActiveEditor(IEditorPart targetEditor) {
IEditorSite editorSite = getEditorSite();
IEditorActionBarContributor actionBarContributor = editorSite.getActionBarContributor();
// Handle that MultiPageEditorSite.getActionBarContributor() returns null.
if (actionBarContributor == null) {
if (editorSite instanceof MultiPageEditorSite multiPageEditorSite) {
actionBarContributor = multiPageEditorSite.getMultiPageEditor().getEditorSite()
.getActionBarContributor();
}
}
if (actionBarContributor != null) {
actionBarContributor.setActiveEditor(targetEditor);
}
}

private static final boolean HACK_TO_SUPPRESS_UNUSUED_WARNING= false;
{
if (HACK_TO_SUPPRESS_UNUSUED_WARNING)
Expand Down
Loading