From fcca35969dd7c63a83ee34c4ce7d54cefdb72bbe Mon Sep 17 00:00:00 2001
From: Aleksey Kladov <aleksey.kladov@gmail.com>
Date: Sat, 23 Mar 2019 16:28:47 +0300
Subject: allow dyn diagnostics

---
 crates/ra_ide_api/src/diagnostics.rs | 26 ++++++++------------------
 1 file changed, 8 insertions(+), 18 deletions(-)

(limited to 'crates/ra_ide_api')

diff --git a/crates/ra_ide_api/src/diagnostics.rs b/crates/ra_ide_api/src/diagnostics.rs
index f662f7e2f..943fd2f53 100644
--- a/crates/ra_ide_api/src/diagnostics.rs
+++ b/crates/ra_ide_api/src/diagnostics.rs
@@ -3,7 +3,7 @@ use hir::{Problem, source_binder};
 use ra_db::SourceDatabase;
 use ra_syntax::{
     Location, SourceFile, SyntaxKind, TextRange, SyntaxNode,
-    ast::{self, AstNode, NameOwner},
+    ast::{self, AstNode},
 
 };
 use ra_text_edit::{TextEdit, TextEditBuilder};
@@ -161,23 +161,13 @@ fn check_module(
 }
 
 fn check_function(acc: &mut Vec<Diagnostic>, db: &RootDatabase, function: hir::Function) {
-    let (_file_id, fn_def) = function.source(db);
-    let source_file = fn_def.syntax().ancestors().find_map(ast::SourceFile::cast).unwrap();
-    let source_map = function.body_source_map(db);
-    for d in function.diagnostics(db) {
-        match d {
-            hir::diagnostics::FunctionDiagnostic::NoSuchField { expr, field } => {
-                if let Some(field) = source_map.field_syntax(expr, field) {
-                    let field = field.to_node(&source_file);
-                    acc.push(Diagnostic {
-                        message: "no such field".into(),
-                        range: field.syntax().range(),
-                        severity: Severity::Error,
-                        fix: None,
-                    })
-                }
-            }
-        }
+    for d in function.diagnostics(db).iter() {
+        acc.push(Diagnostic {
+            message: d.message(),
+            range: d.syntax_node().range(),
+            severity: Severity::Error,
+            fix: None,
+        })
     }
 }
 
-- 
cgit v1.2.3