Author: vrubezhny
Date: 2010-02-05 13:14:41 -0500 (Fri, 05 Feb 2010)
New Revision: 20154
Modified:
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/XmlContentAssistProcessor.java
Log:
JBIDE-5798: Code completion for attributes: String proposals should be higher than EL
ones.
Issue is fixed
Modified:
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/XmlContentAssistProcessor.java
===================================================================
---
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/XmlContentAssistProcessor.java 2010-02-05
17:58:14 UTC (rev 20153)
+++
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/XmlContentAssistProcessor.java 2010-02-05
18:14:41 UTC (rev 20154)
@@ -307,7 +307,7 @@
if (query == null)
query = ""; //$NON-NLS-1$
String stringQuery = matchString;
- int relevanceShift = 0;
+ 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;
}
@@ -348,7 +348,7 @@
String additionalProposalInfo = (textProposal.getContextInfo() == null ? ""
: textProposal.getContextInfo()); //$NON-NLS-1$
int relevance = textProposal.getRelevance();
if (relevance == TextProposal.R_NONE) {
- relevance = baseRelevance;
+ relevance = baseRelevance;
}
relevance += relevanceShift;
Show replies by date