@@ -72,19 +72,19 @@ export async function ensureLanguageServerBinary(
72
72
return langServerSource . path ;
73
73
}
74
74
vscode . window . showErrorMessage (
75
- `Unable to execute ${ '`' } ${ langServerSource . path } --version ${ '`' } . ` +
76
- "To use the bundled language server, set `rust-analyzer.raLspServerPath` " +
75
+ `Unable to run ${ langServerSource . path } binary . ` +
76
+ "To use the pre-built language server, set `rust-analyzer.raLspServerPath` " +
77
77
"value to `null` or remove it from the settings to use it by default."
78
78
) ;
79
79
return null ;
80
80
}
81
81
case BinarySource . Type . GithubRelease : {
82
- const bundledBinaryPath = path . join ( langServerSource . dir , langServerSource . file ) ;
82
+ const prebuiltBinaryPath = path . join ( langServerSource . dir , langServerSource . file ) ;
83
83
84
- if ( ! isBinaryAvailable ( bundledBinaryPath ) ) {
84
+ if ( ! isBinaryAvailable ( prebuiltBinaryPath ) ) {
85
85
const userResponse = await vscode . window . showInformationMessage (
86
- ` Language server binary for rust-analyzer was not found. ` +
87
- ` Do you want to download it now?` ,
86
+ " Language server binary for rust-analyzer was not found. " +
87
+ " Do you want to download it now?" ,
88
88
"Download now" , "Cancel"
89
89
) ;
90
90
if ( userResponse !== "Download now" ) return null ;
@@ -101,15 +101,15 @@ export async function ensureLanguageServerBinary(
101
101
102
102
103
103
assert (
104
- isBinaryAvailable ( bundledBinaryPath ) ,
104
+ isBinaryAvailable ( prebuiltBinaryPath ) ,
105
105
"Downloaded language server binary is not functional"
106
106
) ;
107
107
108
108
vscode . window . showInformationMessage (
109
109
"Rust analyzer language server was successfully installed 🦀"
110
110
) ;
111
111
}
112
- return bundledBinaryPath ;
112
+ return prebuiltBinaryPath ;
113
113
}
114
114
}
115
115
0 commit comments