From a65e64eb06d404cfe8cdda41457f919c25a033a2 Mon Sep 17 00:00:00 2001
From: Markus Schorn <markus.schorn@windriver.com>
Date: Mon, 8 Feb 2010 08:35:38 +0000
Subject: [PATCH] Bug 301777: Strange behavior of source hover on macro
 definitions.

---
 .../ui/text/c/hover/CSourceHover.java         | 46 ++-----------------
 1 file changed, 4 insertions(+), 42 deletions(-)

diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/c/hover/CSourceHover.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/c/hover/CSourceHover.java
index dfe1f67b525..1f70ff26989 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/c/hover/CSourceHover.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/c/hover/CSourceHover.java
@@ -12,7 +12,6 @@
 package org.eclipse.cdt.internal.ui.text.c.hover;
 
 import java.io.IOException;
-import java.util.Arrays;
 import java.util.Set;
 
 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.IASTFileLocation;
 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.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.IBinding;
 import org.eclipse.cdt.core.dom.ast.ICompositeType;
@@ -179,47 +175,13 @@ public class CSourceHover extends AbstractCEditorTextHover {
 		 * @throws CoreException 
 		 */
 		private String computeSourceForMacro(IASTTranslationUnit ast, IASTName name, IBinding binding) throws CoreException {
-			IASTPreprocessorMacroDefinition macroDef= null;
-			final char[] macroName= name.toCharArray();
-
-			// search for macro definition, there should be a more efficient way
-			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);
+			// Search for the macro definition
+			IName[] defs = ast.getDefinitions(binding);
+			for (IName def : defs) {
+				String source= computeSourceForName(def, binding);
 				if (source != null) {
 					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;
 		}