From 0d77be67f7999d2032ad89dd2ad1c040a9f50388 Mon Sep 17 00:00:00 2001 From: Eric Sampson Date: Wed, 6 Oct 2021 01:16:31 -0500 Subject: [PATCH] Don't do work and then throw it away. --- crates/ide/src/annotations.rs | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/crates/ide/src/annotations.rs b/crates/ide/src/annotations.rs index 12c6852ea09..0cb069ba0ea 100644 --- a/crates/ide/src/annotations.rs +++ b/crates/ide/src/annotations.rs @@ -66,14 +66,26 @@ pub(crate) fn annotations( Either::Left(def) => { let (range, ranges_enum_variants) = match def { hir::ModuleDef::Const(konst) => { - (konst.source(db).and_then(|node| name_range(&node, file_id)), vec![]) + if config.annotate_references { + (konst.source(db).and_then(|node| name_range(&node, file_id)), vec![]) + } else { + (None, vec![]) + } } hir::ModuleDef::Trait(trait_) => { - (trait_.source(db).and_then(|node| name_range(&node, file_id)), vec![]) + if config.annotate_references || config.annotate_impls { + (trait_.source(db).and_then(|node| name_range(&node, file_id)), vec![]) + } else { + (None, vec![]) + } } hir::ModuleDef::Adt(adt) => match adt { hir::Adt::Enum(enum_) => ( - enum_.source(db).and_then(|node| name_range(&node, file_id)), + if config.annotate_references || config.annotate_impls { + enum_.source(db).and_then(|node| name_range(&node, file_id)) + } else { + None + }, if config.annotate_enum_variant_references { enum_ .variants(db) @@ -86,7 +98,13 @@ pub(crate) fn annotations( vec![] }, ), - _ => (adt.source(db).and_then(|node| name_range(&node, file_id)), vec![]), + _ => { + if config.annotate_references || config.annotate_impls { + (adt.source(db).and_then(|node| name_range(&node, file_id)), vec![]) + } else { + (None, vec![]) + } + } }, _ => (None, vec![]), };