wait for incremental compilation before doing completions

Author: zth

server/src/incrementalCompilation.ts

@@ -370,7 +370,7 @@ function removeAnsiCodes(s: string): string {
   const ansiEscape = /\x1B[@-_][0-?]*[ -/]*[@-~]/g;
   return s.replace(ansiEscape, "");
 }
-function triggerIncrementalCompilationOfFile(
+export function triggerIncrementalCompilationOfFile(
   filePath: string,
   fileContent: string,
   send: send,
@@ -469,6 +469,7 @@ function triggerIncrementalCompilationOfFile(
     entry.killCompilationListeners = [];
   }
   const triggerToken = performance.now();
+  // TODO: Can we remove this timeout? Don't remember why it was added...
   const timeout = setTimeout(() => {
     compileContents(entry, fileContent, send, onCompilationFinished);
   }, 20);
@@ -727,6 +728,7 @@ async function compileContents(
   }
 }
 
+// TODO(compilation-revamp) make sure we don't unecessarily trigger incremental compilations
 export function handleUpdateOpenedFile(
   filePath: string,
   fileContent: string,

server/src/server.ts

@@ -673,13 +673,18 @@ function semanticTokens(msg: p.RequestMessage) {
   return response;
 }
 
-function completion(msg: p.RequestMessage) {
+async function completion(msg: p.RequestMessage) {
   // https://microsoft.github.io/language-server-protocol/specifications/specification-current/#textDocument_completion
   let params = msg.params as p.ReferenceParams;
   let filePath = fileURLToPath(params.textDocument.uri);
   let code = getOpenedFileContent(params.textDocument.uri);
   let tmpname = utils.createFileInTempDir();
   fs.writeFileSync(tmpname, code, { encoding: "utf-8" });
+  await new Promise<void>((resolve) => {
+    ic.triggerIncrementalCompilationOfFile(filePath, code, send, () => {
+      resolve();
+    });
+  });
   let response = utils.runAnalysisCommand(
     filePath,
     [
@@ -1235,7 +1240,7 @@ function onMessage(msg: p.Message) {
     } else if (msg.method === p.DocumentSymbolRequest.method) {
       send(documentSymbol(msg));
     } else if (msg.method === p.CompletionRequest.method) {
-      send(completion(msg));
+      completion(msg).then(send);
     } else if (msg.method === p.CompletionResolveRequest.method) {
       send(completionResolve(msg));
     } else if (msg.method === p.SemanticTokensRequest.method) {