From jbosstools-commits at lists.jboss.org Tue Oct 19 13:00:57 2010
Content-Type: multipart/mixed; boundary="===============4879891607348337490=="
MIME-Version: 1.0
From: jbosstools-commits at lists.jboss.org
To: jbosstools-commits at lists.jboss.org
Subject: [jbosstools-commits] JBoss Tools SVN: r25919 -
 trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/computers.
Date: Tue, 19 Oct 2010 13:00:57 -0400
Message-ID: <201010191700.o9JH0vaQ022831@svn01.web.mwc.hst.phx2.redhat.com>

--===============4879891607348337490==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

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/co=
ntentassist/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
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/c=
ontentassist/computers/AbstractXmlCompletionProposalComputer.java	2010-10-1=
9 17:00:37 UTC (rev 25918)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/c=
ontentassist/computers/AbstractXmlCompletionProposalComputer.java	2010-10-1=
9 17:00:56 UTC (rev 25919)
@@ -651,8 +651,37 @@
 		return region;
 	}
 =

+	protected ContentAssistRequest computeCompletionProposals(String matchStr=
ing, ITextRegion completionRegion, IDOMNode treeNode, IDOMNode xmlnode, Com=
pletionProposalInvocationContext context) {
+		ContentAssistRequest contentAssistRequest =3D super.computeCompletionPro=
posals(matchString, completionRegion, treeNode, xmlnode, context);
+		if (contentAssistRequest =3D=3D null) {
+			IStructuredDocumentRegion sdRegion =3D getStructuredDocumentRegion(cont=
ext.getInvocationOffset());
+			contentAssistRequest =3D newContentAssistRequest((Node) treeNode, treeN=
ode.getParentNode(), sdRegion, completionRegion, context.getInvocationOffse=
t(), 0, ""); //$NON-NLS-1$
+		}
+		=

+		String regionType =3D completionRegion.getType();
+
+		/*
+		 * Jeremy: Add attribute name proposals before  empty tag close
+		 */
+		if ((xmlnode.getNodeType() =3D=3D Node.ELEMENT_NODE) || (xmlnode.getNode=
Type() =3D=3D Node.DOCUMENT_NODE)) {
+			if (regionType =3D=3D DOMRegionContext.XML_EMPTY_TAG_CLOSE) {
+				addAttributeNameProposals(contentAssistRequest, context);
+			} else if ((regionType =3D=3D DOMRegionContext.XML_CONTENT) =

+					|| (regionType =3D=3D DOMRegionContext.XML_CHAR_REFERENCE) =

+					|| (regionType =3D=3D DOMRegionContext.XML_ENTITY_REFERENCE) =

+					|| (regionType =3D=3D DOMRegionContext.XML_PE_REFERENCE)
+					|| (regionType =3D=3D DOMRegionContext.BLOCK_TEXT)
+					|| (regionType =3D=3D DOMRegionContext.XML_END_TAG_OPEN)) {
+				addTextELProposals(contentAssistRequest, context);
+			}
+		}
+
+		return contentAssistRequest;
+	}
 	=

-	=

+	protected ContentAssistRequest newContentAssistRequest(Node node, Node po=
ssibleParent, IStructuredDocumentRegion documentRegion, ITextRegion complet=
ionRegion, int begin, int length, String filter) {
+		return new ContentAssistRequest(node, possibleParent, documentRegion, co=
mpletionRegion, begin, length, filter);
+	}
 	/**
 	 * Calculates and adds the tag name proposals to the Content Assist Reque=
st object
 	 * =



--===============4879891607348337490==--