Initialize Implementation action. See

#34

Author: angelozerr

core/ts.core.tests/src/ts/internal/client/protocol/CommandNamesTest.java

@@ -3,6 +3,8 @@
 import org.junit.Assert;
 import org.junit.Test;
 
+import ts.client.CommandNames;
+
 
 public class CommandNamesTest {
 

core/ts.core/META-INF/MANIFEST.MF

@@ -24,7 +24,6 @@ Export-Package: ts,
  ts.cmd,
  ts.cmd.tsc,
  ts.cmd.tslint,
- ts.internal.client.protocol;x-friends:="ts.core.tests",
  ts.nodejs,
  ts.repository,
  ts.resources,

core/ts.core/src/ts/internal/client/protocol/CommandNames.java renamed to core/ts.core/src/ts/client/CommandNames.java

@@ -8,7 +8,7 @@
  *  Contributors:
  *  Angelo Zerr <angelo.zerr@gmail.com> - initial API and implementation
  */
-package ts.internal.client.protocol;
+package ts.client;
 
 /**
  * Command names of tsserver.
@@ -21,7 +21,8 @@ public enum CommandNames {
 					"definition"), SignatureHelp("signatureHelp"), QuickInfo("quickinfo"), Geterr("geterr"), Format(
 							"format"), References("references"), Occurrences("occurrences"), Configure(
 									"configure"), SemanticDiagnosticsSync("semanticDiagnosticsSync",
-											"2.0.3"), SyntacticDiagnosticsSync("syntacticDiagnosticsSync", "2.0.3");
+											"2.0.3"), SyntacticDiagnosticsSync("syntacticDiagnosticsSync",
+													"2.0.3"), Implementation("implementation", "2.0.6");
 
 	private final String name;
 	private final String sinceVersion;

core/ts.core/src/ts/client/ITypeScriptServiceClient.java

@@ -85,11 +85,16 @@ void navbar(String fileName, IPositionProvider positionProvider, ITypeScriptNavB
 
 	void configure(ConfigureRequestArguments arguments) throws TypeScriptException;
 
-	// @Since("2.0.3")
+	// Since 2.0.3
+
 	void semanticDiagnosticsSync(String file, Boolean includeLinePosition, ITypeScriptDiagnosticsCollector collector)
 			throws TypeScriptException;
 
 	void syntacticDiagnosticsSync(String file, Boolean includeLinePosition, ITypeScriptDiagnosticsCollector collector)
 			throws TypeScriptException;
 
+	// Since 2.0.5
+
+	void implementation(String fileName, int line, int offset, ITypeScriptDefinitionCollector collector)
+			throws TypeScriptException;
 }

core/ts.core/src/ts/client/TypeScriptServiceClient.java

@@ -50,6 +50,7 @@
 import ts.internal.client.protocol.DefinitionRequest;
 import ts.internal.client.protocol.FormatRequest;
 import ts.internal.client.protocol.GeterrRequest;
+import ts.internal.client.protocol.ImplementationRequest;
 import ts.internal.client.protocol.NavBarRequest;
 import ts.internal.client.protocol.OccurrencesRequest;
 import ts.internal.client.protocol.OpenRequest;
@@ -320,6 +321,15 @@ public void syntacticDiagnosticsSync(String fileName, Boolean includeLinePositio
 		execute(request);
 	}
 
+	// ---------------- Since 2.0.5
+
+	@Override
+	public void implementation(String fileName, int line, int offset, ITypeScriptDefinitionCollector collector)
+			throws TypeScriptException {
+		ImplementationRequest request = new ImplementationRequest(fileName, line, offset, collector);
+		execute(request);
+	}
+
 	private void execute(Request request) throws TypeScriptException {
 		if (!request.isAsynch()) {
 			try {

core/ts.core/src/ts/internal/client/protocol/ChangeRequest.java

@@ -13,6 +13,7 @@
 import com.eclipsesource.json.JsonObject;
 
 import ts.TypeScriptException;
+import ts.client.CommandNames;
 
 /**
  * Change request message; value of command field is "change". Update the

core/ts.core/src/ts/internal/client/protocol/CloseRequest.java

@@ -13,6 +13,7 @@
 import com.eclipsesource.json.JsonObject;
 
 import ts.TypeScriptException;
+import ts.client.CommandNames;
 
 /**
  * Close request.

core/ts.core/src/ts/internal/client/protocol/CompletionDetailsRequest.java

@@ -15,6 +15,7 @@
 import com.eclipsesource.json.JsonValue;
 
 import ts.TypeScriptException;
+import ts.client.CommandNames;
 import ts.client.completions.ITypeScriptCompletionEntryDetailsCollector;
 import ts.utils.JsonHelper;
 

core/ts.core/src/ts/internal/client/protocol/CompletionsRequest.java

@@ -15,6 +15,7 @@
 import com.eclipsesource.json.JsonValue;
 
 import ts.TypeScriptException;
+import ts.client.CommandNames;
 import ts.client.ITypeScriptServiceClient;
 import ts.client.completions.ITypeScriptCompletionCollector;
 

core/ts.core/src/ts/internal/client/protocol/ConfigureRequest.java

@@ -3,6 +3,7 @@
 import com.eclipsesource.json.JsonObject;
 
 import ts.TypeScriptException;
+import ts.client.CommandNames;
 
 public class ConfigureRequest extends SimpleRequest {
 

core/ts.core/src/ts/internal/client/protocol/DefinitionRequest.java

@@ -15,6 +15,7 @@
 import com.eclipsesource.json.JsonValue;
 
 import ts.TypeScriptException;
+import ts.client.CommandNames;
 import ts.client.definition.ITypeScriptDefinitionCollector;
 
 /**

core/ts.core/src/ts/internal/client/protocol/FileLocationRequest.java

@@ -10,6 +10,7 @@
  */
 package ts.internal.client.protocol;
 
+import ts.client.CommandNames;
 import ts.client.ITypeScriptCollector;
 
 /**

core/ts.core/src/ts/internal/client/protocol/FileRequest.java

@@ -10,6 +10,7 @@
  */
 package ts.internal.client.protocol;
 
+import ts.client.CommandNames;
 import ts.client.ITypeScriptCollector;
 
 /**

core/ts.core/src/ts/internal/client/protocol/FormatRequest.java

@@ -15,6 +15,7 @@
 import com.eclipsesource.json.JsonValue;
 
 import ts.TypeScriptException;
+import ts.client.CommandNames;
 import ts.client.format.ITypeScriptFormatCollector;
 
 /**

core/ts.core/src/ts/internal/client/protocol/GeterrRequest.java

@@ -17,6 +17,7 @@
 import com.eclipsesource.json.JsonArray;
 import com.eclipsesource.json.JsonObject;
 
+import ts.client.CommandNames;
 import ts.client.diagnostics.ITypeScriptDiagnosticsCollector;
 
 /**

core/ts.core/src/ts/internal/client/protocol/ImplementationRequest.java

@@ -0,0 +1,39 @@
+package ts.internal.client.protocol;
+
+import com.eclipsesource.json.JsonArray;
+import com.eclipsesource.json.JsonObject;
+import com.eclipsesource.json.JsonValue;
+
+import ts.TypeScriptException;
+import ts.client.CommandNames;
+import ts.client.definition.ITypeScriptDefinitionCollector;
+
+/**
+ * Go to implementation request; value of command field is "implementation".
+ * Return response giving the file locations that implement the symbol found in
+ * file at location line, col.
+ */
+public class ImplementationRequest extends FileLocationRequest<ITypeScriptDefinitionCollector> {
+
+	public ImplementationRequest(String fileName, int line, int offset, ITypeScriptDefinitionCollector collector) {
+		super(CommandNames.Implementation, new FileLocationRequestArgs(fileName, line, offset));
+		super.setCollector(collector);
+	}
+
+	@Override
+	public void collect(JsonObject response) throws TypeScriptException {
+		ITypeScriptDefinitionCollector collector = super.getCollector();
+		JsonArray items = response.get("body").asArray();
+		JsonObject def = null;
+		JsonObject start = null;
+		JsonObject end = null;
+		for (JsonValue item : items) {
+			def = (JsonObject) item;
+			start = def.get("start").asObject();
+			end = def.get("end").asObject();
+			collector.addDefinition(def.getString("file", null), start.getInt("line", -1), start.getInt("offset", -1),
+					end.getInt("line", -1), end.getInt("offset", -1));
+		}
+	}
+
+}

core/ts.core/src/ts/internal/client/protocol/NavBarRequest.java

@@ -18,6 +18,7 @@
 import com.google.gson.InstanceCreator;
 
 import ts.TypeScriptException;
+import ts.client.CommandNames;
 import ts.client.IPositionProvider;
 import ts.client.Location;
 import ts.client.navbar.ITypeScriptNavBarCollector;

core/ts.core/src/ts/internal/client/protocol/OccurrencesRequest.java

@@ -15,6 +15,7 @@
 import com.eclipsesource.json.JsonValue;
 
 import ts.TypeScriptException;
+import ts.client.CommandNames;
 import ts.client.occurrences.ITypeScriptOccurrencesCollector;
 
 /**

core/ts.core/src/ts/internal/client/protocol/OpenRequest.java

@@ -13,6 +13,7 @@
 import com.eclipsesource.json.JsonObject;
 
 import ts.TypeScriptException;
+import ts.client.CommandNames;
 
 /**
  * Open request; value of command field is "open". Notify the server that the

core/ts.core/src/ts/internal/client/protocol/QuickInfoRequest.java

@@ -13,6 +13,7 @@
 import com.eclipsesource.json.JsonObject;
 
 import ts.TypeScriptException;
+import ts.client.CommandNames;
 import ts.client.quickinfo.ITypeScriptQuickInfoCollector;
 
 /**

core/ts.core/src/ts/internal/client/protocol/ReferencesRequest.java

@@ -5,6 +5,7 @@
 import com.eclipsesource.json.JsonValue;
 
 import ts.TypeScriptException;
+import ts.client.CommandNames;
 import ts.client.references.ITypeScriptReferencesCollector;
 
 public class ReferencesRequest extends FileLocationRequest<ITypeScriptReferencesCollector> {

core/ts.core/src/ts/internal/client/protocol/ReloadRequest.java

@@ -13,6 +13,7 @@
 import com.eclipsesource.json.JsonObject;
 
 import ts.TypeScriptException;
+import ts.client.CommandNames;
 
 /**
  * Reload request message; value of command field is "reload". Reload contents

core/ts.core/src/ts/internal/client/protocol/Request.java

@@ -13,6 +13,7 @@
 import com.eclipsesource.json.JsonObject;
 
 import ts.TypeScriptException;
+import ts.client.CommandNames;
 import ts.client.ITypeScriptAsynchCollector;
 import ts.client.ITypeScriptCollector;
 import ts.client.TypeScriptTimeoutException;

core/ts.core/src/ts/internal/client/protocol/SemanticDiagnosticsSyncRequest.java

@@ -5,6 +5,7 @@
 import com.eclipsesource.json.JsonValue;
 
 import ts.TypeScriptException;
+import ts.client.CommandNames;
 import ts.client.diagnostics.ITypeScriptDiagnosticsCollector;
 
 /**

core/ts.core/src/ts/internal/client/protocol/SignatureHelpRequest.java

@@ -13,6 +13,7 @@
 import com.eclipsesource.json.JsonObject;
 
 import ts.TypeScriptException;
+import ts.client.CommandNames;
 import ts.client.signaturehelp.ITypeScriptSignatureHelpCollector;
 
 /**

core/ts.core/src/ts/internal/client/protocol/SimpleRequest.java

@@ -14,6 +14,7 @@
 
 import ts.TypeScriptException;
 import ts.TypeScriptNoContentAvailableException;
+import ts.client.CommandNames;
 import ts.client.ITypeScriptAsynchCollector;
 import ts.client.ITypeScriptCollector;
 

core/ts.core/src/ts/internal/client/protocol/SyntacticDiagnosticsSyncRequest.java

@@ -5,6 +5,7 @@
 import com.eclipsesource.json.JsonValue;
 
 import ts.TypeScriptException;
+import ts.client.CommandNames;
 import ts.client.diagnostics.ITypeScriptDiagnosticsCollector;
 
 /**

core/ts.core/src/ts/resources/AbstractTypeScriptFile.java

@@ -22,7 +22,6 @@
 import ts.client.format.FormatOptions;
 import ts.client.format.ITypeScriptFormatCollector;
 import ts.client.navbar.ITypeScriptNavBarCollector;
-import ts.client.navbar.NavigationBarItem;
 import ts.client.navbar.NavigationBarItemRoot;
 import ts.client.occurrences.ITypeScriptOccurrencesCollector;
 import ts.client.references.ITypeScriptReferencesCollector;
@@ -183,6 +182,16 @@ public void navbar(ITypeScriptNavBarCollector collector) throws TypeScriptExcept
 		client.navbar(this.getName(), this, collector);
 	}
 
+	@Override
+	public void implementation(int position, ITypeScriptDefinitionCollector collector) throws TypeScriptException {
+		this.synch();
+		ITypeScriptServiceClient client = tsProject.getClient();
+		Location location = this.getLocation(position);
+		int line = location.getLine();
+		int offset = location.getOffset();
+		client.implementation(this.getName(), line, offset, collector);
+	}
+
 	private class TypeScriptNavBarCollector implements ITypeScriptNavBarCollector, ITypeScriptAsynchCollector {
 
 		@Override

core/ts.core/src/ts/resources/ITypeScriptFile.java

@@ -140,6 +140,15 @@ public interface ITypeScriptFile extends IPositionProvider {
 	 */
 	void navbar(ITypeScriptNavBarCollector collector) throws TypeScriptException;
 
+	/**
+	 * Call implementation from the tsserver.
+	 * 
+	 * @param position
+	 * @param collector
+	 * @throws TypeScriptException
+	 */
+	void implementation(int position, ITypeScriptDefinitionCollector collector) throws TypeScriptException;
+
 	void addNavbarListener(INavbarListener listener);
 
 	void removeNavbarListener(INavbarListener listener);

core/ts.core/src/ts/resources/ITypeScriptProject.java

@@ -11,6 +11,7 @@
 package ts.resources;
 
 import ts.TypeScriptException;
+import ts.client.CommandNames;
 import ts.client.ITypeScriptClientListener;
 import ts.client.ITypeScriptServiceClient;
 import ts.client.diagnostics.ITypeScriptDiagnosticsCollector;
@@ -92,4 +93,14 @@ void syntacticDiagnosticsSync(ITypeScriptFile tsFile, Boolean includeLinePositio
 
 	void disposeTslint();
 
+	/**
+	 * Returns true if the given tsserver command can be supported by the
+	 * TypeScript version configured for the project and false otherwise.
+	 * 
+	 * @param command
+	 * @return true if the given tsserver command can be supported by the
+	 *         TypeScript version configured for the project and false
+	 *         otherwise.
+	 */
+	boolean canSupport(CommandNames command);
 }