Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2024-12-26 13:03:31 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix: allow for binaries from $PATH to pass validity check

Browse source
This commit is contained in:
Veetaha 2020-07-06 13:39:08 +03:00
parent 46163acf62
commit ef223b9e64
1 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
editors/code/src/util.ts
View file

@ -1,5 +1,4 @@
import * as lc from "vscode-languageclient"; import * as lc from "vscode-languageclient";
import * as fs from "fs";
import * as vscode from "vscode"; import * as vscode from "vscode";
import { strict as nativeAssert } from "assert"; import { strict as nativeAssert } from "assert";
import { spawnSync } from "child_process"; import { spawnSync } from "child_process";
@ -114,15 +113,12 @@ export function isRustEditor(editor: vscode.TextEditor): editor is RustEditor {
export function isValidExecutable(path: string): boolean { export function isValidExecutable(path: string): boolean {
log.debug("Checking availability of a binary at", path); log.debug("Checking availability of a binary at", path);
if (!fs.existsSync(path)) return false;
const res = spawnSync(path, ["--version"], { encoding: 'utf8' }); const res = spawnSync(path, ["--version"], { encoding: 'utf8' });
const isSuccess = res.status === 0; const printOutput = res.error && (res.error as any).code !== 'ENOENT' ? log.warn : log.debug;
const printOutput = isSuccess ? log.debug : log.warn;
printOutput(path, "--version:", res); printOutput(path, "--version:", res);
return isSuccess; return res.status === 0;
} }
/** Sets ['when'](https://code.visualstudio.com/docs/getstarted/keybindings#_when-clause-contexts) clause contexts */ /** Sets ['when'](https://code.visualstudio.com/docs/getstarted/keybindings#_when-clause-contexts) clause contexts */