Don't expose impl details of SyntaxPtr

3 files changed, 43 insertions, 6 deletions

diff --git a/crates/ra_hir_ty/src/diagnostics.rs b/crates/ra_hir_ty/src/diagnostics.rs
index 927896d6f..da85bd082 100644
--- a/crates/ra_hir_ty/src/diagnostics.rs
+++ b/crates/ra_hir_ty/src/diagnostics.rs
@@ -3,7 +3,7 @@
 use std::any::Any;
 
 use hir_expand::{db::AstDatabase, name::Name, HirFileId, InFile};
-use ra_syntax::{ast, AstNode, AstPtr, SyntaxNodePtr};
+use ra_syntax::{ast, AstNode, AstPtr, SyntaxNodePtr, TextRange};
 use stdx::format_to;
 
 pub use hir_def::{diagnostics::UnresolvedModule, expr::MatchArm};
@@ -13,6 +13,7 @@ pub use hir_expand::diagnostics::{AstDiagnostic, Diagnostic, DiagnosticSink};
 pub struct NoSuchField {
     pub file: HirFileId,
     pub field: AstPtr<ast::RecordField>,
+    pub highlight_range: TextRange,
 }
 
 impl Diagnostic for NoSuchField {
@@ -20,6 +21,10 @@ impl Diagnostic for NoSuchField {
         "no such field".to_string()
     }
 
+    fn highlight_range(&self) -> TextRange {
+        self.highlight_range
+    }
+
     fn source(&self) -> InFile<SyntaxNodePtr> {
         InFile { file_id: self.file, value: self.field.clone().into() }
     }
@@ -33,6 +38,7 @@ impl Diagnostic for NoSuchField {
 pub struct MissingFields {
     pub file: HirFileId,
     pub field_list: AstPtr<ast::RecordFieldList>,
+    pub highlight_range: TextRange,
     pub missed_fields: Vec<Name>,
 }
 
@@ -44,6 +50,10 @@ impl Diagnostic for MissingFields {
         }
         buf
     }
+    fn highlight_range(&self) -> TextRange {
+        self.highlight_range
+    }
+
     fn source(&self) -> InFile<SyntaxNodePtr> {
         InFile { file_id: self.file, value: self.field_list.clone().into() }
     }
@@ -66,6 +76,7 @@ impl AstDiagnostic for MissingFields {
 pub struct MissingPatFields {
     pub file: HirFileId,
     pub field_list: AstPtr<ast::RecordFieldPatList>,
+    pub highlight_range: TextRange,
     pub missed_fields: Vec<Name>,
 }
 
@@ -77,6 +88,9 @@ impl Diagnostic for MissingPatFields {
         }
         buf
     }
+    fn highlight_range(&self) -> TextRange {
+        self.highlight_range
+    }
     fn source(&self) -> InFile<SyntaxNodePtr> {
         InFile { file_id: self.file, value: self.field_list.clone().into() }
     }
@@ -90,12 +104,16 @@ pub struct MissingMatchArms {
     pub file: HirFileId,
     pub match_expr: AstPtr<ast::Expr>,
     pub arms: AstPtr<ast::MatchArmList>,
+    pub highlight_range: TextRange,
 }
 
 impl Diagnostic for MissingMatchArms {
     fn message(&self) -> String {
         String::from("Missing match arm")
     }
+    fn highlight_range(&self) -> TextRange {
+        self.highlight_range
+    }
     fn source(&self) -> InFile<SyntaxNodePtr> {
         InFile { file_id: self.file, value: self.match_expr.clone().into() }
     }
@@ -108,12 +126,16 @@ impl Diagnostic for MissingMatchArms {
 pub struct MissingOkInTailExpr {
     pub file: HirFileId,
     pub expr: AstPtr<ast::Expr>,
+    pub highlight_range: TextRange,
 }
 
 impl Diagnostic for MissingOkInTailExpr {
     fn message(&self) -> String {
         "wrap return expression in Ok".to_string()
     }
+    fn highlight_range(&self) -> TextRange {
+        self.highlight_range
+    }
     fn source(&self) -> InFile<SyntaxNodePtr> {
         InFile { file_id: self.file, value: self.expr.clone().into() }
     }
diff --git a/crates/ra_hir_ty/src/expr.rs b/crates/ra_hir_ty/src/expr.rs
index fd59f4320..1d3950b70 100644
--- a/crates/ra_hir_ty/src/expr.rs
+++ b/crates/ra_hir_ty/src/expr.rs
@@ -4,7 +4,7 @@ use std::sync::Arc;
 
 use hir_def::{path::path, resolver::HasResolver, AdtId, FunctionId};
 use hir_expand::diagnostics::DiagnosticSink;
-use ra_syntax::{ast, AstPtr};
+use ra_syntax::{ast, AstNode, AstPtr};
 use rustc_hash::FxHashSet;
 
 use crate::{
@@ -100,6 +100,7 @@ impl<'a, 'b> ExprValidator<'a, 'b> {
                     self.sink.push(MissingFields {
                         file: source_ptr.file_id,
                         field_list: AstPtr::new(&field_list),
+                        highlight_range: field_list.syntax().text_range(),
                         missed_fields,
                     })
                 }
@@ -130,6 +131,7 @@ impl<'a, 'b> ExprValidator<'a, 'b> {
                         self.sink.push(MissingPatFields {
                             file: source_ptr.file_id,
                             field_list: AstPtr::new(&field_list),
+                            highlight_range: field_list.syntax().text_range(),
                             missed_fields,
                         })
                     }
@@ -213,6 +215,7 @@ impl<'a, 'b> ExprValidator<'a, 'b> {
                         file: source_ptr.file_id,
                         match_expr: AstPtr::new(&match_expr),
                         arms: AstPtr::new(&arms),
+                        highlight_range: match_expr.syntax().text_range(),
                     })
                 }
             }
@@ -244,8 +247,13 @@ impl<'a, 'b> ExprValidator<'a, 'b> {
             let (_, source_map) = db.body_with_source_map(self.func.into());
 
             if let Ok(source_ptr) = source_map.expr_syntax(id) {
-                self.sink
-                    .push(MissingOkInTailExpr { file: source_ptr.file_id, expr: source_ptr.value });
+                let root = source_ptr.file_syntax(db.upcast());
+                let highlight_range = source_ptr.value.to_node(&root).syntax().text_range();
+                self.sink.push(MissingOkInTailExpr {
+                    file: source_ptr.file_id,
+                    expr: source_ptr.value,
+                    highlight_range,
+                });
             }
         }
     }
diff --git a/crates/ra_hir_ty/src/infer.rs b/crates/ra_hir_ty/src/infer.rs
index 246b0e9be..7e6cdefe4 100644
--- a/crates/ra_hir_ty/src/infer.rs
+++ b/crates/ra_hir_ty/src/infer.rs
@@ -665,6 +665,7 @@ impl Expectation {
 mod diagnostics {
     use hir_def::{expr::ExprId, src::HasSource, FunctionId, Lookup};
     use hir_expand::diagnostics::DiagnosticSink;
+    use ra_syntax::AstNode;
 
     use crate::{db::HirDatabase, diagnostics::NoSuchField};
 
@@ -682,10 +683,16 @@ mod diagnostics {
         ) {
             match self {
                 InferenceDiagnostic::NoSuchField { expr, field } => {
-                    let file = owner.lookup(db.upcast()).source(db.upcast()).file_id;
+                    let source = owner.lookup(db.upcast()).source(db.upcast());
                     let (_, source_map) = db.body_with_source_map(owner.into());
                     let field = source_map.field_syntax(*expr, *field);
-                    sink.push(NoSuchField { file, field })
+                    let root = field.file_syntax(db.upcast());
+                    let highlight_range = field.value.to_node(&root).syntax().text_range();
+                    sink.push(NoSuchField {
+                        file: source.file_id,
+                        field: field.value,
+                        highlight_range,
+                    })
                 }
             }
         }