aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.cargo/config4
-rw-r--r--README.md2
-rw-r--r--crates/tools/src/main.rs4
3 files changed, 7 insertions, 3 deletions
diff --git a/.cargo/config b/.cargo/config
index b9db30c96..3fba0f71d 100644
--- a/.cargo/config
+++ b/.cargo/config
@@ -1,8 +1,10 @@
1[alias] 1[alias]
2# Automatically generates the ast and syntax kinds files 2# Automatically generates the ast and syntax kinds files
3gen-syntax = "run --package tools --bin tools -- gen-syntax" 3gen-syntax = "run --package tools --bin tools -- gen-syntax"
4# Extracts the tests from 4# Extracts the tests from
5gen-tests = "run --package tools --bin tools -- gen-tests" 5gen-tests = "run --package tools --bin tools -- gen-tests"
6# Installs ra_lsp_server
7install-lsp = "install --path crates/ra_lsp_server --force"
6# Installs the visual studio code extension 8# Installs the visual studio code extension
7install-code = "run --package tools --bin tools -- install-code" 9install-code = "run --package tools --bin tools -- install-code"
8# Formats the full repository or installs the git hook to do it automatically. 10# 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
29$ cargo run --package ra_cli symbols < crates/ra_syntax/src/lib.rs 29$ cargo run --package ra_cli symbols < crates/ra_syntax/src/lib.rs
30 30
31# install the language server 31# install the language server
32$ cargo install-lsp
33or
32$ cargo install --path crates/ra_lsp_server 34$ cargo install --path crates/ra_lsp_server
33``` 35```
34 36
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
150fn install_code_extension() -> Result<()> { 150fn install_code_extension() -> Result<()> {
151 run("cargo install --path crates/ra_lsp_server --force", ".")?; 151 run("cargo install --path crates/ra_lsp_server --force", ".")?;
152 if cfg!(windows) { 152 if cfg!(windows) {
153 run(r"cmd.exe /c npm.cmd install", "./editors/code")?; 153 run(r"cmd.exe /c npm.cmd ci", "./editors/code")?;
154 run(r"cmd.exe /c npm.cmd run package", "./editors/code")?; 154 run(r"cmd.exe /c npm.cmd run package", "./editors/code")?;
155 } else { 155 } else {
156 run(r"npm install", "./editors/code")?; 156 run(r"npm ci", "./editors/code")?;
157 run(r"npm run package", "./editors/code")?; 157 run(r"npm run package", "./editors/code")?;
158 } 158 }
159 if cfg!(windows) { 159 if cfg!(windows) {