diff options
author | Jonah Graham | 2016-05-17 14:08:22 +0000 |
---|---|---|
committer | Victor Rubezhny | 2016-05-23 20:26:05 +0000 |
commit | 4b48f6b79153c46cf2452920be1493cf825368fb (patch) | |
tree | 9cf7f1b3096ff8d7ed488845a5b4200238abfaf7 | |
parent | fe89400781b9ec35c9336a181651389eb5afcc23 (diff) | |
download | webtools.jsdt-4b48f6b79153c46cf2452920be1493cf825368fb.tar.gz webtools.jsdt-4b48f6b79153c46cf2452920be1493cf825368fb.tar.xz webtools.jsdt-4b48f6b79153c46cf2452920be1493cf825368fb.zip |
Bug 493810: fix return type of computeContextInformation
The correct type is IContextInformation, that is consistent with what
the implementations (such as HippieProposalComputer) expects and with
the original version of IJavaCompletionProposalComputer copied from the
JDT. It is also consistent with what the javadoc for the method says too.
Change-Id: Idac3620189671ff13fd3f526cd02f722737fb5ec
Signed-off-by: Jonah Graham <jonah@kichwacoders.com>
2 files changed, 5 insertions, 3 deletions
diff --git a/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/text/java/TemplateCompletionProposalComputer.java b/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/text/java/TemplateCompletionProposalComputer.java index d3c6edc2a..e8deeb2b2 100644 --- a/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/text/java/TemplateCompletionProposalComputer.java +++ b/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/text/java/TemplateCompletionProposalComputer.java @@ -20,6 +20,7 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.jface.text.BadLocationException; import org.eclipse.jface.text.TextUtilities; import org.eclipse.jface.text.contentassist.ICompletionProposal; +import org.eclipse.jface.text.contentassist.IContextInformation; import org.eclipse.jface.text.templates.TemplateContextType; import org.eclipse.wst.jsdt.core.IJavaScriptUnit; import org.eclipse.wst.jsdt.internal.corext.template.java.JavaContextType; @@ -130,7 +131,7 @@ public final class TemplateCompletionProposalComputer implements IJavaCompletion /* * @see org.eclipse.jface.text.contentassist.ICompletionProposalComputer#computeContextInformation(org.eclipse.jface.text.contentassist.TextContentAssistInvocationContext, org.eclipse.core.runtime.IProgressMonitor) */ - public List<ICompletionProposal> computeContextInformation(ContentAssistInvocationContext context, IProgressMonitor monitor) { + public List<IContextInformation> computeContextInformation(ContentAssistInvocationContext context, IProgressMonitor monitor) { return Collections.emptyList(); } diff --git a/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/ui/text/java/IJavaCompletionProposalComputer.java b/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/ui/text/java/IJavaCompletionProposalComputer.java index d0f8f2995..ed15d17d5 100644 --- a/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/ui/text/java/IJavaCompletionProposalComputer.java +++ b/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/ui/text/java/IJavaCompletionProposalComputer.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2008 IBM Corporation and others. + * Copyright (c) 2000, 2016 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -14,6 +14,7 @@ import java.util.List; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.jface.text.contentassist.ICompletionProposal; +import org.eclipse.jface.text.contentassist.IContextInformation; /** * Computes completions and context information displayed by the JavaScript editor content assistant. @@ -53,7 +54,7 @@ public interface IJavaCompletionProposalComputer { * invocation, i.e. there is no need for the receiver to spawn a sub monitor. * @return a list of context information objects (element type: {@link org.eclipse.jface.text.contentassist.IContextInformation}) */ - List<ICompletionProposal> computeContextInformation(ContentAssistInvocationContext context, IProgressMonitor monitor); + List<IContextInformation> computeContextInformation(ContentAssistInvocationContext context, IProgressMonitor monitor); /** * Returns the reason why this computer was unable to produce any completion proposals or |