Skip to content

Commit 9fa8445

Browse files
Rename Write() method on vt to WriteWithCRLFTranslation
1 parent 410ac17 commit 9fa8445

File tree

2 files changed

+4
-9
lines changed

2 files changed

+4
-9
lines changed

internal/assertions/highlighting_assertion.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,11 @@ func (a *HighlightingAssertion) Run(result executable.ExecutableResult, logger *
4646
virtualTerminal2 := virtual_terminal.NewCustomVT(maxTerminalHeight, maxTerminalWidth)
4747
defer virtualTerminal2.Close()
4848

49-
if _, err := virtualTerminal1.Write([]byte(a.ExpectedOutput)); err != nil {
49+
if _, err := virtualTerminal1.WriteWithCRLFTranslation([]byte(a.ExpectedOutput)); err != nil {
5050
return err
5151
}
5252

53-
if _, err := virtualTerminal2.Write(result.Stdout); err != nil {
53+
if _, err := virtualTerminal2.WriteWithCRLFTranslation(result.Stdout); err != nil {
5454
return err
5555
}
5656

virtual_terminal/virtual_terminal.go

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,8 @@ func (vt *VirtualTerminal) Close() {
2323
vt.vt.Close()
2424
}
2525

26-
func (vt *VirtualTerminal) Write(p []byte) (n int, err error) {
27-
// TODO: I'll remove this after PR review
28-
// Confused about where this (crlf translation) should be put:
29-
// Here:
30-
// Upsides: The caller doesn't have to perform crlf translation on every write
31-
// Downsides: the Write() method may return length different from len(p)
32-
// A better way would have been if the vt package had provided a way to enable ONLCR
26+
func (vt *VirtualTerminal) WriteWithCRLFTranslation(p []byte) (n int, err error) {
27+
// The vt package does not provide a way to enable ONLCR on the virtual terminal
3328
tr := crlfTranslation(p)
3429
return vt.vt.Write(tr)
3530
}

0 commit comments

Comments
 (0)