Improved content assist display strings
diff --git a/org.eclipse.photran.core.vpg/src/org/eclipse/photran/internal/core/analysis/binding/Definition.java b/org.eclipse.photran.core.vpg/src/org/eclipse/photran/internal/core/analysis/binding/Definition.java
index 3f0ce73..1707b55 100644
--- a/org.eclipse.photran.core.vpg/src/org/eclipse/photran/internal/core/analysis/binding/Definition.java
+++ b/org.eclipse.photran.core.vpg/src/org/eclipse/photran/internal/core/analysis/binding/Definition.java
@@ -333,7 +333,7 @@
result.append(classification.toString());
- if (!type.equals(Type.VOID))
+ if (!type.equals(Type.VOID) && !(type instanceof FunctionType))
{
result.append(" - "); //$NON-NLS-1$
result.append(type);
diff --git a/org.eclipse.photran.ui.vpg/src/org/eclipse/photran/internal/ui/editor_vpg/contentassist/FortranCompletionProcessor.java b/org.eclipse.photran.ui.vpg/src/org/eclipse/photran/internal/ui/editor_vpg/contentassist/FortranCompletionProcessor.java
index bb74a9f..1605c7b 100755
--- a/org.eclipse.photran.ui.vpg/src/org/eclipse/photran/internal/ui/editor_vpg/contentassist/FortranCompletionProcessor.java
+++ b/org.eclipse.photran.ui.vpg/src/org/eclipse/photran/internal/ui/editor_vpg/contentassist/FortranCompletionProcessor.java
@@ -46,7 +46,11 @@
HashMap<String, TreeSet<Definition>> defs = new HashMap<String, TreeSet<Definition>>();
private String errorMessage = null;
-
+
+ //private final Color LIGHT_YELLOW = new Color(null, new RGB(255, 255, 191));
+ private final Color LIGHT_YELLOW = new Color(null, new RGB(255, 255, 223));
+ //private final Color WHITE = new Color(null, new RGB(255, 255, 255));
+
public IContentAssistant setup(FortranEditor editor)
{
String contentAssistEnabledProperty = new SearchPathProperties().getProperty(
@@ -54,8 +58,6 @@
SearchPathProperties.ENABLE_CONTENT_ASSIST_PROPERTY_NAME);
if (contentAssistEnabledProperty != null && contentAssistEnabledProperty.equals("true")) //$NON-NLS-1$
{
- final Color LIGHT_YELLOW = new Color(null, new RGB(255, 255, 191));
-
FortranEditorTasks.instance(editor).addASTTask(new FortranCompletionProcessorASTTask(this));
FortranEditorTasks.instance(editor).addVPGTask(new FortranCompletionProcessorVPGTask(this));
diff --git a/org.eclipse.photran.ui.vpg/src/org/eclipse/photran/internal/ui/editor_vpg/contentassist/FortranCompletionProposalComputer.java b/org.eclipse.photran.ui.vpg/src/org/eclipse/photran/internal/ui/editor_vpg/contentassist/FortranCompletionProposalComputer.java
index ff76e3a..4f7ae49 100755
--- a/org.eclipse.photran.ui.vpg/src/org/eclipse/photran/internal/ui/editor_vpg/contentassist/FortranCompletionProposalComputer.java
+++ b/org.eclipse.photran.ui.vpg/src/org/eclipse/photran/internal/ui/editor_vpg/contentassist/FortranCompletionProposalComputer.java
@@ -163,10 +163,10 @@
}
}
- private FortranCompletionProposal createProposal(String identifier)
- {
- return createProposal(identifier, null, null);
- }
+// private FortranCompletionProposal createProposal(String identifier)
+// {
+// return createProposal(identifier, null, null);
+// }
private FortranCompletionProposal createProposal(String identifier, String description)
{
@@ -188,8 +188,8 @@
return new FortranCompletionProposal(
identifier,
new TemplateProposal(new Template(
- displayString(identifier, description),
- displayString(identifier, description),
+ identifier,
+ description == null ? "" : description, //$NON-NLS-1$
FortranTemplateContext.ID,
replaceArgumentsWithTemplateVariables(identifier),
true),
@@ -231,13 +231,13 @@
else return string;
}
- private String displayString(String identifier, String description)
- {
- if (description == null)
- return identifier;
- else
- return identifier + " - " + description; //$NON-NLS-1$
- }
+// private String displayString(String identifier, String description)
+// {
+// if (description == null)
+// return identifier;
+// else
+// return identifier + " - " + description; //$NON-NLS-1$
+// }
/**
* A single proposal which will appear in the content assist list.
