From bd7aa5db149012c54aea228839e44aa8d1b53a15 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Wed, 8 Jan 2020 17:21:18 +0100 Subject: [PATCH] Rename VS Code extension to rust-analyzer --- docs/user/README.md | 6 +++--- editors/code/.vscodeignore | 1 + editors/code/icon.png | Bin 0 -> 17918 bytes editors/code/package-lock.json | 4 ++-- editors/code/package.json | 7 ++++--- xtask/src/install.rs | 33 ++++++++++++++++++++++++--------- 6 files changed, 34 insertions(+), 17 deletions(-) create mode 100644 editors/code/icon.png diff --git a/docs/user/README.md b/docs/user/README.md index fa202f06cccd..d17108788b32 100644 --- a/docs/user/README.md +++ b/docs/user/README.md @@ -44,7 +44,7 @@ $ cargo xtask install The automatic installation is expected to *just work* for common cases, if it doesn't, report bugs! -**Note** [#1831](https://github.com/rust-analyzer/rust-analyzer/issues/1831): If you are using the popular +**Note** [#1831](https://github.com/rust-analyzer/rust-analyzer/issues/1831): If you are using the popular [Vim emulation plugin](https://github.com/VSCodeVim/Vim), you will likely need to turn off the `rust-analyzer.enableEnhancedTyping` setting. @@ -58,7 +58,7 @@ $ cargo install --path ./crates/ra_lsp_server/ --force --locked $ cd ./editors/code $ npm install $ ./node_modules/vsce/out/vsce package -$ code --install-extension ./ra-lsp-0.0.1.vsix +$ code --install-extension ./rust-analyzer-0.1.0.vsix ``` It's better to remove existing Rust plugins to avoid interference. @@ -83,7 +83,7 @@ manually install the `.vsix` package: 3. Open the Extensions View (`View > Extensions`, keyboard shortcut: `Ctrl+Shift+X`). 4. From the top-right kebab menu (`ยทยทยท`) select `Install from VSIX...` 5. Inside the `rust-analyzer` directory find the `editors/code` subdirectory and choose - the `ra-lsp-0.0.1.vsix` file. + the `rust-analyzer-0.1.0.vsix` file. 6. Restart Visual Studio Code and re-establish the connection to the remote host. In case of errors please make sure that `~/.cargo/bin` is in your `PATH` on the remote diff --git a/editors/code/.vscodeignore b/editors/code/.vscodeignore index 9bcd28e6122e..3d1156d3bee9 100644 --- a/editors/code/.vscodeignore +++ b/editors/code/.vscodeignore @@ -2,3 +2,4 @@ !out/main.js !package.json !package-lock.json +!icon.png diff --git a/editors/code/icon.png b/editors/code/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..992aee4bd56544c29484dfe35875eb2af612ac03 GIT binary patch literal 17918 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 FO#sF4!R7z} literal 0 HcmV?d00001 diff --git a/editors/code/package-lock.json b/editors/code/package-lock.json index adb01760a1e0..3059323aa881 100644 --- a/editors/code/package-lock.json +++ b/editors/code/package-lock.json @@ -1,6 +1,6 @@ { - "name": "ra-lsp", - "version": "0.0.1", + "name": "rust-analyzer", + "version": "0.1.0", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/editors/code/package.json b/editors/code/package.json index e7fc314f3b5c..7c22d21d35d5 100644 --- a/editors/code/package.json +++ b/editors/code/package.json @@ -1,10 +1,11 @@ { - "name": "ra-lsp", - "displayName": "ra-lsp", + "name": "rust-analyzer", + "displayName": "rust-analyzer", "description": "An alternative rust language server to the RLS", "preview": true, "private": true, - "version": "0.0.1", + "icon": "icon.png", + "version": "0.1.0", "publisher": "matklad", "repository": { "url": "https://github.com/matklad/rust-analyzer/" diff --git a/xtask/src/install.rs b/xtask/src/install.rs index fa82633de152..bffd91af1728 100644 --- a/xtask/src/install.rs +++ b/xtask/src/install.rs @@ -107,29 +107,44 @@ fn install_client(ClientOpt::VsCode: ClientOpt) -> Result<()> { }; Cmd { - unix: &format!(r"{} --install-extension ./ra-lsp-0.0.1.vsix --force", code_binary), + unix: &format!(r"{} --install-extension ./rust-analyzer-0.1.0.vsix --force", code_binary), windows: &format!( - r"cmd.exe /c {}.cmd --install-extension ./ra-lsp-0.0.1.vsix --force", + r"cmd.exe /c {}.cmd --install-extension ./rust-analyzer-0.1.0.vsix --force", code_binary ), work_dir: "./editors/code", } .run()?; - let output = Cmd { - unix: &format!(r"{} --list-extensions", code_binary), - windows: &format!(r"cmd.exe /c {}.cmd --list-extensions", code_binary), - work_dir: ".", - } - .run_with_output()?; + let installed_extensions = { + let output = Cmd { + unix: &format!(r"{} --list-extensions", code_binary), + windows: &format!(r"cmd.exe /c {}.cmd --list-extensions", code_binary), + work_dir: ".", + } + .run_with_output()?; + String::from_utf8(output.stdout)? + }; - if !str::from_utf8(&output.stdout)?.contains("ra-lsp") { + if !installed_extensions.contains("rust-analyzer") { anyhow::bail!( "Could not install the Visual Studio Code extension. \ Please make sure you have at least NodeJS 10.x together with the latest version of VS Code installed and try again." ); } + if installed_extensions.contains("ra-lsp") { + Cmd { + unix: &format!(r"{} --uninstall-extension matklad.ra-lsp", code_binary), + windows: &format!( + r"cmd.exe /c {}.cmd --uninstall-extension matklad.ra-lsp", + code_binary + ), + work_dir: "./editors/code", + } + .run()?; + } + Ok(()) }