mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-23 17:05:26 +02:00
Code Issues Wiki Activity

Fix invocation of macro explorere for selections beyond last declaration.

Browse source
This commit is contained in:
Markus Schorn 2008-03-14 21:20:37 +00:00
parent 831dd9ee1f
commit e7bb0ea2c2
1 changed files with 29 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/c/hover/CMacroExpansionInput.java
View file

@ -105,35 +105,40 @@ public class CMacroExpansionInput {
}
if (fAllowSelection) {
// selection
boolean macroOccurrence= false;
fEnclosingNode= nodeSelector.findEnclosingNode(fTextRegion.getOffset(), fTextRegion.getLength());
if (fEnclosingNode != null) {
boolean macroOccurrence= false;
if (fEnclosingNode.getParent() instanceof IASTPreprocessorMacroExpansion) {
fEnclosingNode= fEnclosingNode.getParent();
}
if (fEnclosingNode instanceof IASTPreprocessorMacroExpansion) {
addExpansionNode(fEnclosingNode);
macroOccurrence= true;
}
else {
IASTNodeLocation[] locations= fEnclosingNode.getNodeLocations();
for (int i = 0; i < locations.length; i++) {
IASTNodeLocation location= locations[i];
if (location instanceof IASTMacroExpansionLocation) {
IASTFileLocation fileLocation= location.asFileLocation();
if (fileLocation != null && ast.getFilePath().equals(fileLocation.getFileName())) {
if (fTextRegion.overlapsWith(fileLocation.getNodeOffset(), fileLocation.getNodeLength())) {
addExpansionNode(nodeSelector.findEnclosingNode(fileLocation.getNodeOffset(), fileLocation.getNodeLength()));
macroOccurrence= true;
}
if (fEnclosingNode == null) {
// selection beyond last declaration
fEnclosingNode= ast;
}
else if (fEnclosingNode.getParent() instanceof IASTPreprocessorMacroExpansion) {
// selection enclosed by the name of a macro expansion
fEnclosingNode= fEnclosingNode.getParent();
}
if (fEnclosingNode instanceof IASTPreprocessorMacroExpansion) {
// selection enclosed by a macro expansion
addExpansionNode(fEnclosingNode);
macroOccurrence= true;
}
else {
IASTNodeLocation[] locations= fEnclosingNode.getNodeLocations();
for (int i = 0; i < locations.length; i++) {
IASTNodeLocation location= locations[i];
if (location instanceof IASTMacroExpansionLocation) {
IASTFileLocation fileLocation= location.asFileLocation();
if (fileLocation != null && ast.getFilePath().equals(fileLocation.getFileName())) {
if (fTextRegion.overlapsWith(fileLocation.getNodeOffset(), fileLocation.getNodeLength())) {
addExpansionNode(nodeSelector.findEnclosingNode(fileLocation.getNodeOffset(), fileLocation.getNodeLength()));
macroOccurrence= true;
}
}
}
}
if (macroOccurrence) {
createMacroExpansionExplorer(ast);
return Status.OK_STATUS;
}
}
if (macroOccurrence) {
createMacroExpansionExplorer(ast);
return Status.OK_STATUS;
}
}
}