9 files changed, 182 insertions, 66 deletions

diff --git a/crates/ra_hir/src/ty/tests.rs b/crates/ra_hir/src/ty/tests.rs
index fb53fcf0b..83aedaa00 100644
--- a/crates/ra_hir/src/ty/tests.rs
+++ b/crates/ra_hir/src/ty/tests.rs
@@ -1,8 +1,11 @@
+use std::sync::Arc;
 use std::fmt::Write;
 use std::path::{PathBuf, Path};
 use std::fs;
 
-use ra_db::{SyntaxDatabase};
+use salsa::Database;
+
+use ra_db::SyntaxDatabase;
 use ra_syntax::ast::{self, AstNode};
 use test_utils::{project_dir, assert_eq_text, read_text};
 
@@ -31,7 +34,7 @@ fn test(a: u32, b: isize, c: !, d: &str) {
     "test";
     1.0f32;
 }"#,
-        "0001_basics.txt",
+        "basics.txt",
     );
 }
 
@@ -45,7 +48,7 @@ fn test() {
     let c = b;
 }
 }"#,
-        "0002_let.txt",
+        "let.txt",
     );
 }
 
@@ -64,7 +67,7 @@ fn test() {
     b::c();
 }
 }"#,
-        "0003_paths.txt",
+        "paths.txt",
     );
 }
 
@@ -87,7 +90,7 @@ fn test() {
     a.c;
 }
 "#,
-        "0004_struct.txt",
+        "struct.txt",
     );
 }
 
@@ -109,7 +112,7 @@ fn test(a: &u32, b: &mut u32, c: *const u32, d: *mut u32) {
     *d;
 }
 "#,
-        "0005_refs.txt",
+        "refs_and_ptrs.txt",
     );
 }
 
@@ -130,7 +133,7 @@ fn test() -> &mut &f64 {
     &mut &c
 }
 "#,
-        "0006_backwards.txt",
+        "backwards.txt",
     );
 }
 
@@ -149,7 +152,31 @@ impl S {
     }
 }
 "#,
-        "0007_self.txt",
+        "self.txt",
+    );
+}
+
+#[test]
+fn infer_boolean_op() {
+    check_inference(
+        r#"
+fn f(x: bool) -> i32 {
+    0i32
+}
+
+fn test() {
+    let x = a && b;
+    let y = true || false;
+    let z = x == y;
+    let h = CONST_1 <= CONST_2;
+    let c = f(z || y) + 5;
+    let d = b;
+    let e = 3i32 && "hello world";
+
+    10 < 3
+}
+"#,
+        "boolean_op.txt",
     );
 }
 
@@ -166,7 +193,25 @@ fn infer(content: &str) -> String {
             .unwrap()
             .unwrap();
         let inference_result = func.infer(&db).unwrap();
-        for (syntax_ptr, ty) in &inference_result.type_of {
+        let body_syntax_mapping = func.body_syntax_mapping(&db).unwrap();
+        let mut types = Vec::new();
+        for (pat, ty) in inference_result.type_of_pat.iter() {
+            let syntax_ptr = match body_syntax_mapping.pat_syntax(pat) {
+                Some(sp) => sp,
+                None => continue,
+            };
+            types.push((syntax_ptr, ty));
+        }
+        for (expr, ty) in inference_result.type_of_expr.iter() {
+            let syntax_ptr = match body_syntax_mapping.expr_syntax(expr) {
+                Some(sp) => sp,
+                None => continue,
+            };
+            types.push((syntax_ptr, ty));
+        }
+        // sort ranges for consistency
+        types.sort_by_key(|(ptr, _)| (ptr.range().start(), ptr.range().end()));
+        for (syntax_ptr, ty) in &types {
             let node = syntax_ptr.resolve(&source_file);
             write!(
                 acc,
@@ -217,3 +262,43 @@ fn ellipsize(mut text: String, max_len: usize) -> String {
 fn test_data_dir() -> PathBuf {
     project_dir().join("crates/ra_hir/src/ty/tests/data")
 }
+
+#[test]
+fn typing_whitespace_inside_a_function_should_not_invalidate_types() {
+    let (mut db, pos) = MockDatabase::with_position(
+        "
+        //- /lib.rs
+        fn foo() -> i32 {
+            <|>1 + 1
+        }
+    ",
+    );
+    let func = source_binder::function_from_position(&db, pos)
+        .unwrap()
+        .unwrap();
+    {
+        let events = db.log_executed(|| {
+            func.infer(&db).unwrap();
+        });
+        assert!(format!("{:?}", events).contains("infer"))
+    }
+
+    let new_text = "
+        fn foo() -> i32 {
+            1
+            +
+            1
+        }
+    "
+    .to_string();
+
+    db.query_mut(ra_db::FileTextQuery)
+        .set(pos.file_id, Arc::new(new_text));
+
+    {
+        let events = db.log_executed(|| {
+            func.infer(&db).unwrap();
+        });
+        assert!(!format!("{:?}", events).contains("infer"), "{:#?}", events)
+    }
+}
diff --git a/crates/ra_hir/src/ty/tests/data/0006_backwards.txt b/crates/ra_hir/src/ty/tests/data/backwards.txt
index 120069401..b6807fb2a 100644
--- a/crates/ra_hir/src/ty/tests/data/0006_backwards.txt
+++ b/crates/ra_hir/src/ty/tests/data/backwards.txt
@@ -1,20 +1,20 @@
-[22; 24) '{}': ()
 [14; 15) 'x': u32
-[142; 158) 'unknow...nction': [unknown]
-[126; 127) 'a': u32
-[198; 216) 'unknow...tion()': f64
-[228; 229) 'c': f64
-[198; 214) 'unknow...nction': [unknown]
-[166; 184) 'S { i3...d: b }': S
-[222; 229) '&mut &c': &mut &f64
-[194; 195) 'c': f64
-[92; 110) 'unknow...tion()': u32
-[142; 160) 'unknow...tion()': i32
-[92; 108) 'unknow...nction': [unknown]
-[116; 128) 'takes_u32(a)': ()
+[22; 24) '{}': ()
 [78; 231) '{     ...t &c }': &mut &f64
-[227; 229) '&c': &f64
 [88; 89) 'a': u32
-[181; 182) 'b': i32
+[92; 108) 'unknow...nction': [unknown]
+[92; 110) 'unknow...tion()': u32
 [116; 125) 'takes_u32': fn(u32,) -> ()
+[116; 128) 'takes_u32(a)': ()
+[126; 127) 'a': u32
 [138; 139) 'b': i32
+[142; 158) 'unknow...nction': [unknown]
+[142; 160) 'unknow...tion()': i32
+[166; 184) 'S { i3...d: b }': S
+[181; 182) 'b': i32
+[194; 195) 'c': f64
+[198; 214) 'unknow...nction': [unknown]
+[198; 216) 'unknow...tion()': f64
+[222; 229) '&mut &c': &mut &f64
+[227; 229) '&c': &f64
+[228; 229) 'c': f64
diff --git a/crates/ra_hir/src/ty/tests/data/0001_basics.txt b/crates/ra_hir/src/ty/tests/data/basics.txt
index 212e92e00..8ea244ba8 100644
--- a/crates/ra_hir/src/ty/tests/data/0001_basics.txt
+++ b/crates/ra_hir/src/ty/tests/data/basics.txt
@@ -1,13 +1,13 @@
+[9; 10) 'a': u32
+[17; 18) 'b': isize
+[27; 28) 'c': !
 [33; 34) 'd': &[unknown]
-[88; 94) '1isize': [unknown]
+[42; 121) '{     ...f32; }': ()
 [48; 49) 'a': u32
 [55; 56) 'b': isize
-[112; 118) '1.0f32': [unknown]
-[76; 82) '1usize': [unknown]
-[9; 10) 'a': u32
-[27; 28) 'c': !
 [62; 63) 'c': !
-[17; 18) 'b': isize
-[100; 106) '"test"': [unknown]
-[42; 121) '{     ...f32; }': ()
 [69; 70) 'd': &[unknown]
+[76; 82) '1usize': [unknown]
+[88; 94) '1isize': [unknown]
+[100; 106) '"test"': [unknown]
+[112; 118) '1.0f32': [unknown]
diff --git a/crates/ra_hir/src/ty/tests/data/boolean_op.txt b/crates/ra_hir/src/ty/tests/data/boolean_op.txt
new file mode 100644
index 000000000..cce8d68fb
--- /dev/null
+++ b/crates/ra_hir/src/ty/tests/data/boolean_op.txt
@@ -0,0 +1,31 @@
+[6; 7) 'x': [unknown]
+[22; 34) '{     0i32 }': i32
+[28; 32) '0i32': i32
+[46; 237) '{     ... < 3 }': bool
+[56; 57) 'x': bool
+[60; 61) 'a': bool
+[60; 66) 'a && b': bool
+[65; 66) 'b': bool
+[76; 77) 'y': bool
+[80; 84) 'true': bool
+[80; 93) 'true || false': bool
+[88; 93) 'false': bool
+[103; 104) 'z': bool
+[107; 108) 'x': bool
+[107; 113) 'x == y': bool
+[112; 113) 'y': bool
+[123; 124) 'h': bool
+[127; 134) 'CONST_1': [unknown]
+[127; 145) 'CONST_...ONST_2': bool
+[138; 145) 'CONST_2': [unknown]
+[155; 156) 'c': [unknown]
+[159; 172) 'f(z || y) + 5': [unknown]
+[182; 183) 'd': [unknown]
+[186; 187) 'b': [unknown]
+[197; 198) 'e': bool
+[201; 205) '3i32': bool
+[201; 222) '3i32 &...world"': bool
+[209; 222) '"hello world"': bool
+[229; 231) '10': [unknown]
+[229; 235) '10 < 3': bool
+[234; 235) '3': [unknown]
diff --git a/crates/ra_hir/src/ty/tests/data/0002_let.txt b/crates/ra_hir/src/ty/tests/data/let.txt
index 916ca25a1..30f4a2cf5 100644
--- a/crates/ra_hir/src/ty/tests/data/0002_let.txt
+++ b/crates/ra_hir/src/ty/tests/data/let.txt
@@ -1,7 +1,7 @@
-[21; 22) 'a': [unknown]
-[52; 53) '1': usize
 [11; 71) '{     ...= b; }': ()
-[63; 64) 'c': usize
+[21; 22) 'a': [unknown]
 [25; 31) '1isize': [unknown]
 [41; 42) 'b': usize
+[52; 53) '1': usize
+[63; 64) 'c': usize
 [67; 68) 'b': usize
diff --git a/crates/ra_hir/src/ty/tests/data/0003_paths.txt b/crates/ra_hir/src/ty/tests/data/paths.txt
index 2a12d264f..b22f4d4a5 100644
--- a/crates/ra_hir/src/ty/tests/data/0003_paths.txt
+++ b/crates/ra_hir/src/ty/tests/data/paths.txt
@@ -1,9 +1,9 @@
 [15; 20) '{ 1 }': u32
 [17; 18) '1': u32
-[50; 51) '1': u32
 [48; 53) '{ 1 }': u32
-[82; 88) 'b::c()': u32
+[50; 51) '1': u32
 [67; 91) '{     ...c(); }': ()
 [73; 74) 'a': fn() -> u32
 [73; 76) 'a()': u32
 [82; 86) 'b::c': fn() -> u32
+[82; 88) 'b::c()': u32
diff --git a/crates/ra_hir/src/ty/tests/data/0005_refs.txt b/crates/ra_hir/src/ty/tests/data/refs_and_ptrs.txt
index 296e955c1..afab343ea 100644
--- a/crates/ra_hir/src/ty/tests/data/0005_refs.txt
+++ b/crates/ra_hir/src/ty/tests/data/refs_and_ptrs.txt
@@ -1,23 +1,23 @@
-[115; 117) '&b': &&mut u32
-[88; 94) '&mut a': &mut &u32
-[146; 147) 'd': *mut u32
-[145; 147) '*d': u32
-[65; 66) 'a': &u32
+[9; 10) 'a': &u32
+[18; 19) 'b': &mut u32
+[31; 32) 'c': *const u32
 [46; 47) 'd': *mut u32
 [59; 150) '{     ... *d; }': ()
-[116; 117) 'b': &mut u32
-[131; 132) 'c': *const u32
-[130; 132) '*c': u32
+[65; 66) 'a': &u32
 [72; 74) '*a': u32
-[107; 109) '*b': u32
-[108; 109) 'b': &mut u32
-[9; 10) 'a': &u32
-[18; 19) 'b': &mut u32
+[73; 74) 'a': &u32
+[80; 82) '&a': &&u32
+[81; 82) 'a': &u32
+[88; 94) '&mut a': &mut &u32
 [93; 94) 'a': &u32
 [100; 101) 'b': &mut u32
-[81; 82) 'a': &u32
-[80; 82) '&a': &&u32
-[73; 74) 'a': &u32
+[107; 109) '*b': u32
+[108; 109) 'b': &mut u32
+[115; 117) '&b': &&mut u32
+[116; 117) 'b': &mut u32
 [123; 124) 'c': *const u32
-[31; 32) 'c': *const u32
+[130; 132) '*c': u32
+[131; 132) 'c': *const u32
 [138; 139) 'd': *mut u32
+[145; 147) '*d': u32
+[146; 147) 'd': *mut u32
diff --git a/crates/ra_hir/src/ty/tests/data/0007_self.txt b/crates/ra_hir/src/ty/tests/data/self.txt
index db4ba17d0..c38029f97 100644
--- a/crates/ra_hir/src/ty/tests/data/0007_self.txt
+++ b/crates/ra_hir/src/ty/tests/data/self.txt
@@ -1,6 +1,6 @@
-[50; 54) 'self': &S
 [34; 38) 'self': &S
 [40; 61) '{     ...     }': ()
+[50; 54) 'self': &S
+[75; 79) 'self': &S
 [88; 109) '{     ...     }': ()
 [98; 102) 'self': &S
-[75; 79) 'self': &S
diff --git a/crates/ra_hir/src/ty/tests/data/0004_struct.txt b/crates/ra_hir/src/ty/tests/data/struct.txt
index b4af18b87..7b324c82f 100644
--- a/crates/ra_hir/src/ty/tests/data/0004_struct.txt
+++ b/crates/ra_hir/src/ty/tests/data/struct.txt
@@ -1,16 +1,16 @@
-[86; 90) 'C(1)': [unknown]
-[121; 122) 'B': B
+[72; 154) '{     ...a.c; }': ()
+[82; 83) 'c': [unknown]
 [86; 87) 'C': [unknown]
-[129; 130) '1': [unknown]
+[86; 90) 'C(1)': [unknown]
+[88; 89) '1': [unknown]
+[96; 97) 'B': [unknown]
 [107; 108) 'a': A
+[114; 133) 'A { b:...C(1) }': A
+[121; 122) 'B': B
 [127; 128) 'C': [unknown]
+[127; 131) 'C(1)': C
+[129; 130) '1': [unknown]
+[139; 140) 'a': A
 [139; 142) 'a.b': B
-[114; 133) 'A { b:...C(1) }': A
-[148; 151) 'a.c': C
 [148; 149) 'a': A
-[139; 140) 'a': A
-[72; 154) '{     ...a.c; }': ()
-[96; 97) 'B': [unknown]
-[88; 89) '1': [unknown]
-[82; 83) 'c': [unknown]
-[127; 131) 'C(1)': C
+[148; 151) 'a.c': C