[222875] [content assist] AbstractContentAssistProcessor adds useless echo content assist proposal for attribute values
diff --git a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/contentassist/AbstractXMLModelQueryCompletionProposalComputer.java b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/contentassist/AbstractXMLModelQueryCompletionProposalComputer.java
index f5b1146..aa4a109 100644
--- a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/contentassist/AbstractXMLModelQueryCompletionProposalComputer.java
+++ b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/contentassist/AbstractXMLModelQueryCompletionProposalComputer.java
@@ -419,13 +419,16 @@
proposedInfo = getAdditionalInfo(null, elementDecl);
CustomCompletionProposal proposal = null;
if ((currentValue != null) && (currentValue.length() > 0)) {
- String rValue = "\"" + currentValue + "\""; //$NON-NLS-2$//$NON-NLS-1$
- proposal = new MarkupCompletionProposal(rValue,
- contentAssistRequest.getReplacementBeginPosition(),
- contentAssistRequest.getReplacementLength(), 1, image,
- rValue, null, proposedInfo,
- XMLRelevanceConstants.R_XML_ATTRIBUTE_VALUE);
- contentAssistRequest.addProposal(proposal);
+ final String regionText = open.getText(contentAssistRequest.getRegion());
+ if (regionText.charAt(0) != '"' && regionText.charAt(0) != '\'') {
+ String rValue = "\"" + currentValue + "\""; //$NON-NLS-2$//$NON-NLS-1$
+ proposal = new MarkupCompletionProposal(rValue,
+ contentAssistRequest.getReplacementBeginPosition(),
+ contentAssistRequest.getReplacementLength(), 1, image,
+ rValue, null, proposedInfo,
+ XMLRelevanceConstants.R_XML_ATTRIBUTE_VALUE);
+ contentAssistRequest.addProposal(proposal);
+ }
}
}
}
