Skip to content

[pull] main from microsoft:main #943

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

Merged
pull merged 14 commits into from
Feb 18, 2026
Merged

[pull] main from microsoft:main #943

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
be3c70f
Fix some jumping on scrolling up
roblourens Feb 18, 2026
bceeacc
fix
roblourens Feb 18, 2026
f32f330
Enable kitty graphics protocol, bump xterm.js (#295701)
anthonykim1 Feb 18, 2026
3e19988
Merge pull request #295923 from microsoft/roblou/high-gibbon
roblourens Feb 18, 2026
ebbe486
Browser: Managed CDP context groups (#295676)
kycutler Feb 18, 2026
3165923
fix: crash with run_as_node in sub app (#295927)
deepak1556 Feb 18, 2026
ddf7d0b
Browser: Disable toolbar buttons when not possible to use them (#295942)
jruales Feb 18, 2026
cb12b13
Fix instructions reading in WSL (#295898)
pwang347 Feb 18, 2026
ed52ab8
perf: defer expensive repo diff capture to export time (#295936)
zhichli Feb 18, 2026
e5895d4
:up: distro (#295946)
bpasero Feb 18, 2026
2500a2c
A/B experiment: close button vs Skip for now on sign-in dialog (#295867)
prasanthpul Feb 18, 2026
1874f55
Potential fix for https://github.com/microsoft/vscode/issues/295379 (…
hediet Feb 18, 2026
9ae007d
Prevent static contribution API file from getting line ending changes…
alexr00 Feb 18, 2026
4a2f9d4
chore - comment out session exclusion in settings (#295971)
bpasero Feb 18, 2026
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
2 changes: 1 addition & 1 deletion .npmrc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
disturl="https://electronjs.org/headers"
target="39.6.0"
ms_build_id="13312042"
ms_build_id="13330601"
runtime="electron"
ignore-scripts=false
build_from_source="true"
Expand Down
2 changes: 1 addition & 1 deletion .vscode/settings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
"test/smoke/out/**": true,
"test/automation/out/**": true,
"test/integration/browser/out/**": true,
"src/vs/sessions/**": true
// "src/vs/sessions/**": true
},
// --- Search ---
"search.exclude": {
Expand Down
12 changes: 11 additions & 1 deletion build/lib/compilation.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -368,8 +368,18 @@ function generateExtensionPointNames() {
}, function () {
collectedNames.sort();
const content = JSON.stringify(collectedNames, undefined, '\t') + '\n';
const filePath = 'vs/workbench/services/extensions/common/extensionPoints.json';
try {
const existing = fs.readFileSync(path.join('src', filePath), 'utf-8');
if (existing.replace(/\r\n/g, '\n') === content) {
this.emit('end');
return;
}
} catch {
// File doesn't exist yet, emit it
}
this.emit('data', new File({
path: 'vs/workbench/services/extensions/common/extensionPoints.json',
path: filePath,
contents: Buffer.from(content)
}));
this.emit('end');
Expand Down
13 changes: 13 additions & 0 deletions build/lib/extractExtensionPoints.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,10 +211,23 @@ function scanDirectory(dir: string): string[] {
return names;
}

function normalize(s: string): string {
return s.replace(/\r\n/g, '\n');
}

function main(): void {
const names = scanDirectory(path.join(srcDir, 'vs', 'workbench'));
names.sort();
const output = JSON.stringify(names, undefined, '\t') + '\n';
try {
const existing = fs.readFileSync(outputPath, 'utf-8');
if (normalize(existing) === normalize(output)) {
console.log(`No changes to ${path.relative(rootDir, outputPath)}`);
return;
}
} catch {
// File doesn't exist yet, write it
}
fs.writeFileSync(outputPath, output, 'utf-8');
console.log(`Wrote ${names.length} extension points to ${path.relative(rootDir, outputPath)}`);
}
Expand Down
96 changes: 48 additions & 48 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

22 changes: 11 additions & 11 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "code-oss-dev",
"version": "1.110.0",
"distro": "16be71799bd7ef33ea9b0206fb548ce74a47daa4",
"distro": "3dc22e559f766d4c609a675d88819589e9876d9c",
"author": {
"name": "Microsoft Corporation"
},
Expand Down Expand Up @@ -95,16 +95,16 @@
"@vscode/windows-mutex": "^0.5.0",
"@vscode/windows-process-tree": "^0.6.0",
"@vscode/windows-registry": "^1.1.0",
"@xterm/addon-clipboard": "^0.3.0-beta.152",
"@xterm/addon-image": "^0.10.0-beta.152",
"@xterm/addon-ligatures": "^0.11.0-beta.152",
"@xterm/addon-progress": "^0.3.0-beta.152",
"@xterm/addon-search": "^0.17.0-beta.152",
"@xterm/addon-serialize": "^0.15.0-beta.152",
"@xterm/addon-unicode11": "^0.10.0-beta.152",
"@xterm/addon-webgl": "^0.20.0-beta.151",
"@xterm/headless": "^6.1.0-beta.152",
"@xterm/xterm": "^6.1.0-beta.152",
"@xterm/addon-clipboard": "^0.3.0-beta.165",
"@xterm/addon-image": "^0.10.0-beta.165",
"@xterm/addon-ligatures": "^0.11.0-beta.165",
"@xterm/addon-progress": "^0.3.0-beta.165",
"@xterm/addon-search": "^0.17.0-beta.165",
"@xterm/addon-serialize": "^0.15.0-beta.165",
"@xterm/addon-unicode11": "^0.10.0-beta.165",
"@xterm/addon-webgl": "^0.20.0-beta.164",
"@xterm/headless": "^6.1.0-beta.165",
"@xterm/xterm": "^6.1.0-beta.165",
"http-proxy-agent": "^7.0.0",
"https-proxy-agent": "^7.0.2",
"jschardet": "3.1.4",
Expand Down
Loading
Loading