r
/
Runic.jl
mirror of https://github.com/fredrikekre/Runic.jl
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Add a progress prefix in verbose mode 

This patch adds a progress prefix to each file of the form
`[file/nfiles]` to verbose output.
pull/121/head
Fredrik Ekre 12 months ago
parent
9ae14105c3
commit
e3f5d040fb
No known key found for this signature in database
GPG Key ID: DE82E6D5E364C0A2
2 changed files with 46 additions and 20 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 37
      src/main.jl
  2. 29
      test/maintests.jl

37
src/main.jl
Unescape View File

@ -85,12 +85,15 @@ function panic(
return errno return errno
end end
function okln() blue(str) = printstyled(stderr, str; color = :blue)
function okln(str)
blue(str)
printstyled(stderr, "✔"; color = :green, bold = true) printstyled(stderr, "✔"; color = :green, bold = true)
println(stderr) println(stderr)
return return
end end
function errln() function errln(str)
blue(str)
printstyled(stderr, "✖"; color = :red, bold = true) printstyled(stderr, "✖"; color = :red, bold = true)
println(stderr) println(stderr)
return return
@ -316,7 +319,8 @@ function main(argv)
end end
# Loop over the input files # Loop over the input files
for inputfile in inputfiles nfiles_str = string(length(inputfiles))
for (file_counter, inputfile) in enumerate(inputfiles)
# Read the input # Read the input
if input_is_stdin if input_is_stdin
@assert length(inputfiles) == 1 @assert length(inputfiles) == 1
@ -365,14 +369,18 @@ function main(argv)
if print_progress if print_progress
@assert inputfile != "-" @assert inputfile != "-"
input_pretty = relpath(inputfile) input_pretty = relpath(inputfile)
prefix = string(
"[", lpad(string(file_counter), textwidth(nfiles_str), " "), "/",
nfiles_str, "] "
)
if Sys.iswindows() if Sys.iswindows()
input_pretty = replace(input_pretty, "\\" => "/") input_pretty = replace(input_pretty, "\\" => "/")
end end
if check if check
str = "Checking `$(input_pretty)` " str = string(prefix, "Checking `", input_pretty, "` ")
ndots = 80 - textwidth(str) - 1 - 1 ndots = 80 - textwidth(str) - 1 - 1
dots = ndots > 0 ? "."^ndots : "" dots = ndots > 0 ? "."^ndots : ""
printstyled(stderr, str * dots * " "; color = :blue) str = string(str, dots, " ")
else else
if output.output_is_samefile if output.output_is_samefile
output_pretty = " " output_pretty = " "
@ -383,10 +391,10 @@ function main(argv)
end end
output_pretty = " -> `$(output_pretty)` " output_pretty = " -> `$(output_pretty)` "
end end
str = "Formatting `$(input_pretty)`$(output_pretty)" str = string(prefix, "Formatting `", input_pretty, "`", output_pretty)
ndots = 80 - textwidth(str) - 1 - 1 ndots = 80 - textwidth(str) - 1 - 1
dots = ndots > 0 ? "."^ndots : "" dots = ndots > 0 ? "."^ndots : ""
printstyled(stderr, str * dots * " "; color = :blue) str = string(str, dots, " ")
end end
end end
@ -396,7 +404,7 @@ function main(argv)
format_tree!(ctx′) format_tree!(ctx′)
ctx′ ctx′
catch err catch err
print_progress && errln() print_progress && errln(str)
if err isa JuliaSyntax.ParseError if err isa JuliaSyntax.ParseError
panic("failed to parse input: ", err) panic("failed to parse input: ", err)
continue continue
@ -424,24 +432,25 @@ function main(argv)
changed = !nodes_equal(ctx.fmt_tree, ctx.src_tree) changed = !nodes_equal(ctx.fmt_tree, ctx.src_tree)
if check if check
if changed if changed
print_progress && errln() print_progress && errln(str)
global errno = 1 global errno = 1
else else
print_progress && okln() print_progress && okln(str)
end end
elseif changed || !inplace elseif changed || !inplace
@assert output.which !== :devnull @assert output.which !== :devnull
try try
writeo(output, seekstart(ctx.fmt_io)) writeo(output, seekstart(ctx.fmt_io))
catch err catch err
print_progress && errln() print_progress && errln(str)
panic("could not write to output file `$(output.file)`: ", err) panic("could not write to output file `$(output.file)`: ", err)
continue
end end
print_progress && okln() print_progress && okln(str)
else else
print_progress && okln() print_progress && okln(str)
end end
if diff if changed && diff
mktempdir() do dir mktempdir() do dir
a = mkdir(joinpath(dir, "a")) a = mkdir(joinpath(dir, "a"))
b = mkdir(joinpath(dir, "b")) b = mkdir(joinpath(dir, "b"))

29
test/maintests.jl
Unescape View File

@ -104,7 +104,7 @@ function maintests(f::R) where {R}
rc, fd1, fd2 = runic(argv) rc, fd1, fd2 = runic(argv)
@test rc == 0 @test rc == 0
@test isempty(fd1) @test isempty(fd1)
@test occursin("Formatting `in.jl` -> `out.jl` ...", fd2) @test occursin("[1/1] Formatting `in.jl` -> `out.jl` ...", fd2)
@test occursin("✔", fd2) @test occursin("✔", fd2)
@test !occursin("✖", fd2) @test !occursin("✖", fd2)
@test read(f_out, String) == good @test read(f_out, String) == good
@ -128,7 +128,7 @@ function maintests(f::R) where {R}
rc, fd1, fd2 = runic(argv) rc, fd1, fd2 = runic(argv)
@test rc == 0 @test rc == 0
@test isempty(fd1) @test isempty(fd1)
@test occursin("Formatting `in.jl` ...", fd2) @test occursin("[1/1] Formatting `in.jl` ...", fd2)
@test occursin("✔", fd2) @test occursin("✔", fd2)
@test !occursin("✖", fd2) @test !occursin("✖", fd2)
@test read(f_in, String) == good @test read(f_in, String) == good
@ -150,7 +150,7 @@ function maintests(f::R) where {R}
write(f_in, good) write(f_in, good)
rc, fd1, fd2 = runic(argv) rc, fd1, fd2 = runic(argv)
@test rc == 0 @test rc == 0
@test occursin("Formatting `in.jl` ...", fd2) @test occursin("[1/1] Formatting `in.jl` ...", fd2)
@test occursin("✔", fd2) @test occursin("✔", fd2)
@test !occursin("✖", fd2) @test !occursin("✖", fd2)
@test read(f_in, String) == good @test read(f_in, String) == good
@ -184,6 +184,7 @@ function maintests(f::R) where {R}
@test isempty(fd1) @test isempty(fd1)
@test occursin("Formatting `good.jl` ...", fd2) @test occursin("Formatting `good.jl` ...", fd2)
@test occursin("Formatting `src/bad.jl` ...", fd2) @test occursin("Formatting `src/bad.jl` ...", fd2)
@test occursin("[1/2]", fd2) && occursin("[2/2]", fd2)
@test occursin("✔", fd2) @test occursin("✔", fd2)
@test !occursin("✖", fd2) @test !occursin("✖", fd2)
@test !occursin("git.jl", fd2) @test !occursin("git.jl", fd2)
@ -208,7 +209,7 @@ function maintests(f::R) where {R}
rc, fd1, fd2 = runic(argv) rc, fd1, fd2 = runic(argv)
@test rc == 1 @test rc == 1
@test isempty(fd1) @test isempty(fd1)
@test occursin("Checking `in.jl` ...", fd2) @test occursin("[1/1] Checking `in.jl` ...", fd2)
@test !occursin("✔", fd2) @test !occursin("✔", fd2)
@test occursin("✖", fd2) @test occursin("✖", fd2)
@test read(f_in, String) == bad @test read(f_in, String) == bad
@ -230,7 +231,7 @@ function maintests(f::R) where {R}
rc, fd1, fd2 = runic(argv) rc, fd1, fd2 = runic(argv)
@test rc == 0 @test rc == 0
@test isempty(fd1) @test isempty(fd1)
@test occursin("Checking `in.jl` ...", fd2) @test occursin("[1/1] Checking `in.jl` ...", fd2)
@test occursin("✔", fd2) @test occursin("✔", fd2)
@test !occursin("✖", fd2) @test !occursin("✖", fd2)
@test read(f_in, String) == good @test read(f_in, String) == good
@ -265,6 +266,7 @@ function maintests(f::R) where {R}
@test isempty(fd1) @test isempty(fd1)
@test occursin("Checking `good.jl` ...", fd2) @test occursin("Checking `good.jl` ...", fd2)
@test occursin("Checking `src/bad.jl` ...", fd2) @test occursin("Checking `src/bad.jl` ...", fd2)
@test occursin("[1/2]", fd2) && occursin("[2/2]", fd2)
@test occursin("✔", fd2) @test occursin("✔", fd2)
@test occursin("✖", fd2) @test occursin("✖", fd2)
@test !occursin("git.jl", fd2) @test !occursin("git.jl", fd2)
@ -296,7 +298,7 @@ function maintests(f::R) where {R}
rc, fd1, fd2 = runic(argv) rc, fd1, fd2 = runic(argv)
@test rc == 1 @test rc == 1
@test isempty(fd1) @test isempty(fd1)
@test occursin("Checking `in.jl` ...", fd2) @test occursin("[1/1] Checking `in.jl` ...", fd2)
@test !occursin("✔", fd2) @test !occursin("✔", fd2)
@test occursin("✖", fd2) @test occursin("✖", fd2)
@test occursin("diff --git", fd2) @test occursin("diff --git", fd2)
@ -307,6 +309,21 @@ function maintests(f::R) where {R}
end end
end end
# runic --verbose
cdtmp() do
f_in = "in.jl"
write(f_in, good)
let argv = ["--verbose"; "--check"; fill(f_in, 10)]
rc, fd1, fd2 = runic(argv)
@test rc == 0
@test isempty(fd1)
for i in 1:9
@test occursin("[ $(i)/10] Checking `in.jl` ...", fd2)
end
@test occursin("[10/10] Checking `in.jl` ...", fd2)
end
end
# Error paths # Error paths
# runic -o # runic -o
let (rc, fd1, fd2) = runic(["-o"]) let (rc, fd1, fd2) = runic(["-o"])

Write Preview
Loading…
Cancel
Save