wait for lifecycle jobs before calc semantic tokens (#1412)

Signed-off-by: Yan Zhang <[email protected]>
eclipse-jdtls · Apr 26, 2020 · 465ee9a · 465ee9a
1 parent 4455d06
commit 465ee9a
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/...ipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/commands/SemanticTokensCommand.java b/...ipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/commands/SemanticTokensCommand.java
@@ -22,6 +22,8 @@
 import org.eclipse.jdt.core.manipulation.CoreASTProvider;
 import org.eclipse.jdt.ls.core.internal.JDTUtils;
 import org.eclipse.jdt.ls.core.internal.JavaLanguageServerPlugin;
+import org.eclipse.jdt.ls.core.internal.JobHelpers;
+import org.eclipse.jdt.ls.core.internal.handlers.DocumentLifeCycleHandler;
 import org.eclipse.jdt.ls.core.internal.handlers.JsonRpcHelpers;
 import org.eclipse.jdt.ls.core.internal.semantictokens.SemanticTokenManager;
 import org.eclipse.jdt.ls.core.internal.semantictokens.SemanticTokens;
@@ -30,9 +32,12 @@
 import org.eclipse.jface.text.IDocument;
 
 public class SemanticTokensCommand {
-
  public static SemanticTokens provide(String uri) {
+ JobHelpers.waitForJobs(DocumentLifeCycleHandler.DOCUMENT_LIFE_CYCLE_JOBS, null);
+ return doProvide(uri);
+ }
 
+ private static SemanticTokens doProvide(String uri) {
  IDocument document = null;
 
  ICompilationUnit cu = JDTUtils.resolveCompilationUnit(uri);