Author: vrubezhny Date: 2009-07-31 16:18:26 -0400 (Fri, 31 Jul 2009) New Revision: 16933 Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/AbstractXMLContentAssistProcessor.java Log: JBIDE-4660: Update and correct the CA-related JUnit tests after the new-style CA is applied. JsfJspJbide1641Test Test suite related issue is corrected Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/AbstractXMLContentAssistProcessor.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/AbstractXMLContentAssistProcessor.java 2009-07-31 15:52:38 UTC (rev 16932) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/AbstractXMLContentAssistProcessor.java 2009-07-31 20:18:26 UTC (rev 16933) @@ -665,12 +665,18 @@ if (xmlDocument == null) return EMPTY_TAGS; - // Get Fixed Structured Document Region - IStructuredDocumentRegion sdFixedRegion = this.getStructuredDocumentRegion(getOffset()); - if (sdFixedRegion == null) - return EMPTY_TAGS; - Node n = findNodeForOffset(xmlDocument, sdFixedRegion.getStartOffset()); + Node n = null; + if (includeThisTag) { + n = findNodeForOffset(xmlDocument, getOffset()); + } else { + // Get Fixed Structured Document Region + IStructuredDocumentRegion sdFixedRegion = this.getStructuredDocumentRegion(getOffset()); + if (sdFixedRegion == null) + return null; + + n = findNodeForOffset(xmlDocument, sdFixedRegion.getStartOffset()); + } if (n == null) return EMPTY_TAGS;