Attachment 37284 Details for Bug 115927 – org.eclipse.jst.jsp.ui.patch

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

[patch] org.eclipse.jst.jsp.ui.patch

org.eclipse.jst.jsp.ui.patch (text/plain), 2.93 KB, created by Amy Wu

on 2006-03-30 02:51:02 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Amy Wu

Created: 2006-03-30 02:51:02 EST

Size: 2.93 KB

patch

obsolete

>Index: src/org/eclipse/jst/jsp/ui/internal/contentassist/JSPContentAssistProcessor.java
>===================================================================
>RCS file: /cvsroot/webtools/jst/components/jsp/plugins/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/contentassist/JSPContentAssistProcessor.java,v
>retrieving revision 1.48
>diff -u -r1.48 JSPContentAssistProcessor.java
>--- src/org/eclipse/jst/jsp/ui/internal/contentassist/JSPContentAssistProcessor.java	22 Nov 2005 02:40:41 -0000	1.48
>+++ src/org/eclipse/jst/jsp/ui/internal/contentassist/JSPContentAssistProcessor.java	30 Mar 2006 07:46:15 -0000
>@@ -210,7 +210,12 @@
> 	 * add proposals for tags in attribute values
> 	 */
> 	protected void addAttributeValueProposals(ContentAssistRequest contentAssistRequest) {
>-		addTemplates(contentAssistRequest, TemplateContextTypeIdsJSP.ATTRIBUTE_VALUE);
>+		// bug115927 do not include first quote
>+		int startOffset = contentAssistRequest.getReplacementBeginPosition();
>+		if (contentAssistRequest.getMatchString().length() > 0 && (contentAssistRequest.getMatchString().charAt(0) == '\'' || contentAssistRequest.getMatchString().charAt(0) == '"')) {
>+			++startOffset;
>+		}
>+		addTemplates(contentAssistRequest, TemplateContextTypeIdsJSP.ATTRIBUTE_VALUE, startOffset);
> 
> 		IDOMNode node = (IDOMNode) contentAssistRequest.getNode();
> 
>@@ -1145,7 +1150,8 @@
> 			}
> 		}
> 		
>-		addTemplates(request, TemplateContextTypeIdsJSP.ALL);
>+		// bug115927 use original document position for all/any region templates
>+		addTemplates(request, TemplateContextTypeIdsJSP.ALL, documentPosition);
> 		return request;
> 	}
> 
>@@ -1163,6 +1169,17 @@
> 	 * @param context
> 	 */
> 	private void addTemplates(ContentAssistRequest contentAssistRequest, String context) {
>+		addTemplates(contentAssistRequest, context, contentAssistRequest.getReplacementBeginPosition());
>+	}
>+	
>+	/**
>+	 * Adds templates to the list of proposals
>+	 * 
>+	 * @param contentAssistRequest
>+	 * @param context
>+	 * @param startOffset
>+	 */
>+	private void addTemplates(ContentAssistRequest contentAssistRequest, String context, int startOffset) {
> 		if (contentAssistRequest == null)
> 			return;
> 		
>@@ -1174,7 +1191,7 @@
> 
> 			if (getTemplateCompletionProcessor() != null) {
> 				getTemplateCompletionProcessor().setContextType(context);
>-				ICompletionProposal[] proposals = getTemplateCompletionProcessor().computeCompletionProposals(fTextViewer, contentAssistRequest.getReplacementBeginPosition());
>+				ICompletionProposal[] proposals = getTemplateCompletionProcessor().computeCompletionProposals(fTextViewer, startOffset);
> 				for (int i = 0; i < proposals.length; ++i) {
> 					if (useProposalList)
> 						contentAssistRequest.addProposal(proposals[i]);
>@@ -1184,8 +1201,7 @@
> 			}
> 		}
> 	}
>-
>-
>+	
> 	protected void addEntityProposals(ContentAssistRequest contentAssistRequest, int documentPosition, ITextRegion completionRegion, IDOMNode treeNode) {
> 		// ignore
> 	}

Actions: View | Diff

Attachments on bug 115927: 37284 | 37285 | 37286 | 37374 | 37375 | 37376