11 files changed, 120 insertions, 13 deletions

diff --git a/crates/ra_hir/src/ty.rs b/crates/ra_hir/src/ty.rs
index 0c24a0652..2d533eb6a 100644
--- a/crates/ra_hir/src/ty.rs
+++ b/crates/ra_hir/src/ty.rs
@@ -18,6 +18,7 @@ mod primitive;
 #[cfg(test)]
 mod tests;
 
+use std::borrow::Cow;
 use std::ops::Index;
 use std::sync::Arc;
 use std::{fmt, mem};
@@ -671,7 +672,10 @@ impl<'a, D: HirDatabase> InferenceContext<'a, D> {
     }
 
     fn unify(&mut self, ty1: &Ty, ty2: &Ty) -> bool {
-        match (ty1, ty2) {
+        // try to resolve type vars first
+        let ty1 = self.resolve_ty_shallow(ty1);
+        let ty2 = self.resolve_ty_shallow(ty2);
+        match (&*ty1, &*ty2) {
             (Ty::Unknown, ..) => true,
             (.., Ty::Unknown) => true,
             (Ty::Bool, _)
@@ -698,10 +702,12 @@ impl<'a, D: HirDatabase> InferenceContext<'a, D> {
                 .zip(ts2.iter())
                 .all(|(t1, t2)| self.unify(t1, t2)),
             (Ty::Infer(InferTy::TypeVar(tv1)), Ty::Infer(InferTy::TypeVar(tv2))) => {
+                // both type vars are unknown since we tried to resolve them
                 self.var_unification_table.union(*tv1, *tv2);
                 true
             }
             (Ty::Infer(InferTy::TypeVar(tv)), other) | (other, Ty::Infer(InferTy::TypeVar(tv))) => {
+                // the type var is unknown since we tried to resolve it
                 self.var_unification_table
                     .union_value(*tv, TypeVarValue::Known(other.clone()));
                 true
@@ -746,6 +752,23 @@ impl<'a, D: HirDatabase> InferenceContext<'a, D> {
         })
     }
 
+    /// If `ty` is a type variable with known type, returns that type;
+    /// otherwise, return ty.
+    fn resolve_ty_shallow<'b>(&mut self, ty: &'b Ty) -> Cow<'b, Ty> {
+        match ty {
+            Ty::Infer(InferTy::TypeVar(tv)) => {
+                match self.var_unification_table.probe_value(*tv).known() {
+                    Some(known_ty) => {
+                        // The known_ty can't be a type var itself
+                        Cow::Owned(known_ty.clone())
+                    }
+                    _ => Cow::Borrowed(ty),
+                }
+            }
+            _ => Cow::Borrowed(ty),
+        }
+    }
+
     /// Resolves the type completely; type variables without known type are
     /// replaced by Ty::Unknown.
     fn resolve_ty_completely(&mut self, ty: Ty) -> Ty {
@@ -816,12 +839,15 @@ impl<'a, D: HirDatabase> InferenceContext<'a, D> {
                 // if let is desugared to match, so this is always simple if
                 self.infer_expr(*condition, &Expectation::has_type(Ty::Bool))?;
                 let then_ty = self.infer_expr(*then_branch, expected)?;
-                if let Some(else_branch) = else_branch {
-                    self.infer_expr(*else_branch, expected)?;
-                } else {
-                    // no else branch -> unit
-                    self.unify(&expected.ty, &Ty::unit()); // actually coerce
-                }
+                match else_branch {
+                    Some(else_branch) => {
+                        self.infer_expr(*else_branch, expected)?;
+                    }
+                    None => {
+                        // no else branch -> unit
+                        self.unify(&then_ty, &Ty::unit()); // actually coerce
+                    }
+                };
                 then_ty
             }
             Expr::Block { statements, tail } => self.infer_block(statements, *tail, expected)?,
diff --git a/crates/ra_hir/src/ty/tests.rs b/crates/ra_hir/src/ty/tests.rs
index d8c0af326..815aecda7 100644
--- a/crates/ra_hir/src/ty/tests.rs
+++ b/crates/ra_hir/src/ty/tests.rs
@@ -230,6 +230,18 @@ fn test2(a1: *const A, a2: *mut A) {
     );
 }
 
+#[test]
+fn infer_bug_484() {
+    check_inference(
+        r#"
+fn test() {
+   let x = if true {};
+}
+"#,
+        "bug_484.txt",
+    );
+}
+
 fn infer(content: &str) -> String {
     let (db, _, file_id) = MockDatabase::with_single_file(content);
     let source_file = db.source_file(file_id);
diff --git a/crates/ra_hir/src/ty/tests/data/bug_484.txt b/crates/ra_hir/src/ty/tests/data/bug_484.txt
new file mode 100644
index 000000000..300530551
--- /dev/null
+++ b/crates/ra_hir/src/ty/tests/data/bug_484.txt
@@ -0,0 +1,5 @@
+[11; 37) '{    l... {}; }': ()
+[20; 21) 'x': ()
+[24; 34) 'if true {}': ()
+[27; 31) 'true': bool
+[32; 34) '{}': ()
diff --git a/crates/ra_lsp_server/src/main_loop.rs b/crates/ra_lsp_server/src/main_loop.rs
index 726c758aa..03c834dbc 100644
--- a/crates/ra_lsp_server/src/main_loop.rs
+++ b/crates/ra_lsp_server/src/main_loop.rs
@@ -65,7 +65,7 @@ pub fn main_loop(
     let workspaces = match ws_worker.recv().unwrap() {
         Ok(ws) => vec![ws],
         Err(e) => {
-            log::warn!("loading workspace failed: {}", e);
+            log::error!("loading workspace failed: {}", e);
             Vec::new()
         }
     };
diff --git a/crates/ra_lsp_server/src/main_loop/handlers.rs b/crates/ra_lsp_server/src/main_loop/handlers.rs
index 7f6146b6c..a781df181 100644
--- a/crates/ra_lsp_server/src/main_loop/handlers.rs
+++ b/crates/ra_lsp_server/src/main_loop/handlers.rs
@@ -4,7 +4,7 @@ use gen_lsp_server::ErrorCode;
 use languageserver_types::{
     CodeActionResponse, Command, CodeLens, Diagnostic, DiagnosticSeverity, DocumentFormattingParams,
     DocumentHighlight, DocumentSymbol, Documentation, FoldingRange, FoldingRangeKind,
-    FoldingRangeParams, Hover, HoverContents, Location, MarkedString, MarkupContent, MarkupKind,
+    FoldingRangeParams, Hover, HoverContents, Location, MarkupContent, MarkupKind,
     ParameterInformation, ParameterLabel, Position, PrepareRenameResponse, Range, RenameParams,
     SignatureInformation, SymbolInformation, TextDocumentIdentifier, TextEdit, WorkspaceEdit,
 };
@@ -422,7 +422,10 @@ pub fn handle_hover(
     let line_index = world.analysis.file_line_index(position.file_id);
     let range = info.range.conv_with(&line_index);
     let res = Hover {
-        contents: HoverContents::Scalar(MarkedString::String(info.info)),
+        contents: HoverContents::Markup(MarkupContent {
+            kind: MarkupKind::Markdown,
+            value: info.info,
+        }),
         range: Some(range),
     };
     Ok(Some(res))
diff --git a/crates/ra_lsp_server/src/project_model/sysroot.rs b/crates/ra_lsp_server/src/project_model/sysroot.rs
index 1dbab57f8..3b2fa070b 100644
--- a/crates/ra_lsp_server/src/project_model/sysroot.rs
+++ b/crates/ra_lsp_server/src/project_model/sysroot.rs
@@ -44,6 +44,14 @@ impl Sysroot {
         let stdout = String::from_utf8(rustc_output.stdout)?;
         let sysroot_path = Path::new(stdout.trim());
         let src = sysroot_path.join("lib/rustlib/src/rust/src");
+        if !src.exists() {
+            failure::bail!(
+                "can't load standard library from sysroot\n\
+                 {:?}\n\
+                 try running `rustup component add rust-src`",
+                src,
+            );
+        }
 
         let mut sysroot = Sysroot {
             crates: Arena::default(),
diff --git a/crates/ra_syntax/src/grammar/items/nominal.rs b/crates/ra_syntax/src/grammar/items/nominal.rs
index 495462ca7..0784fb7b1 100644
--- a/crates/ra_syntax/src/grammar/items/nominal.rs
+++ b/crates/ra_syntax/src/grammar/items/nominal.rs
@@ -140,6 +140,16 @@ fn pos_field_list(p: &mut Parser) {
     }
     while !p.at(R_PAREN) && !p.at(EOF) {
         let m = p.start();
+        // test pos_field_attrs
+        // struct S (
+        //     #[serde(with = "url_serde")]
+        //     pub Uri,
+        // );
+        //
+        // enum S {
+        //     Uri(#[serde(with = "url_serde")] Uri),
+        // }
+        attributes::outer_attributes(p);
         opt_visibility(p);
         if !p.at_ts(types::TYPE_FIRST) {
             p.error("expected a type");
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0115_pos_field_attrs.rs b/crates/ra_syntax/tests/data/parser/inline/ok/0115_pos_field_attrs.rs
new file mode 100644
index 000000000..635b9ac21
--- /dev/null
+++ b/crates/ra_syntax/tests/data/parser/inline/ok/0115_pos_field_attrs.rs
@@ -0,0 +1,4 @@
+struct S (
+    #[serde(with = "url_serde")]
+    pub Uri,
+);
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0115_pos_field_attrs.txt b/crates/ra_syntax/tests/data/parser/inline/ok/0115_pos_field_attrs.txt
new file mode 100644
index 000000000..99ec0755b
--- /dev/null
+++ b/crates/ra_syntax/tests/data/parser/inline/ok/0115_pos_field_attrs.txt
@@ -0,0 +1,39 @@
+SOURCE_FILE@[0; 60)
+  STRUCT_DEF@[0; 59)
+    STRUCT_KW@[0; 6)
+    WHITESPACE@[6; 7)
+    NAME@[7; 8)
+      IDENT@[7; 8) "S"
+    WHITESPACE@[8; 9)
+    POS_FIELD_LIST@[9; 58)
+      L_PAREN@[9; 10)
+      WHITESPACE@[10; 15)
+      POS_FIELD@[15; 55)
+        ATTR@[15; 43)
+          POUND@[15; 16)
+          TOKEN_TREE@[16; 43)
+            L_BRACK@[16; 17)
+            IDENT@[17; 22) "serde"
+            TOKEN_TREE@[22; 42)
+              L_PAREN@[22; 23)
+              IDENT@[23; 27) "with"
+              WHITESPACE@[27; 28)
+              EQ@[28; 29)
+              WHITESPACE@[29; 30)
+              STRING@[30; 41)
+              R_PAREN@[41; 42)
+            R_BRACK@[42; 43)
+        WHITESPACE@[43; 48)
+        VISIBILITY@[48; 51)
+          PUB_KW@[48; 51)
+        WHITESPACE@[51; 52)
+        PATH_TYPE@[52; 55)
+          PATH@[52; 55)
+            PATH_SEGMENT@[52; 55)
+              NAME_REF@[52; 55)
+                IDENT@[52; 55) "Uri"
+      COMMA@[55; 56)
+      WHITESPACE@[56; 57)
+      R_PAREN@[57; 58)
+    SEMI@[58; 59)
+  WHITESPACE@[59; 60)
diff --git a/crates/tools/src/main.rs b/crates/tools/src/main.rs
index 9d73d57c4..5597aae5a 100644
--- a/crates/tools/src/main.rs
+++ b/crates/tools/src/main.rs
@@ -158,12 +158,12 @@ fn install_code_extension() -> Result<()> {
     }
     if cfg!(windows) {
         run(
-            r"cmd.exe /c code.cmd --install-extension ./ra-lsp-0.0.1.vsix",
+            r"cmd.exe /c code.cmd --install-extension ./ra-lsp-0.0.1.vsix --force",
             "./editors/code",
         )?;
     } else {
         run(
-            r"code --install-extension ./ra-lsp-0.0.1.vsix",
+            r"code --install-extension ./ra-lsp-0.0.1.vsix --force",
             "./editors/code",
         )?;
     }
diff --git a/editors/README.md b/editors/README.md
index a63ced725..5b09750e6 100644
--- a/editors/README.md
+++ b/editors/README.md
@@ -1,7 +1,7 @@
 To install experimental VS Code plugin:
 
 ```
-$ git clone https://github.com/rust-analyzer/rust-analyzer.git
+$ git clone https://github.com/rust-analyzer/rust-analyzer.git --depth 1
 $ cd rust-analyzer
 $ cargo install-code
 ```