4 files changed, 68 insertions, 56 deletions

diff --git a/crates/ra_editor/src/lib.rs b/crates/ra_editor/src/lib.rs
index fe0045378..906ee11fe 100644
--- a/crates/ra_editor/src/lib.rs
+++ b/crates/ra_editor/src/lib.rs
@@ -88,7 +88,6 @@ pub fn highlight(file: &File) -> Vec<HighlightedRange> {
     let mut res = Vec::new();
     for node in file.syntax().descendants() {
         let tag = match node.kind() {
-            ERROR => "error",
             COMMENT | DOC_COMMENT => "comment",
             STRING | RAW_STRING | RAW_BYTE_STRING | BYTE_STRING => "string",
             ATTR => "attribute",
@@ -108,21 +107,10 @@ pub fn highlight(file: &File) -> Vec<HighlightedRange> {
 }
 
 pub fn diagnostics(file: &File) -> Vec<Diagnostic> {
-    let mut res = Vec::new();
-
-    for node in file.syntax().descendants() {
-        if node.kind() == ERROR {
-            res.push(Diagnostic {
-                range: node.range(),
-                msg: "Syntax Error".to_string(),
-            });
-        }
-    }
-    res.extend(file.errors().into_iter().map(|err| Diagnostic {
+    file.errors().into_iter().map(|err| Diagnostic {
         range: TextRange::offset_len(err.offset, 1.into()),
-        msg: err.msg,
-    }));
-    res
+        msg: "Syntax Error: ".to_string() + &err.msg,
+    }).collect()
 }
 
 pub fn syntax_tree(file: &File) -> String {
diff --git a/crates/ra_syntax/src/ast/generated.rs b/crates/ra_syntax/src/ast/generated.rs
index b0b855eb4..ef7b5b1a1 100644
--- a/crates/ra_syntax/src/ast/generated.rs
+++ b/crates/ra_syntax/src/ast/generated.rs
@@ -81,7 +81,8 @@ impl<'a> AstNode<'a> for Attr<'a> {
     fn syntax(self) -> SyntaxNodeRef<'a> { self.syntax }
 }
 
-impl<'a> Attr<'a> {pub fn value(self) -> Option<TokenTree<'a>> {
+impl<'a> Attr<'a> {
+    pub fn value(self) -> Option<TokenTree<'a>> {
         super::child_opt(self)
     }
 }
@@ -143,7 +144,8 @@ impl<'a> Block<'a> {
     pub fn statements(self) -> impl Iterator<Item = Stmt<'a>> + 'a {
         super::children(self)
     }
-pub fn expr(self) -> Option<Expr<'a>> {
+
+    pub fn expr(self) -> Option<Expr<'a>> {
         super::child_opt(self)
     }
 }
@@ -164,7 +166,8 @@ impl<'a> AstNode<'a> for BlockExpr<'a> {
     fn syntax(self) -> SyntaxNodeRef<'a> { self.syntax }
 }
 
-impl<'a> BlockExpr<'a> {pub fn block(self) -> Option<Block<'a>> {
+impl<'a> BlockExpr<'a> {
+    pub fn block(self) -> Option<Block<'a>> {
         super::child_opt(self)
     }
 }
@@ -204,7 +207,8 @@ impl<'a> AstNode<'a> for CallExpr<'a> {
 }
 
 impl<'a> ast::ArgListOwner<'a> for CallExpr<'a> {}
-impl<'a> CallExpr<'a> {pub fn expr(self) -> Option<Expr<'a>> {
+impl<'a> CallExpr<'a> {
+    pub fn expr(self) -> Option<Expr<'a>> {
         super::child_opt(self)
     }
 }
@@ -261,10 +265,12 @@ impl<'a> AstNode<'a> for Condition<'a> {
     fn syntax(self) -> SyntaxNodeRef<'a> { self.syntax }
 }
 
-impl<'a> Condition<'a> {pub fn pat(self) -> Option<Pat<'a>> {
+impl<'a> Condition<'a> {
+    pub fn pat(self) -> Option<Pat<'a>> {
         super::child_opt(self)
     }
-pub fn expr(self) -> Option<Expr<'a>> {
+
+    pub fn expr(self) -> Option<Expr<'a>> {
         super::child_opt(self)
     }
 }
@@ -478,7 +484,8 @@ impl<'a> AstNode<'a> for ExprStmt<'a> {
     fn syntax(self) -> SyntaxNodeRef<'a> { self.syntax }
 }
 
-impl<'a> ExprStmt<'a> {pub fn expr(self) -> Option<Expr<'a>> {
+impl<'a> ExprStmt<'a> {
+    pub fn expr(self) -> Option<Expr<'a>> {
         super::child_opt(self)
     }
 }
@@ -556,13 +563,16 @@ impl<'a> AstNode<'a> for FnDef<'a> {
 impl<'a> ast::NameOwner<'a> for FnDef<'a> {}
 impl<'a> ast::TypeParamsOwner<'a> for FnDef<'a> {}
 impl<'a> ast::AttrsOwner<'a> for FnDef<'a> {}
-impl<'a> FnDef<'a> {pub fn param_list(self) -> Option<ParamList<'a>> {
+impl<'a> FnDef<'a> {
+    pub fn param_list(self) -> Option<ParamList<'a>> {
         super::child_opt(self)
     }
-pub fn body(self) -> Option<Block<'a>> {
+
+    pub fn body(self) -> Option<Block<'a>> {
         super::child_opt(self)
     }
-pub fn ret_type(self) -> Option<RetType<'a>> {
+
+    pub fn ret_type(self) -> Option<RetType<'a>> {
         super::child_opt(self)
     }
 }
@@ -602,10 +612,12 @@ impl<'a> AstNode<'a> for ForExpr<'a> {
 }
 
 impl<'a> ast::LoopBodyOwner<'a> for ForExpr<'a> {}
-impl<'a> ForExpr<'a> {pub fn pat(self) -> Option<Pat<'a>> {
+impl<'a> ForExpr<'a> {
+    pub fn pat(self) -> Option<Pat<'a>> {
         super::child_opt(self)
     }
-pub fn iterable(self) -> Option<Expr<'a>> {
+
+    pub fn iterable(self) -> Option<Expr<'a>> {
         super::child_opt(self)
     }
 }
@@ -644,7 +656,8 @@ impl<'a> AstNode<'a> for IfExpr<'a> {
     fn syntax(self) -> SyntaxNodeRef<'a> { self.syntax }
 }
 
-impl<'a> IfExpr<'a> {pub fn condition(self) -> Option<Condition<'a>> {
+impl<'a> IfExpr<'a> {
+    pub fn condition(self) -> Option<Condition<'a>> {
         super::child_opt(self)
     }
 }
@@ -757,10 +770,12 @@ impl<'a> AstNode<'a> for LambdaExpr<'a> {
     fn syntax(self) -> SyntaxNodeRef<'a> { self.syntax }
 }
 
-impl<'a> LambdaExpr<'a> {pub fn param_list(self) -> Option<ParamList<'a>> {
+impl<'a> LambdaExpr<'a> {
+    pub fn param_list(self) -> Option<ParamList<'a>> {
         super::child_opt(self)
     }
-pub fn body(self) -> Option<Expr<'a>> {
+
+    pub fn body(self) -> Option<Expr<'a>> {
         super::child_opt(self)
     }
 }
@@ -781,10 +796,12 @@ impl<'a> AstNode<'a> for LetStmt<'a> {
     fn syntax(self) -> SyntaxNodeRef<'a> { self.syntax }
 }
 
-impl<'a> LetStmt<'a> {pub fn pat(self) -> Option<Pat<'a>> {
+impl<'a> LetStmt<'a> {
+    pub fn pat(self) -> Option<Pat<'a>> {
         super::child_opt(self)
     }
-pub fn initializer(self) -> Option<Expr<'a>> {
+
+    pub fn initializer(self) -> Option<Expr<'a>> {
         super::child_opt(self)
     }
 }
@@ -823,7 +840,8 @@ impl<'a> AstNode<'a> for LifetimeParam<'a> {
     fn syntax(self) -> SyntaxNodeRef<'a> { self.syntax }
 }
 
-impl<'a> LifetimeParam<'a> {pub fn lifetime(self) -> Option<Lifetime<'a>> {
+impl<'a> LifetimeParam<'a> {
+    pub fn lifetime(self) -> Option<Lifetime<'a>> {
         super::child_opt(self)
     }
 }
@@ -885,10 +903,12 @@ impl<'a> MatchArm<'a> {
     pub fn pats(self) -> impl Iterator<Item = Pat<'a>> + 'a {
         super::children(self)
     }
-pub fn guard(self) -> Option<MatchGuard<'a>> {
+
+    pub fn guard(self) -> Option<MatchGuard<'a>> {
         super::child_opt(self)
     }
-pub fn expr(self) -> Option<Expr<'a>> {
+
+    pub fn expr(self) -> Option<Expr<'a>> {
         super::child_opt(self)
     }
 }
@@ -931,10 +951,12 @@ impl<'a> AstNode<'a> for MatchExpr<'a> {
     fn syntax(self) -> SyntaxNodeRef<'a> { self.syntax }
 }
 
-impl<'a> MatchExpr<'a> {pub fn expr(self) -> Option<Expr<'a>> {
+impl<'a> MatchExpr<'a> {
+    pub fn expr(self) -> Option<Expr<'a>> {
         super::child_opt(self)
     }
-pub fn match_arm_list(self) -> Option<MatchArmList<'a>> {
+
+    pub fn match_arm_list(self) -> Option<MatchArmList<'a>> {
         super::child_opt(self)
     }
 }
@@ -974,7 +996,8 @@ impl<'a> AstNode<'a> for MethodCallExpr<'a> {
 }
 
 impl<'a> ast::ArgListOwner<'a> for MethodCallExpr<'a> {}
-impl<'a> MethodCallExpr<'a> {pub fn expr(self) -> Option<Expr<'a>> {
+impl<'a> MethodCallExpr<'a> {
+    pub fn expr(self) -> Option<Expr<'a>> {
         super::child_opt(self)
     }
 }
@@ -997,7 +1020,8 @@ impl<'a> AstNode<'a> for Module<'a> {
 
 impl<'a> ast::NameOwner<'a> for Module<'a> {}
 impl<'a> ast::AttrsOwner<'a> for Module<'a> {}
-impl<'a> Module<'a> {pub fn item_list(self) -> Option<ItemList<'a>> {
+impl<'a> Module<'a> {
+    pub fn item_list(self) -> Option<ItemList<'a>> {
         super::child_opt(self)
     }
 }
@@ -1208,7 +1232,8 @@ impl<'a> AstNode<'a> for Param<'a> {
     fn syntax(self) -> SyntaxNodeRef<'a> { self.syntax }
 }
 
-impl<'a> Param<'a> {pub fn pat(self) -> Option<Pat<'a>> {
+impl<'a> Param<'a> {
+    pub fn pat(self) -> Option<Pat<'a>> {
         super::child_opt(self)
     }
 }
@@ -1233,7 +1258,8 @@ impl<'a> ParamList<'a> {
     pub fn params(self) -> impl Iterator<Item = Param<'a>> + 'a {
         super::children(self)
     }
-pub fn self_param(self) -> Option<SelfParam<'a>> {
+
+    pub fn self_param(self) -> Option<SelfParam<'a>> {
         super::child_opt(self)
     }
 }
@@ -1339,7 +1365,8 @@ impl<'a> AstNode<'a> for Path<'a> {
     fn syntax(self) -> SyntaxNodeRef<'a> { self.syntax }
 }
 
-impl<'a> Path<'a> {pub fn segment(self) -> Option<PathSegment<'a>> {
+impl<'a> Path<'a> {
+    pub fn segment(self) -> Option<PathSegment<'a>> {
         super::child_opt(self)
     }
 }
@@ -1396,7 +1423,8 @@ impl<'a> AstNode<'a> for PathSegment<'a> {
     fn syntax(self) -> SyntaxNodeRef<'a> { self.syntax }
 }
 
-impl<'a> PathSegment<'a> {pub fn name_ref(self) -> Option<NameRef<'a>> {
+impl<'a> PathSegment<'a> {
+    pub fn name_ref(self) -> Option<NameRef<'a>> {
         super::child_opt(self)
     }
 }
@@ -2070,7 +2098,8 @@ impl<'a> AstNode<'a> for UseItem<'a> {
     fn syntax(self) -> SyntaxNodeRef<'a> { self.syntax }
 }
 
-impl<'a> UseItem<'a> {pub fn use_tree(self) -> Option<UseTree<'a>> {
+impl<'a> UseItem<'a> {
+    pub fn use_tree(self) -> Option<UseTree<'a>> {
         super::child_opt(self)
     }
 }
@@ -2091,10 +2120,12 @@ impl<'a> AstNode<'a> for UseTree<'a> {
     fn syntax(self) -> SyntaxNodeRef<'a> { self.syntax }
 }
 
-impl<'a> UseTree<'a> {pub fn path(self) -> Option<Path<'a>> {
+impl<'a> UseTree<'a> {
+    pub fn path(self) -> Option<Path<'a>> {
         super::child_opt(self)
     }
-pub fn use_tree_list(self) -> Option<UseTreeList<'a>> {
+
+    pub fn use_tree_list(self) -> Option<UseTreeList<'a>> {
         super::child_opt(self)
     }
 }
@@ -2156,7 +2187,8 @@ impl<'a> AstNode<'a> for WhileExpr<'a> {
 }
 
 impl<'a> ast::LoopBodyOwner<'a> for WhileExpr<'a> {}
-impl<'a> WhileExpr<'a> {pub fn condition(self) -> Option<Condition<'a>> {
+impl<'a> WhileExpr<'a> {
+    pub fn condition(self) -> Option<Condition<'a>> {
         super::child_opt(self)
     }
 }
diff --git a/crates/ra_syntax/src/ast/generated.rs.tera b/crates/ra_syntax/src/ast/generated.rs.tera
index ceb2cd7e2..ffa9c4134 100644
--- a/crates/ra_syntax/src/ast/generated.rs.tera
+++ b/crates/ra_syntax/src/ast/generated.rs.tera
@@ -77,8 +77,7 @@ impl<'a> {{ node }}<'a> {
 {%- else -%}
 {%- set method_name = m.0 -%}
 {%- set ChildName = m.1 %}
-{%- endif -%}
-
+{%- endif %}
     pub fn {{ method_name }}(self) -> Option<{{ ChildName }}<'a>> {
         super::child_opt(self)
     }
diff --git a/editors/code/src/highlighting.ts b/editors/code/src/highlighting.ts
index ceddffe0e..d440e77c7 100644
--- a/editors/code/src/highlighting.ts
+++ b/editors/code/src/highlighting.ts
@@ -20,13 +20,6 @@ export class Highlighter {
             [string, vscode.TextEditorDecorationType]
         > = [
             ['background', decor('#3F3F3F')],
-            [
-                'error',
-                vscode.window.createTextEditorDecorationType({
-                    borderColor: 'red',
-                    borderStyle: 'none none dashed none'
-                })
-            ],
             ['comment', decor('#7F9F7F')],
             ['string', decor('#CC9393')],
             ['keyword', decor('#F0DFAF')],