| ' +
'' +
'console' +
'.' +
@@ -471,11 +471,11 @@ describe('Blob viewer', () => {
aborted: false,
html:
// Note: whitespace in this string is significant.
- ' | ' +
+ ' | ' +
' |
|---|
' +
- ' | ' +
+ ' | ' +
'' +
'console' +
'.' +
@@ -485,7 +485,7 @@ describe('Blob viewer', () => {
'"Hello world' +
'"' +
')\n |
|---|
' +
- ' | ' +
+ ' | ' +
'' +
' |
|---|
| |
',
@@ -735,9 +735,9 @@ describe('Blob viewer', () => {
aborted: false,
html:
// Note: whitespace in this string is significant.
- ' | // First word line\n' +
- ' | | // Second line | \n' +
- ' | // Third word line |
',
+ ' | // First word line\n' +
+ ' |
|---|
| // Second line |
|---|
\n' +
+ ' | // Third word line |
|---|
',
lsif: '',
},
}
@@ -748,9 +748,9 @@ describe('Blob viewer', () => {
aborted: false,
html:
// Note: whitespace in this string is significant.
- ' | // First line\n' +
- ' | | // Second word line | \n' +
- ' | // Third line |
',
+ ' | // First line\n' +
+ ' |
|---|
| // Second word line |
|---|
\n' +
+ ' | // Third line |
|---|
',
lsif: '',
},
}
@@ -932,12 +932,12 @@ describe('Blob viewer', () => {
highlight: {
aborted: false,
html:
- ' | ' +
+ ' | ' +
' |
|---|
' +
- ' | ' +
+ ' | ' +
'' +
'' +
'console' +
@@ -968,12 +968,12 @@ describe('Blob viewer', () => {
highlight: {
aborted: false,
html:
- ' | ' +
+ ' | ' +
' |
|---|
' +
- ' | ' +
+ ' | ' +
'' +
'' +
'console' +
diff --git a/client/web/src/integration/notebook.test.ts b/client/web/src/integration/notebook.test.ts
index 8d48bb190b09..6e717d17fcec 100644
--- a/client/web/src/integration/notebook.test.ts
+++ b/client/web/src/integration/notebook.test.ts
@@ -422,7 +422,7 @@ describe('Search Notebook', () => {
)
// Wait for highlighted code to load
- await driver.page.waitForSelector(`${fileBlockSelector} td.line`, { visible: true })
+ await driver.page.waitForSelector(`${fileBlockSelector} th.line`, { visible: true })
// Refocus the entire block (prevents jumping content for below actions)
await driver.page.click(fileBlockSelector)
@@ -617,7 +617,7 @@ https://sourcegraph.test:3443/github.com/sourcegraph/sourcegraph@branch/-/blob/c
await driver.page.click(`${symbolBlockSelector} [data-testid="symbol-suggestion-button"]`)
// Wait for highlighted code to load
- await driver.page.waitForSelector(`${symbolBlockSelector} td.line`, { visible: true })
+ await driver.page.waitForSelector(`${symbolBlockSelector} th.line`, { visible: true })
// Refocus the entire block (prevents jumping content for below actions)
await driver.page.click(symbolBlockSelector)
@@ -708,7 +708,7 @@ https://sourcegraph.test:3443/github.com/sourcegraph/sourcegraph@branch/-/blob/c
const fileBlockSelector = blockSelector(blockIds[2])
// Wait for highlighted code to load
- await driver.page.waitForSelector(`${fileBlockSelector} td.line`, { visible: true })
+ await driver.page.waitForSelector(`${fileBlockSelector} th.line`, { visible: true })
const fileBlockHeaderText = await getFileBlockHeaderText(fileBlockSelector)
expect(fileBlockHeaderText).toEqual('sourcegraph/sourcegraph›client/search/src/index.ts')
diff --git a/client/web/src/repo/blob/BlameColumn.tsx b/client/web/src/repo/blob/BlameColumn.tsx
index 980b5026702d..227db06b8c09 100644
--- a/client/web/src/repo/blob/BlameColumn.tsx
+++ b/client/web/src/repo/blob/BlameColumn.tsx
@@ -51,7 +51,7 @@ export const BlameColumn = React.memo(({ isBlameVisible, codeV
// if no other columns with decorations
if (!row?.querySelector(`.${styles.decoration}`)) {
// remove line number cell extra horizontal padding
- row?.querySelector('td.line')?.classList.remove('px-2')
+ row?.querySelector('th.line')?.classList.remove('px-2')
}
}
@@ -71,7 +71,7 @@ export const BlameColumn = React.memo(({ isBlameVisible, codeV
cell.classList.add(styles.decoration)
// add line number cell extra horizontal padding
- row.querySelector('td.line')?.classList.add('px-2')
+ row.querySelector('th.line')?.classList.add('px-2')
// add decorations wrapper
const wrapper = document.createElement('div')
diff --git a/client/web/src/repo/blob/Blob.module.scss b/client/web/src/repo/blob/Blob.module.scss
index 1d07384aef48..d32704106be4 100644
--- a/client/web/src/repo/blob/Blob.module.scss
+++ b/client/web/src/repo/blob/Blob.module.scss
@@ -13,7 +13,7 @@
border-collapse: collapse;
}
- td:global(.line) {
+ th:global(.line) {
&::before {
// draw line number with css so it cannot be copied to clipboard
content: attr(data-line);
@@ -43,13 +43,13 @@
}
}
- &:first-child td:global(.line) {
+ &:first-child th:global(.line) {
// place bottom spacer below the line number set with ::before pseudo-element
display: flex;
flex-direction: column-reverse;
}
- &:first-child:last-child td:global(.line) {
+ &:first-child:last-child th:global(.line) {
// place the line number set with ::before pseudo-element between top and bottom spacers
&::before {
order: 1;
@@ -61,7 +61,7 @@
}
}
- td:global(.line),
+ th:global(.line),
td:global(.code) {
padding: 0;
}
diff --git a/client/web/src/repo/blob/Blob.tsx b/client/web/src/repo/blob/Blob.tsx
index 67acf58c3ebf..b28113e245a8 100644
--- a/client/web/src/repo/blob/Blob.tsx
+++ b/client/web/src/repo/blob/Blob.tsx
@@ -185,7 +185,7 @@ const domFunctions = {
if (!row) {
throw new Error('Could not find closest row for codeCell')
}
- const numberCell = row.querySelector('td.line')
+ const numberCell = row.querySelector('th.line')
if (!numberCell || !numberCell.dataset.line) {
throw new Error('Could not find line number')
}
diff --git a/client/web/src/repo/compare/dom-functions.ts b/client/web/src/repo/compare/dom-functions.ts
index f929c97b4d35..69249bd0eb90 100644
--- a/client/web/src/repo/compare/dom-functions.ts
+++ b/client/web/src/repo/compare/dom-functions.ts
@@ -22,7 +22,7 @@ export const diffDomFunctions: DOMFunctions = {
// Find all line number cells in this row
const lineNumberCells = codeCell
.closest('tr')
- ?.querySelectorAll('td[data-line]') as NodeListOf
+ ?.querySelectorAll('[data-line]') as NodeListOf
// If there are line numbers...
if (lineNumberCells?.length) {
// Pick the second (last, using `pop`) line number cell, since code-intel will
diff --git a/cmd/frontend/internal/highlight/highlight.go b/cmd/frontend/internal/highlight/highlight.go
index bfa49a07cb1c..471cae68cb25 100644
--- a/cmd/frontend/internal/highlight/highlight.go
+++ b/cmd/frontend/internal/highlight/highlight.go
@@ -562,10 +562,10 @@ func generatePlainTable(code string) (*HighlightedCode, error) {
tr := &html.Node{Type: html.ElementNode, DataAtom: atom.Tr, Data: atom.Tr.String()}
table.AppendChild(tr)
- tdLineNumber := &html.Node{Type: html.ElementNode, DataAtom: atom.Td, Data: atom.Td.String()}
- tdLineNumber.Attr = append(tdLineNumber.Attr, html.Attribute{Key: "class", Val: "line"})
- tdLineNumber.Attr = append(tdLineNumber.Attr, html.Attribute{Key: "data-line", Val: fmt.Sprint(row + 1)})
- tr.AppendChild(tdLineNumber)
+ thLineNumber := &html.Node{Type: html.ElementNode, DataAtom: atom.Th, Data: atom.Th.String()}
+ thLineNumber.Attr = append(thLineNumber.Attr, html.Attribute{Key: "class", Val: "line"})
+ thLineNumber.Attr = append(thLineNumber.Attr, html.Attribute{Key: "data-line", Val: fmt.Sprint(row + 1)})
+ tr.AppendChild(thLineNumber)
codeCell := &html.Node{Type: html.ElementNode, DataAtom: atom.Td, Data: atom.Td.String()}
codeCell.Attr = append(codeCell.Attr, html.Attribute{Key: "class", Val: "code"})
diff --git a/cmd/frontend/internal/highlight/highlight_test.go b/cmd/frontend/internal/highlight/highlight_test.go
index 2aea0e3ee5d2..8bc10bf6e74c 100644
--- a/cmd/frontend/internal/highlight/highlight_test.go
+++ b/cmd/frontend/internal/highlight/highlight_test.go
@@ -52,8 +52,8 @@ func TestGeneratePlainTable(t *testing.T) {
line 2
`
- want := template.HTML(` | line 1 | | line 2 | |
- | |
+ want := template.HTML(``)
response, err := generatePlainTable(input)
if err != nil {
@@ -71,8 +71,8 @@ func TestGeneratePlainTableSecurity(t *testing.T) {
`
- want := template.HTML(` | <strong>line 1</strong> | | <script>alert("line 2")</script> | |
- | |
+ want := template.HTML(` | <strong>line 1</strong> |
|---|
| <script>alert("line 2")</script> |
|---|
|
+ |
|---|
|
|
|---|
`)
response, err := generatePlainTable(input)
if err != nil {
diff --git a/cmd/frontend/internal/highlight/html.go b/cmd/frontend/internal/highlight/html.go
index 5136c7280164..c326f17f472a 100644
--- a/cmd/frontend/internal/highlight/html.go
+++ b/cmd/frontend/internal/highlight/html.go
@@ -228,10 +228,10 @@ func newHtmlRow(row int32, includeLineNumbers bool) (htmlRow, htmlCode *html.Nod
tr := &html.Node{Type: html.ElementNode, DataAtom: atom.Tr, Data: atom.Tr.String()}
if includeLineNumbers {
- tdLineNumber := &html.Node{Type: html.ElementNode, DataAtom: atom.Td, Data: atom.Td.String()}
- tdLineNumber.Attr = append(tdLineNumber.Attr, html.Attribute{Key: "class", Val: "line"})
- tdLineNumber.Attr = append(tdLineNumber.Attr, html.Attribute{Key: "data-line", Val: fmt.Sprint(row + 1)})
- tr.AppendChild(tdLineNumber)
+ thLineNumber := &html.Node{Type: html.ElementNode, DataAtom: atom.Thead, Data: atom.Thead.String()}
+ thLineNumber.Attr = append(thLineNumber.Attr, html.Attribute{Key: "class", Val: "line"})
+ thLineNumber.Attr = append(thLineNumber.Attr, html.Attribute{Key: "data-line", Val: fmt.Sprint(row + 1)})
+ tr.AppendChild(thLineNumber)
}
codeCell := &html.Node{Type: html.ElementNode, DataAtom: atom.Td, Data: atom.Td.String()}
diff --git a/docker-images/syntax-highlighter/crates/sg-syntax/src/sg_syntect.rs b/docker-images/syntax-highlighter/crates/sg-syntax/src/sg_syntect.rs
index bc8f2ff5b103..ea8f546334d6 100644
--- a/docker-images/syntax-highlighter/crates/sg-syntax/src/sg_syntect.rs
+++ b/docker-images/syntax-highlighter/crates/sg-syntax/src/sg_syntect.rs
@@ -12,7 +12,7 @@ use syntect::{
///
///
///
-/// |
+/// |
/// |
///
/// package
@@ -181,7 +181,7 @@ fn close_table(s: &mut String) {
fn open_row(s: &mut String, i: usize) {
write!(
s,
- " | ",
+ " | ",
i + 1
)
.unwrap();
@@ -256,7 +256,7 @@ mod tests {
let expected = " \
\
\
- | \
+ | \
| \
\
\
@@ -286,7 +286,7 @@ mod tests {
let expected = "\
\
\
- | \
+ | \
| \
<div>test</div> \
| \
@@ -310,7 +310,7 @@ mod tests {
let expected = "\
\
\
- | \
+ | \
| \
package main\n \
| \
@@ -335,7 +335,7 @@ mod tests {
let expected = "\
\
\
- | \
+ | \
| \
\
\
@@ -359,7 +359,7 @@ mod tests {
| \
\
\
- | \
+ | \
| \
\
\n\
@@ -367,7 +367,7 @@ mod tests {
| \
\
\
- | \
+ | \
| \
\
\
| | |
|---|
| | |
|
|
|---|
|
|
|---|
|
|
|---|