Do big refactoring to use Java8 CompletableFuture for

TypeScriptServiceClient. See
#63

Author: angelozerr

core/ts.core.tests/samples/sample.js

@@ -4,8 +4,7 @@
         "noImplicitAny": true,
         "removeComments": true,
         "preserveConstEnums": true,
-        "sourceMap": true,
-        "watch": true
+        "sourceMap": true
     },
     "files": [
         "sample.ts"

core/ts.core.tests/samples/sample.js.map

@@ -0,0 +1,133 @@
+package ts.core.tests;
+
+import java.io.File;
+import java.util.List;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ExecutionException;
+
+import ts.TypeScriptException;
+import ts.client.FileSpan;
+import ts.client.ITypeScriptServiceClient;
+import ts.client.Location;
+import ts.client.LoggingInterceptor;
+import ts.client.TypeScriptServiceClient;
+import ts.client.completions.CompletionEntry;
+import ts.client.diagnostics.DiagnosticEvent;
+import ts.client.projectinfo.ProjectInfo;
+import ts.client.quickinfo.QuickInfo;
+import ts.utils.FileUtils;
+
+public class Main3 {
+
+	public static void main(String[] args) throws TypeScriptException, InterruptedException, ExecutionException {
+		File projectDir = new File("./samples");
+		// sample.ts has the following content:
+		// var s = "";s.
+		File sampleFile = new File(projectDir, "sample.ts");
+		String fileName = FileUtils.getPath(sampleFile);
+
+		// Create TypeScript client
+		ITypeScriptServiceClient client = new TypeScriptServiceClient(projectDir,
+				new File("../ts.repository/node_modules/typescript/bin/tsserver"), null);
+
+		client.addInterceptor(LoggingInterceptor.getInstance());
+		
+		// Open "sample.ts" in an editor
+		client.openFile(fileName, null);
+
+		// compile on save
+		client.compileOnSaveEmitFile(fileName, true);
+
+		
+		// Completions with line/offset
+		CompletableFuture<List<CompletionEntry>> completionPromise = client.completions(fileName, 1, 14);
+		List<CompletionEntry> entries = completionPromise.get();
+		displayCompletions(entries);
+
+		// Completions with position (only since TypeScript 2.0)
+		// completionPromise = client.completions(fileName, 14);
+		// entries = completionPromise.get();
+		// displayCompletions(entries);
+
+		// QuickInfo
+		CompletableFuture<QuickInfo> quickInfoPromise = client.quickInfo(fileName, 1, 5);
+		QuickInfo quickInfo = quickInfoPromise.get();
+		displayQuickInfo(quickInfo);
+
+		// Definition
+		CompletableFuture<List<FileSpan>> definitionPromise = client.definition(fileName, 1, 5);
+		List<FileSpan> definition = definitionPromise.get();
+		displayDefinition(definition);
+
+		// Update the editor content to set s as number
+		// var s = 1;s.
+		// client.changeFile(fileName, 9, 11, "1"); // position change, doesn't
+		// work with TypeScript 2.1.4
+		client.changeFile(fileName, 1, 9, 1, 11, "1");
+
+		// Do completion after the last dot of "s" variable which is a Number
+		// (toExponential, ....)
+		completionPromise = client.completions(fileName, 1, 14);
+		entries = completionPromise.get();
+		displayCompletions(entries);
+
+		// geterr
+		List<DiagnosticEvent> events = client.geterr(new String[] { fileName }, 0).get();
+		displayDiagnostics(events);
+
+		// projectInfo
+		ProjectInfo projectInfo = client.projectInfo(fileName, null, true).get();
+		displayProjectInfo(projectInfo);
+		
+		//
+		// client.geterrForProjectRequest(file, delay, projectInfo)
+
+		// Close "sample.ts"
+		client.closeFile(fileName);
+
+
+		// synchronized (client) {t
+		// try {
+		// client.wait(2000);
+		// } catch (InterruptedException e) {
+		// // TODO Auto-generated catch block
+		// e.printStackTrace();
+		// }
+		// }
+		client.dispose();
+
+	}
+
+	public static void displayCompletions(List<CompletionEntry> entries) {
+		for (CompletionEntry entry : entries) {
+			System.err.println(entry.getName());
+		}
+	}
+
+	private static void displayQuickInfo(QuickInfo quickInfo) {
+		System.err.println("DisplayString: " + quickInfo.getDisplayString() + ", start: "
+				+ toString(quickInfo.getStart()) + ", end: " + toString(quickInfo.getEnd()));
+	}
+
+	private static void displayDefinition(List<FileSpan> spans) {
+		for (FileSpan span : spans) {
+			System.err.println("file: " + span.getFile() + ", start: " + toString(span.getStart()) + ", end: "
+					+ toString(span.getEnd()));
+		}
+	}
+
+	private static void displayDiagnostics(List<DiagnosticEvent> events) {
+		for (DiagnosticEvent event : events) {
+			System.err.println(event.getBody().getFile());
+		}
+	}
+
+	private static void displayProjectInfo(ProjectInfo projectInfo) {
+		System.err.println(projectInfo.getConfigFileName());
+	}
+
+	private static String toString(Location loc) {
+		return "{" + loc.getLine() + ", " + loc.getOffset() + "}";
+	}
+
+}

core/ts.core.tests/samples/tsconfig.json

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="target/classes"/>

core/ts.core.tests/src/ts/core/tests/Main3.java

@@ -6,19 +6,20 @@ Bundle-Localization: plugin
 Bundle-SymbolicName: ts.core
 Bundle-Version: 1.2.0.qualifier
 Bundle-Activator: ts.internal.Activator
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Import-Package: com.eclipsesource.json;version="0.9.4",
  org.osgi.framework;version="1.3.0"
 Bundle-ActivationPolicy: lazy
 Export-Package: ts,
  ts.client,
  ts.client.codefixes,
  ts.client.completions,
- ts.client.definition,
+ ts.client.configure,
  ts.client.diagnostics,
  ts.client.format,
  ts.client.navbar,
  ts.client.occurrences,
+ ts.client.projectinfo,
  ts.client.quickinfo,
  ts.client.references,
  ts.client.signaturehelp,

core/ts.core/.classpath

@@ -28,11 +28,14 @@ public enum CommandNames {
 	Definition("definition"), 
 	SignatureHelp("signatureHelp"), 
 	QuickInfo("quickinfo"), 
-	Geterr("geterr"), 
+	Geterr("geterr"),
+	GeterrForProject("geterrForProject"),
 	Format("format"), 
 	References("references"), 
 	Occurrences("occurrences"), 
-	Configure("configure"), 
+	Configure("configure"),
+	ProjectInfo("projectInfo"),
+	Rename("rename"),
 
 	// 2.0.3
 	SemanticDiagnosticsSync("semanticDiagnosticsSync", "2.0.3"), 

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

@@ -0,0 +1,29 @@
+package ts.client;
+
+import ts.internal.client.protocol.Message;
+
+/**
+ * Server-initiated event message
+ *
+ * @param <T>
+ */
+public class Event<T> extends Message {
+
+	/**
+	 * Name fo event.
+	 */
+	private String event;
+
+	/**
+	 * Event-specific information
+	 */
+	private T body;
+
+	public String getEvent() {
+		return event;
+	}
+
+	public T getBody() {
+		return body;
+	}
+}

core/ts.core/src/ts/client/AbstractTypeScriptCollector.java

@@ -1,5 +1,5 @@
 /**
- *  Copyright (c) 2015-2016 Angelo ZERR.
+ *  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
@@ -8,20 +8,22 @@
  *  Contributors:
  *  Angelo Zerr <[email protected]> - initial API and implementation
  */
-package ts.client.completions;
+package ts.client;
 
 /**
- * @see https://github.com/Microsoft/TypeScript/blob/master/src/services/services.ts
- *
+ * Object found in response messages defining a span of text in a specific
+ * source file.
+ * 
+ * @see https://github.com/Microsoft/TypeScript/blob/master/src/server/protocol.ts
  */
-public interface ICompletionInfo {
+public class FileSpan extends TextSpan {
 
-	boolean isMemberCompletion();
 	/**
-	 * Returns true when the current location also allows for a new identifier
-	 * @return true when the current location also allows for a new identifier
+	 * File containing text span.
 	 */
-	boolean isNewIdentifierLocation();  
-	
-	ICompletionEntry[] getEntries();
+	private String file;
+
+	public String getFile() {
+		return file;
+	}
 }

core/ts.core/src/ts/client/CommandNames.java

@@ -10,16 +10,15 @@
  */
 package ts.client;
 
-import com.eclipsesource.json.JsonObject;
-
+import ts.internal.client.protocol.Response;
 import ts.internal.client.protocol.Request;
 
 public interface IInterceptor {
 
-	void handleRequest(Request request, ITypeScriptServiceClient client, String methodName);
+	void handleRequest(Request<?> request, String json, ITypeScriptServiceClient client);
 
-	void handleResponse(JsonObject response, ITypeScriptServiceClient client,
-			String methodName, long ellapsedTime);
+	void handleResponse(Response<?> response, String json,
+			long ellapsedTime, TypeScriptServiceClient typeScriptServiceClient);
 
 	void handleError(Throwable error, ITypeScriptServiceClient client, String methodName,
 			long ellapsedTime);