sigmasternchen/xtext-core
1
0
Fork 0
mirror of https://github.com/sigmasternchen/xtext-core synced 2025-03-15 16:28:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[LSP] don’t auto cancel all running requests onWrite (fixes #171)

Browse source
This commit is contained in:
Sven Efftinge 2016-11-08 20:19:59 +01:00
parent e0705b0c41
commit c6b00dadbd
2 changed files with 2 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/server/concurrent/RequestManager.xtend
View file

@ -59,7 +59,6 @@ class RequestManager {
*/
def <V> CompletableFuture<V> runWrite((CancelIndicator)=>V writeRequest) {
return CompletableFutures.computeAsync(executorService) [
cancelIndicators.forEach[cancel]
val cancelIndicator = new RequestCancelIndicator(it)
cancelIndicators += cancelIndicator

9
org.eclipse.xtext.ide/xtend-gen/org/eclipse/xtext/ide/server/concurrent/RequestManager.java
View file

@ -15,7 +15,6 @@ import java.util.concurrent.CompletionException;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.Semaphore;
import java.util.function.Consumer;
import java.util.function.Function;
import org.apache.log4j.Logger;
import org.eclipse.lsp4j.jsonrpc.CancelChecker;
@ -67,19 +66,15 @@ public class RequestManager {
public <V extends Object> CompletableFuture<V> runWrite(final Function1<? super CancelIndicator, ? extends V> writeRequest) {
final Function<CancelChecker, V> _function = (CancelChecker it) -> {
try {
final Consumer<Cancellable> _function_1 = (Cancellable it_1) -> {
it_1.cancel();
};
this.cancelIndicators.forEach(_function_1);
final RequestCancelIndicator cancelIndicator = new RequestCancelIndicator(it);
this.cancelIndicators.add(cancelIndicator);
this.semaphore.acquire(this.MAX_PERMITS);
try {
final CancelIndicator _function_2 = () -> {
final CancelIndicator _function_1 = () -> {
cancelIndicator.checkCanceled();
return false;
};
return writeRequest.apply(_function_2);
return writeRequest.apply(_function_1);
} catch (final Throwable _t) {
if (_t instanceof Throwable) {
final Throwable t = (Throwable)_t;