import * as vscode from 'vscode';
import * as lc from 'vscode-languageclient';
+import * as ra from './rust-analyzer-api';
import { Ctx } from './ctx';
-export interface SourceChange {
- label: string;
- workspaceEdit: lc.WorkspaceEdit;
- cursorPosition?: lc.TextDocumentPositionParams;
-}
-
-export async function applySourceChange(ctx: Ctx, change: SourceChange) {
+export async function applySourceChange(ctx: Ctx, change: ra.SourceChange) {
const client = ctx.client;
if (!client) return;
toReveal.position,
);
const editor = vscode.window.activeTextEditor;
- if (!editor || editor.document.uri.toString() !== uri.toString()) {
+ if (!editor || !editor.selection.isEmpty) {
return;
}
- if (!editor.selection.isEmpty) {
- return;
+
+ if (editor.document.uri !== uri) {
+ const doc = await vscode.workspace.openTextDocument(uri);
+ await vscode.window.showTextDocument(doc);
}
editor.selection = new vscode.Selection(position, position);
editor.revealRange(