Enhanced toggling

Enhanced toggling to support direct switch to different types of
breakpoints without multiple attempts

Fixes: #652

Author: subyssurendran666

org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/RulerToggleHitBreakpointActionDelegate.java

@@ -13,6 +13,8 @@
  *******************************************************************************/
 package org.eclipse.jdt.internal.debug.ui.actions;
 
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.debug.internal.ui.DebugUIPlugin;
 import org.eclipse.jdt.debug.core.IJavaLineBreakpoint;
 import org.eclipse.jdt.internal.debug.ui.JDIDebugUIPlugin;
 import org.eclipse.jface.dialogs.IInputValidator;
@@ -27,14 +29,21 @@ public class RulerToggleHitBreakpointActionDelegate extends AbstractRulerToggleB
 	@Override
 	protected boolean doWork(ITextEditor editor, ITextSelection selection) {
 		IJavaLineBreakpoint jlp = ToggleBreakpointAdapter.findExistingBreakpoint(currentEditor, selection);
-		if (jlp == null) {
+
+		try {
 			hitCountDialog();
 			if (BreakpointToggleUtils.getHitCount() < 1) {
 				return false;
 			}
+			if (jlp != null) {
+				ToggleBreakpointAdapter.deleteBreakpoint(jlp, editor, null);
+			}
+			BreakpointToggleUtils.setHitpoint(true);
+			return true;
+		} catch (CoreException e) {
+			DebugUIPlugin.log(e);
+			return false;
 		}
-		BreakpointToggleUtils.setHitpoint(true);
-		return true;
 	}
 
 	private void hitCountDialog() {

org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/RulerToggleTracepointActionDelegate.java

@@ -13,14 +13,26 @@
  *******************************************************************************/
 package org.eclipse.jdt.internal.debug.ui.actions;
 
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.debug.internal.ui.DebugUIPlugin;
+import org.eclipse.jdt.debug.core.IJavaLineBreakpoint;
 import org.eclipse.jface.text.ITextSelection;
 import org.eclipse.ui.texteditor.ITextEditor;
 
 public class RulerToggleTracepointActionDelegate extends AbstractRulerToggleBreakpointActionDelegate {
 
 	@Override
 	protected boolean doWork(ITextEditor editor, ITextSelection selection) {
-		BreakpointToggleUtils.setUnsetTracepoint(true);
-		return true;
+		IJavaLineBreakpoint jlp = ToggleBreakpointAdapter.findExistingBreakpoint(currentEditor, selection);
+		try {
+			if (jlp != null && !jlp.isConditionEnabled()) {
+				ToggleBreakpointAdapter.deleteBreakpoint(jlp, editor, null);
+			}
+			BreakpointToggleUtils.setUnsetTracepoint(true);
+			return true;
+		} catch (CoreException e) {
+			DebugUIPlugin.log(e);
+			return false;
+		}
 	}
-}
+}

org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/RulerToggleTriggerBreakpointActionDelegate.java

@@ -13,14 +13,26 @@
  *******************************************************************************/
 package org.eclipse.jdt.internal.debug.ui.actions;
 
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.debug.internal.ui.DebugUIPlugin;
+import org.eclipse.jdt.debug.core.IJavaLineBreakpoint;
 import org.eclipse.jface.text.ITextSelection;
 import org.eclipse.ui.texteditor.ITextEditor;
 
 public class RulerToggleTriggerBreakpointActionDelegate extends AbstractRulerToggleBreakpointActionDelegate {
 
 	@Override
 	protected boolean doWork(ITextEditor editor, ITextSelection selection) {
-		BreakpointToggleUtils.setTriggerpoint(true);
-		return true;
+		IJavaLineBreakpoint jlp = ToggleBreakpointAdapter.findExistingBreakpoint(currentEditor, selection);
+		try {
+			if (jlp != null && !jlp.isTriggerPoint()) {
+				ToggleBreakpointAdapter.deleteBreakpoint(jlp, editor, null);
+			}
+			BreakpointToggleUtils.setTriggerpoint(true);
+			return true;
+		} catch (CoreException e) {
+			DebugUIPlugin.log(e);
+			return false;
+		}
 	}
 }

org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/ToggleBreakpointAdapter.java

@@ -1612,7 +1612,11 @@ private void toggleFieldOrMethodBreakpoints(IWorkbenchPart part, ISelection sele
 			} else {
 				deleteBreakpoint(breakpoint, part, null);
 			}
-			return;
+			if (!BreakpointToggleUtils.isToggleLambdaEntryBreakpoint()) {
+				return;
+			} else if (breakpoint instanceof IJavaMethodBreakpoint) {
+				return;
+			}
 		}
 		// no breakpoint found: we create new one
 		CompilationUnit unit = parseCompilationUnit(editor);
@@ -1688,10 +1692,10 @@ private static void logBadAnnotation(SimpleMarkerAnnotation annotation, CoreExce
 	 *
 	 * @param breakpoint the breakpoint to delete
 	 * @param part a workbench part, or <code>null</code> if unknown
-	 * @param progressMonitor the progress monitor
+	 * @param monitor  the progress monitor
 	 * @throws CoreException if the deletion fails
 	 */
-	private static void deleteBreakpoint(IJavaBreakpoint breakpoint, IWorkbenchPart part, IProgressMonitor monitor) throws CoreException {
+	public static void deleteBreakpoint(IJavaBreakpoint breakpoint, IWorkbenchPart part, IProgressMonitor monitor) throws CoreException {
 		final Shell shell = part != null ? part.getSite().getShell() : null;
 		final boolean[] result = new boolean[] { true };
 
@@ -1886,4 +1890,4 @@ private static ICompilationUnit getCompilationUnit(ITextEditor editor) {
 		return JavaCore.createCompilationUnitFrom(file);
 	}
 
-}
+}