forked from superset-sh/superset
-
Notifications
You must be signed in to change notification settings - Fork 1
[PR4/5] fix(upstream): v1 split pane 起動時のサイジング修正（ターミナル Session Readiness 機構）(#3416) #162
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.
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
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
54 changes: 54 additions & 0 deletions
54
apps/desktop/src/renderer/lib/terminal/session-readiness.ts
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,54 @@ | ||
| type SessionReadyWaiter = { | ||
| resolve: () => void; | ||
| reject: (error: Error) => void; | ||
| }; | ||
|
|
||
| const readyPaneIds = new Set<string>(); | ||
| const waitersByPaneId = new Map<string, Set<SessionReadyWaiter>>(); | ||
|
|
||
| function resolveWaiters(paneId: string): void { | ||
| const waiters = waitersByPaneId.get(paneId); | ||
| if (!waiters) return; | ||
| waitersByPaneId.delete(paneId); | ||
| for (const waiter of waiters) { | ||
| waiter.resolve(); | ||
| } | ||
| } | ||
|
|
||
| function rejectWaiters(paneId: string, error: Error): void { | ||
| const waiters = waitersByPaneId.get(paneId); | ||
| if (!waiters) return; | ||
| waitersByPaneId.delete(paneId); | ||
| for (const waiter of waiters) { | ||
| waiter.reject(error); | ||
| } | ||
| } | ||
|
|
||
| export function clearTerminalSessionReady(paneId: string): void { | ||
| readyPaneIds.delete(paneId); | ||
| } | ||
|
|
||
| export function markTerminalSessionReady(paneId: string): void { | ||
| readyPaneIds.add(paneId); | ||
| resolveWaiters(paneId); | ||
| } | ||
|
|
||
| export function rejectTerminalSessionReady(paneId: string, error: Error): void { | ||
| readyPaneIds.delete(paneId); | ||
| rejectWaiters(paneId, error); | ||
| } | ||
|
|
||
| export function waitForTerminalSessionReady(paneId: string): Promise<void> { | ||
| if (readyPaneIds.has(paneId)) { | ||
| return Promise.resolve(); | ||
| } | ||
|
|
||
| return new Promise<void>((resolve, reject) => { | ||
| let waiters = waitersByPaneId.get(paneId); | ||
| if (!waiters) { | ||
| waiters = new Set(); | ||
| waitersByPaneId.set(paneId, waiters); | ||
| } | ||
| waiters.add({ resolve, reject }); | ||
| }); | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
5 changes: 5 additions & 0 deletions
5
apps/desktop/src/renderer/stores/tabs/utils/terminal-cleanup.ts
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Passing
waitForMountedSession: truehere makeslaunchCommandInPaneskipcreateOrAttachand wait formarkTerminalSessionReady, which is only emitted byuseTerminalLifecycleafter the pane is mounted. That works for the currently rendered tab, butopenPreset(..., { target: "active-tab" })is also invoked from background setup flows (e.g. workspace init), where the workspace tab can exist without being mounted; in that case the promise never resolves and the preset command is never sent. Please keep helper-side attach for these active-tab preset paths unless visibility/mount is guaranteed.Useful? React with 👍 / 👎.