Author: vrubezhny Date: 2010-10-08 08:26:17 -0400 (Fri, 08 Oct 2010) New Revision: 25645 Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/computers/XmlELCompletionProposalComputer.java Log: JBIDE-7104 CA proposals aren't filtered when CA is invoked right before next tag or tag ending (before '<'-character) Apply operation for the proposals is fixed Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/computers/XmlELCompletionProposalComputer.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/computers/XmlELCompletionProposalComputer.java 2010-10-08 10:50:47 UTC (rev 25644) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/computers/XmlELCompletionProposalComputer.java 2010-10-08 12:26:17 UTC (rev 25645) @@ -348,7 +348,7 @@ String stringQuery = matchString; int relevanceShift = -2; // Fix for JBIDE-5987: Relevance for predicate proposals is shifted down by default to show EL proposals lower than attr-value proposals if (shiftRelevanceAgainstTagNameProposals) { - relevanceShift += prefix.getText() != null && prefix.getText().trim().length() > 0 ? (XMLRelevanceConstants.R_STRICTLY_VALID_TAG_INSERTION - baseRelevance + 2): -2; + relevanceShift += prefix.getText() != null && prefix.getText().trim().length() > 0 ? 0 : -2; } int beginChangeOffset = prefix.getStartOffset() + prefix.getOffset();