Skip to content
This repository was archived by the owner on Sep 30, 2024. It is now read-only.

Commit 93af0ba

Browse files
chore: tables in code excerpts should use headers for line numbers
1 parent d817791 commit 93af0ba

File tree

5 files changed

+18
-18
lines changed

5 files changed

+18
-18
lines changed

client/branded/src/components/panel/views/__snapshots__/HierarchicalLocationsView.test.tsx.snap

Lines changed: 11 additions & 11 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

client/search-ui/src/components/CodeExcerpt.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -341,7 +341,7 @@ export const CodeExcerpt: React.FunctionComponent<Props> = ({
341341
<tbody>
342342
{range(startLine, endLine).map(index => (
343343
<tr key={index}>
344-
<td className="line" data-line={index + 1} />
344+
<th className="line" data-line={index + 1} />
345345
{/* create empty space to fill viewport (as if the blob content were already fetched, otherwise we'll overfetch) */}
346346
<td className="code"> </td>
347347
</tr>

cmd/frontend/internal/highlight/highlight.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -562,7 +562,7 @@ func generatePlainTable(code string) (*HighlightedCode, error) {
562562
tr := &html.Node{Type: html.ElementNode, DataAtom: atom.Tr, Data: atom.Tr.String()}
563563
table.AppendChild(tr)
564564

565-
tdLineNumber := &html.Node{Type: html.ElementNode, DataAtom: atom.Td, Data: atom.Td.String()}
565+
tdLineNumber := &html.Node{Type: html.ElementNode, DataAtom: atom.Th, Data: atom.Th.String()}
566566
tdLineNumber.Attr = append(tdLineNumber.Attr, html.Attribute{Key: "class", Val: "line"})
567567
tdLineNumber.Attr = append(tdLineNumber.Attr, html.Attribute{Key: "data-line", Val: fmt.Sprint(row + 1)})
568568
tr.AppendChild(tdLineNumber)

cmd/frontend/internal/highlight/highlight_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@ func TestGeneratePlainTable(t *testing.T) {
5252
line 2
5353
5454
`
55-
want := template.HTML(`<table><tr><td class="line" data-line="1"></td><td class="code"><span>line 1</span></td></tr><tr><td class="line" data-line="2"></td><td class="code"><span>line 2</span></td></tr><tr><td class="line" data-line="3"></td><td class="code"><span>
56-
</span></td></tr><tr><td class="line" data-line="4"></td><td class="code"><span>
55+
want := template.HTML(`<table><tr><th class="line" data-line="1"></th><td class="code"><span>line 1</span></td></tr><tr><th class="line" data-line="2"></th><td class="code"><span>line 2</span></td></tr><tr><th class="line" data-line="3"></th><td class="code"><span>
56+
</span></td></tr><tr><th class="line" data-line="4"></th><td class="code"><span>
5757
</span></td></tr></table>`)
5858
response, err := generatePlainTable(input)
5959
if err != nil {
@@ -71,8 +71,8 @@ func TestGeneratePlainTableSecurity(t *testing.T) {
7171
<script>alert("line 2")</script>
7272
7373
`
74-
want := template.HTML(`<table><tr><td class="line" data-line="1"></td><td class="code"><span>&lt;strong&gt;line 1&lt;/strong&gt;</span></td></tr><tr><td class="line" data-line="2"></td><td class="code"><span>&lt;script&gt;alert(&#34;line 2&#34;)&lt;/script&gt;</span></td></tr><tr><td class="line" data-line="3"></td><td class="code"><span>
75-
</span></td></tr><tr><td class="line" data-line="4"></td><td class="code"><span>
74+
want := template.HTML(`<table><tr><th class="line" data-line="1"></th><td class="code"><span>&lt;strong&gt;line 1&lt;/strong&gt;</span></td></tr><tr><th class="line" data-line="2"></th><td class="code"><span>&lt;script&gt;alert(&#34;line 2&#34;)&lt;/script&gt;</span></td></tr><tr><th class="line" data-line="3"></th><td class="code"><span>
75+
</span></td></tr><tr><th class="line" data-line="4"></th><td class="code"><span>
7676
</span></td></tr></table>`)
7777
response, err := generatePlainTable(input)
7878
if err != nil {

cmd/frontend/internal/highlight/html.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ func newHtmlRow(row int32, includeLineNumbers bool) (htmlRow, htmlCode *html.Nod
228228
tr := &html.Node{Type: html.ElementNode, DataAtom: atom.Tr, Data: atom.Tr.String()}
229229

230230
if includeLineNumbers {
231-
tdLineNumber := &html.Node{Type: html.ElementNode, DataAtom: atom.Td, Data: atom.Td.String()}
231+
tdLineNumber := &html.Node{Type: html.ElementNode, DataAtom: atom.Th, Data: atom.Th.String()}
232232
tdLineNumber.Attr = append(tdLineNumber.Attr, html.Attribute{Key: "class", Val: "line"})
233233
tdLineNumber.Attr = append(tdLineNumber.Attr, html.Attribute{Key: "data-line", Val: fmt.Sprint(row + 1)})
234234
tr.AppendChild(tdLineNumber)

0 commit comments

Comments
 (0)