Auto merge of rust-lang#12886 - Veykril:sema-cache, r=Veykril

bors · bors · commit 8e4d9b84fe52 · 2022-07-27T10:46:20.000Z
fix: Fix Semantics::original_ast_node not caching the resulting file
diff --git a/crates/hir/src/semantics.rs b/crates/hir/src/semantics.rs
@@ -924,7 +924,12 @@ impl<'db> SemanticsImpl<'db> {
     }
 
     fn original_ast_node<N: AstNode>(&self, node: N) -> Option<N> {
-        self.wrap_node_infile(node).original_ast_node(self.db.upcast()).map(|it| it.value)
+        self.wrap_node_infile(node).original_ast_node(self.db.upcast()).map(
+            |InFile { file_id, value }| {
+                self.cache(find_root(value.syntax()), file_id);
+                value
+            },
+        )
     }
 
     fn diagnostics_display_range(&self, src: InFile<SyntaxNodePtr>) -> FileRange {

Original file line number	Diff line number	Diff line change
`@@ -924,7 +924,12 @@ impl<'db> SemanticsImpl<'db> {`
`924`	`924`	`}`
`925`	`925`
`926`	`926`	`fn original_ast_node<N: AstNode>(&self, node: N) -> Option<N> {`
`927`		`- self.wrap_node_infile(node).original_ast_node(self.db.upcast()).map(\|it\| it.value)`
	`927`	`+ self.wrap_node_infile(node).original_ast_node(self.db.upcast()).map(`
	`928`	`+ \|InFile { file_id, value }\| {`
	`929`	`+ self.cache(find_root(value.syntax()), file_id);`
	`930`	`+ value`
	`931`	`+ },`
	`932`	`+ )`
`928`	`933`	`}`
`929`	`934`
`930`	`935`	`fn diagnostics_display_range(&self, src: InFile<SyntaxNodePtr>) -> FileRange {`