Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2024-11-15 01:17:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #14482 - Veykril:vscode-linking-popup, r=Veykril

Browse source 
fix: Fix relative path creation using the wrong path accessor

This should hopefully fix the other errors with paths people seem to be getting
This commit is contained in:
bors 2023-04-04 06:21:34 +00:00
commit e871540171
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -142,23 +142,27 @@ export async function createClient(
);
void vscode.workspace.fs.stat(path).then(async () => {
const choice = await vscode.window.showInformationMessage(
`This rust file does not belong to a loaded cargo project. It looks like it might belong to the workspace at ${path}, do you want to add it to the linked Projects?`,
`This rust file does not belong to a loaded cargo project. It looks like it might belong to the workspace at ${path.path}, do you want to add it to the linked Projects?`,
"Yes",
"No",
"Don't show this again"
);
switch (choice) {
case undefined:
break;
case "No":
break;
case "Yes":
const pathToInsert =
"." +
parent.substring(folder.length) +
pathSeparator +
"Cargo.toml";
await config.update(
"linkedProjects",
config
.get<any[]>("linkedProjects")
?.concat(
"." +
path.fsPath.substring(folder.length)
),
?.concat(pathToInsert),
false
);
break;