Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2024-12-27 21:43:37 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix: when running the "discoverProjectCommand", use the Rust file's

Browse source 
parent directory instead of the workspace folder.
This commit is contained in:
David Barsky 2023-04-08 11:22:22 -04:00
parent 51d5862caf
commit b99c129b74
2 changed files with 15 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
editors/code/src/commands.ts
View file

@ -761,12 +761,13 @@ export function addProject(ctx: CtxInit): Cmd {
} }
const workspaces: JsonProject[] = await Promise.all( const workspaces: JsonProject[] = await Promise.all(
vscode.workspace.workspaceFolders!.map(async (folder): Promise<JsonProject> => { vscode.workspace.textDocuments
const rustDocuments = vscode.workspace.textDocuments.filter(isRustDocument); .filter(isRustDocument)
return discoverWorkspace(rustDocuments, discoverProjectCommand, { .map(async (file): Promise<JsonProject> => {
cwd: folder.uri.fsPath, return discoverWorkspace([file], discoverProjectCommand, {
}); cwd: path.dirname(file.uri.fsPath),
}) });
})
); );
ctx.addToDiscoveredWorkspaces(workspaces); ctx.addToDiscoveredWorkspaces(workspaces);

14
editors/code/src/ctx.ts
View file

@ -1,6 +1,7 @@
import * as vscode from "vscode"; import * as vscode from "vscode";
import * as lc from "vscode-languageclient/node"; import * as lc from "vscode-languageclient/node";
import * as ra from "./lsp_ext"; import * as ra from "./lsp_ext";
import * as path from "path";
import { Config, prepareVSCodeConfig } from "./config"; import { Config, prepareVSCodeConfig } from "./config";
import { createClient } from "./client"; import { createClient } from "./client";
@ -192,12 +193,13 @@ export class Ctx {
const discoverProjectCommand = this.config.discoverProjectCommand; const discoverProjectCommand = this.config.discoverProjectCommand;
if (discoverProjectCommand) { if (discoverProjectCommand) {
const workspaces: JsonProject[] = await Promise.all( const workspaces: JsonProject[] = await Promise.all(
vscode.workspace.workspaceFolders!.map(async (folder): Promise<JsonProject> => { vscode.workspace.textDocuments
const rustDocuments = vscode.workspace.textDocuments.filter(isRustDocument); .filter(isRustDocument)
return discoverWorkspace(rustDocuments, discoverProjectCommand, { .map(async (file): Promise<JsonProject> => {
cwd: folder.uri.fsPath, return discoverWorkspace([file], discoverProjectCommand, {
}); cwd: path.dirname(file.uri.fsPath),
}) });
})
); );
this.addToDiscoveredWorkspaces(workspaces); this.addToDiscoveredWorkspaces(workspaces);