Merge #267

267: Fix the extend keybinding r=DJMcNab a=DJMcNab

Make the extend selection keybinding less annoying for users not used to Injelli-J (myself included). Also fixes a minor style issue and runs `npm update`.

Co-authored-by: DJMcNab <[email protected]>

2 files changed, 2 insertions, 8 deletions

diff --git a/crates/tools/src/lib.rs b/crates/tools/src/lib.rs
index c2123db99..674b9d11f 100644
--- a/crates/tools/src/lib.rs
+++ b/crates/tools/src/lib.rs
@@ -112,10 +112,7 @@ pub fn run_rustfmt(mode: Mode) -> Result<()> {
 fn install_rustfmt() -> Result<()> {
     run(&format!("rustup install {}", TOOLCHAIN), ".")?;
     run(
-        &format!(
-            "rustup component add rustfmt-preview --toolchain {}",
-            TOOLCHAIN
-        ),
+        &format!("rustup component add rustfmt --toolchain {}", TOOLCHAIN),
         ".",
     )
 }
diff --git a/crates/tools/src/main.rs b/crates/tools/src/main.rs
index d2a6aa94f..36a7c83e2 100644
--- a/crates/tools/src/main.rs
+++ b/crates/tools/src/main.rs
@@ -127,10 +127,7 @@ fn install_code_extension() -> Result<()> {
     } else {
         run(r"npm install", "./editors/code")?;
     }
-    run(
-        r"node ./node_modules/vsce/out/vsce package",
-        "./editors/code",
-    )?;
+    run(r"npm run package", "./editors/code")?;
     if cfg!(windows) {
         run(
             r"cmd.exe /c code.cmd --install-extension ./ra-lsp-0.0.1.vsix",