From 9963f43d51071ea02f8f6d490b9c49882034b42c Mon Sep 17 00:00:00 2001
From: Kirill Bulatov <mail4score@gmail.com>
Date: Sun, 9 Aug 2020 01:59:26 +0300
Subject: Refactor the diagnostics

---
 crates/ra_hir/src/semantics.rs | 28 ++++++++++------------------
 1 file changed, 10 insertions(+), 18 deletions(-)

(limited to 'crates/ra_hir/src')

diff --git a/crates/ra_hir/src/semantics.rs b/crates/ra_hir/src/semantics.rs
index 1c5dc3d51..b4420d378 100644
--- a/crates/ra_hir/src/semantics.rs
+++ b/crates/ra_hir/src/semantics.rs
@@ -109,11 +109,14 @@ impl<'db, DB: HirDatabase> Semantics<'db, DB> {
         self.imp.parse(file_id)
     }
 
-    pub fn ast<T: AstDiagnostic + Diagnostic>(&self, d: &T) -> <T as AstDiagnostic>::AST {
-        let file_id = d.source().file_id;
+    pub fn diagnostic_fix_source<T: AstDiagnostic + Diagnostic>(
+        &self,
+        d: &T,
+    ) -> <T as AstDiagnostic>::AST {
+        let file_id = d.presentation().file_id;
         let root = self.db.parse_or_expand(file_id).unwrap();
         self.imp.cache(root, file_id);
-        d.ast(self.db.upcast())
+        d.fix_source(self.db.upcast())
     }
 
     pub fn expand(&self, macro_call: &ast::MacroCall) -> Option<SyntaxNode> {
@@ -145,12 +148,8 @@ impl<'db, DB: HirDatabase> Semantics<'db, DB> {
         self.imp.original_range(node)
     }
 
-    pub fn diagnostics_fix_range(&self, diagnostics: &dyn Diagnostic) -> FileRange {
-        self.imp.diagnostics_fix_range(diagnostics)
-    }
-
-    pub fn diagnostics_range(&self, diagnostics: &dyn Diagnostic) -> FileRange {
-        self.imp.diagnostics_range(diagnostics)
+    pub fn diagnostics_presentation_range(&self, diagnostics: &dyn Diagnostic) -> FileRange {
+        self.imp.diagnostics_presentation_range(diagnostics)
     }
 
     pub fn ancestors_with_macros(&self, node: SyntaxNode) -> impl Iterator<Item = SyntaxNode> + '_ {
@@ -380,15 +379,8 @@ impl<'db> SemanticsImpl<'db> {
         original_range(self.db, node.as_ref())
     }
 
-    fn diagnostics_fix_range(&self, diagnostics: &dyn Diagnostic) -> FileRange {
-        let src = diagnostics.fix_source();
-        let root = self.db.parse_or_expand(src.file_id).unwrap();
-        let node = src.value.to_node(&root);
-        original_range(self.db, src.with_value(&node))
-    }
-
-    fn diagnostics_range(&self, diagnostics: &dyn Diagnostic) -> FileRange {
-        let src = diagnostics.source();
+    fn diagnostics_presentation_range(&self, diagnostics: &dyn Diagnostic) -> FileRange {
+        let src = diagnostics.presentation();
         let root = self.db.parse_or_expand(src.file_id).unwrap();
         let node = src.value.to_node(&root);
         original_range(self.db, src.with_value(&node))
-- 
cgit v1.2.3