language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-30 22:01:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge #6766

Browse source 
6766: Add client install support for `code-exploration` builds. r=lnicola a=derdaele

VSCode has a feature to install the command to the PATH. 
<img width="640" alt="Capture d’écran 2020-12-08 à 19 25 43" src="https://user-images.githubusercontent.com/16373039/101525141-2e013300-398b-11eb-8d07-60a92ae9587c.png">

`code-exploration` is the command name for the ARM64 experimental build. As of today, this is the only build running natively on Apple Silicon.

See _ARM64_ Experimental in https://code.visualstudio.com/insiders/#osx.

The `-exploration` prefix seems pretty undocumented, my understanding of it is that it is an insider-like version that uses a different electron version (in this case, maybe the election version that was recently ported to Apple Silicon?).

Co-authored-by: Jérémy <jeremy.derdaele@gmail.com>
This commit is contained in:
bors[bot] 2020-12-08 18:53:58 +00:00 • committed by GitHub
commit 9145b973c9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
xtask/src/install.rs
View file

@ -16,6 +16,7 @@ pub struct InstallCmd {
#[derive(Clone, Copy)] #[derive(Clone, Copy)]
pub enum ClientOpt { pub enum ClientOpt {
VsCode, VsCode,
VsCodeExploration,
VsCodeInsiders, VsCodeInsiders,
VsCodium, VsCodium,
VsCodeOss, VsCodeOss,
@ -26,10 +27,11 @@ impl ClientOpt {
pub const fn as_cmds(&self) -> &'static [&'static str] { pub const fn as_cmds(&self) -> &'static [&'static str] {
match self { match self {
ClientOpt::VsCode => &["code"], ClientOpt::VsCode => &["code"],
ClientOpt::VsCodeExploration => &["code-exploration"],
ClientOpt::VsCodeInsiders => &["code-insiders"], ClientOpt::VsCodeInsiders => &["code-insiders"],
ClientOpt::VsCodium => &["codium"], ClientOpt::VsCodium => &["codium"],
ClientOpt::VsCodeOss => &["code-oss"], ClientOpt::VsCodeOss => &["code-oss"],
ClientOpt::Any => &["code", "code-insiders", "codium", "code-oss"], ClientOpt::Any => &["code", "code-exploration", "code-insiders", "codium", "code-oss"],
} }
} }
} }
@ -44,7 +46,13 @@ impl std::str::FromStr for ClientOpt {
type Err = anyhow::Error; type Err = anyhow::Error;
fn from_str(s: &str) -> Result<Self, Self::Err> { fn from_str(s: &str) -> Result<Self, Self::Err> {
[ClientOpt::VsCode, ClientOpt::VsCodeInsiders, ClientOpt::VsCodium, ClientOpt::VsCodeOss] [
ClientOpt::VsCode,
ClientOpt::VsCodeExploration,
ClientOpt::VsCodeInsiders,
ClientOpt::VsCodium,
ClientOpt::VsCodeOss,
]
.iter() .iter()
.copied() .copied()
.find(|c| [s] == c.as_cmds()) .find(|c| [s] == c.as_cmds())