@@ -192,13 +192,13 @@ async function bootstrapServer(config: Config, state: PersistentState): Promise<
192
192
async function patchelf ( dest : PathLike ) : Promise < void > {
193
193
await vscode . window . withProgress (
194
194
{
195
- location : vscode . ProgressLocation . Notification ,
195
+ location : vscode . ProgressLocation . Notification ,
196
196
title : "Patching rust-analysis for NixOS"
197
- } ,
197
+ } ,
198
198
async ( progress , _ ) => {
199
- let patch_path = path . join ( os . tmpdir ( ) , "patch-ra.nix" )
200
- progress . report ( { message : "Writing nix file" , increment : 5 } )
201
- await fs . writeFile ( patch_path , `
199
+ const patchPath = path . join ( os . tmpdir ( ) , "patch-ra.nix" ) ;
200
+ progress . report ( { message : "Writing nix file" , increment : 5 } ) ;
201
+ await fs . writeFile ( patchPath , `
202
202
{src, pkgs ? import <nixpkgs> {}}:
203
203
pkgs.stdenv.mkDerivation {
204
204
name = "rust-analyzer";
@@ -210,23 +210,23 @@ async function patchelf(dest: PathLike): Promise<void> {
210
210
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out
211
211
'';
212
212
}
213
- ` )
214
- let orig_file = dest + "-orig"
215
- await fs . rename ( dest , orig_file )
216
- progress . report ( { message : "Patching executable" , increment : 20 } )
213
+ ` ) ;
214
+ const origFile = dest + "-orig" ;
215
+ await fs . rename ( dest , origFile ) ;
216
+ progress . report ( { message : "Patching executable" , increment : 20 } ) ;
217
217
await new Promise ( ( resolve , reject ) => {
218
- exec ( `nix-build ${ patch_path } --arg src '${ orig_file } ' -o ${ dest } ` ,
219
- ( err , stdout , stderr ) => {
220
- if ( err != null ) {
221
- reject ( Error ( stderr ) )
222
- } else {
223
- resolve ( stdout )
224
- }
225
- } )
226
- } )
227
- await fs . unlink ( orig_file )
218
+ exec ( `nix-build ${ patchPath } --arg src '${ origFile } ' -o ${ dest } ` ,
219
+ ( err , stdout , stderr ) => {
220
+ if ( err != null ) {
221
+ reject ( Error ( stderr ) ) ;
222
+ } else {
223
+ resolve ( stdout ) ;
224
+ }
225
+ } ) ;
226
+ } ) ;
227
+ await fs . unlink ( origFile ) ;
228
228
}
229
- )
229
+ ) ;
230
230
}
231
231
232
232
async function getServer ( config : Config , state : PersistentState ) : Promise < string | undefined > {
@@ -281,7 +281,7 @@ async function getServer(config: Config, state: PersistentState): Promise<string
281
281
282
282
// Patching executable if that's NixOS.
283
283
if ( fs . stat ( "/etc/nixos" ) . then ( _ => true ) . catch ( _ => false ) ) {
284
- await patchelf ( dest )
284
+ await patchelf ( dest ) ;
285
285
}
286
286
287
287
await state . updateServerVersion ( config . package . version ) ;
0 commit comments