mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-09-10 12:03:16 +02:00
Code Issues Wiki Activity

Bug 507974 - Open Declaration on identifier in assembly file

Browse source 
Since we don't have a semantic model of assembly code, just look
for a CElement with a name matching the selected identifier in the
assembly file, and search for the selected identifier in the index.

Change-Id: Ifae8e7f608ca27b06fdb4d1d9d1797c88469a6c5
This commit is contained in:
Nathan Ridge 2016-12-06 02:19:04 -05:00
parent 5b86da58ad
commit e3017e7656
1 changed files with 46 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/OpenDeclarationsJob.java
View file

@ -78,6 +78,7 @@ import org.eclipse.cdt.core.index.IIndexName;
import org.eclipse.cdt.core.index.IndexFilter;
import org.eclipse.cdt.core.model.CModelException;
import org.eclipse.cdt.core.model.ICElement;
import org.eclipse.cdt.core.model.ICElementVisitor;
import org.eclipse.cdt.core.model.ICProject;
import org.eclipse.cdt.core.model.IInclude;
import org.eclipse.cdt.core.model.ILanguage;
@ -171,6 +172,7 @@ class OpenDeclarationsJob extends Job implements ASTRunnable {
try {
ICElement element = SelectionConverter.getElementAtOffset(fTranslationUnit, fTextSelection);
if (element instanceof IInclude) {
// If the cursor is over an include, open the referenced file.
IInclude include = (IInclude) element;
IPath fileToOpen = CElementIncludeResolver.resolveInclude(include);
if (fileToOpen != null) {
@ -179,6 +181,50 @@ class OpenDeclarationsJob extends Job implements ASTRunnable {
}
fAction.reportIncludeLookupFailure(include.getFullFileName());
return Status.OK_STATUS;
} else {
// Otherwise, lookup the selected word in the index.
// Without a semantic model for the assembly code, this is the best we can do.
if (fSelectedText != null && fSelectedText.length() > 0) {
final ICProject project = fTranslationUnit.getCProject();
final char[] name = fSelectedText.toCharArray();
List<ICElement> elems= new ArrayList<>();
// Search for an element in the assembly file.
// Some things in assembly files like macro definitions are
// modelled in the C model, so those will be found here.
fTranslationUnit.accept(new ICElementVisitor() {
@Override
public boolean visit(ICElement element) throws CoreException {
if (element.getElementName().equals(fSelectedText)) {
elems.add(element);
}
return true;
}});
// Search for a binding in the index.
final IndexFilter filter = IndexFilter.ALL;
final IIndexBinding[] bindings = fIndex.findBindings(name, false, filter, fMonitor);
for (IIndexBinding binding : bindings) {
// Convert bindings to CElements.
IName[] declNames = fIndex.findNames(binding, IIndex.FIND_DECLARATIONS |
IIndex.FIND_DEFINITIONS | IIndex.SEARCH_ACROSS_LANGUAGE_BOUNDARIES);
convertToCElements(project, fIndex, declNames, elems);
}
// Search for a macro in the index.
IIndexMacro[] macros= fIndex.findMacros(name, filter, fMonitor);
for (IIndexMacro macro : macros) {
ICElement elem= IndexUI.getCElementForMacro(project, fIndex, macro);
if (elem != null) {
elems.add(elem);
}
}
if (!navigateCElements(elems)) {
fAction.reportSymbolLookupFailure(fSelectedText);
}
return Status.OK_STATUS;
}
}
} catch (CModelException e) {
} catch (CoreException e) {