Skip to content

Wait for gutter cells to render before rendering jump to next uncovered line button #38

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
wants to merge 1 commit into
base: main
Choose a base branch
from
+30 −15
Open

Wait for gutter cells to render before rendering jump to next uncovered line button #38

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
45 changes: 30 additions & 15 deletions src/github-injector.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ function setupJumpToUncoveredLineHotkey() {
document.addEventListener("keydown", uncoveredLineKeyListener);
}

function tryInjectDiffCommitUI(): void {
async function tryInjectDiffCommitUI(): Promise<void> {
const rootElement =
document.getElementById("diff-content-parent") || document.body;
if (rootElement.classList.contains("qlty-diff-ui")) return;
Expand All @@ -92,32 +92,36 @@ function tryInjectDiffCommitUI(): void {
links.push(link);
});

if (links.length === 0) {
return; // No links to process
await processFileLinks(rootElement, links);

if (isPRPage()) {
addPRPageBadge();
addNextUncoveredLineButton();
} else {
addDiffPageBadge();
}

links.forEach(async (link) => {
console.log("[qlty] injected diff UI");
rootElement.classList.add("qlty-diff-ui");
}

async function processFileLinks(rootElement: HTMLElement, links: Element[]) {
const promises: Promise<void>[] = [];

for (const link of links) {
const path = (link as HTMLElement).innerText.replace("\u200E", "");
const fileId = link.getAttribute("href")?.split("#")[1] ?? "";

await injectIntoFileContainer(
promises.push(injectIntoFileContainer(
link.parentElement?.parentElement ?? link,
path,
rootElement.querySelectorAll(
`[data-diff-anchor="${fileId}"] td:nth-last-child(2)`,
),
);
});

if (isPRPage()) {
addPRPageBadge();
addNextUncoveredLineButton();
} else {
addDiffPageBadge();
));
}

console.log("[qlty] injected diff UI");
rootElement.classList.add("qlty-diff-ui");
return Promise.all(promises);
}

function isPRPage(): boolean {
Expand Down Expand Up @@ -174,6 +178,13 @@ function jumpToNextUncoveredLine() {
el.parentElement?.classList.contains("selected-line"),
);

const currentElement = uncoveredLineDivs[currentlySelectedIndex];
if (currentElement) {
// Click the current line to deselect it; this is necessary to make sure
// the selected line doesn't stay selected (occurs sometimes during back/forward nav)
selectLinkableLine(currentElement.parentElement!);
}

const nextIndex = (currentlySelectedIndex + 1) % uncoveredLineDivs.length;
const nextElement = uncoveredLineDivs[nextIndex];
nextElement.scrollIntoView({ behavior: "smooth", block: "center" });
Expand All @@ -184,6 +195,10 @@ function jumpToNextUncoveredLine() {
return;
}

selectLinkableLine(linkableLine);
}

function selectLinkableLine(linkableLine: HTMLElement) {
// Click the line to highlight it
// If we don't also trigger a click event, then our line gets unhighlighted on
// subsequent button clicks
Expand Down