mathieu/os-rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove extra parameter, access Db through semantics

Browse source
This commit is contained in:
btwotwo 2022-10-11 19:23:41 +02:00
parent 3732d159b2
commit 3c39668ca4
No known key found for this signature in database
GPG key ID: D456A0349D73A0A3
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
crates/ide-completion/src/completions/env_vars.rs
View file

@ -18,7 +18,8 @@ const CARGO_DEFINED_VARS: &[(&str, &str)] = &[
("CARGO_PKG_NAME","The name of your package"), ("CARGO_PKG_NAME","The name of your package"),
("CARGO_PKG_DESCRIPTION","The description from the manifest of your package"), ("CARGO_PKG_DESCRIPTION","The description from the manifest of your package"),
("CARGO_PKG_HOMEPAGE","The home page from the manifest of your package"), ("CARGO_PKG_HOMEPAGE","The home page from the manifest of your package"),
("CARGO_PKG_REPOSITORY","The repository from the manifest of your package"), ("CARGO_PKG_REPOSITORY",
"The repository from the manifest of your package"),
("CARGO_PKG_LICENSE","The license from the manifest of your package"), ("CARGO_PKG_LICENSE","The license from the manifest of your package"),
("CARGO_PKG_LICENSE_FILE","The license file from the manifest of your package"), ("CARGO_PKG_LICENSE_FILE","The license file from the manifest of your package"),
("CARGO_PKG_RUST_VERSION","The Rust version from the manifest of your package. Note that this is the minimum Rust version supported by the package, not the current Rust version"), ("CARGO_PKG_RUST_VERSION","The Rust version from the manifest of your package. Note that this is the minimum Rust version supported by the package, not the current Rust version"),
@ -33,7 +34,7 @@ pub(crate) fn complete_cargo_env_vars(
ctx: &CompletionContext<'_>, ctx: &CompletionContext<'_>,
expanded: &ast::String, expanded: &ast::String,
) -> Option<()> { ) -> Option<()> {
guard_env_macro(expanded, &ctx.sema, &ctx.db)?; guard_env_macro(expanded, &ctx.sema)?;
let range = expanded.text_range_between_quotes()?; let range = expanded.text_range_between_quotes()?;
CARGO_DEFINED_VARS.iter().for_each(|(var, detail)| { CARGO_DEFINED_VARS.iter().for_each(|(var, detail)| {
@ -48,11 +49,11 @@ pub(crate) fn complete_cargo_env_vars(
fn guard_env_macro( fn guard_env_macro(
string: &ast::String, string: &ast::String,
semantics: &Semantics<'_, RootDatabase>, semantics: &Semantics<'_, RootDatabase>,
db: &RootDatabase,
) -> Option<()> { ) -> Option<()> {
let call = get_outer_macro(string)?; let call = get_outer_macro(string)?;
let name = call.path()?.segment()?.name_ref()?; let name = call.path()?.segment()?.name_ref()?;
let makro = semantics.resolve_macro_call(&call)?; let makro = semantics.resolve_macro_call(&call)?;
let db = semantics.db;
match name.text().as_str() { match name.text().as_str() {
"env" | "option_env" if makro.kind(db) == hir::MacroKind::BuiltIn => Some(()), "env" | "option_env" if makro.kind(db) == hir::MacroKind::BuiltIn => Some(()),