From 0dc60e10acfb1e82dfeb9ab98dc6eabf70a74530 Mon Sep 17 00:00:00 2001
From: Hirokazu Hata <h.hata.ai.t@gmail.com>
Date: Thu, 24 Jan 2019 03:23:15 +0900
Subject: Use npm ci instead of install

---
 crates/tools/src/main.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/crates/tools/src/main.rs b/crates/tools/src/main.rs
index 5597aae5a..d6eabce6c 100644
--- a/crates/tools/src/main.rs
+++ b/crates/tools/src/main.rs
@@ -150,10 +150,10 @@ fn existing_tests(dir: &Path, ok: bool) -> Result<HashMap<String, (PathBuf, Test
 fn install_code_extension() -> Result<()> {
     run("cargo install --path crates/ra_lsp_server --force", ".")?;
     if cfg!(windows) {
-        run(r"cmd.exe /c npm.cmd install", "./editors/code")?;
+        run(r"cmd.exe /c npm.cmd ci", "./editors/code")?;
         run(r"cmd.exe /c npm.cmd run package", "./editors/code")?;
     } else {
-        run(r"npm install", "./editors/code")?;
+        run(r"npm ci", "./editors/code")?;
         run(r"npm run package", "./editors/code")?;
     }
     if cfg!(windows) {
-- 
cgit v1.2.3


From 7bd38fb927013e47015abb2e0fd5c2df7261019c Mon Sep 17 00:00:00 2001
From: Hirokazu Hata <h.hata.ai.t@gmail.com>
Date: Thu, 24 Jan 2019 03:41:23 +0900
Subject: Add install-lsp subcommand

---
 .cargo/config | 4 +++-
 README.md     | 2 ++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/.cargo/config b/.cargo/config
index b9db30c96..3fba0f71d 100644
--- a/.cargo/config
+++ b/.cargo/config
@@ -1,8 +1,10 @@
 [alias]
 # Automatically generates the ast and syntax kinds files
 gen-syntax   = "run --package tools --bin tools -- gen-syntax"
-# Extracts the tests from 
+# Extracts the tests from
 gen-tests    = "run --package tools --bin tools -- gen-tests"
+# Installs ra_lsp_server
+install-lsp = "install --path crates/ra_lsp_server --force"
 # Installs the visual studio code extension
 install-code = "run --package tools --bin tools -- install-code"
 # Formats the full repository or installs the git hook to do it automatically.
diff --git a/README.md b/README.md
index 8d4e32704..74f281ccb 100644
--- a/README.md
+++ b/README.md
@@ -29,6 +29,8 @@ $ cargo run --package ra_cli parse < crates/ra_syntax/src/lib.rs
 $ cargo run --package ra_cli symbols < crates/ra_syntax/src/lib.rs
 
 # install the language server
+$ cargo install-lsp
+or
 $ cargo install --path crates/ra_lsp_server
 ```
 
-- 
cgit v1.2.3