diff --git a/crates/ra_editor/src/lib.rs b/crates/ra_editor/src/lib.rs
index fe00453780b..906ee11fe7f 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/editors/code/src/highlighting.ts b/editors/code/src/highlighting.ts
index ceddffe0ebf..d440e77c7f7 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')],