Skip to content

Commit ab65bee

Browse files
committed
fix: strip cr in fileParts and ownerOf for windows line-ending compat
1 parent 4119f32 commit ab65bee

1 file changed

Lines changed: 2 additions & 1 deletion

File tree

internal/tools/tokless_block.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ func stripLegacyHeading(raw, heading string) string {
142142

143143
// fileParts splits raw into head, managed sections, and tail.
144144
func fileParts(raw string) (head []string, blocks []managedSection, tail []string) {
145-
lines := strings.Split(raw, "\n")
145+
lines := strings.Split(strings.ReplaceAll(raw, "\r", ""), "\n")
146146
ownerIdx := make([]int, 0)
147147
for i, line := range lines {
148148
if ownerOf(line) != "" {
@@ -193,6 +193,7 @@ func blocksFromLines(lines []string) []managedSection {
193193

194194
// ownerOf returns owner id for a known heading.
195195
func ownerOf(line string) string {
196+
line = strings.TrimRight(line, "\r")
196197
for _, o := range util.ToklessOwners {
197198
for _, marker := range util.SectionMarkers(o) {
198199
if line == marker {

0 commit comments

Comments
 (0)