Author: vrubezhny Date: 2009-11-23 20:27:04 -0500 (Mon, 23 Nov 2009) New Revision: 18794 Modified: trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/JSPExprHyperlinkPartitioner.java Log: JBIDE-5247: Endless cycling in org.jboss.tools.jsf.text.ext.hyperlink.JSPExprHyperlinkPartitioner.getRegion(IDocument, int) under some conditions Issue is fixed Modified: trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/JSPExprHyperlinkPartitioner.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/JSPExprHyperlinkPartitioner.java 2009-11-24 01:11:08 UTC (rev 18793) +++ trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/JSPExprHyperlinkPartitioner.java 2009-11-24 01:27:04 UTC (rev 18794) @@ -13,9 +13,6 @@ import org.eclipse.jface.text.IDocument; import org.eclipse.wst.xml.core.internal.provisional.document.IDOMAttr; import org.eclipse.wst.xml.core.internal.provisional.document.IDOMText; -import org.w3c.dom.Document; -import org.w3c.dom.Node; - import org.jboss.tools.common.text.ext.hyperlink.AbstractHyperlinkPartitioner; import org.jboss.tools.common.text.ext.hyperlink.HyperlinkRegion; import org.jboss.tools.common.text.ext.hyperlink.IExclusiblePartitionerRecognition; @@ -24,10 +21,13 @@ import org.jboss.tools.common.text.ext.util.StructuredModelWrapper; import org.jboss.tools.common.text.ext.util.Utils; import org.jboss.tools.jst.text.ext.hyperlink.jsp.JSPRootHyperlinkPartitioner; +import org.w3c.dom.Document; +import org.w3c.dom.Node; /** * @author Jeremy */ +@SuppressWarnings("restriction") public class JSPExprHyperlinkPartitioner extends AbstractHyperlinkPartitioner implements IHyperlinkPartitionRecognizer, IExclusiblePartitionerRecognition { public static final String JSP_EXPRESSION_PARTITION = "org.jboss.tools.common.text.ext.jsp.JSP_EXPRESSION"; //$NON-NLS-1$ @@ -110,7 +110,7 @@ if (lineBreaker1 != -1 && lineBreaker1 + valStart < exprEnd) exprEnd = valStart + lineBreaker1; exprLength = exprEnd - exprStart; - if(exprLength==0) { + if(exprLength<=0) { return null; } else if (exprStart <= offset && exprEnd >= offset) { int start = exprStart;