[386974] On completing <script> attributes, source is wrong inserted and re-formatted
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 237c524..294faa0 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
@@ -377,6 +377,14 @@
}
if(defaultValue != null && ((matchString.length() == 0) || defaultValue.startsWith(matchString))) {
String rString = "\"" + defaultValue + "\""; //$NON-NLS-1$ //$NON-NLS-2$
+ final String regionText = contentAssistRequest.getDocumentRegion().getText(contentAssistRequest.getRegion());
+ final int matchStringLength = contentAssistRequest.getMatchString().length();
+ if (matchString.length() > 0 && matchStringLength < regionText.length()) {
+ final String remaining = regionText.substring(matchStringLength).trim();
+ if (remaining.charAt(0) != '\'' && remaining.charAt(0) != '"') {
+ rLength = matchStringLength;
+ }
+ }
CustomCompletionProposal proposal = new MarkupCompletionProposal(
rString, rOffset, rLength, defaultValue.length() + 1,
XMLEditorPluginImageHelper.getInstance().getImage(XMLEditorPluginImages.IMG_OBJ_DEFAULT),
