Skip to content

fix(patches): rebase 00-brand-remove-branding for VS Code 1.126.0 #22

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
sbs44 merged 5 commits into from
Jun 28, 2026
Merged

fix(patches): rebase 00-brand-remove-branding for VS Code 1.126.0 #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
932b3d9
fix(patches): rebase 00-brand-remove-branding for VS Code 1.126.0
sbs44 Jun 27, 2026
f37192b
fix(patches): rebase 4 more patches for VS Code 1.126.0
sbs44 Jun 27, 2026
2f68075
fix(patches): re-engineer 51-ext-copilot-remove for VS Code 1.126.0
sbs44 Jun 27, 2026
e4acf06
fix(patches): resolve 3 tsgo typecheck errors for VS Code 1.126.0
sbs44 Jun 28, 2026
3bfc05b
fix(patches): adapt copilotManagedSettings to forked policy-watcher
sbs44 Jun 28, 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
76 changes: 30 additions & 46 deletions patches/00-brand-remove-branding.patch
View file
Open in desktop

Large diffs are not rendered by default.

10 changes: 7 additions & 3 deletions patches/00-build-disable-mangle.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
diff --git a/build/lib/compilation.ts b/build/lib/compilation.ts
index 948c6b4..66ecdd3 100644
index 32e3e25e..6e9396d2 100644
--- a/build/lib/compilation.ts
+++ b/build/lib/compilation.ts
@@ -131,27 +131,3 @@ export function compileTask(src: string, out: string, build: boolean, options: {
@@ -137,31 +137,7 @@ export function compileTask(src: string, out: string, build: boolean, options: {
generator.execute();
}

- // mangle: TypeScript to TypeScript
- let mangleStream = es.through();
Expand All @@ -27,6 +29,8 @@ index 948c6b4..66ecdd3 100644
- });
- }
-
return srcPipe
const emit = util.streamToPromise(srcPipe
- .pipe(mangleStream)
.pipe(generator.stream)
.pipe(compile())
.pipe(gulp.dest(out)));
34 changes: 18 additions & 16 deletions patches/00-copilot-fix-action-condition.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
diff --git a/src/vs/workbench/contrib/chat/browser/actions/chatActions.ts b/src/vs/workbench/contrib/chat/browser/actions/chatActions.ts
index dd222258..1c1e7201 100644
index 7f7d1479..87b739be 100644
--- a/src/vs/workbench/contrib/chat/browser/actions/chatActions.ts
+++ b/src/vs/workbench/contrib/chat/browser/actions/chatActions.ts
@@ -1166,7 +1166,7 @@ export function registerChatActions() {
@@ -1202,7 +1202,7 @@ export function registerChatActions() {
id: 'workbench.action.chat.configureCodeCompletions',
title: localize2('configureCompletions', "Configure Inline Suggestions..."),
precondition: ContextKeyExpr.and(
Expand All @@ -12,7 +12,7 @@ index dd222258..1c1e7201 100644
ChatContextKeys.Setup.untrusted.negate()
),
diff --git a/src/vs/workbench/contrib/chat/browser/actions/chatContextActions.ts b/src/vs/workbench/contrib/chat/browser/actions/chatContextActions.ts
index c7020b52..bb69de4f 100644
index 00c445ab..f1e87408 100644
--- a/src/vs/workbench/contrib/chat/browser/actions/chatContextActions.ts
+++ b/src/vs/workbench/contrib/chat/browser/actions/chatContextActions.ts
@@ -317,7 +317,8 @@ class AttachSelectionToChatAction extends Action2 {
Expand All @@ -26,9 +26,10 @@ index c7020b52..bb69de4f 100644
}, {
id: MenuId.InlineChatEditorAffordance,
diff --git a/src/vs/workbench/contrib/chat/browser/chat.shared.contribution.ts b/src/vs/workbench/contrib/chat/browser/chat.shared.contribution.ts
index 3fcf5140..82d4066f 100644
--- a/src/vs/workbench/contrib/chat/browser/chat.shared.contribution.ts
+++ b/src/vs/workbench/contrib/chat/browser/chat.shared.contribution.ts
@@ -1672,7 +1672,7 @@ configurationRegistry.registerConfiguration({
@@ -1757,7 +1757,7 @@ configurationRegistry.registerConfiguration({
[ChatConfiguration.AIDisabled]: {
type: 'boolean',
description: nls.localize('chat.disableAIFeatures', "Disable and hide built-in AI features provided by GitHub Copilot, including chat and inline suggestions."),
Expand All @@ -50,10 +51,10 @@ index 8fb472b3..16cff2b1 100644
ChatContextKeys.Setup.disabledInWorkspace.negate(),
),
diff --git a/src/vs/workbench/contrib/chat/browser/chatSetup/chatSetupContributions.ts b/src/vs/workbench/contrib/chat/browser/chatSetup/chatSetupContributions.ts
index 34449705..86277e78 100644
index ac91175c..8fd319a7 100644
--- a/src/vs/workbench/contrib/chat/browser/chatSetup/chatSetupContributions.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatSetup/chatSetupContributions.ts
@@ -229,12 +229,13 @@ export class ChatSetupContribution extends Disposable implements IWorkbenchContr
@@ -230,12 +230,13 @@ export class ChatSetupContribution extends Disposable implements IWorkbenchContr
title: ChatSetupTriggerAction.CHAT_SETUP_ACTION_LABEL,
category: CHAT_CATEGORY,
f1: true,
Expand All @@ -73,46 +74,47 @@ index 34449705..86277e78 100644
)
});
}
@@ -367,6 +368,7 @@ export class ChatSetupContribution extends Disposable implements IWorkbenchContr
@@ -368,6 +369,7 @@ export class ChatSetupContribution extends Disposable implements IWorkbenchContr
id: MenuId.AccountsContext,
group: '2_copilot',
when: ContextKeyExpr.and(
+ ContextKeyExpr.has('config.chat.disableAIFeatures').negate(),
ChatContextKeys.Setup.hidden.negate(),
ChatContextKeys.Setup.disabledInWorkspace.negate(),
ChatContextKeys.Setup.completed.negate(),
@@ -399,5 +401,6 @@ export class ChatSetupContribution extends Disposable implements IWorkbenchContr
@@ -400,6 +402,7 @@ export class ChatSetupContribution extends Disposable implements IWorkbenchContr
id: MenuId.TitleBarAdjacentCenter,
order: 0, // same position as the update button
when: ContextKeyExpr.and(
+ ContextKeyExpr.has('config.chat.disableAIFeatures').negate(),
IsWebContext.negate(),
ChatContextKeys.Entitlement.signedOut,
@@ -430,6 +433,7 @@ export class ChatSetupContribution extends Disposable implements IWorkbenchContr
ChatEntitlementContextKeys.hasByokModels.negate(),
@@ -449,6 +452,7 @@ export class ChatSetupContribution extends Disposable implements IWorkbenchContr
category: localize2('chat.category', 'Chat'),
f1: true,
precondition: ContextKeyExpr.and(
+ ContextKeyExpr.has('config.chat.disableAIFeatures').negate(),
ChatContextKeys.Setup.hidden.negate(),
ChatContextKeys.Setup.disabledInWorkspace.negate(),
ContextKeyExpr.or(
@@ -489,6 +493,7 @@ export class ChatSetupContribution extends Disposable implements IWorkbenchContr
@@ -514,6 +518,7 @@ export class ChatSetupContribution extends Disposable implements IWorkbenchContr
category: localize2('chat.category', 'Chat'),
f1: true,
precondition: ContextKeyExpr.and(
+ ContextKeyExpr.has('config.chat.disableAIFeatures').negate(),
ChatContextKeys.Setup.hidden.negate(),
ChatContextKeys.Setup.disabledInWorkspace.negate(),
ContextKeyExpr.or(
@@ -585,6 +590,7 @@ export class ChatSetupContribution extends Disposable implements IWorkbenchContr
registerGenerateCodeCommand('chat.internal.codeReview.run', 'github.copilot.chat.codeReview.run');
@@ -608,6 +613,7 @@ export class ChatSetupContribution extends Disposable implements IWorkbenchContr
registerGenerateCodeCommand('chat.internal.review', 'github.copilot.chat.review');

const internalGenerateCodeContext = ContextKeyExpr.and(
+ ContextKeyExpr.has('config.chat.disableAIFeatures').negate(),
ChatContextKeys.Setup.hidden.negate(),
ChatContextKeys.Setup.disabledInWorkspace.negate(),
ChatContextKeys.Setup.completed.negate(),
@@ -813,7 +819,11 @@ export class ChatTeardownContribution extends Disposable implements IWorkbenchCo
@@ -873,7 +879,11 @@ export class ChatTeardownContribution extends Disposable implements IWorkbenchCo
title: ChatSetupHideAction.TITLE,
f1: true,
category: CHAT_CATEGORY,
Expand Down Expand Up @@ -140,7 +142,7 @@ index 7e5d8f63..e949b389 100644

export class StartSessionAction extends Action2 {
diff --git a/src/vs/workbench/contrib/mcp/browser/mcpServersView.ts b/src/vs/workbench/contrib/mcp/browser/mcpServersView.ts
index c47eeb39..dcc00326 100644
index c983379d..bc16fdc5 100644
--- a/src/vs/workbench/contrib/mcp/browser/mcpServersView.ts
+++ b/src/vs/workbench/contrib/mcp/browser/mcpServersView.ts
@@ -543,7 +543,7 @@ export class McpServersViewsContribution extends Disposable implements IWorkbenc
Expand Down Expand Up @@ -199,10 +201,10 @@ index 6ee2a32c..c5cdc792 100644
ChatContextKeys.Setup.disabledInWorkspace.negate(),
ChatContextKeys.Setup.completed.negate(),
diff --git a/src/vs/workbench/contrib/scm/browser/scmInput.ts b/src/vs/workbench/contrib/scm/browser/scmInput.ts
index 6adf03c6..38a6d42c 100644
index 63642985..5dee8dca 100644
--- a/src/vs/workbench/contrib/scm/browser/scmInput.ts
+++ b/src/vs/workbench/contrib/scm/browser/scmInput.ts
@@ -846,6 +846,7 @@ registerAction2(class extends Action2 {
@@ -847,6 +847,7 @@ registerAction2(class extends Action2 {
menu: {
id: MenuId.SCMInputBox,
when: ContextKeyExpr.and(
Expand Down
34 changes: 17 additions & 17 deletions patches/20-keymap-use-custom-lib.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
diff --git a/.npmrc b/.npmrc
index 8c21e58ef14..25a93f408ad 100644
index 8c21e58e..25a93f40 100644
--- a/.npmrc
+++ b/.npmrc
@@ -4,5 +4,6 @@ ms_build_id="14159160"
Expand All @@ -10,7 +10,7 @@ index 8c21e58ef14..25a93f408ad 100644
legacy-peer-deps="true"
timeout=180000
diff --git a/build/.moduleignore b/build/.moduleignore
index 90780acffa9..b226373f632 100644
index 8eb8da15..da57545b 100644
--- a/build/.moduleignore
+++ b/build/.moduleignore
@@ -63,11 +63,11 @@ fsevents/test/**
Expand All @@ -31,10 +31,10 @@ index 90780acffa9..b226373f632 100644
native-is-elevated/binding.gyp
native-is-elevated/build/**
diff --git a/eslint.config.js b/eslint.config.js
index fda37713fee..a2150a119a6 100644
index 51b085ee..938419e2 100644
--- a/eslint.config.js
+++ b/eslint.config.js
@@ -1530,7 +1530,7 @@ export default defineConfig(
@@ -1561,7 +1561,7 @@ export default defineConfig(
'inspector',
'minimist',
'node:module',
Expand All @@ -44,26 +44,26 @@ index fda37713fee..a2150a119a6 100644
'node-pty',
'os',
diff --git a/package-lock.json b/package-lock.json
index 38d50ffa4de..cad1ae14f2c 100644
index 81d315f0..1d99e154 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -41,6 +41,7 @@
"@vscode/windows-mutex": "^0.5.0",
"@vscode/windows-process-tree": "^0.7.0",
"@vscode/windows-registry": "^1.2.0",
+ "@vscodium/native-keymap": "3.3.7-258424",
"@xterm/addon-clipboard": "^0.3.0-beta.220",
"@xterm/addon-image": "^0.10.0-beta.220",
"@xterm/addon-ligatures": "^0.11.0-beta.220",
@@ -59,7 +60,6 @@
"@xterm/addon-clipboard": "^0.3.0-beta.285",
"@xterm/addon-image": "^0.10.0-beta.285",
"@xterm/addon-ligatures": "^0.11.0-beta.285",
@@ -60,7 +61,6 @@
"kerberos": "2.1.1",
"minimist": "^1.2.8",
"native-is-elevated": "0.9.0",
- "native-keymap": "^3.3.5",
"node-addon-api": "^6.0.0",
"node-pty": "^1.2.0-beta.13",
"open": "^10.1.2",
@@ -4466,6 +4466,13 @@
@@ -4496,6 +4496,13 @@
"hasInstallScript": true,
"license": "MIT"
},
Expand All @@ -77,7 +77,7 @@ index 38d50ffa4de..cad1ae14f2c 100644
"node_modules/@webgpu/types": {
"version": "0.1.66",
"resolved": "https://registry.npmjs.org/@webgpu/types/-/types-0.1.66.tgz",
@@ -14114,9 +14121,10 @@
@@ -14157,9 +14164,10 @@
}
},
"node_modules/napi-build-utils": {
Expand All @@ -91,7 +91,7 @@ index 38d50ffa4de..cad1ae14f2c 100644
},
"node_modules/native-is-elevated": {
"version": "0.9.0",
@@ -14125,13 +14133,6 @@
@@ -14168,13 +14176,6 @@
"hasInstallScript": true,
"license": "MIT"
},
Expand All @@ -105,7 +105,7 @@ index 38d50ffa4de..cad1ae14f2c 100644
"node_modules/natural-compare": {
"version": "1.4.0",
"resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
@@ -15526,16 +15527,17 @@
@@ -15580,16 +15581,17 @@
"license": "ISC"
},
"node_modules/prebuild-install": {
Expand All @@ -128,10 +128,10 @@ index 38d50ffa4de..cad1ae14f2c 100644
"pump": "^3.0.0",
"rc": "^1.2.7",
diff --git a/package.json b/package.json
index a43d079633a..508acdfb4dd 100644
index 36485330..2a5830cd 100644
--- a/package.json
+++ b/package.json
@@ -141,7 +141,7 @@
@@ -144,7 +144,7 @@
"kerberos": "2.1.1",
"minimist": "^1.2.8",
"native-is-elevated": "0.9.0",
Expand All @@ -141,7 +141,7 @@ index a43d079633a..508acdfb4dd 100644
"node-pty": "^1.2.0-beta.13",
"open": "^10.1.2",
diff --git a/src/vs/platform/environment/test/node/nativeModules.integrationTest.ts b/src/vs/platform/environment/test/node/nativeModules.integrationTest.ts
index 9b11a712c25..975c312747a 100644
index 9b11a712..975c3127 100644
--- a/src/vs/platform/environment/test/node/nativeModules.integrationTest.ts
+++ b/src/vs/platform/environment/test/node/nativeModules.integrationTest.ts
@@ -42,12 +42,12 @@ flakySuite('Native Modules (all platforms)', () => {
Expand All @@ -162,7 +162,7 @@ index 9b11a712c25..975c312747a 100644

test('@vscode/native-watchdog', async () => {
diff --git a/src/vs/platform/keyboardLayout/electron-main/keyboardLayoutMainService.ts b/src/vs/platform/keyboardLayout/electron-main/keyboardLayoutMainService.ts
index 8950ce2184a..f31cea623bc 100644
index 8950ce21..f31cea62 100644
--- a/src/vs/platform/keyboardLayout/electron-main/keyboardLayoutMainService.ts
+++ b/src/vs/platform/keyboardLayout/electron-main/keyboardLayoutMainService.ts
@@ -3,7 +3,7 @@
Expand Down
Loading
Loading