Attachment #207179 for bug #361315

Lines 13-18 Link Here

(-)plugin.xml (+7 lines)
13	<plugin>	13	<plugin>
14	<extension-point id="launchingConnectors" name="%connectorsExtPoint.name" schema="schema/launchingConnectors.exsd"/>	14	<extension-point id="launchingConnectors" name="%connectorsExtPoint.name" schema="schema/launchingConnectors.exsd"/>
15	<extension-point id="breakpointParticipants" name="%breakpointParticipantsExt.name" schema="schema/breakpointParticipants.exsd"/>	15	<extension-point id="breakpointParticipants" name="%breakpointParticipantsExt.name" schema="schema/breakpointParticipants.exsd"/>
		16	<extension-point id="scriptResolvers" name="scriptResolvers" schema="schema/scriptResolvers.exsd"/>
16	<extension	17	<extension
17	point="org.eclipse.debug.core.launchConfigurationTypes">	18	point="org.eclipse.debug.core.launchConfigurationTypes">
18	<launchConfigurationType	19	<launchConfigurationType
Lines 161-165 Link Here
161	id="org.eclipse.wst.jsdt.debug.core.source.path.computer">	162	id="org.eclipse.wst.jsdt.debug.core.source.path.computer">
162	</sourcePathComputer>	163	</sourcePathComputer>
163	</extension>	164	</extension>
		165	<extension
		166	point="org.eclipse.wst.jsdt.debug.core.scriptResolvers">
		167	<scriptResolver
		168	class="org.eclipse.wst.jsdt.debug.internal.core.model.DefaultScriptResolver">
		169	</scriptResolver>
		170	</extension>
164		171
165	</plugin>	172	</plugin>




<?xml version='1.0' encoding='UTF-8'?>
<!-- Schema file written by PDE -->
<schema targetNamespace="org.eclipse.wst.jsdt.debug.core" xmlns="http://www.w3.org/2001/XMLSchema">
<annotation>
      <appinfo>
         <meta.schema plugin="org.eclipse.wst.jsdt.debug.core" id="scriptResolvers" name="scriptResolvers"/>
      </appinfo>
      <documentation>
         This extension point is used to contribute a script solver that is consulted any place in JSDT where a &lt;code&gt;ScriptReference&lt;/code&gt; must be resolved to a workspace-local &lt;code&gt;IFile&lt;/code&gt;.
&lt;br&gt;&lt;br&gt;
An example of typical usage is resolving if a breakpoint&apos;s workspace path matches that of a given &lt;code&gt;ScriptReference&lt;/code&gt;
      </documentation>
   </annotation>

   <element name="extension">
      <annotation>
         <appinfo>
            <meta.element />
         </appinfo>
      </annotation>
      <complexType>
         <sequence minOccurs="1" maxOccurs="unbounded">
            <element ref="scriptResolver"/>
         </sequence>
         <attribute name="point" type="string" use="required">
            <annotation>
               <documentation>
                  
               </documentation>
            </annotation>
         </attribute>
         <attribute name="id" type="string">
            <annotation>
               <documentation>
                  
               </documentation>
            </annotation>
         </attribute>
         <attribute name="name" type="string">
            <annotation>
               <documentation>
                  
               </documentation>
               <appinfo>
                  <meta.attribute translatable="true"/>
               </appinfo>
            </annotation>
         </attribute>
      </complexType>
   </element>

   <element name="scriptResolver">
      <annotation>
         <documentation>
            A resolver that can help determine equality between workspace-local IFiles and JavaScript ScriptReferences
         </documentation>
      </annotation>
      <complexType>
         <attribute name="class" type="string" use="required">
            <annotation>
               <documentation>
                  The fully qualified name of the Java class that implements org.eclipse.wst.jsdt.debug.core.model.IScriptResolver
               </documentation>
               <appinfo>
                  <meta.attribute kind="java" basedOn=":org.eclipse.wst.jsdt.debug.core.model.IScriptResolver"/>
               </appinfo>
            </annotation>
         </attribute>
      </complexType>
   </element>

   <annotation>
      <appinfo>
         <meta.section type="since"/>
      </appinfo>
      <documentation>
         3.4
      </documentation>
   </annotation>

   <annotation>
      <appinfo>
         <meta.section type="examples"/>
      </appinfo>
      <documentation>
         The following is an example of the default script resolver:
&lt;pre&gt;
   &lt;extension point=&quot;org.eclipse.wst.jsdt.debug.core.scriptResolvers&quot;&gt;
      &lt;scriptResolver
            class=&quot;org.eclipse.wst.jsdt.debug.internal.core.model.DefaultScriptResolver&quot;&gt;
      &lt;/scriptResolver&gt;
   &lt;/extension&gt;
&lt;/pre&gt;
      </documentation>
   </annotation>

   <annotation>
      <appinfo>
         <meta.section type="apiinfo"/>
      </appinfo>
      <documentation>
         The class field must specify the fully qualified name of the the class the implements &lt;code&gt;org.eclipse.wst.jsdt.debug.core.model.IScriptResolver.java&lt;/code&gt;.
      </documentation>
   </annotation>

   <annotation>
      <appinfo>
         <meta.section type="implementation"/>
      </appinfo>
      <documentation>
         [Enter information about supplied implementation of this extension point.]
      </documentation>
   </annotation>

   <annotation>
      <appinfo>
         <meta.section type="copyright"/>
      </appinfo>
      <documentation>
         Copyright (c) 2011 IBM Corporation and others.&lt;br&gt;
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 
&lt;a href=&quot;http://www.eclipse.org/legal/epl-v10.html&quot;&gt;http://www.eclipse.org/legal/epl-v10.html&lt;/a&gt;
      </documentation>
   </annotation>

</schema>




/*******************************************************************************
 * Copyright (c) 2011 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
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *     IBM Corporation - initial API and implementation
 *******************************************************************************/
package org.eclipse.wst.jsdt.debug.core.model;

import java.net.URI;

import org.eclipse.core.resources.IFile;
import org.eclipse.core.runtime.IPath;
import org.eclipse.wst.jsdt.debug.core.jsdi.ScriptReference;

/**
 * This resolver allows contributors to plug-in to the process of resolving a {@link ScriptReference}'s 
 * {@link URI} to a workspace-local {@link IFile}.

 * @noextend This interface is not intended to be extended by clients.
 * @since 3.4
 */
public interface IScriptResolver {

	/**
	 * This method determines if the given {@link IPath} matches the {@link URI} from {@link ScriptReference#sourceURI()}.

	 * @param script the {@link ScriptReference} to compare the source {@link URI} from - never <code>null</code>
	 * @param path the path to match against the source {@link URI} - never <code>null</code>
	 * 
	 * @return <code>true</code> if the source {@link URI} of the given {@link ScriptReference} is considered to match the given {@link IPath}, <code>false</code> otherwise.
	 */
	public boolean matches(ScriptReference script, IPath path);
	
	/**
	 * This method is used to find the workspace {@link IFile} that corresponds to the source {@link URI} from the given {@link ScriptReference}.
	 * <br><br>
	 * If no file can be determined the method must return <code>null</code>. The result will be checked for existence.
	 * 
	 * @param script the {@link ScriptReference} to find the {@link IFile} for
	 * @return the {@link IFile} for the {@link ScriptReference} or <code>null</code>
	 */
	public IFile getFile(ScriptReference script);
}

Lines 73-78 Link Here

(-)src/org/eclipse/wst/jsdt/debug/internal/core/Constants.java (+5 lines)
73	* The name of the launching connectors extension point	73	* The name of the launching connectors extension point
74	*/	74	*/
75	static final String LAUNCHING_CONNECTORS = "launchingConnectors"; //$NON-NLS-1$	75	static final String LAUNCHING_CONNECTORS = "launchingConnectors"; //$NON-NLS-1$
		76	/**
		77	* The name of the script resolvers extension point
		78	* @since 3.4
		79	*/
		80	static final String SCRIPT_RESOLVERS = "scriptResolvers"; //$NON-NLS-1$
76		81
77	//######### PREFERENCES ############	82	//######### PREFERENCES ############
78	/**	83	/**

Lines 27-32 Link Here

(-)src/org/eclipse/wst/jsdt/debug/internal/core/JavaScriptDebugPlugin.java (+17 lines)
27	import org.eclipse.core.runtime.preferences.InstanceScope;	27	import org.eclipse.core.runtime.preferences.InstanceScope;
28	import org.eclipse.wst.jsdt.debug.internal.core.launching.ConnectorsManager;	28	import org.eclipse.wst.jsdt.debug.internal.core.launching.ConnectorsManager;
29	import org.eclipse.wst.jsdt.debug.internal.core.model.BreakpointParticipantManager;	29	import org.eclipse.wst.jsdt.debug.internal.core.model.BreakpointParticipantManager;
		30	import org.eclipse.wst.jsdt.debug.internal.core.model.ScriptResolutionManager;
30	import org.osgi.framework.BundleContext;	31	import org.osgi.framework.BundleContext;
31		32
32	/**	33	/**
Lines 64-69 Link Here
64	*/	65	*/
65	private static JavaScriptPreferencesManager prefmanager = null;	66	private static JavaScriptPreferencesManager prefmanager = null;
66	/**	67	/**
		68	* Singleton {@link ScriptResolutionManager}
		69	*/
		70	private static ScriptResolutionManager resolutionmanager = null;
		71	/**
67	* Handle to the 'External JavaScript Source' project	72	* Handle to the 'External JavaScript Source' project
68	*/	73	*/
69	private static IProject extSrcProject = null;	74	private static IProject extSrcProject = null;
Lines 94-99 Link Here
94	}	99	}
95		100
96	/**	101	/**
		102	* Returns the singleton {@link ScriptResolutionManager}
		103	* @return the {@link ScriptResolutionManager}
		104	* @since 3.4
		105	*/
		106	public static synchronized ScriptResolutionManager getResolutionManager() {
		107	if(resolutionmanager == null) {
		108	resolutionmanager = new ScriptResolutionManager();
		109	}
		110	return resolutionmanager;
		111	}
		112
		113	/**
97	* Returns the current handle to the 'External JavaScript Source' project or <code>null</code>. If the project	114	* Returns the current handle to the 'External JavaScript Source' project or <code>null</code>. If the project
98	* is not accessible it can be created by passing <code>true</code> in for the create parameter.	115	* is not accessible it can be created by passing <code>true</code> in for the create parameter.
99	*	116	*




 *******************************************************************************/
package org.eclipse.wst.jsdt.debug.internal.core.breakpoints;

import java.net.URI;
import java.net.URISyntaxException;
import java.util.ArrayList;
import java.util.HashMap;


import org.eclipse.core.resources.IMarker;
import org.eclipse.core.resources.IWorkspace;
import org.eclipse.core.resources.IWorkspaceRoot;
import org.eclipse.core.resources.IWorkspaceRunnable;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException;

import org.eclipse.wst.jsdt.debug.core.model.JavaScriptDebugModel;
import org.eclipse.wst.jsdt.debug.internal.core.Constants;
import org.eclipse.wst.jsdt.debug.internal.core.JavaScriptDebugPlugin;
import org.eclipse.wst.jsdt.debug.internal.core.Messages;
import org.eclipse.wst.jsdt.debug.internal.core.launching.SourceLookup;
import org.eclipse.wst.jsdt.debug.internal.core.model.IJavaScriptEventListener;
import org.eclipse.wst.jsdt.debug.internal.core.model.JavaScriptDebugTarget;

	 * The total count of all of the targets this breakpoint is installed in
	 */
	public static final String INSTALL_COUNT = JavaScriptDebugPlugin.PLUGIN_ID + ".install_count"; //$NON-NLS-1$
	
	private HashSet targets = null;
	private HashMap requestspertarget = new HashMap(4);


			boolean success = true;
			for (Iterator iter = scripts.iterator(); iter.hasNext();) {
				ScriptReference script = (ScriptReference) iter.next();
				if (JavaScriptDebugPlugin.getResolutionManager().matches(script, new Path(getScriptPath()))) {
					success &= createRequest(target, script);
				}
			}
			if (success) {
				if (this.targets == null) {

			ScriptReference script = sevent.script();
			
			try {
				if (JavaScriptDebugPlugin.getResolutionManager().matches(script, new Path(getScriptPath()))) {
					createRequest(target, script);
				}
			} catch (CoreException ce) {
				JavaScriptDebugPlugin.log(ce);
			}

		return true;
	}

	protected boolean scriptPathMatches(ScriptReference script) throws CoreException {
		URI sourceURI = script.sourceURI();
		if ("file".equals(sourceURI.getScheme())) {//$NON-NLS-1$			
			IWorkspaceRoot workspaceRoot = ResourcesPlugin.getWorkspace().getRoot();
			URI workspaceURI = workspaceRoot.getRawLocationURI();			
			sourceURI = workspaceURI.relativize(sourceURI);
		}
		String path = getScriptPath();
		IPath spath = new Path(path);
		if(spath.segment(0).equals(Messages.external_javascript_source)) {
			spath = spath.removeFirstSegments(1).makeAbsolute();
		}
		//XXX use the same algorithm we use to save the source to 'encode' the source URI for comparison
		IPath uripath = SourceLookup.getSourcePath(sourceURI);
		if(uripath != null) {
			uripath = uripath.makeAbsolute();
		}
		return spath.equals(uripath);
	}

	/**
	 * Returns if the type names for the breakpoint are equal or not. Two <code>null</code> type names are considered to be equal.
	 * 

Lines 20-25 Link Here

(-)src/org/eclipse/wst/jsdt/debug/internal/core/breakpoints/JavaScriptLoadBreakpoint.java (-6 / +20 lines)
20	import org.eclipse.core.resources.ResourcesPlugin;	20	import org.eclipse.core.resources.ResourcesPlugin;
21	import org.eclipse.core.runtime.CoreException;	21	import org.eclipse.core.runtime.CoreException;
22	import org.eclipse.core.runtime.IProgressMonitor;	22	import org.eclipse.core.runtime.IProgressMonitor;
		23	import org.eclipse.core.runtime.Path;
23	import org.eclipse.debug.core.DebugException;	24	import org.eclipse.debug.core.DebugException;
24	import org.eclipse.debug.core.model.IBreakpoint;	25	import org.eclipse.debug.core.model.IBreakpoint;
25	import org.eclipse.wst.jsdt.debug.core.breakpoints.IJavaScriptBreakpointParticipant;	26	import org.eclipse.wst.jsdt.debug.core.breakpoints.IJavaScriptBreakpointParticipant;
Lines 102-108 Link Here
102	ScriptReference script = sevent.script();	103	ScriptReference script = sevent.script();
103	JavaScriptThread thread = target.findThread((sevent).thread());	104	JavaScriptThread thread = target.findThread((sevent).thread());
104	if (thread != null) {	105	if (thread != null) {
105	if(isGlobalLoadSuspend(target.getVM())) {	106	if(isGlobalLoadSuspend()) {
		107	if(!supportsGlobalSuspend(target.getVM())) {
		108	return true;
		109	}
106	JavaScriptPreferencesManager.setGlobalSuspendOn(script.sourceURI().toString());	110	JavaScriptPreferencesManager.setGlobalSuspendOn(script.sourceURI().toString());
107	thread.addBreakpoint(this);	111	thread.addBreakpoint(this);
108	return false;	112	return false;
Lines 126-132 Link Here
126	*/	130	*/
127	private boolean isMatchedScriptLoadSuspend(ScriptReference script, JavaScriptThread thread, boolean suspendVote) {	131	private boolean isMatchedScriptLoadSuspend(ScriptReference script, JavaScriptThread thread, boolean suspendVote) {
128	try {	132	try {
129	if (scriptPathMatches(script)) {	133	if (JavaScriptDebugPlugin.getResolutionManager().matches(script, new Path(getScriptPath()))) {
130	int vote = thread.suspendForScriptLoad(this, script, suspendVote);	134	int vote = thread.suspendForScriptLoad(this, script, suspendVote);
131	return (vote & IJavaScriptBreakpointParticipant.SUSPEND) > 0 \|\| vote == IJavaScriptBreakpointParticipant.DONT_CARE;	135	return (vote & IJavaScriptBreakpointParticipant.SUSPEND) > 0 \|\| vote == IJavaScriptBreakpointParticipant.DONT_CARE;
132	}	136	}
Lines 138-148 Link Here
138	}	142	}
139		143
140	/**	144	/**
141	* Returns if this breakpoint supports global suspend	145	* Use reflection hack to opt-out of global suspend
142	*	146	*
143	* @return <code>true</code> if we should suspend on all script loads <code>false</code> otherwise	147	* @param vm
		148	* @return <code>true</code> if the backing {@link VirtualMachine} supports global suspend
144	*/	149	*/
145	private boolean isGlobalLoadSuspend(VirtualMachine vm) {	150	boolean supportsGlobalSuspend(VirtualMachine vm) {
146	boolean supports = true;	151	boolean supports = true;
147	try {	152	try {
148	//TODO consider supportsSuspendOnScriptLoads for future VirtualMachine extensions	153	//TODO consider supportsSuspendOnScriptLoads for future VirtualMachine extensions
Lines 153-160 Link Here
153	//assume the method is not there / problematic	158	//assume the method is not there / problematic
154	supports = true;	159	supports = true;
155	}	160	}
		161	return supports;
		162	}
		163
		164	/**
		165	* Returns if this breakpoint supports global suspend
		166	*
		167	* @return <code>true</code> if we should suspend on all script loads <code>false</code> otherwise
		168	*/
		169	private boolean isGlobalLoadSuspend() {
156	try {	170	try {
157	return supports && ensureMarker().getAttribute(GLOBAL_SUSPEND, false);	171	return ensureMarker().getAttribute(GLOBAL_SUSPEND, false);
158	}	172	}
159	catch(CoreException ce) {	173	catch(CoreException ce) {
160	JavaScriptDebugPlugin.log(ce);	174	JavaScriptDebugPlugin.log(ce);

Lines 40-46 Link Here

(-)src/org/eclipse/wst/jsdt/debug/internal/core/launching/SourceLookup.java (-6 / +9 lines)
40	public final class SourceLookup {	40	public final class SourceLookup {
41		41
42	public static final QualifiedName SCRIPT_URL = new QualifiedName(JavaScriptCore.PLUGIN_ID, "scriptURL"); //$NON-NLS-1$	42	public static final QualifiedName SCRIPT_URL = new QualifiedName(JavaScriptCore.PLUGIN_ID, "scriptURL"); //$NON-NLS-1$
43		43	public static final IPath TOP_LEVEL_PATH = new Path("/"); //$NON-NLS-1$
44	/**	44	/**
45	* Returns the name of the source object to lookup or <code>null</code>	45	* Returns the name of the source object to lookup or <code>null</code>
46	* if the object is not a {@link IJavaScriptStackFrame} or an {@link IScript}	46	* if the object is not a {@link IJavaScriptStackFrame} or an {@link IScript}
Lines 50-61 Link Here
50	* @since 1.1	50	* @since 1.1
51	*/	51	*/
52	public static String getSourceName(Object object) {	52	public static String getSourceName(Object object) {
		53	String name = null;
53	if (object instanceof IJavaScriptStackFrame) {	54	if (object instanceof IJavaScriptStackFrame) {
54	return ((IJavaScriptStackFrame) object).getSourceName();	55	name = ((IJavaScriptStackFrame) object).getSourceName();
55	}	56	}
56	if(object instanceof IScript) {	57	if(object instanceof IScript) {
57	String name = URIUtil.lastSegment(((IScript)object).sourceURI());	58	name = URIUtil.lastSegment(((IScript)object).sourceURI());
58	if(!JavaScriptCore.isJavaScriptLikeFileName(name)) {	59	}
		60	if(name != null) {
		61	if(new Path(name).getFileExtension() == null) {
59	//append .js, there is no case where we would look up a file with no extension from a script node	62	//append .js, there is no case where we would look up a file with no extension from a script node
60	StringBuffer buf = new StringBuffer(name.length()+3);	63	StringBuffer buf = new StringBuffer(name.length()+3);
61	buf.append(name).append('.').append(Constants.JS_EXTENSION);	64	buf.append(name).append('.').append(Constants.JS_EXTENSION);
Lines 165-171 Link Here
165	return null;	168	return null;
166	}	169	}
167	if(uripath.trim().equals("/")) { //$NON-NLS-1$	170	if(uripath.trim().equals("/")) { //$NON-NLS-1$
168	uripath = "page.js"; //$NON-NLS-1$	171	uripath = "index.htm"; //$NON-NLS-1$
169	}	172	}
170	String host = sourceuri.getHost();	173	String host = sourceuri.getHost();
171	IPath path = null;	174	IPath path = null;
Lines 244-250 Link Here
244	newpath = newpath.append((String) segments.get(i));	247	newpath = newpath.append((String) segments.get(i));
245	}	248	}
246	String ext = newpath.getFileExtension();	249	String ext = newpath.getFileExtension();
247	if(ext == null \|\| !Constants.JS_EXTENSION.equals(ext)) {	250	if(ext == null && !Constants.JS_EXTENSION.equals(ext)) {
248	newpath = newpath.addFileExtension(Constants.JS_EXTENSION);	251	newpath = newpath.addFileExtension(Constants.JS_EXTENSION);
249	}	252	}
250	return newpath;	253	return newpath;




/*******************************************************************************
 * Copyright (c) 2011 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
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *     IBM Corporation - initial API and implementation
 *******************************************************************************/
package org.eclipse.wst.jsdt.debug.internal.core.model;

import java.net.URI;

import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IResource;
import org.eclipse.core.resources.IWorkspaceRoot;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.Path;
import org.eclipse.core.runtime.URIUtil;
import org.eclipse.wst.jsdt.debug.core.jsdi.ScriptReference;
import org.eclipse.wst.jsdt.debug.core.model.IScriptResolver;
import org.eclipse.wst.jsdt.debug.internal.core.Messages;
import org.eclipse.wst.jsdt.debug.internal.core.launching.SourceLookup;

/**
 * Default implementation of an {@link IScriptResolver}
 * @since 3.4
 */
public class DefaultScriptResolver implements IScriptResolver {

	/* (non-Javadoc)
	 * @see org.eclipse.wst.jsdt.debug.core.model.IScriptResolver#matches(org.eclipse.wst.jsdt.debug.core.jsdi.ScriptReference, org.eclipse.core.runtime.IPath)
	 */
	public boolean matches(ScriptReference script, IPath path) {
		if(guessScriptMatches(script, path)) {
			return true;
		}
		//no luck, try an exact match
		URI sourceURI = script.sourceURI();
		if (URIUtil.isFileURI(sourceURI)) {
			IWorkspaceRoot workspaceRoot = ResourcesPlugin.getWorkspace().getRoot();
			URI workspaceURI = workspaceRoot.getRawLocationURI();			
			sourceURI = workspaceURI.relativize(sourceURI);
		}
		IPath spath = path;
		if(spath.segmentCount() > 0 && spath.segment(0).equals(Messages.external_javascript_source)) {
			spath = spath.removeFirstSegments(1).makeAbsolute();
		}
		IPath uripath = SourceLookup.getSourcePath(sourceURI);
		if(uripath != null) {
			uripath = uripath.makeAbsolute();
		}
		return spath.equals(uripath);
	}

	/**
	 * Guesses if the paths are considered equal by walking backward from the last segment of the paths and counting the matching segments. 
	 * The paths are guessed to be equal iff any two or more segments match in order.
	 * 
	 * @param script the {@link ScriptReference}
	 * @param path the path to compare
	 * @return <code>true</code> if the paths 'match', <code>false</code> otherwise
	 */
	boolean guessScriptMatches(ScriptReference script, IPath path) {
		IPath newpath = path.makeAbsolute();
		IPath uri = new Path(script.sourceURI().getPath());
		if(SourceLookup.TOP_LEVEL_PATH.equals(newpath) && SourceLookup.TOP_LEVEL_PATH.equals(uri)) {
			return true;
		}
		uri = uri.makeAbsolute();
		int matched_segments = 0;
		int last = uri.segmentCount()-1;
		for(int i  = newpath.segmentCount()-1; i > -1; i--) {
			if(last < 0) {
				break;
			}
			if(newpath.segment(i).equals(uri.segment(last))) {
				matched_segments++;
				last--;
			}
		}
		return matched_segments > 1;
	}
	
	/* (non-Javadoc)
	 * @see org.eclipse.wst.jsdt.debug.core.model.IScriptResolver#getFile(org.eclipse.wst.jsdt.debug.core.jsdi.ScriptReference)
	 */
	public IFile getFile(ScriptReference script) {
		IPath p = SourceLookup.getSourcePath(script.sourceURI());
		IResource res = ResourcesPlugin.getWorkspace().getRoot().findMember(p);
		if(res.getType() == IResource.FILE) {
			return (IFile) res;
		}
		return null;
	}
}




/*******************************************************************************
 * Copyright (c) 2011 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
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *     IBM Corporation - initial API and implementation
 *******************************************************************************/
package org.eclipse.wst.jsdt.debug.internal.core.model;

import java.util.Arrays;
import java.util.List;

import org.eclipse.core.runtime.IConfigurationElement;
import org.eclipse.core.runtime.IExtensionPoint;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.ListenerList;
import org.eclipse.core.runtime.Platform;
import org.eclipse.wst.jsdt.debug.core.jsdi.ScriptReference;
import org.eclipse.wst.jsdt.debug.core.model.IScriptResolver;
import org.eclipse.wst.jsdt.debug.internal.core.Constants;
import org.eclipse.wst.jsdt.debug.internal.core.JavaScriptDebugPlugin;

/**
 * Handles the collection of {@link ScriptResolverExtension}s and provide useful utilities for path / script handling
 * @since 3.4
 */
public final class ScriptResolutionManager {

	static IScriptResolver[] NO_RESOLVERS = new IScriptResolver[0];
	ListenerList resolvers = null;
	
	/**
	 * This is a convenience method that consults all of the registered {@link IScriptResolver}s.
	 * <br><br>
	 * This method will return <code>true</code> iff any one (or all) of the {@link IScriptResolver}s returns <code>true</code>
	 * @param script the script to check
	 * @param path the path to compare against
	 * @return <code>true</code> if any one (or all) of the {@link IScriptResolver}s return <code>true</code>, <code>false</code> otherwise
	 */
	public boolean matches(ScriptReference script, IPath path) {
		IScriptResolver[] res = getResolvers();
		for (int i = 0; i < res.length; i++) {
			if(res[i].matches(script, path)) {
				return true;
			}
		}
		return false;
	}
	
	/**
	 * Returns the complete listing of {@link IScriptResolver}s or an empty array, never <code>null</code>
	 * 
	 * @return the complete listing of {@link IScriptResolver}s
	 */
	public IScriptResolver[] getResolvers() {
		loadResolvers();
		if(resolvers.size() < 1) {
			return NO_RESOLVERS;
		}
		List res = Arrays.asList(resolvers.getListeners());
		return (IScriptResolver[]) res.toArray(new IScriptResolver[res.size()]);
	}
	
	/**
	 * load up all the extension points to the delegate listeners
	 */
	void loadResolvers() {
		if(resolvers == null) {
			resolvers = new ListenerList();
			IExtensionPoint extensionPoint = Platform.getExtensionRegistry().getExtensionPoint(JavaScriptDebugPlugin.PLUGIN_ID, Constants.SCRIPT_RESOLVERS);
			IConfigurationElement[] elements = extensionPoint.getConfigurationElements();
			for (int i = 0; i < elements.length; i++) {
				resolvers.add(new ScriptResolverExtension(elements[i]));
			}
		}
	}
	
	/**
	 * Clean up
	 */
	public void dispose() {
		if(resolvers != null) {
			resolvers.clear();
			resolvers = null;
		}
	}
}




/*******************************************************************************
 * Copyright (c) 2011 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
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *     IBM Corporation - initial API and implementation
 *******************************************************************************/
package org.eclipse.wst.jsdt.debug.internal.core.model;

import org.eclipse.core.resources.IFile;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IConfigurationElement;
import org.eclipse.core.runtime.IPath;
import org.eclipse.wst.jsdt.debug.core.jsdi.ScriptReference;
import org.eclipse.wst.jsdt.debug.core.model.IScriptResolver;
import org.eclipse.wst.jsdt.debug.internal.core.Constants;

/**
 * Default implementation of the delegate class for all {@link IScriptResolver}s
 * 
 * @since 3.4
 */
public class ScriptResolverExtension implements IScriptResolver {

	private IConfigurationElement element = null;
	private IScriptResolver delegate = null;
	
	/**
	 * Constructor
	 * @param element the backing {@link IConfigurationElement} to lazily load and delegate to
	 */
	public ScriptResolverExtension(IConfigurationElement element) {
		this.element = element;
	}
	
	/**
	 * Returns the delegate {@link IScriptResolver} from the backing {@link IConfigurationElement}
	 * 
	 * @return the delegate {@link IScriptResolver}
	 * @throws CoreException thrown if the delegate class fails to be created
	 */
	synchronized IScriptResolver getDelegate() throws CoreException {
		if(delegate == null) {
			delegate = (IScriptResolver) element.createExecutableExtension(Constants.CLASS);
		}
		return delegate;
	}
	
	/* (non-Javadoc)
	 * @see org.eclipse.wst.jsdt.debug.core.model.IScriptPathResolver#matches(org.eclipse.wst.jsdt.debug.core.jsdi.ScriptReference, org.eclipse.core.runtime.IPath)
	 */
	public boolean matches(ScriptReference script, IPath path) {
		try {
			return getDelegate().matches(script, path);
		}
		catch(CoreException ce) {
			return false;
		}
	}

	/* (non-Javadoc)
	 * @see org.eclipse.wst.jsdt.debug.core.model.IScriptPathResolver#getFile(org.eclipse.wst.jsdt.debug.core.jsdi.ScriptReference)
	 */
	public IFile getFile(ScriptReference script) {
		try {
			return getDelegate().getFile(script);
		}
		catch(CoreException ce) {
			return null;
		}
	}
}

Lines 89-94 Link Here

(-)plugin.xml (+7 lines)
89	type="org.eclipse.debug.internal.ui.viewers.model.provisional.IElementContentProvider">	89	type="org.eclipse.debug.internal.ui.viewers.model.provisional.IElementContentProvider">
90	</adapter>	90	</adapter>
91	</factory>	91	</factory>
		92	<factory
		93	adaptableType="org.eclipse.wst.sse.ui.StructuredTextEditor"
		94	class="org.eclipse.wst.jsdt.debug.internal.ui.adapters.JavaScriptAdapterFactory">
		95	<adapter
		96	type="org.eclipse.debug.ui.actions.IToggleBreakpointsTarget">
		97	</adapter>
		98	</factory>
92	</extension>	99	</extension>
93	<extension	100	<extension
94	point="org.eclipse.ui.editorActions">	101	point="org.eclipse.ui.editorActions">

Return to bug 361315

Added Link Here

(-)schema/scriptResolvers.exsd (+128 lines)
1	<?xml version='1.0' encoding='UTF-8'?>
2	<!-- Schema file written by PDE -->
3	<schema targetNamespace="org.eclipse.wst.jsdt.debug.core" xmlns="http://www.w3.org/2001/XMLSchema">
4	<annotation>
5	<appinfo>
6	<meta.schema plugin="org.eclipse.wst.jsdt.debug.core" id="scriptResolvers" name="scriptResolvers"/>
7	</appinfo>
8	<documentation>
9	This extension point is used to contribute a script solver that is consulted any place in JSDT where a <code>ScriptReference</code> must be resolved to a workspace-local <code>IFile</code>.
10	<br><br>
11	An example of typical usage is resolving if a breakpoint's workspace path matches that of a given <code>ScriptReference</code>
12	</documentation>
13	</annotation>
14
15	<element name="extension">
16	<annotation>
17	<appinfo>
18	<meta.element />
19	</appinfo>
20	</annotation>
21	<complexType>
22	<sequence minOccurs="1" maxOccurs="unbounded">
23	<element ref="scriptResolver"/>
24	</sequence>
25	<attribute name="point" type="string" use="required">
26	<annotation>
27	<documentation>
28
29	</documentation>
30	</annotation>
31	</attribute>
32	<attribute name="id" type="string">
33	<annotation>
34	<documentation>
35
36	</documentation>
37	</annotation>
38	</attribute>
39	<attribute name="name" type="string">
40	<annotation>
41	<documentation>
42
43	</documentation>
44	<appinfo>
45	<meta.attribute translatable="true"/>
46	</appinfo>
47	</annotation>
48	</attribute>
49	</complexType>
50	</element>
51
52	<element name="scriptResolver">
53	<annotation>
54	<documentation>
55	A resolver that can help determine equality between workspace-local IFiles and JavaScript ScriptReferences
56	</documentation>
57	</annotation>
58	<complexType>
59	<attribute name="class" type="string" use="required">
60	<annotation>
61	<documentation>
62	The fully qualified name of the Java class that implements org.eclipse.wst.jsdt.debug.core.model.IScriptResolver
63	</documentation>
64	<appinfo>
65	<meta.attribute kind="java" basedOn=":org.eclipse.wst.jsdt.debug.core.model.IScriptResolver"/>
66	</appinfo>
67	</annotation>
68	</attribute>
69	</complexType>
70	</element>
71
72	<annotation>
73	<appinfo>
74	<meta.section type="since"/>
75	</appinfo>
76	<documentation>
77	3.4
78	</documentation>
79	</annotation>
80
81	<annotation>
82	<appinfo>
83	<meta.section type="examples"/>
84	</appinfo>
85	<documentation>
86	The following is an example of the default script resolver:
87	<pre>
88	<extension point="org.eclipse.wst.jsdt.debug.core.scriptResolvers">
89	<scriptResolver
90	class="org.eclipse.wst.jsdt.debug.internal.core.model.DefaultScriptResolver">
91	</scriptResolver>
92	</extension>
93	</pre>
94	</documentation>
95	</annotation>
96
97	<annotation>
98	<appinfo>
99	<meta.section type="apiinfo"/>
100	</appinfo>
101	<documentation>
102	The class field must specify the fully qualified name of the the class the implements <code>org.eclipse.wst.jsdt.debug.core.model.IScriptResolver.java</code>.
103	</documentation>
104	</annotation>
105
106	<annotation>
107	<appinfo>
108	<meta.section type="implementation"/>
109	</appinfo>
110	<documentation>
111	[Enter information about supplied implementation of this extension point.]
112	</documentation>
113	</annotation>
114
115	<annotation>
116	<appinfo>
117	<meta.section type="copyright"/>
118	</appinfo>
119	<documentation>
120	Copyright (c) 2011 IBM Corporation and others.<br>
121	All rights reserved. This program and the accompanying materials are made
122	available under the terms of the Eclipse Public License v1.0 which
123	accompanies this distribution, and is available at
124	<a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>
125	</documentation>
126	</annotation>
127
128	</schema>

Added Link Here

(-)src/org/eclipse/wst/jsdt/debug/core/model/IScriptResolver.java (+47 lines)
1	/*******************************************************************************
2	* Copyright (c) 2011 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at
6	* http://www.eclipse.org/legal/epl-v10.html
7	*
8	* Contributors:
9	* IBM Corporation - initial API and implementation
10	*******************************************************************************/
11	package org.eclipse.wst.jsdt.debug.core.model;
12
13	import java.net.URI;
14
15	import org.eclipse.core.resources.IFile;
16	import org.eclipse.core.runtime.IPath;
17	import org.eclipse.wst.jsdt.debug.core.jsdi.ScriptReference;
18
19	/**
20	* This resolver allows contributors to plug-in to the process of resolving a {@link ScriptReference}'s
21	* {@link URI} to a workspace-local {@link IFile}.
22
23	* @noextend This interface is not intended to be extended by clients.
24	* @since 3.4
25	*/
26	public interface IScriptResolver {
27
28	/**
29	* This method determines if the given {@link IPath} matches the {@link URI} from {@link ScriptReference#sourceURI()}.
30
31	* @param script the {@link ScriptReference} to compare the source {@link URI} from - never <code>null</code>
32	* @param path the path to match against the source {@link URI} - never <code>null</code>
33	*
34	* @return <code>true</code> if the source {@link URI} of the given {@link ScriptReference} is considered to match the given {@link IPath}, <code>false</code> otherwise.
35	*/
36	public boolean matches(ScriptReference script, IPath path);
37
38	/**
39	* This method is used to find the workspace {@link IFile} that corresponds to the source {@link URI} from the given {@link ScriptReference}.
40	* <br><br>
41	* If no file can be determined the method must return <code>null</code>. The result will be checked for existence.
42	*
43	* @param script the {@link ScriptReference} to find the {@link IFile} for
44	* @return the {@link IFile} for the {@link ScriptReference} or <code>null</code>
45	*/
46	public IFile getFile(ScriptReference script);
47	}