Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2025-01-14 06:03:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

add support of feature flag for runnables #4464

Browse source 
Signed-off-by: Benjamin Coenen <5719034+bnjjj@users.noreply.github.com>
This commit is contained in:
Benjamin Coenen 2020-05-24 13:34:34 +02:00
parent 48d7c61e26
commit 27ed376bc4
2 changed files with 1 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
crates/ra_ide/src/runnables.rs
View file

@ -5,7 +5,7 @@ use itertools::Itertools;
use ra_ide_db::RootDatabase; use ra_ide_db::RootDatabase;
use ra_syntax::{ use ra_syntax::{
ast::{self, AstNode, AttrsOwner, ModuleItemOwner, NameOwner}, ast::{self, AstNode, AttrsOwner, ModuleItemOwner, NameOwner},
match_ast, SmolStr, SyntaxNode, TextRange, match_ast, SyntaxNode, TextRange,
}; };
use crate::FileId; use crate::FileId;

14
crates/rust-analyzer/src/main_loop/handlers.rs
View file

@ -39,7 +39,6 @@ use crate::{
world::WorldSnapshot, world::WorldSnapshot,
LspError, Result, LspError, Result,
}; };
use hir::Attrs;
pub fn handle_analyzer_status(world: WorldSnapshot, _: ()) -> Result<String> { pub fn handle_analyzer_status(world: WorldSnapshot, _: ()) -> Result<String> {
let _p = profile("handle_analyzer_status"); let _p = profile("handle_analyzer_status");
@ -1039,19 +1038,6 @@ fn to_lsp_runnable(
}) })
} }
fn get_features_needed(attrs: Attrs) -> Option<Vec<SmolStr>> {
let cfg_expr = attrs.by_key("cfg").tt_values().map(|subtree| ra_cfg::parse_cfg(subtree));
let features_needed = cfg_expr
.map(|cfg| {
let mut min_features = vec![];
collect_minimal_features_needed(&cfg, &mut min_features);
min_features
})
.flatten()
.collect();
Some(features_needed).filter(|it: &Vec<SmolStr>| !it.is_empty())
}
/// Fill minimal features needed /// Fill minimal features needed
fn collect_minimal_features_needed(cfg_expr: &CfgExpr, features: &mut Vec<SmolStr>) { fn collect_minimal_features_needed(cfg_expr: &CfgExpr, features: &mut Vec<SmolStr>) {
match cfg_expr { match cfg_expr {