From 0f48453acc5b9b82dcda2fa18df79005af539526 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Michael=20O=2E=20Hegg=C3=B8?= Date: Sat, 8 Mar 2025 20:00:43 +0100 Subject: [PATCH] fix(ssh-completions): work if there's no includes --- custom-completions/ssh/ssh-completions.nu | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/custom-completions/ssh/ssh-completions.nu b/custom-completions/ssh/ssh-completions.nu index 32e6055a6..bd97f9261 100644 --- a/custom-completions/ssh/ssh-completions.nu +++ b/custom-completions/ssh/ssh-completions.nu @@ -89,7 +89,7 @@ def "nu-complete ssh-host" [] { $r.includes = $r.includes | each {|f| $folder | path join $f } $r } | reduce {|it| merge deep $it --strategy=append } - let hosts = $first_result.hosts + let $includes: list = $first_result.includes | each {|f| if '*' in $f { glob $f @@ -99,8 +99,11 @@ def "nu-complete ssh-host" [] { } | flatten # Process include files - let second_result = $includes | par-each {|p| $p | open --raw | process } | reduce {|it| merge deep $it --strategy=append } - # We don't further process "Include" lines in these secondary files. - let hosts = $hosts ++ $second_result.hosts + let included_hosts = (if ($includes | is-empty) { [] } else { + let second_result = $includes | par-each {|p| $p | open --raw | process } | reduce {|it| merge deep $it --strategy=append } + $second_result.hosts + }) + + let hosts = $first_result.hosts ++ $included_hosts $hosts | each { {value: $in.name, description: $in.addr } } }