diff options
author | Markus Schorn | 2008-12-17 16:18:50 +0000 |
---|---|---|
committer | Markus Schorn | 2008-12-17 16:18:50 +0000 |
commit | eea81e9d95c1b8dadd23fc29d09f5aded43c2a32 (patch) | |
tree | e15236528eccf16e23c244391924735c90b0790c /core/org.eclipse.cdt.ui | |
parent | a036483c1817b7aadb44c6f3fbbca01ae89ad835 (diff) | |
download | org.eclipse.cdt-eea81e9d95c1b8dadd23fc29d09f5aded43c2a32.tar.gz org.eclipse.cdt-eea81e9d95c1b8dadd23fc29d09f5aded43c2a32.tar.xz org.eclipse.cdt-eea81e9d95c1b8dadd23fc29d09f5aded43c2a32.zip |
Static variables shown as global in search, bug 255192.
Diffstat (limited to 'core/org.eclipse.cdt.ui')
-rw-r--r-- | core/org.eclipse.cdt.ui/browser/org/eclipse/cdt/ui/browser/typeinfo/TypeInfoLabelProvider.java | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/core/org.eclipse.cdt.ui/browser/org/eclipse/cdt/ui/browser/typeinfo/TypeInfoLabelProvider.java b/core/org.eclipse.cdt.ui/browser/org/eclipse/cdt/ui/browser/typeinfo/TypeInfoLabelProvider.java index 5c10cad31bb..d2c447b9a1e 100644 --- a/core/org.eclipse.cdt.ui/browser/org/eclipse/cdt/ui/browser/typeinfo/TypeInfoLabelProvider.java +++ b/core/org.eclipse.cdt.ui/browser/org/eclipse/cdt/ui/browser/typeinfo/TypeInfoLabelProvider.java @@ -23,6 +23,7 @@ import org.eclipse.cdt.core.browser.IFunctionInfo; import org.eclipse.cdt.core.browser.IQualifiedTypeName; import org.eclipse.cdt.core.browser.ITypeInfo; import org.eclipse.cdt.core.browser.ITypeReference; +import org.eclipse.cdt.core.browser.IndexTypeInfo; import org.eclipse.cdt.core.model.CModelException; import org.eclipse.cdt.core.model.CoreModel; import org.eclipse.cdt.core.model.ICElement; @@ -91,9 +92,13 @@ public class TypeInfoLabelProvider extends LabelProvider { buf.append(TypeInfoMessages.TypeInfoLabelProvider_globalScope); } } else if (isSet(SHOW_FULLY_QUALIFIED)) { - if (typeInfo.getCElementType() != ICElement.C_VARIABLE_LOCAL && qualifiedName.isGlobal()) { - buf.append(TypeInfoMessages.TypeInfoLabelProvider_globalScope); - buf.append(' '); + final int elemType = typeInfo.getCElementType(); + if (elemType != ICElement.C_VARIABLE_LOCAL && qualifiedName.isGlobal()) { + if ((elemType != ICElement.C_FUNCTION && elemType != ICElement.C_VARIABLE) || + !(typeInfo instanceof IndexTypeInfo && ((IndexTypeInfo) typeInfo).isFileLocal())) { + buf.append(TypeInfoMessages.TypeInfoLabelProvider_globalScope); + buf.append(' '); + } } buf.append(qualifiedName.getFullyQualifiedName()); } |