Skip to content
Merged
Tyriar merged 2 commits intomainfrom
tyriar/xterm_20251229
Dec 29, 2025
Merged

[email protected] #285312
Tyriar merged 2 commits intomainfrom
tyriar/xterm_20251229

Conversation

@Tyriar
Copy link
Member

@Tyriar Tyriar commented Dec 29, 2025

Fixes #285138
Fixes #285180
Fixes #252449
Fixes #230120

@Tyriar Tyriar added this to the December / January 2026 milestone Dec 29, 2025
@Tyriar Tyriar self-assigned this Dec 29, 2025
Copilot AI review requested due to automatic review settings December 29, 2025 11:52
@Tyriar Tyriar enabled auto-merge December 29, 2025 11:52
Copy link
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

This PR updates xterm and related addons from version 6.1.0-beta.22 to 6.1.0-beta.56, fixing several terminal-related issues. The update includes changes to package dependencies, removal of a conflicting keybinding, and an adjustment to the xterm update script.

  • Updates xterm core library and most addons from beta.22 to beta.56
  • Updates webgl addon from beta.21 to beta.55
  • Removes ctrl+/ keybinding that was conflicting with VS Code's toggle comment functionality
  • Modifies the xterm-update script validation to be more flexible with directory names

Reviewed changes

Copilot reviewed 5 out of 8 changed files in this pull request and generated 1 comment.

Show a summary per file
File Description
src/vs/workbench/contrib/terminalContrib/sendSequence/browser/terminal.sendSequence.contribution.ts Removes ctrl+/ keybinding registration to resolve keybinding conflicts
scripts/xterm-update.js Updates directory validation from exact "vscode" match to regex pattern allowing "vscode" anywhere in basename
remote/web/package.json Updates xterm dependencies to beta.56 (beta.55 for webgl)
remote/web/package-lock.json Updates resolved package versions and integrity hashes for xterm dependencies
remote/package.json Updates xterm dependencies to beta.56 (beta.55 for webgl), adds headless package
remote/package-lock.json Updates resolved package versions and integrity hashes for xterm dependencies
package.json Updates xterm dependencies to beta.56 (beta.55 for webgl) in root package
package-lock.json Updates resolved package versions and integrity hashes for xterm dependencies in root lockfile
Files not reviewed (2)
  • remote/package-lock.json: Language not supported
  • remote/web/package-lock.json: Language not supported

const vscodeDir = process.argv.length >= 3 ? process.argv[2] : process.cwd();
if (path.basename(vscodeDir) !== 'vscode') {
console.error('The cwd is not named "vscode"');
if (!path.basename(vscodeDir).match(/.*vscode.*/)) {
Copy link

Copilot AI Dec 29, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The regex pattern .*vscode.* will match any path containing "vscode" anywhere in the basename, including cases like "vscode-backup", "my-vscode-fork", or even "not-vscode-at-all". This makes the validation too permissive. Consider using a more specific pattern like /^vscode(-[a-z]+)?$/ to match "vscode" exactly or with specific suffixes like "vscode-insiders".

Suggested change
if (!path.basename(vscodeDir).match(/.*vscode.*/)) {
if (!path.basename(vscodeDir).match(/^vscode(-[a-z]+)?$/)) {

Copilot uses AI. Check for mistakes.
@Tyriar Tyriar merged commit 30d2a29 into main Dec 29, 2025
32 of 34 checks passed
@Tyriar Tyriar deleted the tyriar/xterm_20251229 branch December 29, 2025 13:22
@vs-code-engineering vs-code-engineering bot locked and limited conversation to collaborators Feb 12, 2026
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

3 participants