fix(patches): rebase for VS Code 1.124.0

[sbs44]

Combines PR #13 (patch 11) and PR #14 (patch 20).

Refs #12

Supersedes #13 and #14 — close them after this merges.

[claude]

Claude finished @sbs44's task in 2m 38s —— View job

---

Code Review — PR #16: rebase patches for VS Code 1.124.0

• Gather context (patch file, apply mechanism, original vs. rebased patch)
• Analyze the rebased patch changes
• Post review feedback

---

I reviewed patches/20-keymap-use-custom-lib.patch against origin/main, and how patches are applied (git apply --ignore-whitespace via apply_patch in utils.sh:38).

✅ The rebase itself looks correct

The patch swaps native-keymap → @vscodium/native-keymap and the semantic content is fully preserved across all 7 hunks (.npmrc, build/.moduleignore, eslint.config.js, package-lock.json, package.json, nativeModules.integrationTest.ts, keyboardLayoutMainService.ts). The only diffs vs. the old patch are exactly what a clean rebase should touch:

• Blob index hashes updated (e.g. 025e4b04..5e409d87 → 8c21e58ef14..25a93f408ad).
• Hunk offsets shifted to match 1.124.0 (eslint.config.js 1516→1530, package-lock.json 39→41 / 13843→14114, package.json 134→141).
• Drifted context lines updated correctly: ms_build_id 13870025→14159160, export default tseslint.config( → export default defineConfig(, and the playwright-core context line replaced by node-addon-api where upstream reordered deps.

Version strings are consistent everywhere (package.json, the lock root-deps mirror, and the node_modules/@vscodium/native-keymap entry all pin 3.3.7-258424), and the new lock entry is inserted in correct alphabetical position (@vscode/... < @vscodium/... < @xterm/...). The incidental napi-build-utils (1.0.2→2.0.0) and prebuild-install (7.1.2→7.1.3) bumps in the lockfile were already present in the original patch — not new scope creep.

Minor note: with plain git apply (no --3way), the blob index hashes are cosmetic and don't affect application — but updating them is good hygiene and keeps the patch honest. 👍

⚠️ One thing to reconcile — patch 11 is missing

The PR description says:

Combines PR #13 (patch 11) and PR #14 (patch 20).

But the diff only modifies patches/20-keymap-use-custom-lib.patch. patches/11-update-use-github-release.patch is untouched (git diff origin/main...HEAD lists a single file).

If #13 contained a rebase of patch 11 for 1.124.0, that work isn't in this PR — so merging this and closing #13/#14 (as the description instructs) would drop #13's changes. Please either:

• add the patch 11 rebase to this PR, or
• confirm patch 11 still applies cleanly against 1.124.0 unchanged and adjust the description to say only patch 20 needed re-rolling.

Note on verification

I could not empirically confirm the patch applies, since that requires the upstream VS Code 1.124.0 checkout / full build pipeline (prepare_vscode.sh), which isn't available in this review environment. The review above is based on diff analysis. Per the README, a failed apply surfaces as "Patch failed to apply" in the build — worth a force_build run to confirm before relying on it.

Verdict: Patch 20 rebase is clean and mergeable on its own. Resolve the patch-11 / description mismatch before closing #13.
• origin/fix/issue-12-win32-patch-1.124.0