Implement syncCacheAndRenderHints on the VSCode side

Author: fwcd

Editors/vscode/src/extension.ts

@@ -3,8 +3,7 @@ import * as vscode from 'vscode';
 import * as langclient from 'vscode-languageclient/node';
 import { activateInlayHints } from './inlayHints';
 
-export function activate(context: vscode.ExtensionContext) {
-
+export async function activate(context: vscode.ExtensionContext): Promise<void> {
     const config = vscode.workspace.getConfiguration('sourcekit-lsp');
 
     const sourcekit: langclient.Executable = {
@@ -33,10 +32,12 @@ export function activate(context: vscode.ExtensionContext) {
 
     const client = new langclient.LanguageClient('sourcekit-lsp', 'SourceKit Language Server', serverOptions, clientOptions);
 
-    activateInlayHints(context, client);
     context.subscriptions.push(client.start());
 
     console.log('SourceKit-LSP is now active!');
+
+    await client.onReady();
+    activateInlayHints(context, client);
 }
 
 export function deactivate() {

Editors/vscode/src/inlayHints.ts

@@ -139,7 +139,19 @@ class HintsUpdater implements vscode.Disposable {
   }
 
   private syncCacheAndRenderHints(): void {
-
+    this.sourceFiles.forEach(async (file, uri) => {
+      const hints = await this.fetchHints(file);
+      if (!hints) return;
+
+      const decorations = this.hintsToDecorations(hints);
+      file.cachedDecorations = decorations;
+
+      this.visibleSourceKitLSPEditors.forEach(editor => {
+        if (editor.document.uri.toString() === uri) {
+          this.renderDecorations(editor, decorations);
+        }
+      });
+    });
   }
 
   private get visibleSourceKitLSPEditors(): vscode.TextEditor[] {
@@ -175,6 +187,7 @@ class HintsUpdater implements vscode.Disposable {
     try {
       return await this.client.sendRequest(inlayHintsRequest, params, tokenSource.token);
     } catch (e) {
+      this.client.outputChannel.appendLine(`Could not fetch inlay hints: ${e}`);
       return [];
     } finally {
       if (file.inFlightInlayHints.token === tokenSource.token) {