Support for asynch occurrence collector to avoid freeze Eclipse with

large TypeScript project. See
#17

Author: angelozerr

core/ts.core/src/ts/client/CancellationToken.java

@@ -0,0 +1,7 @@
+package ts.client;
+
+public interface ICancellationToken {
+
+	boolean isCancellationRequested();
+	
+}

core/ts.core/src/ts/client/ICancellationToken.java

@@ -0,0 +1,12 @@
+package ts.client;
+
+import ts.TypeScriptException;
+
+public interface ITypeScriptAsynchCollector {
+
+	void startCollect();
+
+	void endCollect();
+
+	void onError(TypeScriptException e);
+}

core/ts.core/src/ts/client/ITypeScriptAsynchCollector.java

@@ -323,7 +323,7 @@ private void collect(JsonObject response, ITypeScriptGeterrCollector collector)
 	}
 
 	// -------------------------- Format
-	
+
 	@Override
 	public void format(String fileName, int line, int offset, int endLine, int endOffset,
 			ITypeScriptFormatCollector collector) throws TypeScriptException {
@@ -346,63 +346,31 @@ private void collectFormat(JsonArray body, ITypeScriptFormatCollector collector)
 					end.getInt("offset", -1), newText);
 		}
 	}
-	
+
 	// ----------------- Find References
-	
-	@Override
-	public void references(String fileName, int line, int offset,
-			ITypeScriptReferencesCollector collector) throws TypeScriptException {
-		ReferencesRequest request = new ReferencesRequest(fileName, line, offset);
-		JsonObject response = execute(request, true, null).asObject();
-		collectReferences(response, collector);
-	}
 
-	private void collectReferences(JsonObject response, ITypeScriptReferencesCollector collector) throws TypeScriptException {
-		JsonObject body = response.get("body").asObject();
-		JsonArray refs = body.get("refs").asArray();
-		JsonObject ref = null;
-		String file = null;
-		JsonObject start = null;
-		JsonObject end = null;
-		String lineText = null;
-		for (JsonValue r : refs) {
-			ref = r.asObject();
-			file = ref.getString("file", null);
-			start = ref.get("start").asObject();
-			end = ref.get("end").asObject();
-			lineText = ref.getString("lineText", null);
-			collector.ref(file, start.getInt("line", -1), start.getInt("offset", -1), end.getInt("line", -1),
-					end.getInt("offset", -1), lineText);
-			
-		}
+	@Override
+	public void references(String fileName, int line, int offset, ITypeScriptReferencesCollector collector)
+			throws TypeScriptException {
+		ReferencesRequest request = new ReferencesRequest(fileName, line, offset, collector);
+		execute(request);
 	}
 
 	// ----------------- Occurrences
-	
+
 	@Override
-	public void occurrences(String fileName, int line, int offset,
-			ITypeScriptOccurrencesCollector collector) throws TypeScriptException {
-		OccurrencesRequest request = new OccurrencesRequest(fileName, line, offset);
-		JsonObject response = execute(request, true, null).asObject();
-		collectOccurrences(response, collector);
+	public void occurrences(String fileName, int line, int offset, ITypeScriptOccurrencesCollector collector)
+			throws TypeScriptException {
+		OccurrencesRequest request = new OccurrencesRequest(fileName, line, offset, collector);
+		execute(request);
 	}
 
-	private void collectOccurrences(JsonObject response, ITypeScriptOccurrencesCollector collector) throws TypeScriptException {
-		JsonArray body = response.get("body").asArray();
-		JsonObject occurrence = null;
-		String file = null;
-		JsonObject start = null;
-		JsonObject end = null;
-		boolean isWriteAccess = false;
-		for (JsonValue b : body) {
-			occurrence = b.asObject();
-			file = occurrence.getString("file", null);
-			start = occurrence.get("start").asObject();
-			end = occurrence.get("end").asObject();
-			isWriteAccess= occurrence.getBoolean("isWriteAccess", false);
-			collector.addOccurrence(file, start.getInt("line", -1), start.getInt("offset", -1), end.getInt("line", -1),
-					end.getInt("offset", -1), isWriteAccess);
-			
+	private void execute(Request request) throws TypeScriptException {
+		if (!request.isAsynch()) {
+			JsonObject response = execute(request, true, null).asObject();
+			request.collect(response);
+		} else {
+			execute(request, true, null);
 		}
 	}
 
@@ -575,7 +543,7 @@ public void join() throws InterruptedException {
 	 * @return the result of the request if it needed and null otherwise.
 	 * @throws TypeScriptException
 	 */
-	private JsonValue execute(Request request, boolean expectsResult, CancellationToken token)
+	private JsonValue execute(Request request, boolean expectsResult, ICancellationToken token)
 			throws TypeScriptException {
 		boolean eventRequest = (request instanceof GeterrRequest);
 		RequestItem requestInfo = null;
@@ -600,11 +568,11 @@ private JsonValue execute(Request request, boolean expectsResult, CancellationTo
 			handleError(request, e, request.getStartTime());
 			TypeScriptException tse = getTypeScriptException(e);
 			if (tse != null) {
-				if (tse instanceof TypeScriptTimeoutException) {
-					// when time out exception, we must be sure that the request
-					// is removed
-					tryCancelRequest(((TypeScriptTimeoutException) tse).getRequest().getSeq());
-				}
+//				if (tse instanceof TypeScriptTimeoutException) {
+//					// when time out exception, we must be sure that the request
+//					// is removed
+//					tryCancelRequest(((TypeScriptTimeoutException) tse).getRequest().getSeq());
+//				}
 				throw (TypeScriptException) tse;
 			}
 			throw new TypeScriptException(e);
@@ -633,7 +601,7 @@ private boolean tryCancelRequest(int seq) {
 		return false;
 	}
 
-	private void sendNextRequests() throws TypeScriptException {
+	private void sendNextRequests() {
 		RequestItem requestItem = null;
 		while (this.pendingResponses.get() == 0 && !this.requestQueue.isEmpty()) {
 			synchronized (requestQueue) {
@@ -643,7 +611,7 @@ private void sendNextRequests() throws TypeScriptException {
 		}
 	}
 
-	private void sendRequest(RequestItem requestItem) throws TypeScriptException {
+	private void sendRequest(RequestItem requestItem) {
 		Request serverRequest = requestItem.request;
 		// log request
 		handleRequest(serverRequest);
@@ -680,18 +648,18 @@ private void sendRequest(RequestItem requestItem) throws TypeScriptException {
 				synchronized (this.callbacks) {
 					ICallbackItem callback = this.callbacks.get(serverRequest.getSeq());
 					if (callback != null) {
-						// callback.e(err);
+						callback.error(e);
 						this.callbacks.remove(serverRequest.getSeq());
 					}
 					this.pendingResponses.getAndDecrement();
 				}
 			}
-			throw e;
 		}
 
 	}
 
 	private void dispatchMessage(JsonObject response) {
+		try {
 		String type = response.getString("type", null);
 		if ("response".equals(type)) {
 			int seq = response.getInt("request_seq", -1);
@@ -725,6 +693,10 @@ private void dispatchMessage(JsonObject response) {
 				}
 			}
 		}
+		}
+		finally {
+			this.sendNextRequests();
+		}
 	}
 
 	// --------------------------- Handler for Request/response/Error

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

@@ -7,7 +7,7 @@ public class TypeScriptTimeoutException extends TypeScriptException {
 
 	private final Request request;
 
-	public TypeScriptTimeoutException(Request<?> request, long timeout) {
+	public TypeScriptTimeoutException(Request request, long timeout) {
 		super("Timeout error " + timeout + "ms");
 		this.request = request;
 	}

core/ts.core/src/ts/client/TypeScriptTimeoutException.java

@@ -7,5 +7,9 @@
 public interface ICallbackItem<T> extends Callable<T> {
 
 	boolean complete(JsonObject response);
+	
+	void error(Throwable e);
+	
+	boolean isAsynch();
 
 }

core/ts.core/src/ts/internal/client/ICallbackItem.java

@@ -10,6 +10,10 @@
  */
 package ts.internal.client.protocol;
 
+import com.eclipsesource.json.JsonObject;
+
+import ts.TypeScriptException;
+
 /**
  * Change request message; value of command field is "change". Update the
  * server's view of the file named by argument 'file'. Server does not currently
@@ -24,4 +28,9 @@ public ChangeRequest(String fileName, int line, int offset, int endLine, int end
 		super(CommandNames.Change, new ChangeRequestArgs(fileName, line, offset, endLine, endOffset, insertString));
 	}
 
+	@Override
+	public void collect(JsonObject response) throws TypeScriptException {
+		// None response
+	}
+
 }

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

@@ -10,6 +10,10 @@
  */
 package ts.internal.client.protocol;
 
+import com.eclipsesource.json.JsonObject;
+
+import ts.TypeScriptException;
+
 /**
  * Close request.
  * 
@@ -22,4 +26,8 @@ public CloseRequest(String fileName) {
 		super(CommandNames.Close, new FileRequestArgs(fileName), null);
 	}
 
+	@Override
+	public void collect(JsonObject response) throws TypeScriptException {
+		// None response
+	}
 }

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

@@ -10,6 +10,10 @@
  */
 package ts.internal.client.protocol;
 
+import com.eclipsesource.json.JsonObject;
+
+import ts.TypeScriptException;
+
 /**
  * Completion entry details request; value of command field is
  * "completionEntryDetails". Given a file location (file, line, col) and an
@@ -21,4 +25,9 @@ public class CompletionDetailsRequest extends FileLocationRequest {
 	public CompletionDetailsRequest(String fileName, int line, int offset, String[] entryNames) {
 		super(CommandNames.CompletionEntryDetails, new CompletionDetailsRequestArgs(fileName, line, offset, entryNames));
 	}
+	
+	@Override
+	public void collect(JsonObject response) throws TypeScriptException {
+		// None response
+	}
 }

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

@@ -10,6 +10,10 @@
  */
 package ts.internal.client.protocol;
 
+import com.eclipsesource.json.JsonObject;
+
+import ts.TypeScriptException;
+
 /**
  * Completions request; value of command field is "completions". Given a file
  * location (file, line, col) and a prefix (which may be the empty string),
@@ -23,5 +27,10 @@ public class CompletionsRequest extends FileLocationRequest {
 	public CompletionsRequest(String fileName, int line, int offset, String prefix) {
 		super(CommandNames.Completions, new CompletionsRequestArgs(fileName, line, offset, prefix));
 	}
+	
+	@Override
+	public void collect(JsonObject response) throws TypeScriptException {
+		// None response
+	}
 
 }

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

@@ -10,6 +10,10 @@
  */
 package ts.internal.client.protocol;
 
+import com.eclipsesource.json.JsonObject;
+
+import ts.TypeScriptException;
+
 /**
  * Go to definition request; value of command field is "definition". Return
  * response giving the file locations that define the symbol found in file at
@@ -23,5 +27,10 @@ public class DefinitionRequest extends FileLocationRequest {
 	public DefinitionRequest(String fileName, int line, int offset) {
 		super(CommandNames.Definition, new FileLocationRequestArgs(fileName, line, offset));
 	}
+	
+	@Override
+	public void collect(JsonObject response) throws TypeScriptException {
+		// None response
+	}
 
 }

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

@@ -10,13 +10,15 @@
  */
 package ts.internal.client.protocol;
 
+import ts.client.ITypeScriptCollector;
+
 /**
  * A request whose arguments specify a file location (file, line, col).
  * 
  * @see https://github.com/Microsoft/TypeScript/blob/master/src/server/protocol.
  *      d.ts
  */
-public class FileLocationRequest extends FileRequest {
+public abstract class FileLocationRequest<C extends ITypeScriptCollector> extends FileRequest<C> {
 
 	public FileLocationRequest(CommandNames command, FileLocationRequestArgs args) {
 		super(command, args, null);

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

@@ -10,13 +10,15 @@
  */
 package ts.internal.client.protocol;
 
+import ts.client.ITypeScriptCollector;
+
 /**
  * Request whose sole parameter is a file name.
  * 
  * @see https://github.com/Microsoft/TypeScript/blob/master/src/server/protocol.
  *      d.ts
  */
-public class FileRequest extends SimpleRequest {
+public abstract class FileRequest<C extends ITypeScriptCollector> extends SimpleRequest<C> {
 
 	public FileRequest(CommandNames command, FileRequestArgs args, Integer seq) {
 		super(command, args, seq);

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

@@ -10,6 +10,10 @@
  */
 package ts.internal.client.protocol;
 
+import com.eclipsesource.json.JsonObject;
+
+import ts.TypeScriptException;
+
 /**
  * Format request; value of command field is "format". Return response giving
  * zero or more edit instructions. The edit instructions will be sorted in file
@@ -25,4 +29,8 @@ public FormatRequest(String fileName, int line, int offset, int endLine, int end
 		super(CommandNames.Format, new FormatRequestArgs(fileName, line, offset, endLine, endOffset));
 	}
 
+	@Override
+	public void collect(JsonObject response) throws TypeScriptException {
+		// None response
+	}
 }

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

@@ -99,4 +99,8 @@ protected Object getResult() throws Exception {
 		return result;
 	}
 
+	@Override
+	public void collect(JsonObject response) {
+		
+	}
 }