Replace PeekMacroRequest with a more generic PeekDocumentsRequest

Author: lokesh-tr

src/sourcekit-lsp/LanguageClientManager.ts

@@ -27,7 +27,7 @@ import { DiagnosticsManager } from "../DiagnosticsManager";
 import { LSPLogger, LSPOutputChannel } from "./LSPOutputChannel";
 import { SwiftOutputChannel } from "../ui/SwiftOutputChannel";
 import { promptForDiagnostics } from "../commands/captureDiagnostics";
-import { PeekMacroParams, PeekMacroRequest } from "./lspExtensions";
+import { PeekDocumentsParams, PeekDocumentsRequest } from "./lspExtensions";
 
 interface SourceKitLogMessageParams extends langclient.LogMessageParams {
     logName?: string;
@@ -620,36 +620,32 @@ export class LanguageClientManager {
         this.languageClient = client;
         this.cancellationToken = new vscode.CancellationTokenSource();
 
-        this.languageClient.onRequest(PeekMacroRequest.method, async (params: PeekMacroParams) => {
-            const locations = params.macroExpansion.expansionURIs.map(uri => {
-                const location = new vscode.Location(
-                    vscode.Uri.from({
-                        scheme: "file",
-                        path: new URL(uri).pathname,
-                    }),
-                    new vscode.Position(0, 0)
-                );
-
-                return location;
-            });
-
-            console.log(params.peekLocation);
+        this.languageClient.onRequest(
+            PeekDocumentsRequest.method,
+            async (params: PeekDocumentsParams) => {
+                const locations = params.locations.map(uri => {
+                    const location = new vscode.Location(
+                        vscode.Uri.from({
+                            scheme: "file",
+                            path: new URL(uri).pathname,
+                        }),
+                        new vscode.Position(0, 0)
+                    );
 
-            const peekPosition = new vscode.Position(
-                params.peekLocation.line,
-                params.peekLocation.character
-            );
+                    return location;
+                });
 
-            await vscode.commands.executeCommand(
-                "editor.action.peekLocations",
-                vscode.window.activeTextEditor?.document.uri,
-                peekPosition,
-                locations,
-                "peek"
-            );
+                await vscode.commands.executeCommand(
+                    "editor.action.peekLocations",
+                    params.uri ?? vscode.window.activeTextEditor?.document.uri,
+                    params.position ?? vscode.window.activeTextEditor?.selection.active,
+                    locations,
+                    params.multiple
+                );
 
-            return { success: true };
-        });
+                return { success: true };
+            }
+        );
 
         return this.clientReadyPromise;
     }

src/sourcekit-lsp/lspExtensions.ts

@@ -18,25 +18,22 @@ import { Position, Uri } from "vscode";
 
 // Definitions for non-standard requests used by sourcekit-lsp
 
-export interface PeekMacroParams {
-    macroExpansion: MacroExpansion;
-    peekLocation: Position;
+export interface PeekDocumentsParams {
+    uri?: Uri;
+    position?: Position;
+    locations: Uri[];
+    multiple: string;
 }
 
-interface MacroExpansion {
-    expansionURIs: Uri[];
-}
-
-export interface PeekMacroResult {
+export interface PeekDocumentsResult {
     success: boolean;
-    failureReason?: string;
 }
 
-export const PeekMacroRequest = new langclient.RequestType<
-    PeekMacroParams,
-    PeekMacroResult,
+export const PeekDocumentsRequest = new langclient.RequestType<
+    PeekDocumentsParams,
+    PeekDocumentsResult,
     unknown
->("sourcekit-lsp/peekMacro");
+>("sourcekit-lsp/peekDocuments");
 
 // Inlay Hints (pre Swift 5.6)
 export interface LegacyInlayHintsParams {