Skip to content

fix(gorgeEx): avoid discard trailling newline; fixes #25092 #25093

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

Closed
wants to merge 1 commit into from
Closed

fix(gorgeEx): avoid discard trailling newline; fixes #25092 #25093

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
23 changes: 15 additions & 8 deletions compiler/gorgeimpl.nim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,21 @@ when defined(nimPreviewSlimSystem):
import ../dist/checksums/src/checksums/sha1

proc readOutput(p: Process): (string, int) =
result[0] = ""
var output = p.outputStream
while not output.atEnd:
result[0].add(output.readLine)
result[0].add("\n")
if result[0].len > 0:
result[0].setLen(result[0].len - "\n".len)
result[1] = p.waitForExit
var outp = p.outputStream
# the following code is copied from osproc.execCmdEx
# @eea4ce0e2cf1dfdd2a90c2ab7f93888

# consider `p.lines(keepNewLines=true)` to avoid exit code test
result = ("", -1)
var line = newStringOfCap(120)
while true:
if outp.readLine(line):
result[0].add(line)
result[0].add("\n")
else:
result[1] = peekExitCode(p)
if result[1] != -1: break
close(p)

proc opGorge*(cmd, input, cache: string, info: TLineInfo; conf: ConfigRef): (string, int) =
let workingDir = parentDir(toFullPath(conf, info))
Expand Down
Loading