Align all status printing (#2309) (#2342)

* align all status printing

* fix tests affected by indenting

* remove unnecessary kwarg uses

(cherry picked from commit 8a33fb1)

Author: IanButterworth

src/Operations.jl

@@ -1770,7 +1770,7 @@ function is_package_downloaded(ctx, pkg::PackageSpec)
 end
 
 function print_status(ctx::Context, old_ctx::Union{Nothing,Context}, header::Symbol,
-                      uuids::Vector, names::Vector; manifest=true, diff=false)
+                      uuids::Vector, names::Vector; manifest=true, diff=false, ignore_indent=false)
     not_installed_indicator = sprint((io, args) -> printstyled(io, args...; color=:red), "→", context=ctx.io)
     ctx.io = something(ctx.status_io, ctx.io) # for instrumenting tests
     filter = !isempty(uuids) || !isempty(names)
@@ -1779,22 +1779,22 @@ function print_status(ctx::Context, old_ctx::Union{Nothing,Context}, header::Sym
     # filter and return early if possible
     if isempty(xs) && !diff
         printpkgstyle(ctx, header, "$(pathrepr(manifest ? ctx.env.manifest_file : ctx.env.project_file)) (empty " *
-                      (manifest ? "manifest" : "project") * ")", true)
+                      (manifest ? "manifest" : "project") * ")", ignore_indent)
         return nothing
     end
     xs = !diff ? xs : eltype(xs)[(id, old, new) for (id, old, new) in xs if old != new]
     if isempty(xs)
-        printpkgstyle(ctx, Symbol("No Changes"), "to $(pathrepr(manifest ? ctx.env.manifest_file : ctx.env.project_file))", true)
+        printpkgstyle(ctx, Symbol("No Changes"), "to $(pathrepr(manifest ? ctx.env.manifest_file : ctx.env.project_file))", ignore_indent)
         return nothing
     end
     xs = !filter ? xs : eltype(xs)[(id, old, new) for (id, old, new) in xs if (id in uuids || something(new, old).name in names)]
     if isempty(xs)
         printpkgstyle(ctx, Symbol("No Matches"),
-                      "in $(diff ? "diff for " : "")$(pathrepr(manifest ? ctx.env.manifest_file : ctx.env.project_file))", true)
+                      "in $(diff ? "diff for " : "")$(pathrepr(manifest ? ctx.env.manifest_file : ctx.env.project_file))", ignore_indent)
         return nothing
     end
     # main print
-    printpkgstyle(ctx, header, pathrepr(manifest ? ctx.env.manifest_file : ctx.env.project_file), true)
+    printpkgstyle(ctx, header, pathrepr(manifest ? ctx.env.manifest_file : ctx.env.project_file), ignore_indent)
     # Sort stdlibs and _jlls towards the end in status output
     xs = sort!(xs, by = (x -> (is_stdlib(x[1]), endswith(something(x[3], x[2]).name, "_jll"), something(x[3], x[2]).name, x[1])))
     all_packages_downloaded = true
@@ -1810,7 +1810,7 @@ function print_status(ctx::Context, old_ctx::Union{Nothing,Context}, header::Sym
         println(ctx.io)
     end
     if !all_packages_downloaded
-        printpkgstyle(ctx, :Info, "packages marked with $not_installed_indicator not downloaded, use `instantiate` to download", true)
+        printpkgstyle(ctx, :Info, "packages marked with $not_installed_indicator not downloaded, use `instantiate` to download", ignore_indent)
     end
     return nothing
 end
@@ -1832,21 +1832,20 @@ function git_head_context(ctx, project_dir)
     end
 end
 
-function show_update(ctx::Context)
+function show_update(ctx::Context; ignore_indent=false)
     old_env = EnvCache()
     old_env.project = ctx.env.original_project
     old_env.manifest = ctx.env.original_manifest
-    status(ctx; header=:Updating, mode=PKGMODE_COMBINED, env_diff=old_env)
+    status(ctx; header=:Updating, mode=PKGMODE_COMBINED, env_diff=old_env, ignore_indent=ignore_indent)
     return nothing
 end
 
 function status(ctx::Context, pkgs::Vector{PackageSpec}=PackageSpec[];
-                header=nothing, mode::PackageMode=PKGMODE_PROJECT, git_diff::Bool=false, env_diff=nothing)
+                header=nothing, mode::PackageMode=PKGMODE_PROJECT, git_diff::Bool=false, env_diff=nothing, ignore_indent=false)
     ctx.io == Base.devnull && return
     # if a package, print header
     if header === nothing && ctx.env.pkg !== nothing
-       printstyled(ctx.io, "Project "; color=Base.info_color(), bold=true)
-       println(ctx.io, ctx.env.pkg.name, " v", ctx.env.pkg.version)
+       printpkgstyle(ctx.io, :Project, string(ctx.env.pkg.name, " v", ctx.env.pkg.version); color=Base.info_color())
     end
     # load old ctx
     old_ctx = nothing
@@ -1869,10 +1868,10 @@ function status(ctx::Context, pkgs::Vector{PackageSpec}=PackageSpec[];
     diff = old_ctx !== nothing
     header = something(header, diff ? :Diff : :Status)
     if mode == PKGMODE_PROJECT || mode == PKGMODE_COMBINED
-        print_status(ctx, old_ctx, header, filter_uuids, filter_names; manifest=false, diff=diff)
+        print_status(ctx, old_ctx, header, filter_uuids, filter_names; manifest=false, diff=diff, ignore_indent=ignore_indent)
     end
     if mode == PKGMODE_MANIFEST || mode == PKGMODE_COMBINED
-        print_status(ctx, old_ctx, header, filter_uuids, filter_names; diff=diff)
+        print_status(ctx, old_ctx, header, filter_uuids, filter_names; diff=diff, ignore_indent=ignore_indent)
     end
 end
 

src/Types.jl

@@ -1370,10 +1370,10 @@ end
 function printpkgstyle(ctx::Context, cmd::Symbol, text::String, ignore_indent::Bool=false)
     printpkgstyle(ctx.io, cmd, text, ignore_indent)
 end
-function printpkgstyle(io::IO, cmd::Symbol, text::String, ignore_indent::Bool=false)
+function printpkgstyle(io::IO, cmd::Symbol, text::String, ignore_indent::Bool=false; color=:green)
     indent = textwidth(string(:Precompiling)) # "Precompiling" is the longest operation
     ignore_indent && (indent = 0)
-    printstyled(io, lpad(string(cmd), indent), color=:green, bold=true)
+    printstyled(io, lpad(string(cmd), indent), color=color, bold=true)
     println(io, " ", text)
 end
 

test/new.jl

@@ -1936,13 +1936,13 @@ end
         @test occursin(r"Status `.+Project.toml`", readline(io))
         @test occursin(r"→ \[7876af07\] Example v\d\.\d\.\d", readline(io))
         @test occursin(r"\[d6f4376e\] Markdown", readline(io))
-        @test "Info packages marked with → not downloaded, use `instantiate` to download" == readline(io)
+        @test "Info packages marked with → not downloaded, use `instantiate` to download" == strip(readline(io))
         Pkg.status(;io=io, mode=Pkg.PKGMODE_MANIFEST)
         @test occursin(r"Status `.+Manifest.toml`", readline(io))
         @test occursin(r"→ \[7876af07\] Example v\d\.\d\.\d", readline(io))
         @test occursin(r"\[2a0f44e3\] Base64", readline(io))
         @test occursin(r"\[d6f4376e\] Markdown", readline(io))
-        @test "Info packages marked with → not downloaded, use `instantiate` to download" == readline(io)
+        @test "Info packages marked with → not downloaded, use `instantiate` to download" == strip(readline(io))
     end
     # Manifest Status API
     isolate(loaded_depot=true) do