582 files changed, 2248 insertions, 2102 deletions
diff --git a/.cargo/config b/.cargo/config
index 3ac2ce336..92a3acfd0 100644
--- a/.cargo/config
+++ b/.cargo/config
@@ -1,23 +1,23 @@
 [alias]
 # Automatically generates the ast and syntax kinds files
 gen-syntax   = "run --package ra_tools --bin ra_tools -- gen-syntax"
 # Extracts the tests from
 gen-tests    = "run --package ra_tools --bin ra_tools -- gen-tests"
-# Installs ra_lsp_server
-install-lsp = "install --path crates/ra_lsp_server --force"
-# Installs ra_lsp_server with the jemalloc feature
-jinstall-lsp = "install --path crates/ra_lsp_server --force --features jemalloc"
 # Installs the visual studio code extension
-install-code = "run --package ra_tools --bin ra_tools -- install-code"
+install-ra   = "run --package ra_tools --bin ra_tools -- install-ra"
+install-code = "run --package ra_tools --bin ra_tools -- install-ra" # just an alias
 # Formats the full repository or installs the git hook to do it automatically.
 format       = "run --package ra_tools --bin ra_tools -- format"
 format-hook  = "run --package ra_tools --bin ra_tools -- format-hook"
 # Run clippy
 lint         = "run --package ra_tools --bin ra_tools -- lint"
 # Runs the fuzzing test suite (currently only parser)
 fuzz-tests   = "run --package ra_tools --bin ra_tools -- fuzz-tests"
-render-test  = "run --package ra_cli -- render-test"
 # Parse a file. This should be piped the file contents
 parse        = "run --package ra_cli -- parse"
diff --git a/.travis.yml b/.travis.yml
index e151cc8f0..87b546442 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,9 +1,7 @@
 cache: cargo
 before_cache:
-    # ask Cargo to clean up artifacts for workspace crates
+    - find ./target/debug -maxdepth 1 -type f -delete
-    - cargo clean $(printf -- '--package %s ' $(cd crates; ls))
+    - rm -fr ./target/debug/{deps,.fingerprint}/{*ra_*,*heavy_test*,*gen_lsp*,*thread_worker*}
-    # Cargo doesn't clean up depinfo itself, do it manually
-    - find ./target/debug -maxdepth 2 -iname '*.d' -delete
    - rm -f  ./target/.rustc_info.json
 matrix:
@@ -43,10 +41,9 @@ matrix:
            - xvfb
          before_install: cd editors/code
          install:
-            - npm install
+            - npm ci
            - npm run vscode:prepublish
          script:
-            - npm ci
            - npm run travis
          env:
            - CXX="g++-4.9", CC="gcc-4.9"
diff --git a/Cargo.lock b/Cargo.lock
index 7c7836a13..fd4d876de 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -68,7 +68,7 @@ name = "backtrace-sys"
 version = "0.1.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "cc 1.0.37 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cc 1.0.38 (registry+https://github.com/rust-lang/crates.io-index)",
 "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -150,7 +150,7 @@ dependencies = [
 [[package]]
 name = "cc"
-version = "1.0.37"
+version = "1.0.38"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
@@ -291,11 +291,10 @@ dependencies = [
 [[package]]
 name = "crossbeam-channel"
-version = "0.3.8"
+version = "0.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "crossbeam-utils 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
@@ -303,21 +302,21 @@ name = "crossbeam-deque"
 version = "0.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "crossbeam-epoch 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "crossbeam-epoch 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "crossbeam-utils 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
 name = "crossbeam-epoch"
-version = "0.7.1"
+version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "arrayvec 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)",
 "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
- "crossbeam-utils 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)",
 "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "memoffset 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "memoffset 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "scopeguard 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "scopeguard 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
@@ -325,12 +324,12 @@ name = "crossbeam-queue"
 version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "crossbeam-utils 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
 name = "crossbeam-utils"
-version = "0.6.5"
+version = "0.6.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -353,7 +352,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
 "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 0.15.40 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 0.15.42 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
@@ -443,7 +442,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
 "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 0.15.40 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 0.15.42 (registry+https://github.com/rust-lang/crates.io-index)",
 "synstructure 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -537,7 +536,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 name = "gen_lsp_server"
 version = "0.2.0"
 dependencies = [
- "crossbeam-channel 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "crossbeam-channel 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
 "flexi_logger 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "log 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)",
 "lsp-types 0.59.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -687,7 +686,7 @@ name = "jemalloc-sys"
 version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "cc 1.0.37 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cc 1.0.38 (registry+https://github.com/rust-lang/crates.io-index)",
 "fs_extra 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -804,8 +803,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
 name = "memoffset"
-version = "0.2.1"
+version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
+]
 [[package]]
 name = "mio"
@@ -886,7 +888,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
 "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 0.15.40 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 0.15.42 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
@@ -1006,7 +1008,7 @@ dependencies = [
 "proc-macro-hack 0.5.8 (registry+https://github.com/rust-lang/crates.io-index)",
 "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
 "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 0.15.40 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 0.15.42 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
@@ -1040,7 +1042,7 @@ dependencies = [
 "pest_meta 2.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
 "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 0.15.40 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 0.15.42 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
@@ -1074,7 +1076,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
 "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 0.15.40 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 0.15.42 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
@@ -1239,7 +1241,7 @@ dependencies = [
 name = "ra_lsp_server"
 version = "0.1.0"
 dependencies = [
- "crossbeam-channel 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "crossbeam-channel 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
 "flexi_logger 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "gen_lsp_server 0.2.0",
 "log 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1310,7 +1312,7 @@ dependencies = [
 [[package]]
 name = "ra_rustc_lexer"
-version = "0.1.0-pre.1"
+version = "0.1.0-pre.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1322,9 +1324,9 @@ version = "0.1.0"
 dependencies = [
 "itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "ra_parser 0.1.0",
- "ra_rustc_lexer 0.1.0-pre.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ra_rustc_lexer 0.1.0-pre.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "ra_text_edit 0.1.0",
- "rowan 0.6.0-pre.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rowan 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "smol_str 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
 "test_utils 0.1.0",
 "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1362,7 +1364,7 @@ name = "ra_vfs"
 version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "crossbeam-channel 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "crossbeam-channel 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
 "log 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)",
 "notify 4.0.12 (registry+https://github.com/rust-lang/crates.io-index)",
 "parking_lot 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1396,7 +1398,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "getrandom 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
 "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand_chacha 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand_chacha 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "rand_core 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "rand_hc 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "rand_pcg 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1413,10 +1415,9 @@ dependencies = [
 [[package]]
 name = "rand_chacha"
-version = "0.2.0"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "autocfg 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
 "c2-chacha 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "rand_core 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -1532,7 +1533,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "crossbeam-deque 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)",
 "crossbeam-queue 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "crossbeam-utils 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)",
 "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "num_cpus 1.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -1595,7 +1596,7 @@ dependencies = [
 [[package]]
 name = "rowan"
-version = "0.6.0-pre.1"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1653,7 +1654,7 @@ dependencies = [
 "heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
 "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 0.15.40 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 0.15.42 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
@@ -1666,11 +1667,6 @@ dependencies = [
 [[package]]
 name = "scopeguard"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-[[package]]
-name = "scopeguard"
 version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1703,7 +1699,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
 "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 0.15.40 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 0.15.42 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
@@ -1774,7 +1770,7 @@ name = "stacker"
 version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "cc 1.0.37 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cc 1.0.38 (registry+https://github.com/rust-lang/crates.io-index)",
 "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
 "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)",
 "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1792,7 +1788,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
 name = "syn"
-version = "0.15.40"
+version = "0.15.42"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1807,7 +1803,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
 "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 0.15.40 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 0.15.42 (registry+https://github.com/rust-lang/crates.io-index)",
 "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -1896,7 +1892,7 @@ dependencies = [
 name = "thread_worker"
 version = "0.1.0"
 dependencies = [
- "crossbeam-channel 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "crossbeam-channel 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
 "log 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -2147,7 +2143,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a7c3dd8985a7111efc5c80b44e23ecdd8c007de8ade3b96595387e812b957cf5"
 "checksum c2-chacha 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7d64d04786e0f528460fc884753cf8dddcc466be308f6026f8e355c41a0e4101"
 "checksum cargo_metadata 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "5e904f164f39cae0c3a4f2713eb97a47ba64676a071e99a69ddfef4994694d2c"
-"checksum cc 1.0.37 (registry+https://github.com/rust-lang/crates.io-index)" = "39f75544d7bbaf57560d2168f28fd649ff9c76153874db88bdbdfd839b1a7e7d"
+"checksum cc 1.0.38 (registry+https://github.com/rust-lang/crates.io-index)" = "ce400c638d48ee0e9ab75aef7997609ec57367ccfe1463f21bf53c3eca67bf46"
 "checksum cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "b486ce3ccf7ffd79fdeb678eac06a9e6c09fc88d33836340becb8fffe87c5e33"
 "checksum chalk-engine 0.9.0 (git+https://github.com/rust-lang/chalk.git)" = "<none>"
 "checksum chalk-ir 0.1.0 (git+https://github.com/rust-lang/chalk.git)" = "<none>"
@@ -2161,11 +2157,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f"
 "checksum console 0.7.7 (registry+https://github.com/rust-lang/crates.io-index)" = "8ca57c2c14b8a2bf3105bc9d15574aad80babf6a9c44b1058034cdf8bd169628"
 "checksum cpuprofiler 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "33f07976bb6821459632d7a18d97ccca005cb5c552f251f822c7c1781c1d7035"
-"checksum crossbeam-channel 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)" = "0f0ed1a4de2235cabda8558ff5840bffb97fcb64c97827f354a451307df5f72b"
+"checksum crossbeam-channel 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "c8ec7fcd21571dc78f96cc96243cab8d8f035247c3efd16c687be154c3fa9efa"
 "checksum crossbeam-deque 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)" = "05e44b8cf3e1a625844d1750e1f7820da46044ff6d28f4d43e455ba3e5bb2c13"
-"checksum crossbeam-epoch 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "04c9e3102cc2d69cd681412141b390abd55a362afc1540965dad0ad4d34280b4"
+"checksum crossbeam-epoch 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "fedcd6772e37f3da2a9af9bf12ebe046c0dfe657992377b4df982a2b54cd37a9"
 "checksum crossbeam-queue 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7c979cd6cfe72335896575c6b5688da489e420d36a27a0b9eb0c73db574b4a4b"
-"checksum crossbeam-utils 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)" = "f8306fcef4a7b563b76b7dd949ca48f52bc1141aa067d2ea09565f3e2652aa5c"
+"checksum crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)" = "04973fa96e96579258a5091af6003abde64af786b860f18622b82e026cca60e6"
 "checksum dbghelp-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "97590ba53bcb8ac28279161ca943a924d1fd4a8fb3fa63302591647c4fc5b850"
 "checksum derive-new 0.5.7 (registry+https://github.com/rust-lang/crates.io-index)" = "c3fd04571b29c91cfbe1e7c9a228e069ac8635f180ffb4ccd6a6907617ee8bb0"
 "checksum deunicode 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "850878694b7933ca4c9569d30a34b55031b9b139ee1fc7b94a527c4ef960d690"
@@ -2226,7 +2222,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum maplit 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "08cbb6b4fef96b6d77bfc40ec491b1690c779e77b05cd9f07f787ed376fd4c43"
 "checksum matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08"
 "checksum memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "88579771288728879b57485cc7d6b07d648c9f0141eb955f8ab7f9d45394468e"
-"checksum memoffset 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0f9dc261e2b62d7a622bf416ea3c5245cdd5d9a7fcc428c0d06804dfce1775b3"
+"checksum memoffset 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ce6075db033bbbb7ee5a0bbd3a3186bbae616f57fb001c485c7ff77955f8177f"
 "checksum mio 0.6.19 (registry+https://github.com/rust-lang/crates.io-index)" = "83f51996a3ed004ef184e16818edc51fadffe8e7ca68be67f9dee67d84d0ff23"
 "checksum mio-extras 2.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "46e73a04c2fa6250b8d802134d56d554a9ec2922bf977777c805ea5def61ce40"
 "checksum miow 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "8c1f2f3b1cf331de6896aabf6e9d55dca90356cc9960cca7eaaf408a355ae919"
@@ -2259,12 +2255,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum proptest 0.9.4 (registry+https://github.com/rust-lang/crates.io-index)" = "cf147e022eacf0c8a054ab864914a7602618adba841d800a9a9868a5237a529f"
 "checksum quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9274b940887ce9addde99c4eee6b5c44cc494b182b97e73dc8ffdcb3397fd3f0"
 "checksum quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)" = "6ce23b6b870e8f94f81fb0a363d65d86675884b34a09043c81e5562f11c1f8e1"
-"checksum ra_rustc_lexer 0.1.0-pre.1 (registry+https://github.com/rust-lang/crates.io-index)" = "e8d92772f822978a6c9c4657aa61af439e4e635180628b3354049b283b749f1e"
+"checksum ra_rustc_lexer 0.1.0-pre.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6baccda91574dfadd7f8a0bc8f9f110f874b6b484289b2536d3dbf4f0d5d97bb"
 "checksum ra_vfs 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "fb7cd4e302032c5ab514f1c01c89727cd96fd950dd36f9ebee9252df45d9fb1a"
 "checksum rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)" = "6d71dacdc3c88c1fde3885a3be3fbab9f35724e6ce99467f7d9c5026132184ca"
 "checksum rand 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d47eab0e83d9693d40f825f86948aa16eff6750ead4bdffc4ab95b8b3a7f052c"
 "checksum rand_chacha 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "556d3a1ca6600bfcbab7c7c91ccb085ac7fbbcd70e008a98742e7847f4f7bcef"
-"checksum rand_chacha 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e193067942ef6f485a349a113329140d0ab9e2168ce92274499bb0e9a4190d9d"
+"checksum rand_chacha 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "03a2a90da8c7523f554344f921aa97283eadf6ac484a6d2a7d0212fa7f8d6853"
 "checksum rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b"
 "checksum rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d0e7a549d590831370895ab7ba4ea0c1b6b011d106b5ff2da6eee112615e6dc0"
 "checksum rand_core 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "615e683324e75af5d43d8f7a39ffe3ee4a9dc42c5c701167a71dc59c3a493aca"
@@ -2285,7 +2281,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum relative-path 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0e7790c7f1cc73d831d28dc5a7deb316a006e7848e6a7f467cdb10a0a9e0fb1c"
 "checksum remove_dir_all 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "4a83fa3702a688b9359eccba92d153ac33fd2e8462f9e0e3fdf155239ea7792e"
 "checksum ron 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "17f52a24414403f81528b67488cf8edc4eda977d3af1646bb6b106a600ead78f"
-"checksum rowan 0.6.0-pre.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0eeee40f1a2724b7d0d9fa5f73a7804cd2f4c91b37ba9f785d429f31819d60df"
+"checksum rowan 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a796c0517d6969224c42e9ef01356363b0a7c57d10ec986c9a600d075666a5ff"
 "checksum rustc-demangle 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)" = "a7f4dccf6f4891ebcc0c39f9b6eb1a83b9bf5d747cb439ec6fba4f3b977038af"
 "checksum rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7540fc8b0c49f096ee9c961cda096467dce8084bec6bdca2fc83895fd9b28cb8"
 "checksum rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a"
@@ -2293,7 +2289,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum salsa 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2891cd628406e8a0ca714b827511de1bff76f796e3382cc72a3de732ccad5aea"
 "checksum salsa-macros 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b7f1e25ca2b995bdf032946174929d62156ffd57abd7ff88dc6f9bdeb5ac0c59"
 "checksum same-file 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "585e8ddcedc187886a30fa705c47985c3fa88d06624095856b36ca0b82ff4421"
-"checksum scopeguard 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "94258f53601af11e6a49f722422f6e3425c52b06245a5cf9bc09908b174f5e27"
 "checksum scopeguard 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b42e15e59b18a828bbf5c58ea01debb36b9b096346de35d941dcb89009f24a0d"
 "checksum semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403"
 "checksum semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
@@ -2310,7 +2305,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum stacker 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "fb79482f57cf598af52094ec4cc3b3c42499d3ce5bd426f2ac41515b7e57404b"
 "checksum strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
 "checksum superslice 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ab16ced94dbd8a46c82fd81e3ed9a8727dac2977ea869d217bcc4ea1f122e81f"
-"checksum syn 0.15.40 (registry+https://github.com/rust-lang/crates.io-index)" = "bc945221ccf4a7e8c31222b9d1fc77aefdd6638eb901a6ce457a3dc29d4c31e8"
+"checksum syn 0.15.42 (registry+https://github.com/rust-lang/crates.io-index)" = "eadc09306ca51a40555dd6fc2b415538e9e18bc9f870e47b1a524a79fe2dcf5e"
 "checksum synstructure 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)" = "02353edf96d6e4dc81aea2d8490a7e9db177bf8acb0e951c24940bf866cb313f"
 "checksum tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9"
 "checksum tera 0.11.20 (registry+https://github.com/rust-lang/crates.io-index)" = "4b505279e19d8f7d24b1a9dc58327c9c36174b1a2c7ebdeac70792d017cb64f3"
diff --git a/README.md b/README.md
index eabe004c7..5e9537ef1 100644
--- a/README.md
+++ b/README.md
@@ -32,10 +32,10 @@ For setup for other editors, see [./docs/user](./docs/user).
 $ git clone https://github.com/rust-analyzer/rust-analyzer && cd rust-analyzer
 # install both the language server and VS Code extension
-$ cargo install-code
+$ cargo install-ra
 # alternatively, install only the server. Binary name is `ra_lsp_server`.
-$ cargo install-lsp
+$ cargo install-ra --server
 ```
 ## Documentation
diff --git a/crates/ra_assists/src/assist_ctx.rs b/crates/ra_assists/src/assist_ctx.rs
index a12c3ed54..c45262efa 100644
--- a/crates/ra_assists/src/assist_ctx.rs
+++ b/crates/ra_assists/src/assist_ctx.rs
@@ -129,10 +129,13 @@ pub(crate) struct AssistBuilder {
 }
 impl AssistBuilder {
+    /// Replaces specified `range` of text with a given string.
    pub(crate) fn replace(&mut self, range: TextRange, replace_with: impl Into<String>) {
        self.edit.replace(range, replace_with.into())
    }
+    /// Replaces specified `node` of text with a given string, reindenting the
+    /// string to maintain `node`'s existing indent.
    pub(crate) fn replace_node_and_indent(
        &mut self,
        node: &SyntaxNode,
@@ -145,27 +148,31 @@ impl AssistBuilder {
        self.replace(node.text_range(), replace_with)
    }
-    pub(crate) fn set_edit_builder(&mut self, edit: TextEditBuilder) {
+    /// Remove specified `range` of text.
-        self.edit = edit;
-    }
    #[allow(unused)]
    pub(crate) fn delete(&mut self, range: TextRange) {
        self.edit.delete(range)
    }
+    /// Append specified `text` at the given `offset`
    pub(crate) fn insert(&mut self, offset: TextUnit, text: impl Into<String>) {
        self.edit.insert(offset, text.into())
    }
+    /// Specify desired position of the cursor after the assist is applied.
    pub(crate) fn set_cursor(&mut self, offset: TextUnit) {
        self.cursor_position = Some(offset)
    }
+    /// Specify that the assist should be active withing the `target` range.
+    ///
+    /// Target ranges are used to sort assists: the smaller the target range,
+    /// the more specific assist is, and so it should be sorted first.
    pub(crate) fn target(&mut self, target: TextRange) {
        self.target = Some(target)
    }
+    /// Get access to the raw `TextEditBuilder`.
    pub(crate) fn text_edit_builder(&mut self) -> &mut TextEditBuilder {
        &mut self.edit
    }
diff --git a/crates/ra_assists/src/auto_import.rs b/crates/ra_assists/src/auto_import.rs
index 43e75eee1..a32e2f9b6 100644
--- a/crates/ra_assists/src/auto_import.rs
+++ b/crates/ra_assists/src/auto_import.rs
@@ -562,9 +562,12 @@ pub(crate) fn auto_import(mut ctx: AssistCtx<impl HirDatabase>) -> Option<Assist
                AssistId("auto_import"),
                format!("import {} in mod {}", fmt_segments(&segments), name.text()),
                |edit| {
-                    let mut text_edit = TextEditBuilder::default();
+                    apply_auto_import(
-                    apply_auto_import(item_list.syntax(), &path, &segments, &mut text_edit);
+                        item_list.syntax(),
-                    edit.set_edit_builder(text_edit);
+                        &path,
+                        &segments,
+                        edit.text_edit_builder(),
+                    );
                },
            );
        }
@@ -574,9 +577,12 @@ pub(crate) fn auto_import(mut ctx: AssistCtx<impl HirDatabase>) -> Option<Assist
            AssistId("auto_import"),
            format!("import {} in the current file", fmt_segments(&segments)),
            |edit| {
-                let mut text_edit = TextEditBuilder::default();
+                apply_auto_import(
-                apply_auto_import(current_file.syntax(), &path, &segments, &mut text_edit);
+                    current_file.syntax(),
-                edit.set_edit_builder(text_edit);
+                    &path,
+                    &segments,
+                    edit.text_edit_builder(),
+                );
            },
        );
    }
diff --git a/crates/ra_cli/src/analysis_bench.rs b/crates/ra_cli/src/analysis_bench.rs
index 639ac763e..5e9d0c16d 100644
--- a/crates/ra_cli/src/analysis_bench.rs
+++ b/crates/ra_cli/src/analysis_bench.rs
@@ -55,7 +55,7 @@ pub(crate) fn run(verbose: bool, path: &Path, op: Op) -> Result<()> {
        Op::Complete { line, column, .. } => {
            let offset = host
                .analysis()
-                .file_line_index(file_id)
+                .file_line_index(file_id)?
                .offset(LineCol { line, col_utf16: column });
            let file_postion = FilePosition { file_id, offset };
diff --git a/crates/ra_hir/src/nameres/collector.rs b/crates/ra_hir/src/nameres/collector.rs
index 7f765caf3..06b732215 100644
--- a/crates/ra_hir/src/nameres/collector.rs
+++ b/crates/ra_hir/src/nameres/collector.rs
@@ -1,7 +1,7 @@
 use std::borrow::Cow;
+use std::sync::Arc;
-use arrayvec::ArrayVec;
+use ra_db::{FileId, SourceRoot};
-use ra_db::FileId;
 use ra_syntax::{ast, SmolStr};
 use relative_path::RelativePathBuf;
 use rustc_hash::FxHashMap;
@@ -105,6 +105,7 @@ where
            module_id,
            file_id: file_id.into(),
            raw_items: &raw_items,
+            parent_module: None,
        }
        .collect(raw_items.items());
@@ -455,8 +456,14 @@ where
        if !self.macro_stack_monitor.is_poison(macro_def_id) {
            let file_id: HirFileId = macro_call_id.as_file(MacroFileKind::Items);
            let raw_items = self.db.raw_items(file_id);
-            ModCollector { def_collector: &mut *self, file_id, module_id, raw_items: &raw_items }
+            ModCollector {
-                .collect(raw_items.items());
+                def_collector: &mut *self,
+                file_id,
+                module_id,
+                raw_items: &raw_items,
+                parent_module: None,
+            }
+            .collect(raw_items.items());
        } else {
            log::error!("Too deep macro expansion: {:?}", macro_call_id);
            self.def_map.poison_macros.insert(macro_def_id);
@@ -476,6 +483,7 @@ struct ModCollector<'a, D> {
    module_id: CrateModuleId,
    file_id: HirFileId,
    raw_items: &'a raw::RawItems,
+    parent_module: Option<&'a Name>,
 }
 impl<DB> ModCollector<'_, &'_ mut DefCollector<&'_ DB>>
@@ -508,6 +516,7 @@ where
                    module_id,
                    file_id: self.file_id,
                    raw_items: self.raw_items,
+                    parent_module: Some(name),
                }
                .collect(&*items);
            }
@@ -521,6 +530,7 @@ where
                    name,
                    is_root,
                    attr_path.as_ref(),
+                    self.parent_module,
                ) {
                    Ok(file_id) => {
                        let module_id = self.push_child_module(name.clone(), ast_id, Some(file_id));
@@ -530,6 +540,7 @@ where
                            module_id,
                            file_id: file_id.into(),
                            raw_items: &raw_items,
+                            parent_module: None,
                        }
                        .collect(raw_items.items())
                    }
@@ -636,46 +647,47 @@ fn resolve_submodule(
    name: &Name,
    is_root: bool,
    attr_path: Option<&SmolStr>,
+    parent_module: Option<&Name>,
 ) -> Result<FileId, RelativePathBuf> {
-    // FIXME: handle submodules of inline modules properly
    let file_id = file_id.original_file(db);
    let source_root_id = db.file_source_root(file_id);
    let path = db.file_relative_path(file_id);
    let root = RelativePathBuf::default();
    let dir_path = path.parent().unwrap_or(&root);
    let mod_name = path.file_stem().unwrap_or("unknown");
-    let is_dir_owner = is_root || mod_name == "mod";
+    let resolve_mode = match (attr_path.filter(|p| !p.is_empty()), parent_module) {
-    let file_mod = dir_path.join(format!("{}.rs", name));
+        (Some(file_path), Some(parent_name)) => {
-    let dir_mod = dir_path.join(format!("{}/mod.rs", name));
+            let file_path = normalize_attribute_path(file_path);
-    let file_dir_mod = dir_path.join(format!("{}/{}.rs", mod_name, name));
+            let path = dir_path.join(format!("{}/{}", parent_name, file_path)).normalize();
-    let mut candidates = ArrayVec::<[_; 3]>::new();
+            ResolutionMode::InsideInlineModule(InsideInlineModuleMode::WithAttributePath(path))
-    let file_attr_mod = attr_path.map(|file_path| {
+        }
-        let file_path = normalize_attribute_path(file_path);
+        (Some(file_path), None) => {
-        let file_attr_mod = dir_path.join(file_path.as_ref()).normalize();
+            let file_path = normalize_attribute_path(file_path);
-        candidates.push(file_attr_mod.clone());
+            let path = dir_path.join(file_path.as_ref()).normalize();
+            ResolutionMode::OutOfLine(OutOfLineMode::WithAttributePath(path))
-        file_attr_mod
+        }
-    });
+        (None, Some(parent_name)) => {
-    if is_dir_owner {
+            let path = dir_path.join(format!("{}/{}.rs", parent_name, name));
-        candidates.push(file_mod.clone());
+            ResolutionMode::InsideInlineModule(InsideInlineModuleMode::File(path))
-        candidates.push(dir_mod);
+        }
-    } else {
+        _ => {
-        candidates.push(file_dir_mod.clone());
+            let is_dir_owner = is_root || mod_name == "mod";
-    };
+            if is_dir_owner {
-    let sr = db.source_root(source_root_id);
+                let file_mod = dir_path.join(format!("{}.rs", name));
-    let mut points_to = candidates.into_iter().filter_map(|path| sr.files.get(&path)).copied();
+                let dir_mod = dir_path.join(format!("{}/mod.rs", name));
-    // FIXME: handle ambiguity
+                ResolutionMode::OutOfLine(OutOfLineMode::RootOrModRs {
-    match points_to.next() {
+                    file: file_mod,
-        Some(file_id) => Ok(file_id),
+                    directory: dir_mod,
-        None => {
+                })
-            if let Some(file_attr_mod) = file_attr_mod {
-                Err(file_attr_mod)
            } else {
-                Err(if is_dir_owner { file_mod } else { file_dir_mod })
+                let path = dir_path.join(format!("{}/{}.rs", mod_name, name));
+                ResolutionMode::OutOfLine(OutOfLineMode::FileInDirectory(path))
            }
        }
-    }
+    };
+    resolve_mode.resolve(db.source_root(source_root_id))
 }
 fn normalize_attribute_path(file_path: &SmolStr) -> Cow<str> {
@@ -693,6 +705,74 @@ fn normalize_attribute_path(file_path: &SmolStr) -> Cow<str> {
    }
 }
+enum OutOfLineMode {
+    RootOrModRs { file: RelativePathBuf, directory: RelativePathBuf },
+    FileInDirectory(RelativePathBuf),
+    WithAttributePath(RelativePathBuf),
+}
+impl OutOfLineMode {
+    pub fn resolve(&self, source_root: Arc<SourceRoot>) -> Result<FileId, RelativePathBuf> {
+        match self {
+            OutOfLineMode::RootOrModRs { file, directory } => match source_root.files.get(file) {
+                None => resolve_simple_path(source_root, directory).map_err(|_| file.clone()),
+                file_id => resolve_find_result(file_id, file),
+            },
+            OutOfLineMode::FileInDirectory(path) => resolve_simple_path(source_root, path),
+            OutOfLineMode::WithAttributePath(path) => resolve_simple_path(source_root, path),
+        }
+    }
+}
+enum InsideInlineModuleMode {
+    File(RelativePathBuf),
+    WithAttributePath(RelativePathBuf),
+}
+impl InsideInlineModuleMode {
+    pub fn resolve(&self, source_root: Arc<SourceRoot>) -> Result<FileId, RelativePathBuf> {
+        match self {
+            InsideInlineModuleMode::File(path) => resolve_simple_path(source_root, path),
+            InsideInlineModuleMode::WithAttributePath(path) => {
+                resolve_simple_path(source_root, path)
+            }
+        }
+    }
+}
+enum ResolutionMode {
+    OutOfLine(OutOfLineMode),
+    InsideInlineModule(InsideInlineModuleMode),
+}
+impl ResolutionMode {
+    pub fn resolve(&self, source_root: Arc<SourceRoot>) -> Result<FileId, RelativePathBuf> {
+        use self::ResolutionMode::*;
+        match self {
+            OutOfLine(mode) => mode.resolve(source_root),
+            InsideInlineModule(mode) => mode.resolve(source_root),
+        }
+    }
+}
+fn resolve_simple_path(
+    source_root: Arc<SourceRoot>,
+    path: &RelativePathBuf,
+) -> Result<FileId, RelativePathBuf> {
+    resolve_find_result(source_root.files.get(path), path)
+}
+fn resolve_find_result(
+    file_id: Option<&FileId>,
+    path: &RelativePathBuf,
+) -> Result<FileId, RelativePathBuf> {
+    match file_id {
+        Some(file_id) => Ok(file_id.clone()),
+        None => Err(path.clone()),
+    }
+}
 #[cfg(test)]
 mod tests {
    use ra_db::SourceDatabase;
diff --git a/crates/ra_hir/src/nameres/tests/mods.rs b/crates/ra_hir/src/nameres/tests/mods.rs
index d714a3276..382728149 100644
--- a/crates/ra_hir/src/nameres/tests/mods.rs
+++ b/crates/ra_hir/src/nameres/tests/mods.rs
@@ -336,10 +336,10 @@ fn module_resolution_explicit_path_mod_rs_with_win_separator() {
    "###);
 }
-// FIXME: issue #1510. not support out-of-line modules inside inline.
+// FIXME: issue #1529. not support out-of-line modules inside inline.
 #[test]
 #[ignore]
-fn module_resolution_decl_inside_inline_module() {
+fn module_resolution_decl_inside_inline_module_with_path_attribute() {
    let map = def_map_with_crate_graph(
        r###"
        //- /main.rs
@@ -368,10 +368,39 @@ fn module_resolution_decl_inside_inline_module() {
    "###);
 }
-// FIXME: issue #1510. not support out-of-line modules inside inline.
+#[test]
+fn module_resolution_decl_inside_inline_module() {
+    let map = def_map_with_crate_graph(
+        r###"
+        //- /main.rs
+        mod foo {
+            mod bar;
+        }
+        //- /foo/bar.rs
+        pub struct Baz;
+        "###,
+        crate_graph! {
+            "main": ("/main.rs", []),
+        },
+    );
+    assert_snapshot_matches!(map, @r###"
+        ⋮crate
+        ⋮foo: t
+        ⋮
+        ⋮crate::foo
+        ⋮bar: t
+        ⋮
+        ⋮crate::foo::bar
+        ⋮Baz: t v
+    "###);
+}
+// FIXME: issue #1529. not support out-of-line modules inside inline.
 #[test]
 #[ignore]
-fn module_resolution_decl_inside_inline_module_2() {
+fn module_resolution_decl_inside_inline_module_2_with_path_attribute() {
    let map = def_map_with_crate_graph(
        r###"
        //- /main.rs
@@ -400,7 +429,7 @@ fn module_resolution_decl_inside_inline_module_2() {
    "###);
 }
-// FIXME: issue #1510. not support out-of-line modules inside inline.
+// FIXME: issue #1529. not support out-of-line modules inside inline.
 #[test]
 #[ignore]
 fn module_resolution_decl_inside_inline_module_3() {
@@ -433,7 +462,7 @@ fn module_resolution_decl_inside_inline_module_3() {
    "###);
 }
-// FIXME: issue #1510. not support out-of-line modules inside inline.
+// FIXME: issue #1529. not support out-of-line modules inside inline.
 #[test]
 #[ignore]
 fn module_resolution_decl_inside_inline_module_empty_path() {
@@ -491,7 +520,7 @@ fn module_resolution_decl_empty_path() {
    "###);
 }
-// FIXME: issue #1510. not support out-of-line modules inside inline.
+// FIXME: issue #1529. not support out-of-line modules inside inline.
 #[test]
 #[ignore]
 fn module_resolution_decl_inside_inline_module_relative_path() {
@@ -523,9 +552,7 @@ fn module_resolution_decl_inside_inline_module_relative_path() {
    "###);
 }
-// FIXME: issue #1510. not support out-of-line modules inside inline.
 #[test]
-#[ignore]
 fn module_resolution_decl_inside_inline_module_in_crate_root() {
    let map = def_map_with_crate_graph(
        r###"
@@ -557,9 +584,7 @@ fn module_resolution_decl_inside_inline_module_in_crate_root() {
    "###);
 }
-// FIXME: issue #1510. not support out-of-line modules inside inline.
 #[test]
-#[ignore]
 fn module_resolution_decl_inside_inline_module_in_mod_rs() {
    let map = def_map_with_crate_graph(
        r###"
@@ -597,9 +622,7 @@ fn module_resolution_decl_inside_inline_module_in_mod_rs() {
    "###);
 }
-// FIXME: issue #1510. not support out-of-line modules inside inline.
 #[test]
-#[ignore]
 fn module_resolution_decl_inside_inline_module_in_non_crate_root() {
    let map = def_map_with_crate_graph(
        r###"
@@ -613,7 +636,7 @@ fn module_resolution_decl_inside_inline_module_in_non_crate_root() {
        }
        use self::bar::baz::Baz;
-        //- /foo/bar/qwe.rs
+        //- /bar/qwe.rs
        pub struct Baz;
        "###,
        crate_graph! {
@@ -637,7 +660,7 @@ fn module_resolution_decl_inside_inline_module_in_non_crate_root() {
    "###);
 }
-// FIXME: issue #1510. not support out-of-line modules inside inline.
+// FIXME: issue #1529. not support out-of-line modules inside inline.
 #[test]
 #[ignore]
 fn module_resolution_decl_inside_inline_module_in_non_crate_root_2() {
diff --git a/crates/ra_ide_api/src/completion.rs b/crates/ra_ide_api/src/completion.rs
index 85160358a..a6b68be75 100644
--- a/crates/ra_ide_api/src/completion.rs
+++ b/crates/ra_ide_api/src/completion.rs
@@ -16,7 +16,7 @@ mod complete_postfix;
 use ra_db::SourceDatabase;
 #[cfg(test)]
-use crate::completion::completion_item::{check_completion, do_completion};
+use crate::completion::completion_item::do_completion;
 use crate::{
    completion::{
        completion_context::CompletionContext,
diff --git a/crates/ra_ide_api/src/completion/complete_scope.rs b/crates/ra_ide_api/src/completion/complete_scope.rs
index f92034055..2000d953a 100644
--- a/crates/ra_ide_api/src/completion/complete_scope.rs
+++ b/crates/ra_ide_api/src/completion/complete_scope.rs
@@ -121,172 +121,413 @@ impl ImportResolver {
 #[cfg(test)]
 mod tests {
-    use crate::completion::{check_completion, CompletionKind};
+    use crate::completion::{do_completion, CompletionItem, CompletionKind};
+    use insta::assert_debug_snapshot_matches;
-    fn check_reference_completion(name: &str, code: &str) {
+    fn do_reference_completion(code: &str) -> Vec<CompletionItem> {
-        check_completion(name, code, CompletionKind::Reference);
+        do_completion(code, CompletionKind::Reference)
    }
    #[test]
    fn completes_bindings_from_let() {
-        check_reference_completion(
+        assert_debug_snapshot_matches!(
-            "bindings_from_let",
+            do_reference_completion(
-            r"
+                r"
-            fn quux(x: i32) {
+                fn quux(x: i32) {
-                let y = 92;
+                    let y = 92;
-                1 + <|>;
+                    1 + <|>;
-                let z = ();
+                    let z = ();
-            }
+                }
-            ",
+                "
+            ),
+            @r###"[
+    CompletionItem {
+        label: "quux",
+        source_range: [91; 91),
+        delete: [91; 91),
+        insert: "quux($0)",
+        kind: Function,
+        detail: "fn quux(x: i32)",
+    },
+    CompletionItem {
+        label: "x",
+        source_range: [91; 91),
+        delete: [91; 91),
+        insert: "x",
+        kind: Binding,
+        detail: "i32",
+    },
+    CompletionItem {
+        label: "y",
+        source_range: [91; 91),
+        delete: [91; 91),
+        insert: "y",
+        kind: Binding,
+        detail: "i32",
+    },
+]"###
        );
    }
    #[test]
    fn completes_bindings_from_if_let() {
-        check_reference_completion(
+        assert_debug_snapshot_matches!(
-            "bindings_from_if_let",
+            do_reference_completion(
-            r"
+                r"
-            fn quux() {
+                fn quux() {
-                if let Some(x) = foo() {
+                    if let Some(x) = foo() {
-                    let y = 92;
+                        let y = 92;
-                };
+                    };
-                if let Some(a) = bar() {
+                    if let Some(a) = bar() {
-                    let b = 62;
+                        let b = 62;
-                    1 + <|>
+                        1 + <|>
+                    }
                }
-            }
+                "
-            ",
+            ),
+            @r###"[
+    CompletionItem {
+        label: "a",
+        source_range: [242; 242),
+        delete: [242; 242),
+        insert: "a",
+        kind: Binding,
+    },
+    CompletionItem {
+        label: "b",
+        source_range: [242; 242),
+        delete: [242; 242),
+        insert: "b",
+        kind: Binding,
+        detail: "i32",
+    },
+    CompletionItem {
+        label: "quux",
+        source_range: [242; 242),
+        delete: [242; 242),
+        insert: "quux()$0",
+        kind: Function,
+        detail: "fn quux()",
+    },
+]"###
        );
    }
    #[test]
    fn completes_bindings_from_for() {
-        check_reference_completion(
+        assert_debug_snapshot_matches!(
-            "bindings_from_for",
+            do_reference_completion(
-            r"
+                r"
-            fn quux() {
+                fn quux() {
-                for x in &[1, 2, 3] {
+                    for x in &[1, 2, 3] {
-                    <|>
+                        <|>
+                    }
                }
-            }
+                "
-            ",
+            ),
+            @r###"[
+    CompletionItem {
+        label: "quux",
+        source_range: [95; 95),
+        delete: [95; 95),
+        insert: "quux()$0",
+        kind: Function,
+        detail: "fn quux()",
+    },
+    CompletionItem {
+        label: "x",
+        source_range: [95; 95),
+        delete: [95; 95),
+        insert: "x",
+        kind: Binding,
+    },
+]"###
        );
    }
    #[test]
    fn completes_generic_params() {
-        check_reference_completion(
+        assert_debug_snapshot_matches!(
-            "generic_params",
+            do_reference_completion(
-            r"
+                r"
-            fn quux<T>() {
+                fn quux<T>() {
-                <|>
+                    <|>
-            }
+                }
-            ",
+                "
+            ),
+            @r###"[
+    CompletionItem {
+        label: "T",
+        source_range: [52; 52),
+        delete: [52; 52),
+        insert: "T",
+        kind: TypeParam,
+    },
+    CompletionItem {
+        label: "quux",
+        source_range: [52; 52),
+        delete: [52; 52),
+        insert: "quux()$0",
+        kind: Function,
+        detail: "fn quux<T>()",
+    },
+]"###
        );
    }
    #[test]
    fn completes_generic_params_in_struct() {
-        check_reference_completion(
+        assert_debug_snapshot_matches!(
-            "generic_params_in_struct",
+            do_reference_completion(
-            r"
+                r"
-            struct X<T> {
+                struct X<T> {
-                x: <|>
+                    x: <|>
-            }
+                }
-            ",
+                "
+            ),
+            @r###"[
+    CompletionItem {
+        label: "T",
+        source_range: [54; 54),
+        delete: [54; 54),
+        insert: "T",
+        kind: TypeParam,
+    },
+    CompletionItem {
+        label: "X",
+        source_range: [54; 54),
+        delete: [54; 54),
+        insert: "X",
+        kind: Struct,
+    },
+]"###
        );
    }
    #[test]
    fn completes_module_items() {
-        check_reference_completion(
+        assert_debug_snapshot_matches!(
-            "module_items",
+        do_reference_completion(
            r"
-            struct Foo;
+                struct Foo;
-            enum Baz {}
+                enum Baz {}
-            fn quux() {
+                fn quux() {
-                <|>
+                    <|>
-            }
+                }
-            ",
+                "
-        );
+        ),
+        @r###"[
+    CompletionItem {
+        label: "Baz",
+        source_range: [105; 105),
+        delete: [105; 105),
+        insert: "Baz",
+        kind: Enum,
+    },
+    CompletionItem {
+        label: "Foo",
+        source_range: [105; 105),
+        delete: [105; 105),
+        insert: "Foo",
+        kind: Struct,
+    },
+    CompletionItem {
+        label: "quux",
+        source_range: [105; 105),
+        delete: [105; 105),
+        insert: "quux()$0",
+        kind: Function,
+        detail: "fn quux()",
+    },
+]"###
+            );
    }
    #[test]
    fn completes_extern_prelude() {
-        check_reference_completion(
+        assert_debug_snapshot_matches!(
-            "extern_prelude",
+            do_reference_completion(
-            r"
+                r"
-            //- /lib.rs
+                //- /lib.rs
-            use <|>;
+                use <|>;
-            //- /other_crate/lib.rs
+                //- /other_crate/lib.rs
-            // nothing here
+                // nothing here
-            ",
+                "
+            ),
+            @r#"[
+    CompletionItem {
+        label: "other_crate",
+        source_range: [4; 4),
+        delete: [4; 4),
+        insert: "other_crate",
+        kind: Module,
+    },
+]"#
        );
    }
    #[test]
    fn completes_module_items_in_nested_modules() {
-        check_reference_completion(
+        assert_debug_snapshot_matches!(
-            "module_items_in_nested_modules",
+            do_reference_completion(
-            r"
+                r"
-            struct Foo;
+                struct Foo;
-            mod m {
+                mod m {
-                struct Bar;
+                    struct Bar;
-                fn quux() { <|> }
+                    fn quux() { <|> }
-            }
+                }
-            ",
+                "
+            ),
+            @r###"[
+    CompletionItem {
+        label: "Bar",
+        source_range: [117; 117),
+        delete: [117; 117),
+        insert: "Bar",
+        kind: Struct,
+    },
+    CompletionItem {
+        label: "quux",
+        source_range: [117; 117),
+        delete: [117; 117),
+        insert: "quux()$0",
+        kind: Function,
+        detail: "fn quux()",
+    },
+]"###
        );
    }
    #[test]
    fn completes_return_type() {
-        check_reference_completion(
+        assert_debug_snapshot_matches!(
-            "return_type",
+            do_reference_completion(
-            r"
+                r"
-            struct Foo;
+                struct Foo;
-            fn x() -> <|>
+                fn x() -> <|>
-            ",
+                "
-        )
+            ),
+            @r###"[
+    CompletionItem {
+        label: "Foo",
+        source_range: [55; 55),
+        delete: [55; 55),
+        insert: "Foo",
+        kind: Struct,
+    },
+    CompletionItem {
+        label: "x",
+        source_range: [55; 55),
+        delete: [55; 55),
+        insert: "x()$0",
+        kind: Function,
+        detail: "fn x()",
+    },
+]"###
+        );
    }
    #[test]
    fn dont_show_both_completions_for_shadowing() {
-        check_reference_completion(
+        assert_debug_snapshot_matches!(
-            "dont_show_both_completions_for_shadowing",
+            do_reference_completion(
-            r"
+                r"
-            fn foo() {
+                fn foo() {
-                let bar = 92;
+                    let bar = 92;
-                {
+                    {
-                    let bar = 62;
+                        let bar = 62;
-                    <|>
+                        <|>
+                    }
                }
-            }
+                "
-            ",
+            ),
-        )
+            @r###"[
+    CompletionItem {
+        label: "bar",
+        source_range: [146; 146),
+        delete: [146; 146),
+        insert: "bar",
+        kind: Binding,
+        detail: "i32",
+    },
+    CompletionItem {
+        label: "foo",
+        source_range: [146; 146),
+        delete: [146; 146),
+        insert: "foo()$0",
+        kind: Function,
+        detail: "fn foo()",
+    },
+]"###
+        );
    }
    #[test]
    fn completes_self_in_methods() {
-        check_reference_completion("self_in_methods", r"impl S { fn foo(&self) { <|> } }")
+        assert_debug_snapshot_matches!(
+            do_reference_completion(r"impl S { fn foo(&self) { <|> } }"),
+            @r#"[
+    CompletionItem {
+        label: "Self",
+        source_range: [25; 25),
+        delete: [25; 25),
+        insert: "Self",
+        kind: TypeParam,
+    },
+    CompletionItem {
+        label: "self",
+        source_range: [25; 25),
+        delete: [25; 25),
+        insert: "self",
+        kind: Binding,
+        detail: "&{unknown}",
+    },
+]"#
+        );
    }
    #[test]
    fn completes_prelude() {
-        check_reference_completion(
+        assert_debug_snapshot_matches!(
-            "completes_prelude",
+            do_reference_completion(
-            "
+                "
-            //- /main.rs
+                //- /main.rs
-            fn foo() { let x: <|> }
+                fn foo() { let x: <|> }
-            //- /std/lib.rs
+                //- /std/lib.rs
-            #[prelude_import]
+                #[prelude_import]
-            use prelude::*;
+                use prelude::*;
-            mod prelude {
+                mod prelude {
-                struct Option;
+                    struct Option;
-            }
+                }
-            ",
+                "
+            ),
+            @r#"[
+    CompletionItem {
+        label: "Option",
+        source_range: [18; 18),
+        delete: [18; 18),
+        insert: "Option",
+        kind: Struct,
+    },
+    CompletionItem {
+        label: "foo",
+        source_range: [18; 18),
+        delete: [18; 18),
+        insert: "foo()$0",
+        kind: Function,
+        detail: "fn foo()",
+    },
+    CompletionItem {
+        label: "std",
+        source_range: [18; 18),
+        delete: [18; 18),
+        insert: "std",
+        kind: Module,
+    },
+]"#
        );
    }
 }
diff --git a/crates/ra_ide_api/src/completion/complete_snippet.rs b/crates/ra_ide_api/src/completion/complete_snippet.rs
index d2d364b57..a35f31511 100644
--- a/crates/ra_ide_api/src/completion/complete_snippet.rs
+++ b/crates/ra_ide_api/src/completion/complete_snippet.rs
@@ -39,39 +39,76 @@ fn ${1:feature}() {
 #[cfg(test)]
 mod tests {
-    use crate::completion::{check_completion, CompletionKind};
+    use crate::completion::{do_completion, CompletionItem, CompletionKind};
+    use insta::assert_debug_snapshot_matches;
-    fn check_snippet_completion(name: &str, code: &str) {
+    fn do_snippet_completion(code: &str) -> Vec<CompletionItem> {
-        check_completion(name, code, CompletionKind::Snippet);
+        do_completion(code, CompletionKind::Snippet)
    }
    #[test]
    fn completes_snippets_in_expressions() {
-        check_snippet_completion("snippets_in_expressions", r"fn foo(x: i32) { <|> }");
+        assert_debug_snapshot_matches!(
+                    do_snippet_completion(r"fn foo(x: i32) { <|> }"),
+        @r#"[
+    CompletionItem {
+        label: "pd",
+        source_range: [17; 17),
+        delete: [17; 17),
+        insert: "eprintln!(\"$0 = {:?}\", $0);",
+        kind: Snippet,
+    },
+    CompletionItem {
+        label: "ppd",
+        source_range: [17; 17),
+        delete: [17; 17),
+        insert: "eprintln!(\"$0 = {:#?}\", $0);",
+        kind: Snippet,
+    },
+]"#
+                );
    }
    #[test]
    fn should_not_complete_snippets_in_path() {
-        check_snippet_completion(
+        assert_debug_snapshot_matches!(
-            "should_not_complete_snippets_in_path",
+                    do_snippet_completion(r"fn foo(x: i32) { ::foo<|> }"),
-            r"fn foo(x: i32) { ::foo<|> }",
+        @r#"[]"#
-        );
+                );
-        check_snippet_completion(
+        assert_debug_snapshot_matches!(
-            "should_not_complete_snippets_in_path2",
+                    do_snippet_completion(r"fn foo(x: i32) { ::<|> }"),
-            r"fn foo(x: i32) { ::<|> }",
+        @r#"[]"#
-        );
+                );
    }
    #[test]
    fn completes_snippets_in_items() {
-        check_snippet_completion(
+        assert_debug_snapshot_matches!(
-            "snippets_in_items",
+            do_snippet_completion(
-            r"
+                r"
-            #[cfg(test)]
+                #[cfg(test)]
-            mod tests {
+                mod tests {
-                <|>
+                    <|>
-            }
+                }
-            ",
+                "
+            ),
+            @r###"[
+    CompletionItem {
+        label: "Test function",
+        source_range: [78; 78),
+        delete: [78; 78),
+        insert: "#[test]\nfn ${1:feature}() {\n    $0\n}",
+        kind: Snippet,
+        lookup: "tfn",
+    },
+    CompletionItem {
+        label: "pub(crate)",
+        source_range: [78; 78),
+        delete: [78; 78),
+        insert: "pub(crate) $0",
+        kind: Snippet,
+    },
+]"###
        );
    }
 }
diff --git a/crates/ra_ide_api/src/completion/completion_item.rs b/crates/ra_ide_api/src/completion/completion_item.rs
index f78c4c877..d787bb69e 100644
--- a/crates/ra_ide_api/src/completion/completion_item.rs
+++ b/crates/ra_ide_api/src/completion/completion_item.rs
@@ -299,10 +299,3 @@ pub(crate) fn do_completion(code: &str, kind: CompletionKind) -> Vec<CompletionI
    kind_completions.sort_by_key(|c| c.label.clone());
    kind_completions
 }
-#[cfg(test)]
-pub(crate) fn check_completion(test_name: &str, code: &str, kind: CompletionKind) {
-    use insta::assert_debug_snapshot_matches;
-    let kind_completions = do_completion(code, kind);
-    assert_debug_snapshot_matches!(test_name, kind_completions);
-}
diff --git a/crates/ra_ide_api/src/completion/presentation.rs b/crates/ra_ide_api/src/completion/presentation.rs
index 5cf55a496..6878008d3 100644
--- a/crates/ra_ide_api/src/completion/presentation.rs
+++ b/crates/ra_ide_api/src/completion/presentation.rs
@@ -182,80 +182,169 @@ impl Completions {
 #[cfg(test)]
 mod tests {
+    use crate::completion::{do_completion, CompletionItem, CompletionKind};
+    use insta::assert_debug_snapshot_matches;
    use test_utils::covers;
-    use crate::completion::{check_completion, CompletionKind};
+    fn do_reference_completion(code: &str) -> Vec<CompletionItem> {
+        do_completion(code, CompletionKind::Reference)
-    fn check_reference_completion(code: &str, expected_completions: &str) {
-        check_completion(code, expected_completions, CompletionKind::Reference);
    }
    #[test]
    fn inserts_parens_for_function_calls() {
        covers!(inserts_parens_for_function_calls);
-        check_reference_completion(
+        assert_debug_snapshot_matches!(
-            "inserts_parens_for_function_calls1",
+            do_reference_completion(
-            r"
+                r"
-            fn no_args() {}
+                fn no_args() {}
-            fn main() { no_<|> }
+                fn main() { no_<|> }
-            ",
+                "
+            ),
+            @r###"[
+    CompletionItem {
+        label: "main",
+        source_range: [61; 64),
+        delete: [61; 64),
+        insert: "main()$0",
+        kind: Function,
+        detail: "fn main()",
+    },
+    CompletionItem {
+        label: "no_args",
+        source_range: [61; 64),
+        delete: [61; 64),
+        insert: "no_args()$0",
+        kind: Function,
+        detail: "fn no_args()",
+    },
+]"###
        );
-        check_reference_completion(
+        assert_debug_snapshot_matches!(
-            "inserts_parens_for_function_calls2",
+            do_reference_completion(
-            r"
+                r"
-            fn with_args(x: i32, y: String) {}
+                fn with_args(x: i32, y: String) {}
-            fn main() { with_<|> }
+                fn main() { with_<|> }
-            ",
+                "
+            ),
+            @r###"[
+    CompletionItem {
+        label: "main",
+        source_range: [80; 85),
+        delete: [80; 85),
+        insert: "main()$0",
+        kind: Function,
+        detail: "fn main()",
+    },
+    CompletionItem {
+        label: "with_args",
+        source_range: [80; 85),
+        delete: [80; 85),
+        insert: "with_args($0)",
+        kind: Function,
+        detail: "fn with_args(x: i32, y: String)",
+    },
+]"###
+        );
+        assert_debug_snapshot_matches!(
+            do_reference_completion(
+                r"
+                struct S {}
+                impl S {
+                    fn foo(&self) {}
+                }
+                fn bar(s: &S) {
+                    s.f<|>
+                }
+                "
+            ),
+            @r###"[
+    CompletionItem {
+        label: "foo",
+        source_range: [163; 164),
+        delete: [163; 164),
+        insert: "foo()$0",
+        kind: Method,
+        detail: "fn foo(&self)",
+    },
+]"###
        );
-        check_reference_completion(
-            "inserts_parens_for_function_calls3",
-            r"
-            struct S {}
-            impl S {
-                fn foo(&self) {}
-            }
-            fn bar(s: &S) {
-                s.f<|>
-            }
-            ",
-        )
    }
    #[test]
    fn dont_render_function_parens_in_use_item() {
-        check_reference_completion(
+        assert_debug_snapshot_matches!(
-            "dont_render_function_parens_in_use_item",
+            do_reference_completion(
-            "
+                "
-            //- /lib.rs
+                //- /lib.rs
-            mod m { pub fn foo() {} }
+                mod m { pub fn foo() {} }
-            use crate::m::f<|>;
+                use crate::m::f<|>;
-            ",
+                "
-        )
+            ),
+            @r#"[
+    CompletionItem {
+        label: "foo",
+        source_range: [40; 41),
+        delete: [40; 41),
+        insert: "foo",
+        kind: Function,
+        detail: "pub fn foo()",
+    },
+]"#
+        );
    }
    #[test]
    fn dont_render_function_parens_if_already_call() {
-        check_reference_completion(
+        assert_debug_snapshot_matches!(
-            "dont_render_function_parens_if_already_call",
+            do_reference_completion(
-            "
+                "
-            //- /lib.rs
+                //- /lib.rs
-            fn frobnicate() {}
+                fn frobnicate() {}
-            fn main() {
+                fn main() {
-                frob<|>();
+                    frob<|>();
-            }
+                }
-            ",
+                "
+            ),
+            @r#"[
+    CompletionItem {
+        label: "frobnicate",
+        source_range: [35; 39),
+        delete: [35; 39),
+        insert: "frobnicate",
+        kind: Function,
+        detail: "fn frobnicate()",
+    },
+    CompletionItem {
+        label: "main",
+        source_range: [35; 39),
+        delete: [35; 39),
+        insert: "main",
+        kind: Function,
+        detail: "fn main()",
+    },
+]"#
+        );
+        assert_debug_snapshot_matches!(
+            do_reference_completion(
+                "
+                //- /lib.rs
+                struct Foo {}
+                impl Foo { fn new() -> Foo {} }
+                fn main() {
+                    Foo::ne<|>();
+                }
+                "
+            ),
+            @r#"[
+    CompletionItem {
+        label: "new",
+        source_range: [67; 69),
+        delete: [67; 69),
+        insert: "new",
+        kind: Function,
+        detail: "fn new() -> Foo",
+    },
+]"#
        );
-        check_reference_completion(
-            "dont_render_function_parens_if_already_call_assoc_fn",
-            "
-            //- /lib.rs
-            struct Foo {}
-            impl Foo { fn new() -> Foo {} }
-            fn main() {
-                Foo::ne<|>();
-            }
-            ",
-        )
    }
 }
diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__bindings_from_for.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__bindings_from_for.snap
deleted file mode 100644
index e9b717a45..000000000
--- a/crates/ra_ide_api/src/completion/snapshots/completion_item__bindings_from_for.snap
+++ /dev/null
@@ -1,23 +0,0 @@
---
-created: "2019-05-23T22:23:35.119822026Z"
-creator: [email protected]
-source: crates/ra_ide_api/src/completion/completion_item.rs
-expression: kind_completions
---
-[
-    CompletionItem {
-        label: "quux",
-        source_range: [83; 83),
-        delete: [83; 83),
-        insert: "quux()$0",
-        kind: Function,
-        detail: "fn quux()",
-    },
-    CompletionItem {
-        label: "x",
-        source_range: [83; 83),
-        delete: [83; 83),
-        insert: "x",
-        kind: Binding,
-    },
-]
diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__bindings_from_if_let.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__bindings_from_if_let.snap
deleted file mode 100644
index f94477b43..000000000
--- a/crates/ra_ide_api/src/completion/snapshots/completion_item__bindings_from_if_let.snap
+++ /dev/null
@@ -1,31 +0,0 @@
---
-created: "2019-07-23T16:11:48.828805910Z"
-creator: [email protected]
-source: crates/ra_ide_api/src/completion/completion_item.rs
-expression: kind_completions
---
-[
-    CompletionItem {
-        label: "a",
-        source_range: [214; 214),
-        delete: [214; 214),
-        insert: "a",
-        kind: Binding,
-    },
-    CompletionItem {
-        label: "b",
-        source_range: [214; 214),
-        delete: [214; 214),
-        insert: "b",
-        kind: Binding,
-        detail: "i32",
-    },
-    CompletionItem {
-        label: "quux",
-        source_range: [214; 214),
-        delete: [214; 214),
-        insert: "quux()$0",
-        kind: Function,
-        detail: "fn quux()",
-    },
-]
diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__bindings_from_let.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__bindings_from_let.snap
deleted file mode 100644
index 590e2a820..000000000
--- a/crates/ra_ide_api/src/completion/snapshots/completion_item__bindings_from_let.snap
+++ /dev/null
@@ -1,32 +0,0 @@
---
-created: "2019-07-23T16:11:48.828811567Z"
-creator: [email protected]
-source: crates/ra_ide_api/src/completion/completion_item.rs
-expression: kind_completions
---
-[
-    CompletionItem {
-        label: "quux",
-        source_range: [79; 79),
-        delete: [79; 79),
-        insert: "quux($0)",
-        kind: Function,
-        detail: "fn quux(x: i32)",
-    },
-    CompletionItem {
-        label: "x",
-        source_range: [79; 79),
-        delete: [79; 79),
-        insert: "x",
-        kind: Binding,
-        detail: "i32",
-    },
-    CompletionItem {
-        label: "y",
-        source_range: [79; 79),
-        delete: [79; 79),
-        insert: "y",
-        kind: Binding,
-        detail: "i32",
-    },
-]
diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__completes_prelude.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__completes_prelude.snap
deleted file mode 100644
index b339c6c5f..000000000
--- a/crates/ra_ide_api/src/completion/snapshots/completion_item__completes_prelude.snap
+++ /dev/null
@@ -1,30 +0,0 @@
---
-created: "2019-05-23T22:23:35.139262926Z"
-creator: [email protected]
-source: crates/ra_ide_api/src/completion/completion_item.rs
-expression: kind_completions
---
-[
-    CompletionItem {
-        label: "Option",
-        source_range: [18; 18),
-        delete: [18; 18),
-        insert: "Option",
-        kind: Struct,
-    },
-    CompletionItem {
-        label: "foo",
-        source_range: [18; 18),
-        delete: [18; 18),
-        insert: "foo()$0",
-        kind: Function,
-        detail: "fn foo()",
-    },
-    CompletionItem {
-        label: "std",
-        source_range: [18; 18),
-        delete: [18; 18),
-        insert: "std",
-        kind: Module,
-    },
-]
diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__dont_render_function_parens_if_already_call.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__dont_render_function_parens_if_already_call.snap
deleted file mode 100644
index 46bea2ccd..000000000
--- a/crates/ra_ide_api/src/completion/snapshots/completion_item__dont_render_function_parens_if_already_call.snap
+++ /dev/null
@@ -1,24 +0,0 @@
---
-created: "2019-05-23T22:23:35.158296242Z"
-creator: [email protected]
-source: crates/ra_ide_api/src/completion/completion_item.rs
-expression: kind_completions
---
-[
-    CompletionItem {
-        label: "frobnicate",
-        source_range: [35; 39),
-        delete: [35; 39),
-        insert: "frobnicate",
-        kind: Function,
-        detail: "fn frobnicate()",
-    },
-    CompletionItem {
-        label: "main",
-        source_range: [35; 39),
-        delete: [35; 39),
-        insert: "main",
-        kind: Function,
-        detail: "fn main()",
-    },
-]
diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__dont_render_function_parens_if_already_call_assoc_fn.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__dont_render_function_parens_if_already_call_assoc_fn.snap
deleted file mode 100644
index b09a6745e..000000000
--- a/crates/ra_ide_api/src/completion/snapshots/completion_item__dont_render_function_parens_if_already_call_assoc_fn.snap
+++ /dev/null
@@ -1,16 +0,0 @@
---
-created: "2019-05-23T22:44:10.920136527Z"
-creator: [email protected]
-source: crates/ra_ide_api/src/completion/completion_item.rs
-expression: kind_completions
---
-[
-    CompletionItem {
-        label: "new",
-        source_range: [67; 69),
-        delete: [67; 69),
-        insert: "new",
-        kind: Function,
-        detail: "fn new() -> Foo",
-    },
-]
diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__dont_render_function_parens_in_use_item.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__dont_render_function_parens_in_use_item.snap
deleted file mode 100644
index 84ccc8160..000000000
--- a/crates/ra_ide_api/src/completion/snapshots/completion_item__dont_render_function_parens_in_use_item.snap
+++ /dev/null
@@ -1,16 +0,0 @@
---
-created: "2019-05-23T22:23:35.154795561Z"
-creator: [email protected]
-source: crates/ra_ide_api/src/completion/completion_item.rs
-expression: kind_completions
---
-[
-    CompletionItem {
-        label: "foo",
-        source_range: [40; 41),
-        delete: [40; 41),
-        insert: "foo",
-        kind: Function,
-        detail: "pub fn foo()",
-    },
-]
diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__dont_show_both_completions_for_shadowing.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__dont_show_both_completions_for_shadowing.snap
deleted file mode 100644
index 158a2e5b9..000000000
--- a/crates/ra_ide_api/src/completion/snapshots/completion_item__dont_show_both_completions_for_shadowing.snap
+++ /dev/null
@@ -1,24 +0,0 @@
---
-created: "2019-07-23T16:11:48.860949870Z"
-creator: [email protected]
-source: crates/ra_ide_api/src/completion/completion_item.rs
-expression: kind_completions
---
-[
-    CompletionItem {
-        label: "bar",
-        source_range: [126; 126),
-        delete: [126; 126),
-        insert: "bar",
-        kind: Binding,
-        detail: "i32",
-    },
-    CompletionItem {
-        label: "foo",
-        source_range: [126; 126),
-        delete: [126; 126),
-        insert: "foo()$0",
-        kind: Function,
-        detail: "fn foo()",
-    },
-]
diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__extern_prelude.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__extern_prelude.snap
deleted file mode 100644
index b9449a76c..000000000
--- a/crates/ra_ide_api/src/completion/snapshots/completion_item__extern_prelude.snap
+++ /dev/null
@@ -1,15 +0,0 @@
---
-created: "2019-05-23T22:23:35.123197049Z"
-creator: [email protected]
-source: crates/ra_ide_api/src/completion/completion_item.rs
-expression: kind_completions
---
-[
-    CompletionItem {
-        label: "other_crate",
-        source_range: [4; 4),
-        delete: [4; 4),
-        insert: "other_crate",
-        kind: Module,
-    },
-]
diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__generic_params.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__generic_params.snap
deleted file mode 100644
index eb1a4151a..000000000
--- a/crates/ra_ide_api/src/completion/snapshots/completion_item__generic_params.snap
+++ /dev/null
@@ -1,23 +0,0 @@
---
-created: "2019-05-23T22:23:35.123825399Z"
-creator: [email protected]
-source: crates/ra_ide_api/src/completion/completion_item.rs
-expression: kind_completions
---
-[
-    CompletionItem {
-        label: "T",
-        source_range: [44; 44),
-        delete: [44; 44),
-        insert: "T",
-        kind: TypeParam,
-    },
-    CompletionItem {
-        label: "quux",
-        source_range: [44; 44),
-        delete: [44; 44),
-        insert: "quux()$0",
-        kind: Function,
-        detail: "fn quux<T>()",
-    },
-]
diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__generic_params_in_struct.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__generic_params_in_struct.snap
deleted file mode 100644
index 52f08267f..000000000
--- a/crates/ra_ide_api/src/completion/snapshots/completion_item__generic_params_in_struct.snap
+++ /dev/null
@@ -1,22 +0,0 @@
---
-created: "2019-05-23T22:23:35.130778739Z"
-creator: [email protected]
-source: crates/ra_ide_api/src/completion/completion_item.rs
-expression: kind_completions
---
-[
-    CompletionItem {
-        label: "T",
-        source_range: [46; 46),
-        delete: [46; 46),
-        insert: "T",
-        kind: TypeParam,
-    },
-    CompletionItem {
-        label: "X",
-        source_range: [46; 46),
-        delete: [46; 46),
-        insert: "X",
-        kind: Struct,
-    },
-]
diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__inserts_parens_for_function_calls1.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__inserts_parens_for_function_calls1.snap
deleted file mode 100644
index c795b9aae..000000000
--- a/crates/ra_ide_api/src/completion/snapshots/completion_item__inserts_parens_for_function_calls1.snap
+++ /dev/null
@@ -1,24 +0,0 @@
---
-created: "2019-05-23T22:23:35.156115632Z"
-creator: [email protected]
-source: crates/ra_ide_api/src/completion/completion_item.rs
-expression: kind_completions
---
-[
-    CompletionItem {
-        label: "main",
-        source_range: [53; 56),
-        delete: [53; 56),
-        insert: "main()$0",
-        kind: Function,
-        detail: "fn main()",
-    },
-    CompletionItem {
-        label: "no_args",
-        source_range: [53; 56),
-        delete: [53; 56),
-        insert: "no_args()$0",
-        kind: Function,
-        detail: "fn no_args()",
-    },
-]
diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__inserts_parens_for_function_calls2.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__inserts_parens_for_function_calls2.snap
deleted file mode 100644
index b49a838e0..000000000
--- a/crates/ra_ide_api/src/completion/snapshots/completion_item__inserts_parens_for_function_calls2.snap
+++ /dev/null
@@ -1,24 +0,0 @@
---
-created: "2019-05-23T22:44:10.916806744Z"
-creator: [email protected]
-source: crates/ra_ide_api/src/completion/completion_item.rs
-expression: kind_completions
---
-[
-    CompletionItem {
-        label: "main",
-        source_range: [72; 77),
-        delete: [72; 77),
-        insert: "main()$0",
-        kind: Function,
-        detail: "fn main()",
-    },
-    CompletionItem {
-        label: "with_args",
-        source_range: [72; 77),
-        delete: [72; 77),
-        insert: "with_args($0)",
-        kind: Function,
-        detail: "fn with_args(x: i32, y: String)",
-    },
-]
diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__inserts_parens_for_function_calls3.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__inserts_parens_for_function_calls3.snap
deleted file mode 100644
index b62cb7aa1..000000000
--- a/crates/ra_ide_api/src/completion/snapshots/completion_item__inserts_parens_for_function_calls3.snap
+++ /dev/null
@@ -1,16 +0,0 @@
---
-created: "2019-05-23T22:44:40.543731193Z"
-creator: [email protected]
-source: crates/ra_ide_api/src/completion/completion_item.rs
-expression: kind_completions
---
-[
-    CompletionItem {
-        label: "foo",
-        source_range: [139; 140),
-        delete: [139; 140),
-        insert: "foo()$0",
-        kind: Method,
-        detail: "fn foo(&self)",
-    },
-]
diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__module_items.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__module_items.snap
deleted file mode 100644
index cee4898c3..000000000
--- a/crates/ra_ide_api/src/completion/snapshots/completion_item__module_items.snap
+++ /dev/null
@@ -1,30 +0,0 @@
---
-created: "2019-05-23T22:23:35.133106898Z"
-creator: [email protected]
-source: crates/ra_ide_api/src/completion/completion_item.rs
-expression: kind_completions
---
-[
-    CompletionItem {
-        label: "Baz",
-        source_range: [89; 89),
-        delete: [89; 89),
-        insert: "Baz",
-        kind: Enum,
-    },
-    CompletionItem {
-        label: "Foo",
-        source_range: [89; 89),
-        delete: [89; 89),
-        insert: "Foo",
-        kind: Struct,
-    },
-    CompletionItem {
-        label: "quux",
-        source_range: [89; 89),
-        delete: [89; 89),
-        insert: "quux()$0",
-        kind: Function,
-        detail: "fn quux()",
-    },
-]
diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__module_items_in_nested_modules.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__module_items_in_nested_modules.snap
deleted file mode 100644
index ce18e5bb7..000000000
--- a/crates/ra_ide_api/src/completion/snapshots/completion_item__module_items_in_nested_modules.snap
+++ /dev/null
@@ -1,23 +0,0 @@
---
-created: "2019-05-23T22:23:35.134417551Z"
-creator: [email protected]
-source: crates/ra_ide_api/src/completion/completion_item.rs
-expression: kind_completions
---
-[
-    CompletionItem {
-        label: "Bar",
-        source_range: [101; 101),
-        delete: [101; 101),
-        insert: "Bar",
-        kind: Struct,
-    },
-    CompletionItem {
-        label: "quux",
-        source_range: [101; 101),
-        delete: [101; 101),
-        insert: "quux()$0",
-        kind: Function,
-        detail: "fn quux()",
-    },
-]
diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__return_type.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__return_type.snap
deleted file mode 100644
index 16dd18431..000000000
--- a/crates/ra_ide_api/src/completion/snapshots/completion_item__return_type.snap
+++ /dev/null
@@ -1,23 +0,0 @@
---
-created: "2019-05-23T22:23:35.140648630Z"
-creator: [email protected]
-source: crates/ra_ide_api/src/completion/completion_item.rs
-expression: kind_completions
---
-[
-    CompletionItem {
-        label: "Foo",
-        source_range: [47; 47),
-        delete: [47; 47),
-        insert: "Foo",
-        kind: Struct,
-    },
-    CompletionItem {
-        label: "x",
-        source_range: [47; 47),
-        delete: [47; 47),
-        insert: "x()$0",
-        kind: Function,
-        detail: "fn x()",
-    },
-]
diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__self_in_methods.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__self_in_methods.snap
deleted file mode 100644
index b7bcbe864..000000000
--- a/crates/ra_ide_api/src/completion/snapshots/completion_item__self_in_methods.snap
+++ /dev/null
@@ -1,23 +0,0 @@
---
-created: "2019-07-23T16:11:48.859812318Z"
-creator: [email protected]
-source: crates/ra_ide_api/src/completion/completion_item.rs
-expression: kind_completions
---
-[
-    CompletionItem {
-        label: "Self",
-        source_range: [25; 25),
-        delete: [25; 25),
-        insert: "Self",
-        kind: TypeParam,
-    },
-    CompletionItem {
-        label: "self",
-        source_range: [25; 25),
-        delete: [25; 25),
-        insert: "self",
-        kind: Binding,
-        detail: "&{unknown}",
-    },
-]
diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__should_not_complete_snippets_in_path.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__should_not_complete_snippets_in_path.snap
deleted file mode 100644
index cb3278edf..000000000
--- a/crates/ra_ide_api/src/completion/snapshots/completion_item__should_not_complete_snippets_in_path.snap
+++ /dev/null
@@ -1,5 +0,0 @@
-Created: 2019-01-23T05:19:36.475253+00:00
-Creator: [email protected]
-Source: crates/ra_ide_api/src/completion/completion_item.rs
-[]
diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__should_not_complete_snippets_in_path2.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__should_not_complete_snippets_in_path2.snap
deleted file mode 100644
index 62c8e3de9..000000000
--- a/crates/ra_ide_api/src/completion/snapshots/completion_item__should_not_complete_snippets_in_path2.snap
+++ /dev/null
@@ -1,5 +0,0 @@
-Created: 2019-01-23T05:19:36.476869+00:00
-Creator: [email protected]
-Source: crates/ra_ide_api/src/completion/completion_item.rs
-[]
diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__snippets_in_expressions.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__snippets_in_expressions.snap
deleted file mode 100644
index 6f41bf76f..000000000
--- a/crates/ra_ide_api/src/completion/snapshots/completion_item__snippets_in_expressions.snap
+++ /dev/null
@@ -1,22 +0,0 @@
---
-created: "2019-05-23T22:23:35.141901047Z"
-creator: [email protected]
-source: crates/ra_ide_api/src/completion/completion_item.rs
-expression: kind_completions
---
-[
-    CompletionItem {
-        label: "pd",
-        source_range: [17; 17),
-        delete: [17; 17),
-        insert: "eprintln!(\"$0 = {:?}\", $0);",
-        kind: Snippet,
-    },
-    CompletionItem {
-        label: "ppd",
-        source_range: [17; 17),
-        delete: [17; 17),
-        insert: "eprintln!(\"$0 = {:#?}\", $0);",
-        kind: Snippet,
-    },
-]
diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__snippets_in_items.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__snippets_in_items.snap
deleted file mode 100644
index 1eb0adebe..000000000
--- a/crates/ra_ide_api/src/completion/snapshots/completion_item__snippets_in_items.snap
+++ /dev/null
@@ -1,23 +0,0 @@
---
-created: "2019-05-23T22:23:35.149234118Z"
-creator: [email protected]
-source: crates/ra_ide_api/src/completion/completion_item.rs
-expression: kind_completions
---
-[
-    CompletionItem {
-        label: "Test function",
-        source_range: [66; 66),
-        delete: [66; 66),
-        insert: "#[test]\nfn ${1:feature}() {\n    $0\n}",
-        kind: Snippet,
-        lookup: "tfn",
-    },
-    CompletionItem {
-        label: "pub(crate)",
-        source_range: [66; 66),
-        delete: [66; 66),
-        insert: "pub(crate) $0",
-        kind: Snippet,
-    },
-]
diff --git a/crates/ra_ide_api/src/display/snapshots/tests__file_structure.snap b/crates/ra_ide_api/src/display/snapshots/tests__file_structure.snap
deleted file mode 100644
index 102efc026..000000000
--- a/crates/ra_ide_api/src/display/snapshots/tests__file_structure.snap
+++ /dev/null
@@ -1,191 +0,0 @@
---
-created: "2019-06-28T20:46:18.274464142Z"
-creator: [email protected]
-source: crates/ra_ide_api/src/display/structure.rs
-expression: structure
---
-[
-    StructureNode {
-        parent: None,
-        label: "Foo",
-        navigation_range: [8; 11),
-        node_range: [1; 26),
-        kind: STRUCT_DEF,
-        detail: None,
-        deprecated: false,
-    },
-    StructureNode {
-        parent: Some(
-            0,
-        ),
-        label: "x",
-        navigation_range: [18; 19),
-        node_range: [18; 24),
-        kind: NAMED_FIELD_DEF,
-        detail: Some(
-            "i32",
-        ),
-        deprecated: false,
-    },
-    StructureNode {
-        parent: None,
-        label: "m",
-        navigation_range: [32; 33),
-        node_range: [28; 158),
-        kind: MODULE,
-        detail: None,
-        deprecated: false,
-    },
-    StructureNode {
-        parent: Some(
-            2,
-        ),
-        label: "bar1",
-        navigation_range: [43; 47),
-        node_range: [40; 52),
-        kind: FN_DEF,
-        detail: Some(
-            "fn()",
-        ),
-        deprecated: false,
-    },
-    StructureNode {
-        parent: Some(
-            2,
-        ),
-        label: "bar2",
-        navigation_range: [60; 64),
-        node_range: [57; 81),
-        kind: FN_DEF,
-        detail: Some(
-            "fn<T>(t: T) -> T",
-        ),
-        deprecated: false,
-    },
-    StructureNode {
-        parent: Some(
-            2,
-        ),
-        label: "bar3",
-        navigation_range: [89; 93),
-        node_range: [86; 156),
-        kind: FN_DEF,
-        detail: Some(
-            "fn<A, B>(a: A, b: B) -> Vec< u32 >",
-        ),
-        deprecated: false,
-    },
-    StructureNode {
-        parent: None,
-        label: "E",
-        navigation_range: [165; 166),
-        node_range: [160; 180),
-        kind: ENUM_DEF,
-        detail: None,
-        deprecated: false,
-    },
-    StructureNode {
-        parent: Some(
-            6,
-        ),
-        label: "X",
-        navigation_range: [169; 170),
-        node_range: [169; 170),
-        kind: ENUM_VARIANT,
-        detail: None,
-        deprecated: false,
-    },
-    StructureNode {
-        parent: Some(
-            6,
-        ),
-        label: "Y",
-        navigation_range: [172; 173),
-        node_range: [172; 178),
-        kind: ENUM_VARIANT,
-        detail: None,
-        deprecated: false,
-    },
-    StructureNode {
-        parent: None,
-        label: "T",
-        navigation_range: [186; 187),
-        node_range: [181; 193),
-        kind: TYPE_ALIAS_DEF,
-        detail: Some(
-            "()",
-        ),
-        deprecated: false,
-    },
-    StructureNode {
-        parent: None,
-        label: "S",
-        navigation_range: [201; 202),
-        node_range: [194; 213),
-        kind: STATIC_DEF,
-        detail: Some(
-            "i32",
-        ),
-        deprecated: false,
-    },
-    StructureNode {
-        parent: None,
-        label: "C",
-        navigation_range: [220; 221),
-        node_range: [214; 232),
-        kind: CONST_DEF,
-        detail: Some(
-            "i32",
-        ),
-        deprecated: false,
-    },
-    StructureNode {
-        parent: None,
-        label: "impl E",
-        navigation_range: [239; 240),
-        node_range: [234; 243),
-        kind: IMPL_BLOCK,
-        detail: None,
-        deprecated: false,
-    },
-    StructureNode {
-        parent: None,
-        label: "impl fmt::Debug for E",
-        navigation_range: [265; 266),
-        node_range: [245; 269),
-        kind: IMPL_BLOCK,
-        detail: None,
-        deprecated: false,
-    },
-    StructureNode {
-        parent: None,
-        label: "mc",
-        navigation_range: [284; 286),
-        node_range: [271; 303),
-        kind: MACRO_CALL,
-        detail: None,
-        deprecated: false,
-    },
-    StructureNode {
-        parent: None,
-        label: "obsolete",
-        navigation_range: [322; 330),
-        node_range: [305; 335),
-        kind: FN_DEF,
-        detail: Some(
-            "fn()",
-        ),
-        deprecated: true,
-    },
-    StructureNode {
-        parent: None,
-        label: "very_obsolete",
-        navigation_range: [375; 388),
-        node_range: [337; 393),
-        kind: FN_DEF,
-        detail: Some(
-            "fn()",
-        ),
-        deprecated: true,
-    },
-]
diff --git a/crates/ra_ide_api/src/display/structure.rs b/crates/ra_ide_api/src/display/structure.rs
index 2ba10b2ef..b026dfa59 100644
--- a/crates/ra_ide_api/src/display/structure.rs
+++ b/crates/ra_ide_api/src/display/structure.rs
@@ -204,6 +204,192 @@ fn very_obsolete() {}
        .ok()
        .unwrap();
        let structure = file_structure(&file);
-        assert_debug_snapshot_matches!("file_structure", structure);
+        assert_debug_snapshot_matches!(structure,
+        @r#"[
+    StructureNode {
+        parent: None,
+        label: "Foo",
+        navigation_range: [8; 11),
+        node_range: [1; 26),
+        kind: STRUCT_DEF,
+        detail: None,
+        deprecated: false,
+    },
+    StructureNode {
+        parent: Some(
+            0,
+        ),
+        label: "x",
+        navigation_range: [18; 19),
+        node_range: [18; 24),
+        kind: NAMED_FIELD_DEF,
+        detail: Some(
+            "i32",
+        ),
+        deprecated: false,
+    },
+    StructureNode {
+        parent: None,
+        label: "m",
+        navigation_range: [32; 33),
+        node_range: [28; 158),
+        kind: MODULE,
+        detail: None,
+        deprecated: false,
+    },
+    StructureNode {
+        parent: Some(
+            2,
+        ),
+        label: "bar1",
+        navigation_range: [43; 47),
+        node_range: [40; 52),
+        kind: FN_DEF,
+        detail: Some(
+            "fn()",
+        ),
+        deprecated: false,
+    },
+    StructureNode {
+        parent: Some(
+            2,
+        ),
+        label: "bar2",
+        navigation_range: [60; 64),
+        node_range: [57; 81),
+        kind: FN_DEF,
+        detail: Some(
+            "fn<T>(t: T) -> T",
+        ),
+        deprecated: false,
+    },
+    StructureNode {
+        parent: Some(
+            2,
+        ),
+        label: "bar3",
+        navigation_range: [89; 93),
+        node_range: [86; 156),
+        kind: FN_DEF,
+        detail: Some(
+            "fn<A, B>(a: A, b: B) -> Vec< u32 >",
+        ),
+        deprecated: false,
+    },
+    StructureNode {
+        parent: None,
+        label: "E",
+        navigation_range: [165; 166),
+        node_range: [160; 180),
+        kind: ENUM_DEF,
+        detail: None,
+        deprecated: false,
+    },
+    StructureNode {
+        parent: Some(
+            6,
+        ),
+        label: "X",
+        navigation_range: [169; 170),
+        node_range: [169; 170),
+        kind: ENUM_VARIANT,
+        detail: None,
+        deprecated: false,
+    },
+    StructureNode {
+        parent: Some(
+            6,
+        ),
+        label: "Y",
+        navigation_range: [172; 173),
+        node_range: [172; 178),
+        kind: ENUM_VARIANT,
+        detail: None,
+        deprecated: false,
+    },
+    StructureNode {
+        parent: None,
+        label: "T",
+        navigation_range: [186; 187),
+        node_range: [181; 193),
+        kind: TYPE_ALIAS_DEF,
+        detail: Some(
+            "()",
+        ),
+        deprecated: false,
+    },
+    StructureNode {
+        parent: None,
+        label: "S",
+        navigation_range: [201; 202),
+        node_range: [194; 213),
+        kind: STATIC_DEF,
+        detail: Some(
+            "i32",
+        ),
+        deprecated: false,
+    },
+    StructureNode {
+        parent: None,
+        label: "C",
+        navigation_range: [220; 221),
+        node_range: [214; 232),
+        kind: CONST_DEF,
+        detail: Some(
+            "i32",
+        ),
+        deprecated: false,
+    },
+    StructureNode {
+        parent: None,
+        label: "impl E",
+        navigation_range: [239; 240),
+        node_range: [234; 243),
+        kind: IMPL_BLOCK,
+        detail: None,
+        deprecated: false,
+    },
+    StructureNode {
+        parent: None,
+        label: "impl fmt::Debug for E",
+        navigation_range: [265; 266),
+        node_range: [245; 269),
+        kind: IMPL_BLOCK,
+        detail: None,
+        deprecated: false,
+    },
+    StructureNode {
+        parent: None,
+        label: "mc",
+        navigation_range: [284; 286),
+        node_range: [271; 303),
+        kind: MACRO_CALL,
+        detail: None,
+        deprecated: false,
+    },
+    StructureNode {
+        parent: None,
+        label: "obsolete",
+        navigation_range: [322; 330),
+        node_range: [305; 335),
+        kind: FN_DEF,
+        detail: Some(
+            "fn()",
+        ),
+        deprecated: true,
+    },
+    StructureNode {
+        parent: None,
+        label: "very_obsolete",
+        navigation_range: [375; 388),
+        node_range: [337; 393),
+        kind: FN_DEF,
+        detail: Some(
+            "fn()",
+        ),
+        deprecated: true,
+    },
+]"#
+                );
    }
 }
diff --git a/crates/ra_ide_api/src/inlay_hints.rs b/crates/ra_ide_api/src/inlay_hints.rs
index 174662beb..a524e014f 100644
--- a/crates/ra_ide_api/src/inlay_hints.rs
+++ b/crates/ra_ide_api/src/inlay_hints.rs
@@ -1,16 +1,22 @@
 use crate::{db::RootDatabase, FileId};
-use hir::{HirDisplay, Ty};
+use hir::{HirDisplay, SourceAnalyzer, Ty};
-use ra_syntax::ast::Pat;
 use ra_syntax::{
    algo::visit::{visitor, Visitor},
-    ast::{self, PatKind, TypeAscriptionOwner},
+    ast::{
-    AstNode, SmolStr, SourceFile, SyntaxNode, TextRange,
+        AstNode, ForExpr, IfExpr, LambdaExpr, LetStmt, MatchArmList, Pat, PatKind, SourceFile,
+        TypeAscriptionOwner, WhileExpr,
+    },
+    SmolStr, SyntaxKind, SyntaxNode, TextRange,
 };
-#[derive(Debug, PartialEq, Eq)]
+#[derive(Debug, PartialEq, Eq, Clone)]
 pub enum InlayKind {
    LetBindingType,
    ClosureParameterType,
+    ForExpressionBindingType,
+    IfExpressionType,
+    WhileLetExpressionType,
+    MatchArmType,
 }
 #[derive(Debug)]
@@ -34,68 +40,142 @@ fn get_inlay_hints(
    node: &SyntaxNode,
 ) -> Option<Vec<InlayHint>> {
    visitor()
-        .visit(|let_statement: ast::LetStmt| {
+        .visit(|let_statement: LetStmt| {
-            let let_syntax = let_statement.syntax();
            if let_statement.ascribed_type().is_some() {
                return None;
            }
+            let pat = let_statement.pat()?;
-            let let_pat = let_statement.pat()?;
+            let analyzer = SourceAnalyzer::new(db, file_id, let_statement.syntax(), None);
-            let inlay_type_string = get_node_displayable_type(db, file_id, let_syntax, &let_pat)?
+            Some(get_pat_hints(db, &analyzer, pat, InlayKind::LetBindingType, false))
-                .display(db)
-                .to_string()
-                .into();
-            let pat_range = match let_pat.kind() {
-                PatKind::BindPat(bind_pat) => bind_pat.syntax().text_range(),
-                PatKind::TuplePat(tuple_pat) => tuple_pat.syntax().text_range(),
-                _ => return None,
-            };
-            Some(vec![InlayHint {
-                range: pat_range,
-                kind: InlayKind::LetBindingType,
-                label: inlay_type_string,
-            }])
        })
-        .visit(|closure_parameter: ast::LambdaExpr| match closure_parameter.param_list() {
+        .visit(|closure_parameter: LambdaExpr| {
-            Some(param_list) => Some(
+            let analyzer = SourceAnalyzer::new(db, file_id, closure_parameter.syntax(), None);
+            closure_parameter.param_list().map(|param_list| {
                param_list
                    .params()
                    .filter(|closure_param| closure_param.ascribed_type().is_none())
-                    .filter_map(|closure_param| {
+                    .filter_map(|closure_param| closure_param.pat())
-                        let closure_param_syntax = closure_param.syntax();
+                    .map(|root_pat| {
-                        let inlay_type_string = get_node_displayable_type(
+                        get_pat_hints(
                            db,
-                            file_id,
+                            &analyzer,
-                            closure_param_syntax,
+                            root_pat,
-                            &closure_param.pat()?,
+                            InlayKind::ClosureParameterType,
-                        )?
+                            false,
-                        .display(db)
+                        )
-                        .to_string()
-                        .into();
-                        Some(InlayHint {
-                            range: closure_param_syntax.text_range(),
-                            kind: InlayKind::ClosureParameterType,
-                            label: inlay_type_string,
-                        })
                    })
+                    .flatten()
+                    .collect()
+            })
+        })
+        .visit(|for_expression: ForExpr| {
+            let pat = for_expression.pat()?;
+            let analyzer = SourceAnalyzer::new(db, file_id, for_expression.syntax(), None);
+            Some(get_pat_hints(db, &analyzer, pat, InlayKind::ForExpressionBindingType, false))
+        })
+        .visit(|if_expr: IfExpr| {
+            let pat = if_expr.condition()?.pat()?;
+            let analyzer = SourceAnalyzer::new(db, file_id, if_expr.syntax(), None);
+            Some(get_pat_hints(db, &analyzer, pat, InlayKind::IfExpressionType, true))
+        })
+        .visit(|while_expr: WhileExpr| {
+            let pat = while_expr.condition()?.pat()?;
+            let analyzer = SourceAnalyzer::new(db, file_id, while_expr.syntax(), None);
+            Some(get_pat_hints(db, &analyzer, pat, InlayKind::WhileLetExpressionType, true))
+        })
+        .visit(|match_arm_list: MatchArmList| {
+            let analyzer = SourceAnalyzer::new(db, file_id, match_arm_list.syntax(), None);
+            Some(
+                match_arm_list
+                    .arms()
+                    .map(|match_arm| match_arm.pats())
+                    .flatten()
+                    .map(|root_pat| {
+                        get_pat_hints(db, &analyzer, root_pat, InlayKind::MatchArmType, true)
+                    })
+                    .flatten()
                    .collect(),
-            ),
+            )
-            None => None,
        })
        .accept(&node)?
 }
+fn get_pat_hints(
+    db: &RootDatabase,
+    analyzer: &SourceAnalyzer,
+    root_pat: Pat,
+    kind: InlayKind,
+    skip_root_pat_hint: bool,
+) -> Vec<InlayHint> {
+    let original_pat = &root_pat.clone();
+    get_leaf_pats(root_pat)
+        .into_iter()
+        .filter(|pat| !skip_root_pat_hint || pat != original_pat)
+        .filter_map(|pat| {
+            get_node_displayable_type(db, &analyzer, &pat)
+                .map(|pat_type| (pat.syntax().text_range(), pat_type))
+        })
+        .map(|(range, pat_type)| InlayHint {
+            range,
+            kind: kind.clone(),
+            label: pat_type.display(db).to_string().into(),
+        })
+        .collect()
+}
+fn get_leaf_pats(root_pat: Pat) -> Vec<Pat> {
+    let mut pats_to_process = std::collections::VecDeque::<Pat>::new();
+    pats_to_process.push_back(root_pat);
+    let mut leaf_pats = Vec::new();
+    while let Some(maybe_leaf_pat) = pats_to_process.pop_front() {
+        match maybe_leaf_pat.kind() {
+            PatKind::BindPat(bind_pat) => {
+                if let Some(pat) = bind_pat.pat() {
+                    pats_to_process.push_back(pat);
+                } else {
+                    leaf_pats.push(maybe_leaf_pat);
+                }
+            }
+            PatKind::TuplePat(tuple_pat) => {
+                for arg_pat in tuple_pat.args() {
+                    pats_to_process.push_back(arg_pat);
+                }
+            }
+            PatKind::StructPat(struct_pat) => {
+                if let Some(pat_list) = struct_pat.field_pat_list() {
+                    pats_to_process.extend(
+                        pat_list
+                            .field_pats()
+                            .filter_map(|field_pat| {
+                                field_pat
+                                    .pat()
+                                    .filter(|pat| pat.syntax().kind() != SyntaxKind::BIND_PAT)
+                            })
+                            .chain(pat_list.bind_pats().map(|bind_pat| {
+                                bind_pat.pat().unwrap_or_else(|| Pat::from(bind_pat))
+                            })),
+                    );
+                }
+            }
+            PatKind::TupleStructPat(tuple_struct_pat) => {
+                for arg_pat in tuple_struct_pat.args() {
+                    pats_to_process.push_back(arg_pat);
+                }
+            }
+            _ => (),
+        }
+    }
+    leaf_pats
+}
 fn get_node_displayable_type(
    db: &RootDatabase,
-    file_id: FileId,
+    analyzer: &SourceAnalyzer,
-    node_syntax: &SyntaxNode,
    node_pat: &Pat,
 ) -> Option<Ty> {
-    let analyzer = hir::SourceAnalyzer::new(db, file_id, node_syntax, None);
    analyzer.type_of_pat(db, node_pat).and_then(|resolved_type| {
        if let Ty::Apply(_) = resolved_type {
            Some(resolved_type)
@@ -111,68 +191,306 @@ mod tests {
    use insta::assert_debug_snapshot_matches;
    #[test]
-    fn test_inlay_hints() {
+    fn let_statement() {
        let (analysis, file_id) = single_file(
            r#"
-struct OuterStruct {}
+#[derive(PartialEq)]
+enum CustomOption<T> {
+    None,
+    Some(T),
+}
+#[derive(PartialEq)]
+struct Test {
+    a: CustomOption<u32>,
+    b: u8,
+}
 fn main() {
    struct InnerStruct {}
    let test = 54;
-    let test = InnerStruct {};
+    let test: i32 = 33;
-    let test = OuterStruct {};
-    let test = vec![222];
-    let mut test = Vec::new();
-    test.push(333);
-    let test = test.into_iter().map(|i| i * i).collect::<Vec<_>>();
    let mut test = 33;
    let _ = 22;
-    let test: Vec<_> = (0..3).collect();
+    let test = "test";
+    let test = InnerStruct {};
-    let _ = (0..23).map(|i: u32| {
+    let test = vec![222];
-        let i_squared = i * i;
+    let test: Vec<_> = (0..3).collect();
-        i_squared
+    let test = (0..3).collect::<Vec<i128>>();
-    });
+    let test = (0..3).collect::<Vec<_>>();
-    let test: i32 = 33;
+    let mut test = Vec::new();
+    test.push(333);
-    let (x, c) = (42, 'a');
    let test = (42, 'a');
-}
+    let (a, (b, c, (d, e), f)) = (2, (3, 4, (6.6, 7.7), 5));
-"#,
+}"#,
        );
        assert_debug_snapshot_matches!(analysis.inlay_hints(file_id).unwrap(), @r#"[
    InlayHint {
-        range: [71; 75),
+        range: [193; 197),
        kind: LetBindingType,
        label: "i32",
    },
    InlayHint {
-        range: [121; 125),
+        range: [236; 244),
        kind: LetBindingType,
-        label: "OuterStruct",
+        label: "i32",
    },
    InlayHint {
-        range: [297; 305),
+        range: [275; 279),
+        kind: LetBindingType,
+        label: "&str",
+    },
+    InlayHint {
+        range: [539; 543),
+        kind: LetBindingType,
+        label: "(i32, char)",
+    },
+    InlayHint {
+        range: [566; 567),
        kind: LetBindingType,
        label: "i32",
    },
    InlayHint {
-        range: [417; 426),
+        range: [570; 571),
        kind: LetBindingType,
-        label: "u32",
+        label: "i32",
    },
    InlayHint {
-        range: [496; 502),
+        range: [573; 574),
        kind: LetBindingType,
-        label: "(i32, char)",
+        label: "i32",
    },
    InlayHint {
-        range: [524; 528),
+        range: [584; 585),
        kind: LetBindingType,
-        label: "(i32, char)",
+        label: "i32",
+    },
+    InlayHint {
+        range: [577; 578),
+        kind: LetBindingType,
+        label: "f64",
+    },
+    InlayHint {
+        range: [580; 581),
+        kind: LetBindingType,
+        label: "f64",
+    },
+]"#
+        );
+    }
+    #[test]
+    fn closure_parameter() {
+        let (analysis, file_id) = single_file(
+            r#"
+fn main() {
+    let mut start = 0;
+    (0..2).for_each(|increment| {
+        start += increment;
+    })
+}"#,
+        );
+        assert_debug_snapshot_matches!(analysis.inlay_hints(file_id).unwrap(), @r#"[
+    InlayHint {
+        range: [21; 30),
+        kind: LetBindingType,
+        label: "i32",
+    },
+    InlayHint {
+        range: [57; 66),
+        kind: ClosureParameterType,
+        label: "i32",
+    },
+]"#
+        );
+    }
+    #[test]
+    fn for_expression() {
+        let (analysis, file_id) = single_file(
+            r#"
+fn main() {
+    let mut start = 0;
+    for increment in 0..2 {
+        start += increment;
+    }
+}"#,
+        );
+        assert_debug_snapshot_matches!(analysis.inlay_hints(file_id).unwrap(), @r#"[
+    InlayHint {
+        range: [21; 30),
+        kind: LetBindingType,
+        label: "i32",
+    },
+    InlayHint {
+        range: [44; 53),
+        kind: ForExpressionBindingType,
+        label: "i32",
+    },
+]"#
+        );
+    }
+    #[test]
+    fn if_expr() {
+        let (analysis, file_id) = single_file(
+            r#"
+#[derive(PartialEq)]
+enum CustomOption<T> {
+    None,
+    Some(T),
+}
+#[derive(PartialEq)]
+struct Test {
+    a: CustomOption<u32>,
+    b: u8,
+}
+fn main() {
+    let test = CustomOption::Some(Test { a: CustomOption::Some(3), b: 1 });
+    if let CustomOption::None = &test {};
+    if let test = &test {};
+    if let CustomOption::Some(test) = &test {};
+    if let CustomOption::Some(Test { a, b }) = &test {};
+    if let CustomOption::Some(Test { a: x, b: y }) = &test {};
+    if let CustomOption::Some(Test { a: CustomOption::Some(x), b: y }) = &test {};
+    if let CustomOption::Some(Test { a: CustomOption::None, b: y }) = &test {};
+    if let CustomOption::Some(Test { b: y, .. }) = &test {};
+    
+    if test == CustomOption::None {}
+}"#,
+        );
+        assert_debug_snapshot_matches!(analysis.inlay_hints(file_id).unwrap(), @r#"[
+    InlayHint {
+        range: [166; 170),
+        kind: LetBindingType,
+        label: "CustomOption<Test>",
+    },
+    InlayHint {
+        range: [334; 338),
+        kind: IfExpressionType,
+        label: "&Test",
+    },
+    InlayHint {
+        range: [389; 390),
+        kind: IfExpressionType,
+        label: "&CustomOption<u32>",
+    },
+    InlayHint {
+        range: [392; 393),
+        kind: IfExpressionType,
+        label: "&u8",
+    },
+    InlayHint {
+        range: [531; 532),
+        kind: IfExpressionType,
+        label: "&u32",
+    },
+]"#
+        );
+    }
+    #[test]
+    fn while_expr() {
+        let (analysis, file_id) = single_file(
+            r#"
+#[derive(PartialEq)]
+enum CustomOption<T> {
+    None,
+    Some(T),
+}
+#[derive(PartialEq)]
+struct Test {
+    a: CustomOption<u32>,
+    b: u8,
+}
+fn main() {
+    let test = CustomOption::Some(Test { a: CustomOption::Some(3), b: 1 });
+    while let CustomOption::None = &test {};
+    while let test = &test {};
+    while let CustomOption::Some(test) = &test {};
+    while let CustomOption::Some(Test { a, b }) = &test {};
+    while let CustomOption::Some(Test { a: x, b: y }) = &test {};
+    while let CustomOption::Some(Test { a: CustomOption::Some(x), b: y }) = &test {};
+    while let CustomOption::Some(Test { a: CustomOption::None, b: y }) = &test {};
+    while let CustomOption::Some(Test { b: y, .. }) = &test {};
+