Provide the typescriptResourceParticipants to consume tsserver commands

angelozerr · angelozerr · commit 4d8037bc20e2 · 2017-06-08T12:58:02.000+02:00
for other files than ts, tsx, jsx files (like html). See angelozerr/angular-eclipse#30
diff --git a/eclipse/jsdt/ts.eclipse.ide.jsdt.ui/src/ts/eclipse/ide/jsdt/internal/ui/editor/contentassist/TypeScriptCompletionProposalComputer.java b/eclipse/jsdt/ts.eclipse.ide.jsdt.ui/src/ts/eclipse/ide/jsdt/internal/ui/editor/contentassist/TypeScriptCompletionProposalComputer.java
@@ -30,6 +30,7 @@
 import ts.eclipse.ide.core.resources.IIDETypeScriptProject;
 import ts.eclipse.ide.core.utils.TypeScriptResourceUtil;
 import ts.eclipse.ide.jsdt.internal.ui.Trace;
+import ts.eclipse.ide.jsdt.ui.editor.contentassist.JSDTCompletionProposalFactory;
 import ts.eclipse.ide.jsdt.ui.editor.contentassist.TypeScriptContentAssistInvocationContext;
 import ts.resources.ITypeScriptFile;
 
diff --git a/eclipse/jsdt/ts.eclipse.ide.jsdt.ui/src/ts/eclipse/ide/jsdt/ui/editor/contentassist/JSDTCompletionProposalFactory.java b/eclipse/jsdt/ts.eclipse.ide.jsdt.ui/src/ts/eclipse/ide/jsdt/ui/editor/contentassist/JSDTCompletionProposalFactory.java
@@ -8,7 +8,7 @@
  *  Contributors:
  *  Angelo Zerr <angelo.zerr@gmail.com> - initial API and implementation
  */
-package ts.eclipse.ide.jsdt.internal.ui.editor.contentassist;
+package ts.eclipse.ide.jsdt.ui.editor.contentassist;
 
 import java.lang.reflect.Constructor;
 
@@ -19,6 +19,7 @@
 import ts.client.completions.CompletionEntry;
 import ts.client.completions.ICompletionEntryFactory;
 import ts.client.completions.ICompletionEntryMatcher;
+import ts.eclipse.ide.jsdt.internal.ui.editor.contentassist.JSDTTypeScriptCompletionProposal;
 
 /**
  * TypeScript {@link ICompletionProposal} implementation with JSDT
diff --git a/eclipse/ts.eclipse.ide.core/plugin.properties b/eclipse/ts.eclipse.ide.core/plugin.properties
@@ -23,9 +23,10 @@ TypeScriptProblem.name=TypeScript Problem
 TypeScriptBuilder.name=TypeScript Builder
 
 # Extension Points
-nodeJSInstallsContribution.name=Node.js Installations
+nodeJSInstallsContribution.name=Node.js Installations Extension Points
 typeScriptConsoleConnectors.name=TypeScript Console Connector Extension Points
-typeScriptRepositoriesContribution.name=TypeScript Repositories
+typeScriptRepositoriesContribution.name=TypeScript Repositories Extension Points
+typeScriptResourceParticipants.name=TypeScript Resource Participants Extension Points
 
 # Launch
 TypeScriptCompilerLaunchConfigurationDelegate.label=TypeScript Compile
diff --git a/eclipse/ts.eclipse.ide.core/plugin.xml b/eclipse/ts.eclipse.ide.core/plugin.xml
@@ -20,7 +20,12 @@
 	<extension-point id="nodeJSInstalls" 
 					 name="%nodeJSInstallsContribution.name"
 					 schema="schema/nodeJSInstalls.exsd" />
- <extension-point id="typeScriptRepositories" name="%typeScriptRepositoriesContribution.name" schema="schema/typeScriptRepositories.exsd"/>
+ 	<extension-point id="typeScriptRepositories" 
+ 					 name="%typeScriptRepositoriesContribution.name" 
+ 					 schema="schema/typeScriptRepositories.exsd"/>
+ 	<extension-point id="typeScriptResourceParticipants" 
+ 					 name="%typeScriptResourceParticipants.name" 
+ 					 schema="schema/typeScriptResourceParticipants.exsd"/>
 
    <extension point="org.eclipse.core.contenttype.contentTypes">
 	<content-type 
diff --git a/eclipse/ts.eclipse.ide.core/schema/typeScriptResourceParticipants.exsd b/eclipse/ts.eclipse.ide.core/schema/typeScriptResourceParticipants.exsd
@@ -0,0 +1,95 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!-- Schema file written by PDE -->
+<schema targetNamespace="ts.eclipse.ide.core" xmlns="http://www.w3.org/2001/XMLSchema">
+<annotation>
+      <appInfo>
+         <meta.schema plugin="ts.eclipse.ide.core" id="typescriptResourceParticpants" name="TypeScript Resource Particpants"/>
+      </appInfo>
+      <documentation>
+         Extension point to provided embedded TypeScript Repositories.
+      </documentation>
+   </annotation>
+
+   <element name="extension">
+      <annotation>
+         <appInfo>
+            <meta.element />
+         </appInfo>
+      </annotation>
+      <complexType>
+         <sequence minOccurs="1" maxOccurs="unbounded">
+            <element ref="participant"/>
+         </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="participant">
+      <annotation>
+         <documentation>
+            This extension point allows developers to supply a repository containing a TypeScript installation as well as the TSLint tool.
+&lt;p&gt;
+A repository is represented by a root directory containing a &lt;i&gt;node_modules&lt;/i&gt; directory, itself containing the &lt;i&gt;typescript&lt;/i&gt; and &lt;i&gt;tslit&lt;/i&gt; packages.
+&lt;p&gt;
+The version of TypeScript embedded in the repository directory is detected automatically. On first startup, the repository containing the most recent version is selected as active repository. The user is always free to change the active repository.
+         </documentation>
+      </annotation>
+      <complexType>
+         <attribute name="class" type="string" use="required">
+            <annotation>
+               <documentation>
+                  Extension point to know if a given resource can consume tsserver or not.
+               </documentation>
+               <appInfo>
+                  <meta.attribute kind="java" basedOn=":ts.eclipse.ide.core.resources.ITypeScriptResourceParticipant"/>
+               </appInfo>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="since"/>
+      </appInfo>
+      <documentation>
+         2.0
+      </documentation>
+   </annotation>
+
+
+
+   <annotation>
+      <appInfo>
+         <meta.section type="implementation"/>
+      </appInfo>
+      <documentation>
+         This plugin itself does not have any predefined repositories
+      </documentation>
+   </annotation>
+
+
+</schema>
diff --git a/eclipse/ts.eclipse.ide.core/src/ts/eclipse/ide/core/TypeScriptCorePlugin.java b/eclipse/ts.eclipse.ide.core/src/ts/eclipse/ide/core/TypeScriptCorePlugin.java
@@ -53,11 +53,13 @@ public void start(BundleContext context) throws Exception {
 		// set up resource management for IDE
 		ConfigurableTypeScriptResourcesManager resourceManager = ConfigurableTypeScriptResourcesManager.getInstance();
 		resourceManager.setTypeScriptResourcesManagerDelegate(IDEResourcesManager.getInstance());
+		IDEResourcesManager.getInstance().initialize();
 	}
 
 	@Override
 	public void stop(BundleContext context) throws Exception {
 		ResourcesWatcher.getInstance().dispose();
+		IDEResourcesManager.getInstance().destroy();
 		plugin = null;
 		super.stop(context);
 	}
diff --git a/eclipse/ts.eclipse.ide.core/src/ts/eclipse/ide/core/resources/ITypeScriptResourceParticipant.java b/eclipse/ts.eclipse.ide.core/src/ts/eclipse/ide/core/resources/ITypeScriptResourceParticipant.java
@@ -0,0 +1,32 @@
+/**
+ *  Copyright (c) 2015-2017 Angelo ZERR.
+ *  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:
+ *  Angelo Zerr <angelo.zerr@gmail.com> - initial API and implementation
+ */
+package ts.eclipse.ide.core.resources;
+
+import org.eclipse.core.resources.IProject;
+
+/**
+ * Extension point to know if a given resource can consume tsserver or not.
+ *
+ */
+public interface ITypeScriptResourceParticipant {
+
+	/**
+	 * Returns true if the given resource can consume tsserver and false
+	 * otherwise.
+	 * 
+	 * @param project
+	 * @param fileObject
+	 * @return true if the given resource can consume tsserver and false
+	 *         otherwise.
+	 */
+	boolean canConsumeTsserver(IProject project, Object fileObject);
+
+}
diff --git a/eclipse/ts.eclipse.ide.core/src/ts/eclipse/ide/internal/core/resources/IDEResourcesManager.java b/eclipse/ts.eclipse.ide.core/src/ts/eclipse/ide/internal/core/resources/IDEResourcesManager.java
@@ -19,30 +19,42 @@
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IConfigurationElement;
+import org.eclipse.core.runtime.IExtensionDelta;
+import org.eclipse.core.runtime.IExtensionRegistry;
+import org.eclipse.core.runtime.IRegistryChangeEvent;
+import org.eclipse.core.runtime.IRegistryChangeListener;
 import org.eclipse.core.runtime.Platform;
 import org.eclipse.core.runtime.content.IContentType;
 import org.eclipse.core.runtime.content.IContentTypeManager.ContentTypeChangeEvent;
 import org.eclipse.core.runtime.content.IContentTypeManager.IContentTypeChangeListener;
 
 import ts.client.ScriptKindName;
+import ts.eclipse.ide.core.TypeScriptCorePlugin;
 import ts.eclipse.ide.core.preferences.TypeScriptCorePreferenceConstants;
 import ts.eclipse.ide.core.resources.IIDETypeScriptProject;
 import ts.eclipse.ide.core.resources.ITypeScriptElementChangedListener;
+import ts.eclipse.ide.core.resources.ITypeScriptResourceParticipant;
 import ts.eclipse.ide.core.resources.UseSalsa;
 import ts.eclipse.ide.core.resources.buildpath.ITypeScriptBuildPath;
 import ts.eclipse.ide.core.utils.PreferencesHelper;
 import ts.eclipse.ide.internal.core.Trace;
 import ts.resources.ITypeScriptResourcesManagerDelegate;
 import ts.utils.FileUtils;
 
-public class IDEResourcesManager implements ITypeScriptResourcesManagerDelegate {
+public class IDEResourcesManager implements ITypeScriptResourcesManagerDelegate, IRegistryChangeListener {
 
 	private static IDEResourcesManager instance = new IDEResourcesManager();
-
 	private final List<ITypeScriptElementChangedListener> listeners;
 
 	private boolean useJsAsJsx;
 
+	private static final String EXTENSION_TYPESCRIPT_RESOURCE_PARTICIPANTS = "typeScriptResourceParticipants";
+	private static final String CLASS_ATTR = "class";
+	private boolean registryListenerIntialized;
+	private boolean extensionResourceParticipantsLoaded;
+	private List<ITypeScriptResourceParticipant> resourceParticipants;
+
 	/**
 	 * Contents Types IDS
 	 */
@@ -52,6 +64,8 @@ public class IDEResourcesManager implements ITypeScriptResourcesManagerDelegate
 	private static final String JSX_CONTENT_TYPE_ID = "ts.eclipse.ide.core.jsxSource";
 
 	private IDEResourcesManager() {
+		this.registryListenerIntialized = false;
+		this.resourceParticipants = new ArrayList<>();
 		this.listeners = new ArrayList<ITypeScriptElementChangedListener>();
 		updateUseJsAsJsx(Platform.getContentTypeManager().getContentType(JSX_CONTENT_TYPE_ID));
 
@@ -300,7 +314,17 @@ public boolean canConsumeTsserver(IProject project, Object fileObject) {
 		if (isJsFile(fileObject)) {
 			return hasSalsaNature(project);
 		}
-		return (isTsOrTsxOrJsxFile(fileObject));
+		if (isTsOrTsxOrJsxFile(fileObject)) {
+			return true;
+		}
+		// Use extension point
+		loadExtensionResourceParticipants();
+		for (ITypeScriptResourceParticipant participant : resourceParticipants) {
+			if (participant.canConsumeTsserver(project, fileObject)) {
+				return true;
+			}
+		}
+		return false;
 	}
 
 	@Override
@@ -354,4 +378,93 @@ public void removeTypeScriptElementChangedListener(ITypeScriptElementChangedList
 		}
 	}
 
+	private synchronized void loadExtensionResourceParticipants() {
+		if (extensionResourceParticipantsLoaded)
+			return;
+		// Immediately set the flag, as to ensure that this method is never
+		// called twice
+		extensionResourceParticipantsLoaded = true;
+
+		Trace.trace(Trace.EXTENSION_POINT, "->- Loading .typeScriptResourceParticipants extension point ->-");
+
+		IExtensionRegistry registry = Platform.getExtensionRegistry();
+		IConfigurationElement[] cf = registry.getConfigurationElementsFor(TypeScriptCorePlugin.PLUGIN_ID,
+				EXTENSION_TYPESCRIPT_RESOURCE_PARTICIPANTS);
+		
+		addExtensionResourceParticipants(cf);
+		addRegistryListenerIfNeeded();
+
+		Trace.trace(Trace.EXTENSION_POINT, "-<- Done loading .typeScriptResourceParticipants extension point -<-");
+	}
+
+	@Override
+	public void registryChanged(final IRegistryChangeEvent event) {
+		IExtensionDelta[] deltas = event.getExtensionDeltas(TypeScriptCorePlugin.PLUGIN_ID,
+				EXTENSION_TYPESCRIPT_RESOURCE_PARTICIPANTS);
+		if (deltas != null) {
+			synchronized (this) {
+				for (IExtensionDelta delta : deltas) {
+					IConfigurationElement[] cf = delta.getExtension().getConfigurationElements();
+					if (delta.getKind() == IExtensionDelta.ADDED) {
+						addExtensionResourceParticipants(cf);
+					} else {
+						removeExtensionResourceParticipants(cf);
+					}
+				}
+			}
+		}
+	}
+
+	private void addExtensionResourceParticipants(IConfigurationElement[] cf) {
+		for (IConfigurationElement ce : cf) {
+			try {
+				String className = ce.getAttribute(CLASS_ATTR);
+				ITypeScriptResourceParticipant participant = (ITypeScriptResourceParticipant) ce
+						.createExecutableExtension(CLASS_ATTR);
+				synchronized (resourceParticipants) {
+					resourceParticipants.add(participant);
+				}
+				Trace.trace(Trace.EXTENSION_POINT, "  Loaded typeScriptResourceParticipants: " + className);
+			} catch (Throwable t) {
+				Trace.trace(Trace.SEVERE, "  Error while loading typeScriptResourceParticipants", t);
+			}
+		}
+	}
+
+	private void removeExtensionResourceParticipants(IConfigurationElement[] cf) {
+		for (IConfigurationElement ce : cf) {
+			try {
+				String className = ce.getAttribute(CLASS_ATTR);
+				synchronized (resourceParticipants) {
+					for (ITypeScriptResourceParticipant participant : resourceParticipants) {
+						if (className.equals(participant.getClass().getName())) {
+							resourceParticipants.remove(participant);
+							Trace.trace(Trace.EXTENSION_POINT, "Unloaded typeScriptResourceParticipants: " + className);
+
+							break;
+						}
+					}
+				}
+			} catch (Throwable t) {
+				Trace.trace(Trace.SEVERE, "Error while unloading typeScriptResourceParticipants", t);
+			}
+		}
+	}
+
+	private void addRegistryListenerIfNeeded() {
+		if (registryListenerIntialized)
+			return;
+
+		IExtensionRegistry registry = Platform.getExtensionRegistry();
+		registry.addRegistryChangeListener(this, TypeScriptCorePlugin.PLUGIN_ID);
+		registryListenerIntialized = true;
+	}
+
+	public void initialize() {
+
+	}
+
+	public void destroy() {
+		Platform.getExtensionRegistry().removeRegistryChangeListener(this);
+	}
 }

Original file line number	Diff line number	Diff line change
`@@ -53,11 +53,13 @@ public void start(BundleContext context) throws Exception {`
`53`	`53`	`// set up resource management for IDE`
`54`	`54`	`ConfigurableTypeScriptResourcesManager resourceManager = ConfigurableTypeScriptResourcesManager.getInstance();`
`55`	`55`	`resourceManager.setTypeScriptResourcesManagerDelegate(IDEResourcesManager.getInstance());`
	`56`	`+ IDEResourcesManager.getInstance().initialize();`
`56`	`57`	`}`
`57`	`58`
`58`	`59`	`@Override`
`59`	`60`	`public void stop(BundleContext context) throws Exception {`
`60`	`61`	`ResourcesWatcher.getInstance().dispose();`
	`62`	`+ IDEResourcesManager.getInstance().destroy();`
`61`	`63`	`plugin = null;`
`62`	`64`	`super.stop(context);`
`63`	`65`	`}`