Do big refactoring to use Java8 CompletableFuture for

TypeScriptServiceClient. See
#63

Author: angelozerr

core/ts.core.tests/.classpath

@@ -1,7 +1,11 @@
 <?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">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="src/"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>

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

@@ -5,7 +5,7 @@ Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Bundle-SymbolicName: ts.core.tests
 Bundle-Version: 1.2.0.qualifier
-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

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

@@ -1,28 +1,27 @@
 package ts.core.tests;
 
 import java.io.File;
-import java.io.IOException;
 import java.util.List;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ExecutionException;
 
 import ts.TypeScriptException;
-import ts.client.CodeEdit;
+import ts.client.FileSpan;
 import ts.client.ITypeScriptServiceClient;
+import ts.client.Location;
+import ts.client.LoggingInterceptor;
 import ts.client.TypeScriptServiceClient;
-import ts.client.completions.CompletionInfo;
-import ts.client.completions.ICompletionEntry;
-import ts.client.completions.ICompletionInfo;
-import ts.client.definition.DefinitionsInfo;
-import ts.client.format.ITypeScriptFormatCollector;
-import ts.client.navbar.ITypeScriptNavBarCollector;
-import ts.client.navbar.NavigationBarItemRoot;
+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 Main {
 
-	public static void main(String[] args) throws InterruptedException, TypeScriptException, IOException {
-
+	public static void main(String[] args) throws TypeScriptException, InterruptedException, ExecutionException {
 		File projectDir = new File("./samples");
-		// sample2.ts has the following content:
+		// sample.ts has the following content:
 		// var s = "";s.
 		File sampleFile = new File(projectDir, "sample.ts");
 		String fileName = FileUtils.getPath(sampleFile);
@@ -31,60 +30,104 @@ public static void main(String[] args) throws InterruptedException, TypeScriptEx
 		ITypeScriptServiceClient client = new TypeScriptServiceClient(projectDir,
 				new File("../ts.repository/node_modules/typescript/bin/tsserver"), null);
 
-		// Open "sample2.ts" in an editor
+		client.addInterceptor(LoggingInterceptor.getInstance());
+		
+		// Open "sample.ts" in an editor
 		client.openFile(fileName, null);
 
-		// Do completion after the last dot of "s" variable which is a String
-		// (charAt, ....)
-		CompletionInfo completionInfo = new CompletionInfo(null);
-		client.completions(fileName, 1, 14, null, completionInfo);
-		display(completionInfo);
+		// 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
-		client.updateFile(fileName, "var s = 1;s.");
+		// 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, ....)
-		completionInfo = new CompletionInfo(null);
-		client.completions(fileName, 1, 14, null, completionInfo);
-		display(completionInfo);
-
-		DefinitionsInfo definitionInfo = new DefinitionsInfo();
-		client.definition(fileName, 1, 12, definitionInfo);
-		display(definitionInfo);
-
-		client.format(fileName, 1, 1, 1, 12, new ITypeScriptFormatCollector() {
-			@Override
-			public void format(List<CodeEdit> codeEdits) throws TypeScriptException {
-				for (CodeEdit codeEdit : codeEdits) {
-					System.err.println(codeEdit.getNewText());
-				}
-			}
-		});
-
-		client.navbar(fileName, null, new ITypeScriptNavBarCollector() {
-
-			@Override
-			public void setNavBar(NavigationBarItemRoot root) {
-				System.err.println(root);
-			}
-		});
-
-		// client.join();
+		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();
 
 	}
 
-	private static void display(DefinitionsInfo definitionInfo) {
-		// TODO Auto-generated method stub
+	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 display(ICompletionInfo completionInfo) {
-		System.out.println("getCompletionsAtLineOffset:");
-		ICompletionEntry[] entries = completionInfo.getEntries();
-		for (ICompletionEntry entry : entries) {
-			System.out.println(entry.getName());
+	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() + "}";
+	}
+
 }