Merge #8

8: Add std and inlay hints r=matklad a=HKalbasi I actually done this as an experiment for adding [RA to playground](rust-lang/rust-playground#357) but I think this demo can also take advantage of this PR and by merging it, future people don't need to repeat my work. Fix #7 This satisfies me, but it is not great. Specially it is slower than RA on vscode, and I don't know why it should be that slow. Suggestions on this (and other problems) are welcome. Co-authored-by: hamidreza kalbasi <[email protected]> Co-authored-by: HKalbasi <[email protected]>
rust-analyzer · Sep 14, 2021 · 36f60de · 36f60de
2 parents 3cb4342 + f75e1ab
commit 36f60de
Show file tree

Hide file tree

Showing 23 changed files with 715 additions and 198 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -36,7 +36,11 @@ jobs:
         node-version: '15'
 
     - name: Build wasm
-      run: wasm-pack build --target web
+      run: |
+        cd rust-pack
+        cargo run
+        cd ../ra-wasm
+        wasm-pack build --target web
 
     - name: Install www
       uses: borales/[email protected]

diff --git a/.github/workflows/netlify.yaml b/.github/workflows/netlify.yaml
@@ -35,7 +35,11 @@ jobs:
         node-version: '15'
 
     - name: Build wasm
-      run: wasm-pack build --target web
+      run: |
+        cd rust-pack
+        cargo run
+        cd ../ra-wasm
+        wasm-pack build --target web
 
     - name: Install www
       uses: borales/[email protected]

diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,6 @@
 /.bundle
 /vendor
-/target
+target
 /_site
 .sass-cache
 .jekyll-cache

diff --git a/README.md b/README.md
@@ -3,8 +3,11 @@
 To run:
 
 ```shell
+$ cd rust-pack
+$ cargo run
+$ cd ../ra-wasm
 $ wasm-pack build --target web
-$ cd www
+$ cd ../www
 $ yarn
 $ yarn start
 ```
diff --git a/.cargo/config → ra-wasm/.cargo/config b/.cargo/config → ra-wasm/.cargo/config
diff --git a/Cargo.lock → ra-wasm/Cargo.lock b/Cargo.lock → ra-wasm/Cargo.lock
diff --git a/Cargo.toml → ra-wasm/Cargo.toml b/Cargo.toml → ra-wasm/Cargo.toml
@@ -7,11 +7,8 @@ edition = "2018"
 [lib]
 crate-type = ["cdylib"]
 
-[features]
-dev = ["console_error_panic_hook"]
-
 [dependencies]
-console_error_panic_hook = { version = "0.1.6", optional = true }
+console_error_panic_hook = { version = "0.1.6" }
 instant = { version = "0.1", features = ["wasm-bindgen"] }
 log = { version = "0.4.14", features = ["release_max_level_warn"] }
 serde = { version = "1.0.125", features = ["derive"] }
@@ -22,4 +19,5 @@ wasm-bindgen = "0.2.72"
 wasm-bindgen-rayon = "1.0.2"
 
 ide = { version = "0.0.44", package = "ra_ap_ide" }
+cfg = { version = "0.0.44", package = "ra_ap_cfg" }
 ide_db = { version = "0.0.44", package = "ra_ap_ide_db" }