Skip to content

fix(navigation): open the correct chapter/verse when deep-linking into a not-yet-open book (#996) #1025

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

fix(navigation): open the correct chapter/verse when deep-linking into a not-yet-open book (#996) #1025

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: 31 additions & 14 deletions src/utils/openCodexDocumentWithSourcePair.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,36 @@ export async function openCodexDocumentWithSourcePair(
): Promise<void> {
const normalizedPath = codexUri.fsPath.replace(/\\/g, "/");

// Resolve the editor provider once so we can wait for each pane's webview to
// become ready before returning. Callers frequently publish a navigation jump
// (e.g. the `cellToJumpTo` workspace-state key) immediately after this resolves.
// The provider registers that jump listener while resolving each editor, and
// `waitForWebviewReady` only returns once a pane has signalled ready (i.e. after
// it resolved + registered its listener). If we don't wait for the TARGET pane,
// a cold-opened editor can miss the jump and land on chapter 1 instead of the
// requested cell. See issue #996.
let provider:
| { waitForWebviewReady(uri: string, maxWaitMs?: number): Promise<boolean>; }
| undefined;
try {
const { CodexCellEditorProvider } = await import(
"../providers/codexCellEditorProvider/codexCellEditorProvider"
);
provider = CodexCellEditorProvider.getInstance() ?? undefined;
} catch {
provider = undefined;
}
const waitForPaneReady = async (uri: vscode.Uri) => {
if (provider) {
await provider.waitForWebviewReady(uri.toString(), 3000);
} else {
await new Promise((resolve) => setTimeout(resolve, 100));
}
};

if (!workspaceFolderUri) {
await vscode.commands.executeCommand("vscode.openWith", codexUri, "codex.cellEditor");
await waitForPaneReady(codexUri);
return;
}

Expand All @@ -32,27 +60,15 @@ export async function openCodexDocumentWithSourcePair(
"codex.cellEditor",
{ viewColumn: vscode.ViewColumn.One }
);

try {
const { CodexCellEditorProvider } = await import(
"../providers/codexCellEditorProvider/codexCellEditorProvider"
);
const provider = CodexCellEditorProvider.getInstance();
if (provider) {
await provider.waitForWebviewReady(sourceUri.toString(), 3000);
} else {
await new Promise((resolve) => setTimeout(resolve, 100));
}
} catch {
await new Promise((resolve) => setTimeout(resolve, 100));
}
await waitForPaneReady(sourceUri);

await vscode.commands.executeCommand(
"vscode.openWith",
codexUri,
"codex.cellEditor",
{ viewColumn: vscode.ViewColumn.Two }
);
await waitForPaneReady(codexUri);
} catch (sourceError) {
console.warn("Could not open source file:", sourceError);
await vscode.commands.executeCommand(
Expand All @@ -61,5 +77,6 @@ export async function openCodexDocumentWithSourcePair(
"codex.cellEditor",
{ viewColumn: vscode.ViewColumn.Two }
);
await waitForPaneReady(codexUri);
}
}
Loading