Attachment 80444 Details for Bug 205569 – dom resolver patch2 (and code completion null pointer)

[patch] dom resolver patch2 (and code completion null pointer)

patch.txt (text/plain), 3.12 KB, created by Johan Compagner

on 2007-10-16 09:24:40 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Johan Compagner

Created: 2007-10-16 09:24:40 EDT

Size: 3.12 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.dltk.ui
>Index: src/org/eclipse/dltk/ui/text/completion/CompletionProposalComparator.java
>===================================================================
>RCS file: /cvsroot/technology/org.eclipse.dltk/core/plugins/org.eclipse.dltk.ui/src/org/eclipse/dltk/ui/text/completion/CompletionProposalComparator.java,v
>retrieving revision 1.4
>diff -u -r1.4 CompletionProposalComparator.java
>--- src/org/eclipse/dltk/ui/text/completion/CompletionProposalComparator.java	8 May 2007 12:56:53 -0000	1.4
>+++ src/org/eclipse/dltk/ui/text/completion/CompletionProposalComparator.java	16 Oct 2007 13:19:11 -0000
>@@ -66,7 +66,10 @@
> 
> 	private String getSortKey(ICompletionProposal p) {
> 		if (p instanceof AbstractScriptCompletionProposal)
>-			return ((AbstractScriptCompletionProposal) p).getSortString();
>+		{
>+			String sortString =((AbstractScriptCompletionProposal) p).getSortString();
>+			if (sortString != null) return sortString;
>+		}
> 		return p.getDisplayString();
> 	}
> 
>#P org.eclipse.dltk.javascript.core.dom.support
>Index: src/org/eclipse/dlkt/javascript/dom/support/IDesignTimeDOMProvider.java
>===================================================================
>RCS file: /cvsroot/technology/org.eclipse.dltk/javascript/plugins/org.eclipse.dltk.javascript.core.dom.support/src/org/eclipse/dlkt/javascript/dom/support/IDesignTimeDOMProvider.java,v
>retrieving revision 1.1
>diff -u -r1.1 IDesignTimeDOMProvider.java
>--- src/org/eclipse/dlkt/javascript/dom/support/IDesignTimeDOMProvider.java	6 Jun 2007 12:40:12 -0000	1.1
>+++ src/org/eclipse/dlkt/javascript/dom/support/IDesignTimeDOMProvider.java	16 Oct 2007 13:19:13 -0000
>@@ -2,7 +2,7 @@
> 
> import org.eclipse.core.runtime.IExecutableExtension;
> import org.eclipse.dltk.core.ISourceModule;
>-import org.mozilla.javascript.ScriptableObject;
>+import org.mozilla.javascript.Scriptable;
> 
> public interface IDesignTimeDOMProvider extends IExecutableExtension {
> 
>@@ -18,7 +18,7 @@
> 	 * @param module
> 	 * @return top level DOM object for given module
> 	 */
>-	public ScriptableObject resolveTopLevelScope(ISourceModule module);
>+	public Scriptable resolveTopLevelScope(ISourceModule module);
> 
> 	/**
> 	 * 
>Index: src/org/eclipse/dlkt/javascript/dom/support/internal/DOMResolver.java
>===================================================================
>RCS file: /cvsroot/technology/org.eclipse.dltk/javascript/plugins/org.eclipse.dltk.javascript.core.dom.support/src/org/eclipse/dlkt/javascript/dom/support/internal/DOMResolver.java,v
>retrieving revision 1.2
>diff -u -r1.2 DOMResolver.java
>--- src/org/eclipse/dlkt/javascript/dom/support/internal/DOMResolver.java	16 Oct 2007 12:29:56 -0000	1.2
>+++ src/org/eclipse/dlkt/javascript/dom/support/internal/DOMResolver.java	16 Oct 2007 13:19:14 -0000
>@@ -137,7 +137,7 @@
> 		HashMap mp = new HashMap();
> 		for (int a = 0; a < providers.length; a++) {
> 			if (providers[a].canResolve(module)) {
>-				ScriptableObject resolveTopLevelScope = providers[a]
>+				Scriptable resolveTopLevelScope = providers[a]
> 						.resolveTopLevelScope(module);
> 				if (resolveTopLevelScope == null)
> 					continue;

Flags:

alex.panchenko: iplog+

Actions: View | Diff

Attachments on bug 205569: 79802 | 80444