mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-29 19:45:01 +02:00
Code Issues Wiki Activity

Bug 301777: Strange behavior of source hover on macro definitions.

Browse source
This commit is contained in:
Markus Schorn 2010-02-08 08:35:38 +00:00
parent 6693e6d1de
commit a65e64eb06
1 changed files with 4 additions and 42 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/text/c/hover/CSourceHover.java
View file

@ -12,7 +12,6 @@
package org.eclipse.cdt.internal.ui.text.c.hover; package org.eclipse.cdt.internal.ui.text.c.hover;
import java.io.IOException; import java.io.IOException;
import java.util.Arrays;
import java.util.Set; import java.util.Set;
import org.eclipse.core.filebuffers.FileBuffers; import org.eclipse.core.filebuffers.FileBuffers;
@ -51,11 +50,8 @@ import org.eclipse.cdt.core.dom.IName;
import org.eclipse.cdt.core.dom.ast.DOMException; import org.eclipse.cdt.core.dom.ast.DOMException;
import org.eclipse.cdt.core.dom.ast.IASTFileLocation; import org.eclipse.cdt.core.dom.ast.IASTFileLocation;
import org.eclipse.cdt.core.dom.ast.IASTFunctionDefinition; import org.eclipse.cdt.core.dom.ast.IASTFunctionDefinition;
import org.eclipse.cdt.core.dom.ast.IASTFunctionStyleMacroParameter;
import org.eclipse.cdt.core.dom.ast.IASTName; import org.eclipse.cdt.core.dom.ast.IASTName;
import org.eclipse.cdt.core.dom.ast.IASTNode; import org.eclipse.cdt.core.dom.ast.IASTNode;
import org.eclipse.cdt.core.dom.ast.IASTPreprocessorFunctionStyleMacroDefinition;
import org.eclipse.cdt.core.dom.ast.IASTPreprocessorMacroDefinition;
import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit; import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit;
import org.eclipse.cdt.core.dom.ast.IBinding; import org.eclipse.cdt.core.dom.ast.IBinding;
import org.eclipse.cdt.core.dom.ast.ICompositeType; import org.eclipse.cdt.core.dom.ast.ICompositeType;
@ -179,47 +175,13 @@ public class CSourceHover extends AbstractCEditorTextHover {
* @throws CoreException * @throws CoreException
*/ */
private String computeSourceForMacro(IASTTranslationUnit ast, IASTName name, IBinding binding) throws CoreException { private String computeSourceForMacro(IASTTranslationUnit ast, IASTName name, IBinding binding) throws CoreException {
IASTPreprocessorMacroDefinition macroDef= null; // Search for the macro definition
final char[] macroName= name.toCharArray(); IName[] defs = ast.getDefinitions(binding);
for (IName def : defs) {
// search for macro definition, there should be a more efficient way String source= computeSourceForName(def, binding);
IASTPreprocessorMacroDefinition[] macroDefs;
final IASTPreprocessorMacroDefinition[] localMacroDefs= ast.getMacroDefinitions();
for (macroDefs= localMacroDefs; macroDefs != null; macroDefs= (macroDefs == localMacroDefs) ? ast.getBuiltinMacroDefinitions() : null) {
for (IASTPreprocessorMacroDefinition macroDef2 : macroDefs) {
if (Arrays.equals(macroDef2.getName().toCharArray(), macroName)) {
macroDef= macroDef2;
break;
}
}
}
if (macroDef != null) {
String source= computeSourceForName(macroDef.getName(), binding);
if (source != null) { if (source != null) {
return source; return source;
} }
IASTFunctionStyleMacroParameter[] parameters= null;
if (macroDef instanceof IASTPreprocessorFunctionStyleMacroDefinition) {
parameters= ((IASTPreprocessorFunctionStyleMacroDefinition)macroDef).getParameters();
}
StringBuffer buf= new StringBuffer(macroName.length + macroDef.getExpansion().length() + 20);
buf.append("#define ").append(macroName); //$NON-NLS-1$
if (parameters != null) {
buf.append('(');
for (int i = 0; i < parameters.length; i++) {
if (i > 0) {
buf.append(", "); //$NON-NLS-1$
}
IASTFunctionStyleMacroParameter parameter = parameters[i];
buf.append(parameter.getParameter());
}
buf.append(')');
}
String expansion= macroDef.getExpansion();
if (expansion != null) {
buf.append(' ').append(expansion);
}
return buf.toString();
} }
return null; return null;
} }