-
Notifications
You must be signed in to change notification settings - Fork 49
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
Implement grouping of the stack frames #583
Open
gzsombor
wants to merge
2
commits into
eclipse-jdt:master
Choose a base branch
from
gzsombor:single-change
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+780
−46
Open
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
85 changes: 85 additions & 0 deletions
85
...pse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/StackFramePresentationProvider.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,85 @@ | ||
| /******************************************************************************* | ||
| * Copyright (c) 2021, 2025 Zsombor Gegesy and others. | ||
| * | ||
gzsombor marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| * This program and the accompanying materials | ||
| * are made available under the terms of the Eclipse Public License 2.0 | ||
| * which accompanies this distribution, and is available at | ||
| * https://www.eclipse.org/legal/epl-2.0/ | ||
| * | ||
| * SPDX-License-Identifier: EPL-2.0 | ||
| * | ||
| * Contributors: | ||
| * Zsombor Gegesy - initial API and implementation | ||
| *******************************************************************************/ | ||
| package org.eclipse.jdt.internal.debug.ui; | ||
|
|
||
| import org.eclipse.jdt.debug.core.IJavaStackFrame; | ||
| import org.eclipse.jdt.internal.ui.JavaPluginImages; | ||
| import org.eclipse.jface.preference.IPreferenceStore; | ||
| import org.eclipse.jface.resource.ImageDescriptor; | ||
| import org.eclipse.jface.util.IPropertyChangeListener; | ||
| import org.eclipse.jface.util.PropertyChangeEvent; | ||
|
|
||
| /** | ||
| * Provides foreground and background colors for stack frames in a debug view. After usage, it needs to be closed, so it could unregister itself from | ||
| * preference storage. | ||
| * | ||
| */ | ||
| public final class StackFramePresentationProvider implements IPropertyChangeListener { | ||
|
|
||
| private final IPreferenceStore store; | ||
| private boolean collapseStackFrames; | ||
|
|
||
| public StackFramePresentationProvider(IPreferenceStore store) { | ||
| this.store = store; | ||
| store.addPropertyChangeListener(this); | ||
| collapseStackFrames = store.getBoolean(IJDIPreferencesConstants.PREF_COLLAPSE_STACK_FRAMES); | ||
| } | ||
|
|
||
| public StackFramePresentationProvider() { | ||
| this(JDIDebugUIPlugin.getDefault().getPreferenceStore()); | ||
| } | ||
|
|
||
| /** | ||
| * @return the category specific image for the stack frame, or null, if there is no one defined. | ||
| */ | ||
| public ImageDescriptor getStackFrameImage(IJavaStackFrame frame) { | ||
| if (collapseStackFrames) { | ||
| var category = frame.getCategory(); | ||
| if (category != null) { | ||
| switch (category) { | ||
| case LIBRARY: | ||
| case SYNTHETIC: | ||
| case PLATFORM: | ||
| return JavaPluginImages.DESC_OBJS_JAR; | ||
| default: | ||
| break; | ||
| } | ||
| } | ||
| } | ||
| return null; | ||
| } | ||
|
|
||
| /** | ||
| * Unsubscribes to not receive notifications from the {@link IPreferenceStore}. | ||
| */ | ||
| public void close() { | ||
| store.removePropertyChangeListener(this); | ||
| } | ||
|
|
||
| @Override | ||
| public void propertyChange(PropertyChangeEvent event) { | ||
| String prop = event.getProperty(); | ||
| if (IJDIPreferencesConstants.PREF_COLLAPSE_STACK_FRAMES.equals(prop)) { | ||
| collapseStackFrames = (Boolean) event.getNewValue(); | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * @return if stack frames should be collapsed. | ||
| */ | ||
| public boolean isCollapseStackFrames() { | ||
gzsombor marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| return collapseStackFrames; | ||
| } | ||
|
|
||
| } | ||
34 changes: 34 additions & 0 deletions
34
....jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/CollapseStackFramesAction.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,34 @@ | ||
| /******************************************************************************* | ||
| * Copyright (c) 2022, 2025 Zsombor Gegesy and others. | ||
| * | ||
| * This program and the accompanying materials | ||
| * are made available under the terms of the Eclipse Public License 2.0 | ||
| * which accompanies this distribution, and is available at | ||
| * https://www.eclipse.org/legal/epl-2.0/ | ||
| * | ||
| * SPDX-License-Identifier: EPL-2.0 | ||
| * | ||
| * Contributors: | ||
| * Zsombor Gegesy - initial API and implementation | ||
| *******************************************************************************/ | ||
| package org.eclipse.jdt.internal.debug.ui.actions; | ||
|
|
||
| import org.eclipse.jdt.internal.debug.ui.IJDIPreferencesConstants; | ||
|
|
||
| /** | ||
| * Enable/disable collapsing of the non-relevant stack frames in debug views. | ||
| * | ||
| */ | ||
| public class CollapseStackFramesAction extends ToggleBooleanPreferenceAction { | ||
|
|
||
| @Override | ||
| protected String getPreferenceKey() { | ||
| return IJDIPreferencesConstants.PREF_COLLAPSE_STACK_FRAMES; | ||
| } | ||
|
|
||
| @Override | ||
| protected String getCompositeKey() { | ||
| return getPreferenceKey(); | ||
| } | ||
|
|
||
| } |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Try using
org.eclipse.jface.util.Util.ZERO_LENGTH_STRINGfor empty string declarations, so you can avoidNON-NLScommentsThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks, I didn't know about this class!