hsjobeki/noogle
1
1
Fork 0
mirror of https://github.com/hsjobeki/noogle.git synced 2024-10-05 17:07:17 +03:00
Code Issues Projects Releases Wiki Activity

Fix: pkgs.* content of extensible not properly propagated

Browse Source
This commit is contained in:
Johannes Kirschbauer 2024-08-05 11:47:53 +02:00 committed by mergify[bot]
parent dbe9cef4d7
commit 039566eba4
4 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pesto/src/alias.rs
View File

@ -86,6 +86,7 @@ pub fn find_aliases(item: &Docs, list: &Vec<&Docs>) -> AliasList {
res
}
#[derive(Debug)]
pub struct FnCategories<'a> {
pub primop: Vec<&'a Docs>,
pub casual: Vec<&'a Docs>,
@ -120,6 +121,22 @@ pub fn categorize(data: &Vec<Docs>) -> FnCategories {
for item in data.iter() {
if let Some(lambda) = &item.docs.lambda {
if lambda.isFunctor == Some(true) {
// A functor takes self as first argument
// Subtract the first argument from the count of applied arguments.
match lambda.countApplied.map(|s|s-1) {
// Some(0) | None => {
Some(0) => {
if lambda.isPrimop {
primop_lambdas.push(&item);
}
if !lambda.isPrimop {
non_primop_lambdas.push(&item);
}
}
_ => {
partially_applieds.push(&item);
}
}
continue;
}
match lambda.countApplied {

1
pesto/src/main.rs
View File

@ -147,7 +147,6 @@ fn find_document_content<'a>(
pos_type: Some(PositionType::Attribute),
}),
}),
// _ if item. item.lambda_content().is_some() => item.lambda_content(),
_ => match item.fst_alias_content(&all) {
Some(d) => Some(d),
None => item.lambda_content(),

4
pesto/src/pasta.rs
View File

@ -97,7 +97,7 @@ impl<'a> Lookups<'a> for Docs {
.lambda
.as_ref()
.map(|i| {
if i.countApplied == Some(0) || (i.countApplied == None && i.isPrimop) {
if i.countApplied == Some(0) || (i.countApplied == None && i.isPrimop) || (i.countApplied == Some(1) && i.isFunctor == Some(true)) {
Some(ContentSource {
content: i.content.as_ref().map(|inner| dedent(inner)),
source: Some(SourceOrigin {
@ -146,7 +146,7 @@ impl<'a> Lookups<'a> for Docs {
});
x
}
_ => None,
None => None,
}
}
}

4
pesto/src/position.rs
View File

@ -148,9 +148,9 @@ impl<'a> DocComment<'a> for DocIndex<'a> {
if let Some(Some(expr)) = expr {
let doc = match expr.kind() {
rnix::SyntaxKind::NODE_LAMBDA => {
let (outer_lambda, count_applied) = get_parent_lambda(&expr);
let (_outer_lambda, count_applied) = get_parent_lambda(&expr);
NixDocComment {
content: get_expr_docs(&outer_lambda),
content: get_expr_docs(&expr),
count_applied: Some(count_applied),
}
}