Skip to content

Support files that don't end with newline #1

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

Open
mkmik wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Support files that don't end with newline #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4f31911
Go really wants to update go.mod
mkmik Nov 28, 2019
3903f97
Support files that don't end with newline
mkmik Nov 28, 2019
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
6 changes: 5 additions & 1 deletion apply.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,11 @@ func eatLines(scan *bufio.Scanner, prefix string, n int) error {
if !scan.Scan() {
return io.ErrUnexpectedEOF
}
if !bytes.HasPrefix(scan.Bytes(), bprefix) {
// diff can inject comments in lines beginning with a backslash, like when
// highlighting that the original line had no trailing newline
if bytes.HasPrefix(scan.Bytes(), []byte("\\ ")) {
i--
} else if !bytes.HasPrefix(scan.Bytes(), bprefix) {
return fmt.Errorf("line %q does not have expected prefix %q", scan.Bytes(), bprefix)
}
}
Expand Down
2 changes: 2 additions & 0 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
module github.com/rogpeppe/apipe

require 9fans.net/go v0.0.0-20180727211846-5d4fa602e1e8

go 1.13