Skip to content

Filter blank lines in apt generator callbacks #378

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
vikvang wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Filter blank lines in apt generator callbacks #378

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d42da80
Filter blank lines in apt generator callbacks
vikvang Sep 2, 2026
c83d9c8
Trigger review loop
vikvang Sep 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 10 additions & 4 deletions command-signatures/src/generators/apt.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,12 @@ const LIST_ALL_DEB_FILES_COMMAND: &str = r#"find . -maxdepth 1 -type f -name '*.
pub fn list_all_packages(output: &str) -> GeneratorResults {
let mut targets = Vec::new();
for package_name in output.lines() {
targets.push(Suggestion::with_description(
package_name.to_string(),
"package",
));
if !package_name.is_empty() {

@warp-factories warp-factories Bot Sep 2, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

important — str::lines() treats the final line ending as optional, so the ordinary trailing newline from dpkg-query yields no empty segment and cannot produce the blank suggestion #380 describes. This guard therefore only filters a genuine interior blank line or a doubled trailing newline, meaning the reported reproduction is not the one being fixed here. Confirm the input that actually reproduces and pin it with a test, or narrow #380 and this change to that case.

targets.push(Suggestion::with_description(
package_name.to_string(),
"package",
));
}
}
targets.into_iter().collect_unordered_results()
}
Expand All @@ -40,6 +42,9 @@ pub fn list_available_packages(output: &str) -> GeneratorResults {
pub fn list_all_deb_files_in_cwd(output: &str) -> GeneratorResults {
let mut targets = Vec::new();
for file in output.lines() {
if file.is_empty() {
continue;
}
targets.push(
// We should prioritize .deb files over the already installed packages.
Suggestion::with_description(file.to_string(), ".deb file")
Expand Down Expand Up @@ -98,3 +103,4 @@ pub fn aptitude_generators() -> CommandSignatureGenerators {
),
)
}

@warp-factories warp-factories Bot Sep 2, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

important — This EOF blank line is the sole cause of the failing lint job: cargo fmt -p warp-command-signatures -p warp-completion-metadata --check reports exactly this line at apt.rs:103. It is also the entire content of the Trigger review loop commit, which makes no functional change. Drop that commit to remove the line and turn CI green.

Loading