Simplify Diagnostic structure

matklad · matklad · commit 146f6f5a45a4 · 2020-04-17T13:56:42.000+02:00
It's not entirely clear what subnode ranges should mean in the
presence of macros, so let's leave them out for now. We are not using
them heavily anyway.
diff --git a/crates/ra_hir_def/src/diagnostics.rs b/crates/ra_hir_def/src/diagnostics.rs
@@ -4,25 +4,21 @@ use std::any::Any;
 
 use hir_expand::diagnostics::Diagnostic;
 use ra_db::RelativePathBuf;
-use ra_syntax::{ast, AstPtr, SyntaxNodePtr, TextRange};
+use ra_syntax::{ast, AstPtr, SyntaxNodePtr};
 
 use hir_expand::{HirFileId, InFile};
 
 #[derive(Debug)]
 pub struct UnresolvedModule {
     pub file: HirFileId,
     pub decl: AstPtr<ast::Module>,
-    pub highlight_range: TextRange,
     pub candidate: RelativePathBuf,
 }
 
 impl Diagnostic for UnresolvedModule {
     fn message(&self) -> String {
         "unresolved module".to_string()
     }
-    fn highlight_range(&self) -> InFile<TextRange> {
-        InFile::new(self.file, self.highlight_range)
-    }
     fn source(&self) -> InFile<SyntaxNodePtr> {
         InFile::new(self.file, self.decl.clone().into())
     }
diff --git a/crates/ra_hir_def/src/nameres.rs b/crates/ra_hir_def/src/nameres.rs
@@ -297,7 +297,7 @@ pub enum ModuleSource {
 mod diagnostics {
     use hir_expand::diagnostics::DiagnosticSink;
     use ra_db::RelativePathBuf;
-    use ra_syntax::{ast, AstNode, AstPtr};
+    use ra_syntax::{ast, AstPtr};
 
     use crate::{db::DefDatabase, diagnostics::UnresolvedModule, nameres::LocalModuleId, AstId};
 
@@ -326,7 +326,6 @@ mod diagnostics {
                     sink.push(UnresolvedModule {
                         file: declaration.file_id,
                         decl: AstPtr::new(&decl),
-                        highlight_range: decl.syntax().text_range(),
                         candidate: candidate.clone(),
                     })
                 }
diff --git a/crates/ra_hir_expand/src/diagnostics.rs b/crates/ra_hir_expand/src/diagnostics.rs
@@ -16,13 +16,12 @@
 
 use std::{any::Any, fmt};
 
-use ra_syntax::{SyntaxNode, SyntaxNodePtr, TextRange};
+use ra_syntax::{SyntaxNode, SyntaxNodePtr};
 
 use crate::{db::AstDatabase, InFile};
 
 pub trait Diagnostic: Any + Send + Sync + fmt::Debug + 'static {
     fn message(&self) -> String;
-    fn highlight_range(&self) -> InFile<TextRange>;
     fn source(&self) -> InFile<SyntaxNodePtr>;
     fn as_any(&self) -> &(dyn Any + Send + 'static);
 }
diff --git 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, TextRange};
+use ra_syntax::{ast, AstNode, AstPtr, SyntaxNodePtr};
 use stdx::format_to;
 
 pub use hir_def::{diagnostics::UnresolvedModule, expr::MatchArm};
@@ -13,18 +13,13 @@ 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 {
     fn message(&self) -> String {
         "no such field".to_string()
     }
 
-    fn highlight_range(&self) -> InFile<TextRange> {
-        InFile::new(self.file, self.highlight_range)
-    }
-
     fn source(&self) -> InFile<SyntaxNodePtr> {
         InFile::new(self.file, self.field.clone().into())
     }
@@ -38,7 +33,6 @@ 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>,
 }
 
@@ -50,10 +44,6 @@ impl Diagnostic for MissingFields {
         }
         buf
     }
-    fn highlight_range(&self) -> InFile<TextRange> {
-        InFile::new(self.file, self.highlight_range)
-    }
-
     fn source(&self) -> InFile<SyntaxNodePtr> {
         InFile { file_id: self.file, value: self.field_list.clone().into() }
     }
@@ -76,7 +66,6 @@ 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>,
 }
 
@@ -88,9 +77,6 @@ impl Diagnostic for MissingPatFields {
         }
         buf
     }
-    fn highlight_range(&self) -> InFile<TextRange> {
-        InFile::new(self.file, self.highlight_range)
-    }
     fn source(&self) -> InFile<SyntaxNodePtr> {
         InFile { file_id: self.file, value: self.field_list.clone().into() }
     }
@@ -104,16 +90,12 @@ 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) -> InFile<TextRange> {
-        InFile::new(self.file, self.highlight_range)
-    }
     fn source(&self) -> InFile<SyntaxNodePtr> {
         InFile { file_id: self.file, value: self.match_expr.clone().into() }
     }
@@ -126,16 +108,12 @@ 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) -> InFile<TextRange> {
-        InFile::new(self.file, 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
@@ -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, AstNode, AstPtr};
+use ra_syntax::{ast, AstPtr};
 use rustc_hash::FxHashSet;
 
 use crate::{
@@ -100,7 +100,6 @@ 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,
                     })
                 }
@@ -131,7 +130,6 @@ 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,
                         })
                     }
@@ -215,7 +213,6 @@ 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(),
                     })
                 }
             }
@@ -247,13 +244,8 @@ 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) {
-                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,
-                });
+                self.sink
+                    .push(MissingOkInTailExpr { file: source_ptr.file_id, expr: source_ptr.value });
             }
         }
     }
diff --git a/crates/ra_hir_ty/src/infer.rs b/crates/ra_hir_ty/src/infer.rs
@@ -665,7 +665,6 @@ 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};
 
@@ -686,13 +685,7 @@ mod diagnostics {
                     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);
-                    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,
-                    })
+                    sink.push(NoSuchField { file: source.file_id, field: field.value })
                 }
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`use std::any::Any;`
`4`	`4`
`5`	`5`	`use hir_expand::{db::AstDatabase, name::Name, HirFileId, InFile};`
`6`		`-use ra_syntax::{ast, AstNode, AstPtr, SyntaxNodePtr, TextRange};`
	`6`	`+use ra_syntax::{ast, AstNode, AstPtr, SyntaxNodePtr};`
`7`	`7`	`use stdx::format_to;`
`8`	`8`
`9`	`9`	`pub use hir_def::{diagnostics::UnresolvedModule, expr::MatchArm};`
`@@ -13,18 +13,13 @@ pub use hir_expand::diagnostics::{AstDiagnostic, Diagnostic, DiagnosticSink};`
`13`	`13`	`pub struct NoSuchField {`
`14`	`14`	`pub file: HirFileId,`
`15`	`15`	`pub field: AstPtr<ast::RecordField>,`
`16`		`- pub highlight_range: TextRange,`
`17`	`16`	`}`
`18`	`17`
`19`	`18`	`impl Diagnostic for NoSuchField {`
`20`	`19`	`fn message(&self) -> String {`
`21`	`20`	`"no such field".to_string()`
`22`	`21`	`}`
`23`	`22`
`24`		`- fn highlight_range(&self) -> InFile<TextRange> {`
`25`		`- InFile::new(self.file, self.highlight_range)`
`26`		`- }`
`27`		`-`
`28`	`23`	`fn source(&self) -> InFile<SyntaxNodePtr> {`
`29`	`24`	`InFile::new(self.file, self.field.clone().into())`
`30`	`25`	`}`
`@@ -38,7 +33,6 @@ impl Diagnostic for NoSuchField {`
`38`	`33`	`pub struct MissingFields {`
`39`	`34`	`pub file: HirFileId,`
`40`	`35`	`pub field_list: AstPtr<ast::RecordFieldList>,`
`41`		`- pub highlight_range: TextRange,`
`42`	`36`	`pub missed_fields: Vec<Name>,`
`43`	`37`	`}`
`44`	`38`
`@@ -50,10 +44,6 @@ impl Diagnostic for MissingFields {`
`50`	`44`	`}`
`51`	`45`	`buf`
`52`	`46`	`}`
`53`		`- fn highlight_range(&self) -> InFile<TextRange> {`
`54`		`- InFile::new(self.file, self.highlight_range)`
`55`		`- }`
`56`		`-`
`57`	`47`	`fn source(&self) -> InFile<SyntaxNodePtr> {`
`58`	`48`	`InFile { file_id: self.file, value: self.field_list.clone().into() }`
`59`	`49`	`}`
`@@ -76,7 +66,6 @@ impl AstDiagnostic for MissingFields {`
`76`	`66`	`pub struct MissingPatFields {`
`77`	`67`	`pub file: HirFileId,`
`78`	`68`	`pub field_list: AstPtr<ast::RecordFieldPatList>,`
`79`		`- pub highlight_range: TextRange,`
`80`	`69`	`pub missed_fields: Vec<Name>,`
`81`	`70`	`}`
`82`	`71`
`@@ -88,9 +77,6 @@ impl Diagnostic for MissingPatFields {`
`88`	`77`	`}`
`89`	`78`	`buf`
`90`	`79`	`}`
`91`		`- fn highlight_range(&self) -> InFile<TextRange> {`
`92`		`- InFile::new(self.file, self.highlight_range)`
`93`		`- }`
`94`	`80`	`fn source(&self) -> InFile<SyntaxNodePtr> {`
`95`	`81`	`InFile { file_id: self.file, value: self.field_list.clone().into() }`
`96`	`82`	`}`
`@@ -104,16 +90,12 @@ pub struct MissingMatchArms {`
`104`	`90`	`pub file: HirFileId,`
`105`	`91`	`pub match_expr: AstPtr<ast::Expr>,`
`106`	`92`	`pub arms: AstPtr<ast::MatchArmList>,`
`107`		`- pub highlight_range: TextRange,`
`108`	`93`	`}`
`109`	`94`
`110`	`95`	`impl Diagnostic for MissingMatchArms {`
`111`	`96`	`fn message(&self) -> String {`
`112`	`97`	`String::from("Missing match arm")`
`113`	`98`	`}`
`114`		`- fn highlight_range(&self) -> InFile<TextRange> {`
`115`		`- InFile::new(self.file, self.highlight_range)`
`116`		`- }`
`117`	`99`	`fn source(&self) -> InFile<SyntaxNodePtr> {`
`118`	`100`	`InFile { file_id: self.file, value: self.match_expr.clone().into() }`
`119`	`101`	`}`
`@@ -126,16 +108,12 @@ impl Diagnostic for MissingMatchArms {`
`126`	`108`	`pub struct MissingOkInTailExpr {`
`127`	`109`	`pub file: HirFileId,`
`128`	`110`	`pub expr: AstPtr<ast::Expr>,`
`129`		`- pub highlight_range: TextRange,`
`130`	`111`	`}`
`131`	`112`
`132`	`113`	`impl Diagnostic for MissingOkInTailExpr {`
`133`	`114`	`fn message(&self) -> String {`
`134`	`115`	`"wrap return expression in Ok".to_string()`
`135`	`116`	`}`
`136`		`- fn highlight_range(&self) -> InFile<TextRange> {`
`137`		`- InFile::new(self.file, self.highlight_range)`
`138`		`- }`
`139`	`117`	`fn source(&self) -> InFile<SyntaxNodePtr> {`
`140`	`118`	`InFile { file_id: self.file, value: self.expr.clone().into() }`
`141`	`119`	`}`