Merge branch 'eclipse-platform:master' into master

Author: fedejeanne

debug/org.eclipse.debug.ui/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.debug.ui; singleton:=true
-Bundle-Version: 3.18.900.qualifier
+Bundle-Version: 3.19.0.qualifier
 Bundle-Activator: org.eclipse.debug.internal.ui.DebugUIPlugin
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin

debug/org.eclipse.debug.ui/icons/full/obj16/brkp_grp4.svg

@@ -356,7 +356,7 @@ BreakpointWorkingSet.name=Breakpoint
 BreakpointWorkingSet.description=Breakpoint workingsets contain listings of workspace breakpoints
 memoryRenderingsExtensionPointName = Memory Renderings
 TableRenderingPrefActionName = &Table Renderings Preferences...
-
+BreakpointEnablement.label=Enablement
 
 NewMemoryViewAction.label=&New Memory View
 NewMemoryViewAction.tooltip=New Memory View

debug/org.eclipse.debug.ui/plugin.properties

@@ -3044,6 +3044,11 @@ M4 = Platform-specific fourth key
           class="org.eclipse.debug.internal.ui.views.breakpoints.WorkingSetBreakpointOrganizer"
           icon="$nl$/icons/full/obj16/fldr_obj.svg"
           id="org.eclipse.debug.ui.workingSetOrganizer"/>
+          <breakpointOrganizer
+                label="%BreakpointEnablement.label"
+                class="org.eclipse.debug.internal.ui.views.breakpoints.BreakpointEnablement"
+                icon="$nl$/icons/full/obj16/brkp_grp4.svg"
+                id="org.eclipse.debug.ui.breakpointEnablement"/>
           <breakpointOrganizer
                 othersLabel="%BreakpointType.others"
                 label="%BreakpointType.label"

debug/org.eclipse.debug.ui/plugin.xml

@@ -0,0 +1,71 @@
+/*******************************************************************************
+ * Copyright (c) 2025 IBM Corporation 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.debug.internal.ui.views.breakpoints;
+
+import org.eclipse.core.resources.IMarkerDelta;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.debug.core.DebugPlugin;
+import org.eclipse.debug.core.IBreakpointListener;
+import org.eclipse.debug.core.model.IBreakpoint;
+import org.eclipse.debug.ui.AbstractBreakpointOrganizerDelegate;
+import org.eclipse.debug.ui.BreakpointTypeCategory;
+
+/**
+ * Breakpoint organizers for breakpoint types based on breakpoint enablement
+ * state.
+ */
+public class BreakpointEnablement extends AbstractBreakpointOrganizerDelegate implements IBreakpointListener {
+
+	private final BreakpointTypeCategory ENABLED = new BreakpointTypeCategory("Enabled", 0); //$NON-NLS-1$
+	private final BreakpointTypeCategory DISABLED = new BreakpointTypeCategory("Disabled", 1); //$NON-NLS-1$
+
+	public BreakpointEnablement() {
+		DebugPlugin.getDefault().getBreakpointManager().addBreakpointListener(this);
+	}
+
+	@Override
+	public void dispose() {
+		DebugPlugin.getDefault().getBreakpointManager().removeBreakpointListener(this);
+	}
+
+	@Override
+	public IAdaptable[] getCategories(IBreakpoint breakpoint) {
+		try {
+			IAdaptable[] categories;
+			if (breakpoint.isEnabled()) {
+				categories = new IAdaptable[] { ENABLED };
+			} else {
+				categories = new IAdaptable[] { DISABLED };
+			}
+			return categories;
+		} catch (CoreException e) {
+			DebugPlugin.log(e);
+		}
+		return null;
+	}
+
+	@Override
+	public void breakpointAdded(IBreakpoint breakpoint) {
+	}
+
+	@Override
+	public void breakpointRemoved(IBreakpoint breakpoint, IMarkerDelta delta) {
+	}
+
+	@Override
+	public void breakpointChanged(IBreakpoint breakpoint, IMarkerDelta delta) {
+		fireCategoryChanged(ENABLED);
+	}
+}

debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointEnablement.java

@@ -1,5 +1,5 @@
 /*****************************************************************
- * Copyright (c) 2009, 2016 Texas Instruments and others
+ * Copyright (c) 2009, 2025 Texas Instruments and others
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -29,6 +29,7 @@
 import org.eclipse.debug.internal.ui.breakpoints.provisional.OtherBreakpointCategory;
 import org.eclipse.debug.internal.ui.viewers.model.provisional.IPresentationContext;
 import org.eclipse.debug.internal.ui.views.DebugModelPresentationContext;
+import org.eclipse.debug.ui.BreakpointTypeCategory;
 
 /**
  * Breakpoint element comparator.
@@ -74,6 +75,12 @@ private int doCompare(IBreakpointContainer c1, IBreakpointContainer c2) {
 			return -1;
 		}
 
+		if (c1.getCategory() instanceof BreakpointTypeCategory breakType1 && breakType1.isSortable()) {
+			if (c2.getCategory() instanceof BreakpointTypeCategory breakType2 && breakType2.isSortable()) {
+				return Integer.compare(breakType1.getSortPriority(), breakType2.getSortPriority());
+			}
+		}
+
 		// Rest of categories should be listed alphabetically.
 		if (fContext != null) {
 			String name1 = fContext.getModelPresentation().getText(c1);

debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/ElementComparator.java

@@ -31,7 +31,8 @@ public class BreakpointTypeCategory extends PlatformObject implements IBreakpoin
 
 	private final String fName;
 	private ImageDescriptor fImageDescriptor = DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_OBJS_BREAKPOINT_TYPE);
-
+	private boolean fSortable;
+	private int fSortPriority;
 	/**
 	 * Constructs a type category for the given type name.
 	 *
@@ -55,6 +56,20 @@ public BreakpointTypeCategory(String name, ImageDescriptor descriptor) {
 		}
 	}
 
+	/**
+	 * Constructs a type category for the given type name with the given sort
+	 * priority.
+	 *
+	 * @param name         breakpoint type name
+	 * @param sortPriority used to calculate the sort order of this category
+	 * @since 3.19
+	 */
+	public BreakpointTypeCategory(String name, int sortPriority) {
+		fName = name;
+		fSortable = true;
+		fSortPriority = sortPriority;
+	}
+
 	/**
 	 * Returns the name of this category's breakpoint type.
 	 *
@@ -64,6 +79,16 @@ protected String getName() {
 		return fName;
 	}
 
+	/**
+	 * Returns the sorting priority of this category.
+	 *
+	 * @return the sorting priority of this category, default is {@code 0}
+	 * @since 3.19
+	 */
+	public int getSortPriority() {
+		return fSortPriority;
+	}
+
 	@Override
 	public boolean equals(Object object) {
 		if (object instanceof BreakpointTypeCategory type) {
@@ -72,6 +97,16 @@ public boolean equals(Object object) {
 		return false;
 	}
 
+	/**
+	 * Returns whether category has some sort order or not.
+	 *
+	 * @return whether category can be sorted or not.
+	 * @since 3.19
+	 */
+	public boolean isSortable() {
+		return fSortable;
+	}
+
 	@Override
 	public int hashCode() {
 		return getName().hashCode();

debug/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/BreakpointTypeCategory.java

@@ -411,9 +411,10 @@ private void basicBuild(final IBuildConfiguration buildConfiguration, final int
 		try {
 			final IProject project = buildConfiguration.getProject();
 			final ICommand[] commands;
-			if (project.isAccessible())
-				commands = ((Project) project).internalGetDescription().getBuildSpec(false);
-			else
+			if (project.isAccessible()) {
+				ProjectDescription description = ((Project) project).internalGetDescription();
+				commands = description == null ? null : description.getBuildSpec(false);
+			} else
 				commands = null;
 			int work = commands == null ? 0 : commands.length;
 			monitor.beginTask(NLS.bind(Messages.events_building_1, project.getFullPath()), work);
@@ -708,6 +709,9 @@ public ArrayList<BuilderPersistentInfo> createBuildersPersistentInfo(IProject pr
 		ArrayList<BuilderPersistentInfo> oldInfos = getBuildersPersistentInfo(project);
 
 		ProjectDescription desc = ((Project) project).internalGetDescription();
+		if (desc == null) {
+			return null;
+		}
 		ICommand[] commands = desc.getBuildSpec(false);
 		if (commands.length == 0)
 			return null;
@@ -1577,7 +1581,8 @@ public ISchedulingRule getRule(IBuildConfiguration buildConfiguration, int trigg
 			final ICommand[] commands;
 			if (project.isAccessible()) {
 				Set<ISchedulingRule> rules = new HashSet<>();
-				commands = ((Project) project).internalGetDescription().getBuildSpec(false);
+				ProjectDescription description = ((Project) project).internalGetDescription();
+				commands = description == null ? new ICommand[0] : description.getBuildSpec(false);
 				boolean hasNullBuildRule = false;
 				BuildContext context = new BuildContext(buildConfiguration);
 				for (int i = 0; i < commands.length; i++) {