[319771] Templates of "All XML" context are missing from proposals

1 files changed, 19 insertions, 0 deletions

diff --git a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/contentassist/XMLTemplatesCompletionProposalComputer.java b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/contentassist/XMLTemplatesCompletionProposalComputer.java
index 0ab2300063..287baaaec3 100644
--- a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/contentassist/XMLTemplatesCompletionProposalComputer.java
+++ b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/contentassist/XMLTemplatesCompletionProposalComputer.java
@@ -10,6 +10,10 @@
  *******************************************************************************/
 package org.eclipse.wst.xml.ui.internal.contentassist;
 
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.jface.text.contentassist.ICompletionProposal;
 import org.eclipse.wst.sse.ui.contentassist.CompletionProposalInvocationContext;
 import org.eclipse.wst.xml.ui.internal.templates.TemplateContextTypeIdsXML;
@@ -102,4 +106,19 @@ public class XMLTemplatesCompletionProposalComputer extends
 			}
 		}
 	}
+
+	public List computeCompletionProposals(CompletionProposalInvocationContext context, IProgressMonitor monitor) {
+		List list = new ArrayList(super.computeCompletionProposals(context, monitor));
+
+		if (fTemplateProcessor != null) {
+			fTemplateProcessor.setContextType(TemplateContextTypeIdsXML.ALL);
+			ICompletionProposal[] proposals = fTemplateProcessor.computeCompletionProposals(context.getViewer(), context.getInvocationOffset());
+			if (proposals != null) {
+				for (int i = 0; i < proposals.length; i++) {
+					list.add(proposals[i]);
+				}
+			}
+		}
+		return list;
+	}
 }