Skip to content

Extended support for in-line chained lambdas #733

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
iloveeclipse merged 1 commit into from
Oct 24, 2025
Merged

Extended support for in-line chained lambdas #733

Show file tree
Hide file tree
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
73 changes: 50 additions & 23 deletions org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JDIModelPresentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1775,33 +1775,35 @@ protected String getMethodBreakpointText(IJavaMethodBreakpoint methodBreakpoint)
appendSuspendPolicy(methodBreakpoint,label);
appendThreadFilter(methodBreakpoint, label);


boolean entry = methodBreakpoint.isEntry();
boolean exit = methodBreakpoint.isExit();
if (entry && exit) {
label.append(DebugUIMessages.JDIModelPresentation_entry_and_exit);
} else if (entry) {
label.append(DebugUIMessages.JDIModelPresentation_entry);
} else if (exit) {
label.append(DebugUIMessages.JDIModelPresentation_exit);
}
appendConditional(methodBreakpoint, label);

if (member != null) {
label.append(" - "); //$NON-NLS-1$
label.append(getJavaLabelProvider().getText(member));
if (methodBreakpoint.isLambdaBreakpoint()) {
processInLineLambdaLabel(methodBreakpoint, label, member);
} else {
String methodSig= methodBreakpoint.getMethodSignature();
String methodName= methodBreakpoint.getMethodName();
if (methodSig != null) {
label.append(" - "); //$NON-NLS-1$
label.append(Signature.toString(methodSig, methodName, null, false, false));
} else if (methodName != null) {
boolean entry = methodBreakpoint.isEntry();
boolean exit = methodBreakpoint.isExit();
if (entry && exit) {
label.append(DebugUIMessages.JDIModelPresentation_entry_and_exit);
} else if (entry) {
label.append(DebugUIMessages.JDIModelPresentation_entry);
} else if (exit) {
label.append(DebugUIMessages.JDIModelPresentation_exit);
}
appendConditional(methodBreakpoint, label);

if (member != null) {
label.append(" - "); //$NON-NLS-1$
label.append(methodName);
label.append(getJavaLabelProvider().getText(member));
} else {
String methodSig = methodBreakpoint.getMethodSignature();
String methodName = methodBreakpoint.getMethodName();
if (methodSig != null) {
label.append(" - "); //$NON-NLS-1$
label.append(Signature.toString(methodSig, methodName, null, false, false));
} else if (methodName != null) {
label.append(" - "); //$NON-NLS-1$
label.append(methodName);
}
}
}

return label.toString();
}

Expand Down Expand Up @@ -2199,4 +2201,29 @@ public Color getBackground(Object element) {
public synchronized boolean requiresUIThread(Object element) {
return !isInitialized();
}

/**
* Process custom label for inline lambda breakpoints
*/
private void processInLineLambdaLabel(IJavaMethodBreakpoint methodBreakpoint, StringBuilder label, IMember member) throws CoreException {
appendConditional(methodBreakpoint, label);
if (methodBreakpoint.getLambdaName() != null) {
label.append(" - [ " + methodBreakpoint.getLambdaName() + " ]"); //$NON-NLS-1$ //$NON-NLS-2$
} else {
if (member != null) {
label.append(" - "); //$NON-NLS-1$
label.append(getJavaLabelProvider().getText(member));
} else {
String methodSig = methodBreakpoint.getMethodSignature();
String methodName = methodBreakpoint.getMethodName();
if (methodSig != null) {
label.append(" - "); //$NON-NLS-1$
label.append(Signature.toString(methodSig, methodName, null, false, false));
} else if (methodName != null) {
label.append(" - "); //$NON-NLS-1$
label.append(methodName);
}
}
}
}
}
2 changes: 2 additions & 0 deletions org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/ActionMessages.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,8 @@ public class ActionMessages extends NLS {
public static String Override_Dependencies_label1;
public static String Override_Dependencies_label2;

public static String LambdaSelectionDialog_title;

static {
// load message values from bundle file
NLS.initializeMessages(BUNDLE_NAME, ActionMessages.class);
Expand Down
5 changes: 3 additions & 2 deletions ...lipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/ActionMessages.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
###############################################################################
# Copyright (c) 2000, 2022 IBM Corporation and others.
# Copyright (c) 2000, 2025 IBM Corporation and others.
#
# This program and the accompanying materials
# are made available under the terms of the Eclipse Public License 2.0
Expand Down Expand Up @@ -154,4 +154,5 @@ Override_Dependencies_title=Override Dependencies
Override_Dependencies_button=&Override
Override_Dependencies_button1=&Override Dependencies...
Override_Dependencies_label1=Dependencies derived from the Java Build Path:
Override_Dependencies_label2=Dependencies for launching:
Override_Dependencies_label2=Dependencies for launching:
LambdaSelectionDialog_title=Select lambda
Loading
Loading