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

Fix source hover for template paramters and external translation units

Browse source
This commit is contained in:
Anton Leherbauer 2007-04-05 13:02:10 +00:00
parent bf61f08fdb
commit 46cb2c8f4d
1 changed files with 58 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

89
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/c/hover/CSourceHover.java
View file

@ -63,8 +63,8 @@ import org.eclipse.cdt.core.dom.ast.IProblemBinding;
import org.eclipse.cdt.core.dom.ast.ITypedef; import org.eclipse.cdt.core.dom.ast.ITypedef;
import org.eclipse.cdt.core.dom.ast.IVariable; import org.eclipse.cdt.core.dom.ast.IVariable;
import org.eclipse.cdt.core.dom.ast.cpp.ICPPTemplateDefinition; import org.eclipse.cdt.core.dom.ast.cpp.ICPPTemplateDefinition;
import org.eclipse.cdt.core.dom.ast.cpp.ICPPTemplateParameter;
import org.eclipse.cdt.core.index.IIndex; import org.eclipse.cdt.core.index.IIndex;
import org.eclipse.cdt.core.index.IIndexName;
import org.eclipse.cdt.core.model.CModelException; import org.eclipse.cdt.core.model.CModelException;
import org.eclipse.cdt.core.model.ICElement; import org.eclipse.cdt.core.model.ICElement;
import org.eclipse.cdt.core.model.ISourceRange; import org.eclipse.cdt.core.model.ISourceRange;
@ -79,14 +79,11 @@ import org.eclipse.cdt.ui.IWorkingCopyManager;
import org.eclipse.cdt.ui.text.ICPartitions; import org.eclipse.cdt.ui.text.ICPartitions;
import org.eclipse.cdt.internal.core.model.ASTCache.ASTRunnable; import org.eclipse.cdt.internal.core.model.ASTCache.ASTRunnable;
import org.eclipse.cdt.internal.core.model.ext.ICElementHandle;
import org.eclipse.cdt.internal.ui.editor.ASTProvider; import org.eclipse.cdt.internal.ui.editor.ASTProvider;
import org.eclipse.cdt.internal.ui.text.CCodeReader; import org.eclipse.cdt.internal.ui.text.CCodeReader;
import org.eclipse.cdt.internal.ui.text.CHeuristicScanner; import org.eclipse.cdt.internal.ui.text.CHeuristicScanner;
import org.eclipse.cdt.internal.ui.util.Strings; import org.eclipse.cdt.internal.ui.util.Strings;
import org.eclipse.cdt.internal.ui.viewsupport.CElementLabels;
import org.eclipse.cdt.internal.ui.viewsupport.IndexUI;
/** /**
* A text hover presenting the source of the element under the cursor. * A text hover presenting the source of the element under the cursor.
@ -124,13 +121,15 @@ public class CSourceHover extends AbstractCEditorTextHover implements ITextHover
try { try {
IASTName[] names; IASTName[] names;
names = fTU.getLanguage().getSelectedNames(ast, fTextRegion.getOffset(), fTextRegion.getLength()); names = fTU.getLanguage().getSelectedNames(ast, fTextRegion.getOffset(), fTextRegion.getLength());
if (names != null && names.length == 1) { if (names != null && names.length >= 1) {
IBinding binding= names[0].resolveBinding(); for (int i = 0; i < names.length; i++) {
IASTName name= names[i];
IBinding binding= name.resolveBinding();
if (binding != null) { if (binding != null) {
if (binding instanceof IProblemBinding) { if (binding instanceof IProblemBinding) {
if (DEBUG) fSource= "Cannot resolve " + new String(names[0].toCharArray()); //$NON-NLS-1$ if (DEBUG) fSource= "Cannot resolve " + new String(name.toCharArray()); //$NON-NLS-1$
} else if (binding instanceof IMacroBinding) { } else if (binding instanceof IMacroBinding) {
fSource= computeSourceForMacro(ast, names[0], binding); fSource= computeSourceForMacro(ast, name, binding);
} else { } else {
fSource= computeSourceForBinding(ast, binding); fSource= computeSourceForBinding(ast, binding);
} }
@ -139,6 +138,7 @@ public class CSourceHover extends AbstractCEditorTextHover implements ITextHover
} }
} }
} }
}
} catch (CoreException exc) { } catch (CoreException exc) {
return exc.getStatus(); return exc.getStatus();
} catch (DOMException exc) { } catch (DOMException exc) {
@ -228,16 +228,6 @@ public class CSourceHover extends AbstractCEditorTextHover implements ITextHover
return source; return source;
} }
} }
// fallback: return signature only
ICElementHandle cElement= null;
if (names[0] instanceof IIndexName) {
cElement= IndexUI.getCElementForName(fTU.getCProject(), ast.getIndex(), (IIndexName)names[0]);
} else if (names[0] instanceof IASTName) {
cElement= IndexUI.getCElementForName(fTU.getCProject(), ast.getIndex(), (IASTName)names[0]);
}
if (cElement != null) {
return CElementLabels.getTextLabel(cElement, CElementLabels.DEFAULT_QUALIFIED);
}
} }
return null; return null;
} }
@ -261,9 +251,9 @@ public class CSourceHover extends AbstractCEditorTextHover implements ITextHover
LocationKind locationKind= LocationKind.LOCATION; LocationKind locationKind= LocationKind.LOCATION;
if (name instanceof IASTName) { if (name instanceof IASTName) {
IASTName astName= (IASTName)name; IASTName astName= (IASTName)name;
if (astName.getContainingFilename().equals(fileName)) { if (astName.getContainingFilename().equals(fileName) && fTU.getResource() != null) {
// reuse editor buffer for names local to the translation unit // reuse editor buffer for names local to the translation unit
location= fTU.getPath(); location= fTU.getResource().getFullPath();
locationKind= LocationKind.IFILE; locationKind= LocationKind.IFILE;
} }
} }
@ -279,7 +269,6 @@ public class CSourceHover extends AbstractCEditorTextHover implements ITextHover
IDocument doc= buffer.getDocument(); IDocument doc= buffer.getDocument();
// expand source range to include preceding comment, if any // expand source range to include preceding comment, if any
CHeuristicScanner scanner= new CHeuristicScanner(doc); CHeuristicScanner scanner= new CHeuristicScanner(doc);
int commentBound;
if (binding instanceof IParameter) { if (binding instanceof IParameter) {
sourceStart= scanner.scanBackward(nameOffset, CHeuristicScanner.UNBOUND, new char[] { '(', ',' }); sourceStart= scanner.scanBackward(nameOffset, CHeuristicScanner.UNBOUND, new char[] { '(', ',' });
if (sourceStart == CHeuristicScanner.NOT_FOUND) { if (sourceStart == CHeuristicScanner.NOT_FOUND) {
@ -289,6 +278,15 @@ public class CSourceHover extends AbstractCEditorTextHover implements ITextHover
if (sourceStart == CHeuristicScanner.NOT_FOUND) { if (sourceStart == CHeuristicScanner.NOT_FOUND) {
sourceStart = nameOffset; sourceStart = nameOffset;
} }
} else if (binding instanceof ICPPTemplateParameter) {
sourceStart= scanner.scanBackward(nameOffset, CHeuristicScanner.UNBOUND, new char[] { '<', ',' });
if (sourceStart == CHeuristicScanner.NOT_FOUND) {
return null;
}
sourceStart= scanner.findNonWhitespaceForward(sourceStart + 1, nameOffset);
if (sourceStart == CHeuristicScanner.NOT_FOUND) {
sourceStart = nameOffset;
}
} else if (binding instanceof IEnumerator) { } else if (binding instanceof IEnumerator) {
sourceStart= scanner.scanBackward(nameOffset, CHeuristicScanner.UNBOUND, new char[] { '{', ',' }); sourceStart= scanner.scanBackward(nameOffset, CHeuristicScanner.UNBOUND, new char[] { '{', ',' });
if (sourceStart == CHeuristicScanner.NOT_FOUND) { if (sourceStart == CHeuristicScanner.NOT_FOUND) {
@ -301,9 +299,9 @@ public class CSourceHover extends AbstractCEditorTextHover implements ITextHover
} else { } else {
final int nameLine= doc.getLineOfOffset(nameOffset); final int nameLine= doc.getLineOfOffset(nameOffset);
sourceStart= doc.getLineOffset(nameLine); sourceStart= doc.getLineOffset(nameLine);
commentBound= scanner.scanBackward(sourceStart, CHeuristicScanner.UNBOUND, new char[] { '{', '}', ';' }); int commentBound= scanner.scanBackward(sourceStart, CHeuristicScanner.UNBOUND, new char[] { '{', '}', ';', ':' });
if (commentBound == CHeuristicScanner.NOT_FOUND) { if (commentBound == CHeuristicScanner.NOT_FOUND) {
commentBound= -1; commentBound= -1; // unbound
} }
int commentStart= searchCommentBackward(doc, sourceStart, commentBound); int commentStart= searchCommentBackward(doc, sourceStart, commentBound);
if (commentStart >= 0) { if (commentStart >= 0) {
@ -321,16 +319,16 @@ public class CSourceHover extends AbstractCEditorTextHover implements ITextHover
boolean searchBrace= false; boolean searchBrace= false;
boolean searchSemi= false; boolean searchSemi= false;
boolean searchComma= false; boolean searchComma= false;
if (!name.isDefinition()) { if (binding instanceof ICompositeType || binding instanceof IEnumeration || binding instanceof IFunction) {
searchSemi= true;
} else if (binding instanceof ICompositeType || binding instanceof IEnumeration || binding instanceof IFunction) {
searchBrace= true; searchBrace= true;
} else if (binding instanceof ICPPTemplateDefinition) { } else if (binding instanceof ICPPTemplateDefinition) {
searchBrace= true; searchBrace= true;
} else if (binding instanceof IParameter || binding instanceof IEnumerator) { } else if (binding instanceof IParameter || binding instanceof IEnumerator || binding instanceof ICPPTemplateParameter) {
searchComma= true; searchComma= true;
} else if (binding instanceof IVariable || binding instanceof ITypedef) { } else if (binding instanceof IVariable || binding instanceof ITypedef) {
searchSemi= true; searchSemi= true;
} else if (!name.isDefinition()) {
searchSemi= true;
} }
if (searchBrace) { if (searchBrace) {
int brace= scanner.scanForward(nameOffset, CHeuristicScanner.UNBOUND, '{'); int brace= scanner.scanForward(nameOffset, CHeuristicScanner.UNBOUND, '{');
@ -355,8 +353,12 @@ public class CSourceHover extends AbstractCEditorTextHover implements ITextHover
int bound; int bound;
if (binding instanceof IParameter) { if (binding instanceof IParameter) {
bound= scanner.findClosingPeer(nameOffset, '(', ')'); bound= scanner.findClosingPeer(nameOffset, '(', ')');
} else { } else if (binding instanceof ICPPTemplateParameter) {
bound= scanner.findClosingPeer(nameOffset, '<', '>');
} else if (binding instanceof IEnumerator) {
bound= scanner.findClosingPeer(nameOffset, '{', '}'); bound= scanner.findClosingPeer(nameOffset, '{', '}');
} else {
bound = CHeuristicScanner.NOT_FOUND;
} }
if (bound == CHeuristicScanner.NOT_FOUND) { if (bound == CHeuristicScanner.NOT_FOUND) {
bound= Math.min(doc.getLength(), nameOffset + 100); bound= Math.min(doc.getLength(), nameOffset + 100);
@ -373,6 +375,8 @@ public class CSourceHover extends AbstractCEditorTextHover implements ITextHover
IRegion lineRegion= doc.getLineInformationOfOffset(sourceEnd); IRegion lineRegion= doc.getLineInformationOfOffset(sourceEnd);
sourceEnd= lineRegion.getOffset() + lineRegion.getLength(); sourceEnd= lineRegion.getOffset() + lineRegion.getLength();
} }
} else {
} }
} }
@ -460,15 +464,21 @@ public class CSourceHover extends AbstractCEditorTextHover implements ITextHover
if (expression.length() == 0) if (expression.length() == 0)
return null; return null;
//Before trying a search lets make sure that the user is not hovering over a keyword
if (selectionIsKeyword(expression))
return null;
String source= null; String source= null;
ICElement curr = copy.getElement(expression);
if (curr == null) {
// Try with the indexer // Try with the indexer
source= searchInIndex(expression, hoverRegion); source= searchInIndex(hoverRegion);
} else {
if (source == null) {
ICElement curr = copy.getElement(expression);
if (curr != null) {
source= getSourceForCElement(textViewer.getDocument(), curr); source= getSourceForCElement(textViewer.getDocument(), curr);
} }
}
if (source == null || source.trim().length() == 0) if (source == null || source.trim().length() == 0)
return null; return null;
@ -499,13 +509,13 @@ public class CSourceHover extends AbstractCEditorTextHover implements ITextHover
/** /**
* Return the source for the given element including the preceding comment. * Return the source for the given element including the preceding comment.
* *
* @param document the document of the current editor * @param doc the document of the current editor
* @param cElement the element to compute the source from * @param cElement the element to compute the source from
* @return the source or <code>null</code> * @return the source or <code>null</code>
* @throws CModelException * @throws CModelException
* @throws BadLocationException * @throws BadLocationException
*/ */
private String getSourceForCElement(IDocument doc, ICElement cElement) throws CModelException, BadLocationException { private static String getSourceForCElement(IDocument doc, ICElement cElement) throws CModelException, BadLocationException {
if (!(cElement instanceof ISourceReference)) { if (!(cElement instanceof ISourceReference)) {
return null; return null;
} }
@ -540,10 +550,11 @@ public class CSourceHover extends AbstractCEditorTextHover implements ITextHover
if (firstLine == 0) { if (firstLine == 0) {
return -1; return -1;
} }
int currentOffset= doc.getLineOffset(firstLine - 1); ITypedRegion partition= TextUtilities.getPartition(doc, ICPartitions.C_PARTITIONING, start, true);
int currentOffset= Math.max(doc.getLineOffset(firstLine - 1), partition.getOffset() - 1);
int commentOffset= -1; int commentOffset= -1;
while (currentOffset > bound) { while (currentOffset > bound) {
ITypedRegion partition= TextUtilities.getPartition(doc, ICPartitions.C_PARTITIONING, currentOffset, false); partition= TextUtilities.getPartition(doc, ICPartitions.C_PARTITIONING, currentOffset, true);
currentOffset= partition.getOffset() - 1; currentOffset= partition.getOffset() - 1;
if (ICPartitions.C_MULTI_LINE_COMMENT.equals(partition.getType())) { if (ICPartitions.C_MULTI_LINE_COMMENT.equals(partition.getType())) {
int previousCommentOffset= commentOffset; int previousCommentOffset= commentOffset;
@ -614,11 +625,7 @@ public class CSourceHover extends AbstractCEditorTextHover implements ITextHover
return source.substring(i); return source.substring(i);
} }
private String searchInIndex(String name, IRegion textRegion) { private String searchInIndex(IRegion textRegion) {
//Before trying a search lets make sure that the user is not hovering over a keyword
if (selectionIsKeyword(name))
return null;
IEditorPart editor = getEditor(); IEditorPart editor = getEditor();
if (editor != null) { if (editor != null) {
IEditorInput input= editor.getEditorInput(); IEditorInput input= editor.getEditorInput();