Skip to content

style: format the 3 WSL files main merged unformatted (fix red main) - #30951

Closed
brennanb2025 wants to merge 1 commit into
mainfrom
brennanb2025/fix-main-format-wsl-orcad
Closed

brennanb2025 wants to merge 1 commit into
mainfrom
brennanb2025/fix-main-format-wsl-orcad

Conversation

@brennanb2025

@brennanb2025 brennanb2025 commented Oct 20, 2026 •

Copy link
Copy Markdown
Contributor
Files Added Deleted Net
Test 1 $\color{#1a7f37}{\Huge{\mathbf{+}}}$​35 $\color{#cf222e}{\Huge{\mathbf{−}}}$​12 $\color{#1a7f37}{\Huge{\mathbf{+}}}$​23
Prod 3 $\color{#1a7f37}{\Huge{\mathbf{+}}}$​96 $\color{#cf222e}{\Huge{\mathbf{−}}}$​57 $\color{#1a7f37}{\Huge{\mathbf{+}}}$​39

Problem

Main has been red since #29042 (keep the desktop pairing across host restarts) merged with three files that oxfmt --check rejects:

  • src/main/wsl/wsl-orcad-connection.ts
  • src/main/wsl/wsl-orcad-pairing-identity.ts
  • src/main/managed-server/lifecycle/orcad-managed-tunnel-identity-restart.test.ts

Because PR CI tests each PR merged with current main, every open PR now fails "static analysis and typecheck" at the formatting step. That job then stops before typecheck and lint run.

What changed

  • The three files are run through oxfmt. This is formatting only.
  • Formatted, wsl-orcad-connection.ts grows to 312 counted lines, which is over the 300-line max-lines rule. So its public types move, unchanged, into a new module, wsl-orcad-connection-types.ts:
    • WslOrcadConnection
    • WslOrcadConnectOptions
    • WslOrcadConnectionDependencies
    • the internal connect-status pair
  • wsl-orcad-connection.ts re-exports the three public types, so no importer changes.

User-facing change

None. No behaviour changes, and nothing is renamed beyond the move.

Testing

  • oxfmt --check and oxlint pass on the changed files.
  • CI's static analysis job is the typecheck gate.

Source of the breakage: #29042.

Author: Brennan Benson (X: @BrennanKB5)

@brennanb2025
brennanb2025 marked this pull request as ready for review October 20, 2026 01:40
@coderabbitai

coderabbitai Bot commented Oct 20, 2026

Copy link
Copy Markdown
Contributor

Warning

Review limit reached

You've used all free OSS reviews for now. Wait for the free limit to reset to keep reviewing this public repository.

Next included review available in 9 seconds.

Check out review usage here.

View limit details

Limit details: You’ve used all 10 included reviews currently available.

Learn how review limits work.

Review configuration:

⚙️ Run configuration
  • Configuration used: Repository UI
  • Review profile: CHILL
  • Plan: Advanced
  • Run ID: 11f6053d-cd6e-4215-b35f-376a77b56427
📥 Commits

Reviewing files that changed from the base of the PR and between 907694d and c8e117f.

📒 Files selected for processing: 4
  • src/main/managed-server/lifecycle/orcad-managed-tunnel-identity-restart.test.ts
  • src/main/wsl/wsl-orcad-connection-types.ts
  • src/main/wsl/wsl-orcad-connection.ts
  • src/main/wsl/wsl-orcad-pairing-identity.ts
  • Autofix · Keep fixing CodeRabbit findings and required CI, and resolving merge conflicts

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands.

@brennanb2025

Copy link
Copy Markdown
Contributor Author

Review status: superseded, not reviewed further

Problem: main went red after #29042 merged three files that fail the formatting check (wsl-orcad-connection.ts, wsl-orcad-pairing-identity.ts, orcad-managed-tunnel-identity-restart.test.ts). Every open PR failed "static analysis and typecheck" at the formatting step. This PR formats them and moves the connection types into a new file so wsl-orcad-connection.ts stays under the 300-line limit.

What changed since: #30948 merged to main at 2026-10-20 01:46 UTC (main bfdf16b2530). It formats the same three files and keeps wsl-orcad-connection.ts under the limit a different way, by moving the port-fallback listen into wsl-orcad-stdio-bridge.ts.

What that means here: this PR still merges with main without textual conflicts. After that merge, all it would add is the type move into wsl-orcad-connection-types.ts, and main doesn't need that any more. Users see no change either way.

Verified:

  • main's versions of the four touched files pass oxfmt --check with main's config (run locally).
  • git merge-tree against main shows no conflicts.
  • The format failure in PR run 39355702737 (01:51 UTC) came from a merge with the earlier main (907694dc), so it doesn't show that main is still red.

Not verified: lint on main's wsl-orcad-connection.ts (max-lines). The next PR CI run on main bfdf16b2530 or later confirms it.

No review rounds, fixes or QA were run, because there's nothing left to fix. #30953 is another open PR for the same fix.

For Brennan's review: close this PR, since #30948 already landed the fix.

@brennanb2025

Copy link
Copy Markdown
Contributor Author

Closing: superseded by #30948, which fixed main's formatting first.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant