Author: vrubezhny
Date: 2010-10-19 13:00:56 -0400 (Tue, 19 Oct 2010)
New Revision: 25919
Modified:
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/computers/AbstractXmlCompletionProposalComputer.java
Log:
JBIDE-7364
Content Assist doesn't show EL propolals within <style> tag content
Issue is fixed
Modified:
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/computers/AbstractXmlCompletionProposalComputer.java
===================================================================
---
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/computers/AbstractXmlCompletionProposalComputer.java 2010-10-19
17:00:37 UTC (rev 25918)
+++
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/computers/AbstractXmlCompletionProposalComputer.java 2010-10-19
17:00:56 UTC (rev 25919)
@@ -651,8 +651,37 @@
return region;
}
+ protected ContentAssistRequest computeCompletionProposals(String matchString,
ITextRegion completionRegion, IDOMNode treeNode, IDOMNode xmlnode,
CompletionProposalInvocationContext context) {
+ ContentAssistRequest contentAssistRequest =
super.computeCompletionProposals(matchString, completionRegion, treeNode, xmlnode,
context);
+ if (contentAssistRequest == null) {
+ IStructuredDocumentRegion sdRegion =
getStructuredDocumentRegion(context.getInvocationOffset());
+ contentAssistRequest = newContentAssistRequest((Node) treeNode,
treeNode.getParentNode(), sdRegion, completionRegion, context.getInvocationOffset(), 0,
""); //$NON-NLS-1$
+ }
+
+ String regionType = completionRegion.getType();
+
+ /*
+ * Jeremy: Add attribute name proposals before empty tag close
+ */
+ if ((xmlnode.getNodeType() == Node.ELEMENT_NODE) || (xmlnode.getNodeType() ==
Node.DOCUMENT_NODE)) {
+ if (regionType == DOMRegionContext.XML_EMPTY_TAG_CLOSE) {
+ addAttributeNameProposals(contentAssistRequest, context);
+ } else if ((regionType == DOMRegionContext.XML_CONTENT)
+ || (regionType == DOMRegionContext.XML_CHAR_REFERENCE)
+ || (regionType == DOMRegionContext.XML_ENTITY_REFERENCE)
+ || (regionType == DOMRegionContext.XML_PE_REFERENCE)
+ || (regionType == DOMRegionContext.BLOCK_TEXT)
+ || (regionType == DOMRegionContext.XML_END_TAG_OPEN)) {
+ addTextELProposals(contentAssistRequest, context);
+ }
+ }
+
+ return contentAssistRequest;
+ }
-
+ protected ContentAssistRequest newContentAssistRequest(Node node, Node possibleParent,
IStructuredDocumentRegion documentRegion, ITextRegion completionRegion, int begin, int
length, String filter) {
+ return new ContentAssistRequest(node, possibleParent, documentRegion, completionRegion,
begin, length, filter);
+ }
/**
* Calculates and adds the tag name proposals to the Content Assist Request object
*