aboutsummaryrefslogtreecommitdiff
path: root/crates/ra_hir/src
diff options
context:
space:
mode:
authorbors[bot] <bors[bot]@users.noreply.github.com>2019-05-27 12:45:41 +0100
committerbors[bot] <bors[bot]@users.noreply.github.com>2019-05-27 12:45:41 +0100
commitb2bf41b2bac48edd53e3059adfba4a12b3c96aa0 (patch)
tree35b1737a82c1ae207fa9288341c82fb0e8a5cfd4 /crates/ra_hir/src
parent0d1c6076073c73f57340e256dc25da9d37311ef0 (diff)
parenta2845bb1f59e5f3d9f41012ace70037b783468ce (diff)
Merge #1334
1334: check for cancellation during macro expansion r=matklad a=matklad closes #1331 Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'crates/ra_hir/src')
-rw-r--r--crates/ra_hir/src/ids.rs1
1 files changed, 1 insertions, 0 deletions
diff --git a/crates/ra_hir/src/ids.rs b/crates/ra_hir/src/ids.rs
index 2eb7f0da0..5c3799e95 100644
--- a/crates/ra_hir/src/ids.rs
+++ b/crates/ra_hir/src/ids.rs
@@ -61,6 +61,7 @@ impl HirFileId {
61 db: &impl DefDatabase, 61 db: &impl DefDatabase,
62 file_id: HirFileId, 62 file_id: HirFileId,
63 ) -> Option<TreeArc<SyntaxNode>> { 63 ) -> Option<TreeArc<SyntaxNode>> {
64 db.check_canceled();
64 let _p = profile("parse_or_expand_query"); 65 let _p = profile("parse_or_expand_query");
65 match file_id.0 { 66 match file_id.0 {
66 HirFileIdRepr::File(file_id) => Some(db.parse(file_id).syntax().to_owned()), 67 HirFileIdRepr::File(file_id) => Some(db.parse(file_id).syntax().to_owned()),