Skip to content

Commit 8e0d776

Browse files
committed
editor/vscode: lint
1 parent 125e419 commit 8e0d776

File tree

1 file changed

+21
-21
lines changed

1 file changed

+21
-21
lines changed

editors/code/src/main.ts

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -192,13 +192,13 @@ async function bootstrapServer(config: Config, state: PersistentState): Promise<
192192
async function patchelf(dest: PathLike): Promise<void> {
193193
await vscode.window.withProgress(
194194
{
195-
location: vscode.ProgressLocation.Notification,
195+
location: vscode.ProgressLocation.Notification,
196196
title: "Patching rust-analysis for NixOS"
197-
},
197+
},
198198
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, `
202202
{src, pkgs ? import <nixpkgs> {}}:
203203
pkgs.stdenv.mkDerivation {
204204
name = "rust-analyzer";
@@ -210,23 +210,23 @@ async function patchelf(dest: PathLike): Promise<void> {
210210
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out
211211
'';
212212
}
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 });
217217
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);
228228
}
229-
)
229+
);
230230
}
231231

232232
async function getServer(config: Config, state: PersistentState): Promise<string | undefined> {
@@ -281,7 +281,7 @@ async function getServer(config: Config, state: PersistentState): Promise<string
281281

282282
// Patching executable if that's NixOS.
283283
if (fs.stat("/etc/nixos").then(_ => true).catch(_ => false)) {
284-
await patchelf(dest)
284+
await patchelf(dest);
285285
}
286286

287287
await state.updateServerVersion(config.package.version);

0 commit comments

Comments
 (0)