Skip to content
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

Ensure empty lines are copiable and final new line too #16678

Merged
merged 7 commits into from
Aug 13, 2021
Merged

Ensure empty lines are copiable and final new line too #16678

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
426c149
Ensure empty lines are copiable and final new line too
zeripath Aug 12, 2021
88131d4
remove extraneous logging
zeripath Aug 13, 2021
86b59b3
remove extraneous logging
zeripath Aug 13, 2021
7b5cf1d
Add test and ensure spans closed
zeripath Aug 13, 2021
b339f78
Merge branch 'main' into fix-16434-ensure-empty-lines-copiable-and-fi…
6543 Aug 13, 2021
652fb80
Update modules/highlight/highlight_test.go
6543 Aug 13, 2021
3c6a15e
Merge branch 'main' into fix-16434-ensure-empty-lines-copiable-and-fi…
6543 Aug 13, 2021
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
17 changes: 17 additions & 0 deletions modules/highlight/highlight.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,16 +166,33 @@ func File(numLines int, fileName string, code []byte) map[int]string {
}

htmlw.Flush()
finalNewLine := false
if len(code) > 0 {
finalNewLine = code[len(code)-1] == '\n'
}

m := make(map[int]string, numLines)
for k, v := range strings.SplitN(htmlbuf.String(), "\n", numLines) {
line := k + 1
content := string(v)
log.Info("%s", content)

//need to keep lines that are only \n so copy/paste works properly in browser
if content == "" {
content = "\n"
} else if content == `</span><span class="w">` {
content += "\n"
}
m[line] = content
}
if finalNewLine {
m[numLines+1] = "<span class=\"w\">\n</span>"
}

for i, line := range m {
log.Info("%d: %q", i, line)
}

return m
}

Expand Down