Spring/spring-tools
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add some logging to track completion handling

Browse Source
This commit is contained in:
Kris De Volder
2018-11-22 16:03:39 -08:00
parent 079a7de727
commit 1cb46aa444
5 changed files with 32 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/javadoc/JdtLsJavadocProvider.java
View File

@@ -58,11 +58,14 @@ public class JdtLsJavadocProvider implements IJavadocProvider {
}
private IJavadoc javadoc(IJavaElement element) {
long start = System.currentTimeMillis();
try {
log.info("Fetching javadoc {}", element.getBindingKey());
JavadocResponse response = client.javadoc(new JavadocParams(projectUri, element.getBindingKey())).get(10, TimeUnit.SECONDS);
log.info("Fetching javadoc {} took {} ms", element.getBindingKey(), System.currentTimeMillis()-start);
return produceJavadocFromMd(response);
} catch (InterruptedException | ExecutionException | TimeoutException e) {
log.error("", e);
log.error("Fetching javadoc {} failed", e);
return null;
}
}

16
headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/completion/VscodeCompletionEngineAdapter.java
View File

@@ -50,7 +50,7 @@ import reactor.core.scheduler.Schedulers;
*/
public class VscodeCompletionEngineAdapter implements VscodeCompletionEngine {
private static final Supplier<Logger> LOG = Suppliers.memoize(() -> LoggerFactory.getLogger(VscodeCompletionEngineAdapter.class));
private static final Logger log = LoggerFactory.getLogger(VscodeCompletionEngineAdapter.class);
public static class LazyCompletionResolver {
private int nextId = 0; //Used to assign unique id to completion items.
@@ -70,7 +70,7 @@ public class VscodeCompletionEngineAdapter implements VscodeCompletionEngine {
try {
resolveItem(doc, completion, unresolved);
} catch (Exception e) {
LOG.get().error("", e);
log.error("", e);
}
});
return id;
@@ -84,7 +84,7 @@ public class VscodeCompletionEngineAdapter implements VscodeCompletionEngine {
resolver.accept(unresolved);
unresolved.setData(null); //No longer needed after item is resolved.
} else {
LOG.get().warn("Couldn't resolve completion item. Did it already get flushed from the resolver's cache? "+unresolved.getLabel());
log.warn("Couldn't resolve completion item. Did it already get flushed from the resolver's cache? "+unresolved.getLabel());
}
}
}
@@ -96,7 +96,6 @@ public class VscodeCompletionEngineAdapter implements VscodeCompletionEngine {
private final static int DEFAULT_MAX_COMPLETIONS = 50;
private int maxCompletions = DEFAULT_MAX_COMPLETIONS; //TODO: move this to CompletionEngineOptions.
final static Logger logger = LoggerFactory.getLogger(VscodeCompletionEngineAdapter.class);
private SimpleLanguageServer server;
private ICompletionEngine engine;
@@ -129,6 +128,7 @@ public class VscodeCompletionEngineAdapter implements VscodeCompletionEngine {
if (documents.get(params) != null) {
TextDocument doc = documents.getDocumentSnapshot(params.getTextDocument());
return Mono.fromCallable(() -> {
log.info("Starting completion handling");
if (resolver!=null) {
//Assumes we don't have more than one completion request in flight from the client.
// So when a new request arrives we can forget about the old unresolved items:
@@ -155,12 +155,14 @@ public class VscodeCompletionEngineAdapter implements VscodeCompletionEngine {
try {
items.add(adaptItem(doc, c, sortkeys));
} catch (Exception e) {
logger.error("error computing completion", e);
log.error("error computing completion", e);
}
}
list.setItems(items);
return list;
})
.doOnNext(x -> log.info("Got {} completions", x.getItems().size()))
.doAfterTerminate(() -> log.info("Completion handling terminated!"))
.subscribeOn(Schedulers.elastic()); //!!! without this the mono will just be computed on the same thread that calls it.
}
return Mono.just(SimpleTextDocumentService.NO_COMPLETIONS);
@@ -246,7 +248,7 @@ public class VscodeCompletionEngineAdapter implements VscodeCompletionEngine {
return Optional.of(vscodeEdit);
}
} catch (Exception e) {
LOG.get().error("{}", e);
log.error("{}", e);
return Optional.empty();
}
}
@@ -269,7 +271,7 @@ public class VscodeCompletionEngineAdapter implements VscodeCompletionEngine {
return StringUtil.stripIndentation(refIndent, newText);
}
} catch (BadLocationException e) {
LOG.get().error("{}", e);
log.error("{}", e);
}
return newText;
}

3
headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/util/SimpleLanguageServer.java
View File

@@ -10,8 +10,6 @@
*******************************************************************************/
package org.springframework.ide.vscode.commons.languageserver.util;
import static org.springframework.ide.vscode.commons.util.AsyncRunner.thenLog;
import java.lang.management.ManagementFactory;
import java.net.URI;
import java.nio.file.Paths;
@@ -264,6 +262,7 @@ public final class SimpleLanguageServer implements Sts4LanguageServer, LanguageC
if (ih!=null){
ih.accept(params);
}
log.info("Returning server capabilities to client: {}", result.getCapabilities());
return CompletableFuture.completedFuture(result);
}

26
headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/util/SimpleTextDocumentService.java
View File

@@ -10,7 +10,6 @@
*******************************************************************************/
package org.springframework.ide.vscode.commons.languageserver.util;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
@@ -55,6 +54,8 @@ import org.eclipse.lsp4j.WorkspaceEdit;
import org.eclipse.lsp4j.jsonrpc.messages.Either;
import org.eclipse.lsp4j.services.LanguageClient;
import org.eclipse.lsp4j.services.TextDocumentService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.ide.vscode.commons.languageserver.quickfix.Quickfix;
import org.springframework.ide.vscode.commons.util.Assert;
import org.springframework.ide.vscode.commons.util.AsyncRunner;
@@ -69,6 +70,8 @@ import com.google.common.collect.ImmutableList;
public class SimpleTextDocumentService implements TextDocumentService, DocumentEventListenerManager {
private static Logger log = LoggerFactory.getLogger(SimpleTextDocumentService.class);
final private SimpleLanguageServer server;
private Map<String, TrackedDocument> documents = new HashMap<>();
private ListenerList<TextDocumentContentChange> documentChangeListeners = new ListenerList<>();
@@ -278,6 +281,7 @@ public class SimpleTextDocumentService implements TextDocumentService, DocumentE
@Override
public CompletableFuture<Either<List<CompletionItem>, CompletionList>> completion(CompletionParams position) {
log.info("completion request received");
CompletionHandler h = completionHandler;
if (h!=null) {
return completionHandler.handle(position)
@@ -289,13 +293,19 @@ public class SimpleTextDocumentService implements TextDocumentService, DocumentE
@Override
public CompletableFuture<CompletionItem> resolveCompletionItem(CompletionItem unresolved) {
return async.invoke(() -> {
CompletionResolveHandler h = completionResolveHandler;
if (h!=null) {
return h.handle(unresolved);
}
return null;
});
log.info("Completion item resolve request received: {}", unresolved.getLabel());
return async.invoke(() -> {
try {
CompletionResolveHandler h = completionResolveHandler;
if (h!=null) {
log.info("Completion item resolve request starting {}", unresolved.getLabel());
return h.handle(unresolved);
}
} finally {
log.info("Completion item resolve request terminated.");
}
return null;
});
}
@Override

1
headless-services/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/text/DocumentRegion.java
View File

@@ -8,7 +8,6 @@
* Contributors:
* Pivotal, Inc. - initial API and implementation
*******************************************************************************/
package org.springframework.ide.vscode.commons.util.text;
import java.util.ArrayList;