Documentation hover improvements
diff --git a/core/plugins/org.eclipse.dltk.ui/src/org/eclipse/dltk/internal/ui/text/hover/DocumentationHover.java b/core/plugins/org.eclipse.dltk.ui/src/org/eclipse/dltk/internal/ui/text/hover/DocumentationHover.java
index c2604f6..aba673b 100644
--- a/core/plugins/org.eclipse.dltk.ui/src/org/eclipse/dltk/internal/ui/text/hover/DocumentationHover.java
+++ b/core/plugins/org.eclipse.dltk.ui/src/org/eclipse/dltk/internal/ui/text/hover/DocumentationHover.java
@@ -56,8 +56,8 @@
public class DocumentationHover extends AbstractScriptEditorTextHover implements
IInformationProviderExtension2, ITextHoverExtension {
- private static final long LABEL_FLAGS = // ScriptElementLabels.ALL_FULLY_QUALIFIED
- ScriptElementLabels.M_APP_RETURNTYPE
+ private static final long LABEL_FLAGS = ScriptElementLabels.ALL_FULLY_QUALIFIED
+ | ScriptElementLabels.M_APP_RETURNTYPE
| ScriptElementLabels.F_APP_TYPE_SIGNATURE
| ScriptElementLabels.M_PARAMETER_TYPES
| ScriptElementLabels.M_PARAMETER_NAMES
@@ -586,7 +586,7 @@
public String getTitle(Object element) {
if (element instanceof IModelElement) {
IModelElement member = (IModelElement) element;
- long flags = member.getElementType() == IModelElement.FIELD ? LOCAL_VARIABLE_FLAGS
+ long flags = member.getElementType() == IModelElement.LOCAL_VARIABLE ? LOCAL_VARIABLE_FLAGS
: LABEL_FLAGS;
String label = ScriptElementLabels.getDefault()
.getElementLabel(member, flags);
diff --git a/core/plugins/org.eclipse.dltk.ui/src/org/eclipse/dltk/ui/documentation/DocumentationUtils.java b/core/plugins/org.eclipse.dltk.ui/src/org/eclipse/dltk/ui/documentation/DocumentationUtils.java
index db3ee43..ee14255 100644
--- a/core/plugins/org.eclipse.dltk.ui/src/org/eclipse/dltk/ui/documentation/DocumentationUtils.java
+++ b/core/plugins/org.eclipse.dltk.ui/src/org/eclipse/dltk/ui/documentation/DocumentationUtils.java
@@ -71,6 +71,7 @@
return new TextDocumentationResponse(
member,
titleAdapter != null ? titleAdapter.getTitle(member) : null,
+ titleAdapter != null ? titleAdapter.getImage(member) : null,
readAll(reader));
}
return null;