Attachment 212326 Details for Bug 264246 – patch - fix 2

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] patch - fix 2

264246_fix.patch (text/plain), 1.82 KB, created by Nick Sandonato

on 2012-03-08 15:13:03 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Nick Sandonato

Created: 2012-03-08 15:13:03 EST

Size: 1.82 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.wst.xml.ui
>Index: src/org/eclipse/wst/xml/ui/internal/contentassist/MarkupCompletionProposal.java
>===================================================================
>RCS file: /cvsroot/webtools/sourceediting/plugins/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/contentassist/MarkupCompletionProposal.java,v
>retrieving revision 1.1
>diff -u -r1.1 MarkupCompletionProposal.java
>--- src/org/eclipse/wst/xml/ui/internal/contentassist/MarkupCompletionProposal.java	10 Jan 2012 17:53:20 -0000	1.1
>+++ src/org/eclipse/wst/xml/ui/internal/contentassist/MarkupCompletionProposal.java	8 Mar 2012 20:12:02 -0000
>@@ -60,7 +60,7 @@
> 		final String replacement = getReplacementString();
> 		final IDocument document = viewer.getDocument();
> 		final int length = replacement.length();
>-		boolean inAttribute = false, hasGroup = false, inEndTag = false;
>+		boolean inAttribute = false, hasGroup = false;
> 		int offset = 0;
> 		char attType = 0;
> 		int exitPosition = -1;
>@@ -89,23 +89,11 @@
> 						}
> 						break;
> 					case '/':
>-							if (!inAttribute) {
>-								inEndTag = i > 0 && replacement.charAt(i - 1) == '<';
>-							}
> 						break;
> 					case '>':
> 						if (!inAttribute) {
>-							if (i == length - 1) {
>+							if (!inAttribute && exitPosition == -1) {
> 								exitPosition = getReplacementOffset() + i + 1;
>-								if (!inEndTag) { // Don't add a position within the end-tag
>-									addPosition(model, document, getReplacementOffset() + i, 0); // position within start tag
>-									hasGroup = true;
>-								}
>-							}
>-							else {
>-								addPosition(model, document, getReplacementOffset() + i, 0); // position within start tag
>-								addPosition(model, document, getReplacementOffset() + i + 1, 0); // position after start tag
>-								hasGroup = true;
> 							}
> 						}
> 						break;

Actions: View | Diff

Attachments on bug 264246: 202932 | 202934 | 211921 | 212326