mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-06-07 01:36:01 +02:00
Code Issues Wiki Activity

Bug 217485 - Can't set method breakpoints from the editor unless the method/function name is selected.

Browse source
This commit is contained in:
Ken Ryall 2008-02-05 21:38:55 +00:00
parent 48c5584887
commit 3a0793732b
1 changed files with 38 additions and 57 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

95
debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/ToggleBreakpointAdapter.java
View file

@ -1,5 +1,5 @@
/******************************************************************************* /*******************************************************************************
* Copyright (c) 2004, 2007 QNX Software Systems and others. * Copyright (c) 2004, 2008 QNX Software Systems and others.
* All rights reserved. This program and the accompanying materials * All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0 * are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at * which accompanies this distribution, and is available at
@ -8,6 +8,7 @@
* Contributors: * Contributors:
* QNX Software Systems - Initial API and implementation * QNX Software Systems - Initial API and implementation
* Freescale Semiconductor - Address watchpoints, https://bugs.eclipse.org/bugs/show_bug.cgi?id=118299 * Freescale Semiconductor - Address watchpoints, https://bugs.eclipse.org/bugs/show_bug.cgi?id=118299
* Warren Paul (Nokia) - Bug 217485
*******************************************************************************/ *******************************************************************************/
package org.eclipse.cdt.debug.internal.ui.actions; package org.eclipse.cdt.debug.internal.ui.actions;
@ -172,39 +173,24 @@ public class ToggleBreakpointAdapter implements IToggleBreakpointsTarget {
* @see org.eclipse.debug.ui.actions.IToggleBreakpointsTarget#toggleMethodBreakpoints(org.eclipse.ui.IWorkbenchPart, org.eclipse.jface.viewers.ISelection) * @see org.eclipse.debug.ui.actions.IToggleBreakpointsTarget#toggleMethodBreakpoints(org.eclipse.ui.IWorkbenchPart, org.eclipse.jface.viewers.ISelection)
*/ */
public void toggleMethodBreakpoints( IWorkbenchPart part, ISelection selection ) throws CoreException { public void toggleMethodBreakpoints( IWorkbenchPart part, ISelection selection ) throws CoreException {
if ( selection instanceof ITextSelection ) { ICElement element = getCElementFromSelection( part, selection );
String text = ((ITextSelection)selection).getText(); if ( element instanceof IFunction || element instanceof IMethod ) {
if ( text != null ) { toggleMethodBreakpoints0( (IDeclaration)element );
IResource resource = getResource( part );
if ( resource instanceof IFile ) {
ITranslationUnit tu = getTranslationUnit( (IFile)resource );
if ( tu != null ) {
try {
ICElement element = tu.getElement( text.trim() );
if ( element instanceof IFunction || element instanceof IMethod ) {
toggleMethodBreakpoints0( (IDeclaration)element );
}
}
catch( CModelException e ) {
}
}
}
}
} }
else if ( selection instanceof IStructuredSelection ) {
IStructuredSelection ss = (IStructuredSelection)selection;
if ( ss.size() == 1 && (ss.getFirstElement() instanceof IFunction || ss.getFirstElement() instanceof IMethod) ) {
toggleMethodBreakpoints0( (IDeclaration)ss.getFirstElement() );
}
}
} }
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.debug.ui.actions.IToggleBreakpointsTarget#canToggleMethodBreakpoints(org.eclipse.ui.IWorkbenchPart, org.eclipse.jface.viewers.ISelection) * @see org.eclipse.debug.ui.actions.IToggleBreakpointsTarget#canToggleMethodBreakpoints(org.eclipse.ui.IWorkbenchPart, org.eclipse.jface.viewers.ISelection)
*/ */
public boolean canToggleMethodBreakpoints( IWorkbenchPart part, ISelection selection ) { public boolean canToggleMethodBreakpoints( IWorkbenchPart part, ISelection selection ) {
ICElement element = getCElementFromSelection( part, selection );
return ( element instanceof IFunction || element instanceof IMethod );
}
protected ICElement getCElementFromSelection( IWorkbenchPart part, ISelection selection ) {
if ( selection instanceof ITextSelection ) { if ( selection instanceof ITextSelection ) {
String text = ((ITextSelection)selection).getText(); ITextSelection textSelection = (ITextSelection)selection;
String text = textSelection.getText();
if ( text != null ) { if ( text != null ) {
IResource resource = getResource( part ); IResource resource = getResource( part );
if ( resource instanceof IFile ) { if ( resource instanceof IFile ) {
@ -212,7 +198,10 @@ public class ToggleBreakpointAdapter implements IToggleBreakpointsTarget {
if ( tu != null ) { if ( tu != null ) {
try { try {
ICElement element = tu.getElement( text.trim() ); ICElement element = tu.getElement( text.trim() );
return ( element instanceof IFunction || element instanceof IMethod ); if ( element == null ) {
element = tu.getElementAtLine( textSelection.getStartLine() );
}
return element;
} }
catch( CModelException e ) { catch( CModelException e ) {
} }
@ -223,40 +212,22 @@ public class ToggleBreakpointAdapter implements IToggleBreakpointsTarget {
else if ( selection instanceof IStructuredSelection ) { else if ( selection instanceof IStructuredSelection ) {
IStructuredSelection ss = (IStructuredSelection)selection; IStructuredSelection ss = (IStructuredSelection)selection;
if ( ss.size() == 1 ) { if ( ss.size() == 1 ) {
return ( ss.getFirstElement() instanceof IFunction || ss.getFirstElement() instanceof IMethod ); Object object = ss.getFirstElement();
if ( object instanceof ICElement ) {
return (ICElement)object;
}
} }
} }
return false; return null;
} }
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.debug.ui.actions.IToggleBreakpointsTarget#toggleWatchpoints(org.eclipse.ui.IWorkbenchPart, org.eclipse.jface.viewers.ISelection) * @see org.eclipse.debug.ui.actions.IToggleBreakpointsTarget#toggleWatchpoints(org.eclipse.ui.IWorkbenchPart, org.eclipse.jface.viewers.ISelection)
*/ */
public void toggleWatchpoints( IWorkbenchPart part, ISelection selection ) throws CoreException { public void toggleWatchpoints( IWorkbenchPart part, ISelection selection ) throws CoreException {
if ( selection instanceof ITextSelection ) { IVariable variable = getVariableFromSelection( part, selection );
String text = ((ITextSelection)selection).getText(); if ( variable != null ) {
if ( text != null ) { toggleVariableWatchpoint( part, variable );
IResource resource = getResource( part );
if ( resource instanceof IFile ) {
ITranslationUnit tu = getTranslationUnit( (IFile)resource );
if ( tu != null ) {
try {
ICElement element = tu.getElement( text.trim() );
if ( element instanceof IVariable ) {
toggleVariableWatchpoint( part, (IVariable)element );
}
}
catch( CModelException e ) {
}
}
}
}
}
else if ( selection instanceof IStructuredSelection ) {
IStructuredSelection ss = (IStructuredSelection)selection;
if ( ss.size() == 1 && ss.getFirstElement() instanceof IVariable ) {
toggleVariableWatchpoint( part, (IVariable)ss.getFirstElement() );
}
} }
} }
@ -264,6 +235,10 @@ public class ToggleBreakpointAdapter implements IToggleBreakpointsTarget {
* @see org.eclipse.debug.ui.actions.IToggleBreakpointsTarget#canToggleWatchpoints(org.eclipse.ui.IWorkbenchPart, org.eclipse.jface.viewers.ISelection) * @see org.eclipse.debug.ui.actions.IToggleBreakpointsTarget#canToggleWatchpoints(org.eclipse.ui.IWorkbenchPart, org.eclipse.jface.viewers.ISelection)
*/ */
public boolean canToggleWatchpoints( IWorkbenchPart part, ISelection selection ) { public boolean canToggleWatchpoints( IWorkbenchPart part, ISelection selection ) {
return getVariableFromSelection( part, selection ) != null;
}
protected IVariable getVariableFromSelection( IWorkbenchPart part, ISelection selection ) {
if ( selection instanceof ITextSelection ) { if ( selection instanceof ITextSelection ) {
String text = ((ITextSelection)selection).getText(); String text = ((ITextSelection)selection).getText();
if ( text != null ) { if ( text != null ) {
@ -272,7 +247,10 @@ public class ToggleBreakpointAdapter implements IToggleBreakpointsTarget {
ITranslationUnit tu = getTranslationUnit( (IFile)resource ); ITranslationUnit tu = getTranslationUnit( (IFile)resource );
if ( tu != null ) { if ( tu != null ) {
try { try {
return ( tu.getElement( text.trim() ) instanceof IVariable ); ICElement element = tu.getElement( text.trim() );
if (element instanceof IVariable) {
return (IVariable)element;
}
} }
catch( CModelException e ) { catch( CModelException e ) {
} }
@ -283,12 +261,15 @@ public class ToggleBreakpointAdapter implements IToggleBreakpointsTarget {
else if ( selection instanceof IStructuredSelection ) { else if ( selection instanceof IStructuredSelection ) {
IStructuredSelection ss = (IStructuredSelection)selection; IStructuredSelection ss = (IStructuredSelection)selection;
if ( ss.size() == 1 ) { if ( ss.size() == 1 ) {
return ( ss.getFirstElement() instanceof IVariable ); Object selected = ss.getFirstElement();
if (selected instanceof IVariable) {
return (IVariable)selected;
}
} }
} }
return false; return null;
} }
protected void report( String message, IWorkbenchPart part ) { protected void report( String message, IWorkbenchPart part ) {
IEditorStatusLine statusLine = (IEditorStatusLine)part.getAdapter( IEditorStatusLine.class ); IEditorStatusLine statusLine = (IEditorStatusLine)part.getAdapter( IEditorStatusLine.class );
if ( statusLine != null ) { if ( statusLine != null ) {