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 fa202f06ccc..d17108788b3 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 9bcd28e6122..3d1156d3bee 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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 E0LAdZ<^TWy literal 0 HcmV?d00001 diff --git a/editors/code/package-lock.json b/editors/code/package-lock.json index adb01760a1e..3059323aa88 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 e7fc314f3b5..7c22d21d35d 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 fa82633de15..bffd91af172 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(()) }