[jbosstools-commits] JBoss Tools SVN: r5760 - trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist.

Author: vrubezhny Date: 2008-01-17 08:31:14 -0500 (Thu, 17 Jan 2008) New Revision: 5760 Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/RedHatHtmlContentAssistProcessor.java trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/RedHatJSPContentAssistProcessor.java Log: http://jira.jboss.org/jira/browse/JBIDE-1641 Problems with inserting atributes using CA on xhtml pages. Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/RedHatHtmlContentAssistProcessor.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/RedHatHtmlContentAssistProcessor.java 2008-01-17 13:20:30 UTC (rev 5759) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/RedHatHtmlContentAssistProcessor.java 2008-01-17 13:31:14 UTC (rev 5760) @@ -555,7 +555,8 @@ return null; } - if (sdRegion.getStartOffset(region) == pos) { + if (region.getType() == DOMRegionContext.XML_TAG_OPEN && + sdRegion.getStartOffset(region) == pos) { // The offset is at the beginning of the region if ((sdRegion.getStartOffset(region) == sdRegion.getStartOffset()) && (sdRegion.getPrevious() != null) && (!sdRegion.getPrevious().isEnded())) { // Is the region also the start of the node? If so, the Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/RedHatJSPContentAssistProcessor.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/RedHatJSPContentAssistProcessor.java 2008-01-17 13:20:30 UTC (rev 5759) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/RedHatJSPContentAssistProcessor.java 2008-01-17 13:31:14 UTC (rev 5760) @@ -43,6 +43,7 @@ import org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocument; import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement; import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode; +import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext; import org.eclipse.wst.xml.ui.internal.XMLUIMessages; import org.eclipse.wst.xml.ui.internal.XMLUIPlugin; import org.eclipse.wst.xml.ui.internal.contentassist.ContentAssistRequest; @@ -633,7 +634,8 @@ return null; } - if (sdRegion.getStartOffset(region) == pos) { + if (region.getType() == DOMRegionContext.XML_TAG_OPEN && + sdRegion.getStartOffset(region) == pos) { // The offset is at the beginning of the region if ((sdRegion.getStartOffset(region) == sdRegion.getStartOffset()) && (sdRegion.getPrevious() != null) && (!sdRegion.getPrevious().isEnded())) { // Is the region also the start of the node? If so, the